Wrap ModuleSystem and DescriptorSystem into a single object, to continue holding up the XModule house of cards

[PLAT-191]