Now fixing the directories