Started moving things to modules
Renamed from cm.hs
New module
New module