Change modules to inherit from IBase