Renamed modules.defineClass newClass (and cleanup)