Refactored the project into MVC