Refactor of the project.