Changed project structure

Project structure now reflects MVC.