re-structured the directories