restructures cpp files
Merge branch 'master' of https://github.com/xamino/mmci_2