Changed around structure of the directories again so it follows a linear path