Change methods to use new ModuleId struct
Fix some signal/slots.