Modified project structure in order to support MVC