Project structure refactored