Reorganized packages to better implement MVC pattern