Refactor project. Use MVC