Moved MVC classes to separate files.