Refactoring the project structure