Added Controller class and continued refactoring project.