Major package moves to stick to the MVC pattern