Reorganized the directories.