we should create another story for that higher-level structure as well as reconsidering the repeated name of the config file (not having to repeat the name if it's an "enhanced" module where the dir is the name already)... personally I like the idea of having an xml file that is directly within that dir and using 'config' either for supplementary config files (those that might be imported, etc) as well as properties files

overall though I agree with Eric that we should proceed with merging this PR as-is and then revisit those stories afterwards