Start of project structure refactoring