Restructuring namespaces
Begin of ExtensionDefn harvesting