Moved the factories into the project.