Solving the source folder structure