removed deprecated archetype
referencing the wrong archetype
moved clinical_report_header under cluster
fixed address