Finish refactoring of the project controller.