refactored the directory structure to mimic the yeoman directory structure