OLDD apollo CSM moved out of REWORK

small changes for compatibility.