Refactoring the project's tree