Renamed solution and added Generator