Project structure refactoring continues