Yes, you did.
And yes he did. He disbanded the 1er Choc, 11e Choc and 12e Choc, and a small fraction of their personnel was divided into what would become the CPIS and CPEOM, but this did not constitute an operational unit. This i why the GO of the 1er RPIMA became a SOF unit in the 70s.