Restructured the directories and the solution file.