Finished refactoring the projects.