Laid out better MVC structure,