Restructured the directories.
Restructured the directories.