Update Project structure

Update Project structure to MVC structure