XD-1480: Merge Module.Type and ModuleType

Module.Type was brought over from the xdzk prototype and
is a duplicate of the pre existing ModuleType. This
change removes Module.Type and replaces all usages
with ModuleType.