Moving and cleaning up the Controller class