Refactoring the directories.