Big surgical refactor; Removing ModuleObject, ModuleClass, ClassClass