Converting more code to ModuleId, and changing format.