Refactoring. Project structure change