Moved the old amalgamated headers and cpps into a subfolder extras/amalgamation