Changed the directory structure to better match the new conventions