Restructured the directories.