Shortened the solution, project, folder names