Merge various improvements to CDCM, EDCM, compilations and folder structure.