Changes to project structure
more on new structure
More on new project structure