Modified structure to stick to a MVC structure.