- Project structure refactoration