Refactored the project.