Re-structure the directories