Changed the structure of the directories