Major project structure refactoring.