Refactoring the project