Major project structure refactoring