have the project structure refactored