Changed the dir structure to match mavens'