Refactored project structure to MVC packages