Cleaning up API class. Added Controller class