Cleanup deleted/moved files
Merge branch 'master' of github.com:claassen/CmC