Change to a better MVC structure