Completed refactor to project factory.