Project structure refactoring