Reorganized the directories layout