Reorganized code into a single binary for both CCM AND RMM and reorganized files