Project structure refactoring.