Reorganizing toward MVC