Refactoring the project.