Renamed solution folders slightly