Merge pull request #63 from tswicegood/refactor

Switch to single loop now that all directory use the same pattern