Added cleaned controller
Renamed solution