Altered the folder-structure of the solution.