Restructure the directories