Finalize the duplication of projects: refs #285 #321