checkpoint: refactor CAD files