Started restructuring towards MVC