Reorganized the directories