Refactor packages to follow MVC Model