From fcb6b117aafc92b98abffe10bc7ae16325c91596 Mon Sep 17 00:00:00 2001
From: Christophe Duquesne <christophe.duquesne@aurigetech.com>
Date: Fri, 15 Feb 2019 15:23:43 +0100
Subject: [PATCH 1/2] Correction of the XML-Spy project

Correction of the XML-Spy project due to the removal of version numbers
in the names of the files
---
 NeTEx.spp | 678 +++++++++++++++++++++++++++---------------------------
 1 file changed, 339 insertions(+), 339 deletions(-)

diff --git a/NeTEx.spp b/NeTEx.spp
index b1a035064..2ca55c2c9 100644
--- a/NeTEx.spp
+++ b/NeTEx.spp
@@ -19,402 +19,402 @@
 			<File FilePath="xsd\wsdl\NeTEx_wsProducer-WSDL2.wsdl" HomeFolder="Yes"/>
 		</Folder>
 		<Folder FolderName="Frames Containing netex objects">
-			<File FilePath="xsd\netex_framework\netex_frames\netex_compositeFrame_version-v1.0.xsd"/>
-			<File FilePath="xsd\netex_part_3\part3_frames\netex_fareFrame_version-v1.0.xsd"/>
-			<File FilePath="xsd\netex_framework\netex_frames\netex_generalFrame_version-v1.0.xsd"/>
-			<File FilePath="xsd\netex_part_1\part1_frames\netex_infrastructureFrame_version-v1.0.xsd"/>
-			<File FilePath="xsd\netex_framework\netex_frames\netex_resourceFrame_version-v1.1.xsd" HomeFolder="Yes"/>
-			<File FilePath="xsd\netex_framework\netex_frames\netex_serviceCalendarFrame_version-v1.0.xsd"/>
-			<File FilePath="xsd\netex_part_2\part2_frames\netex_serviceFrame_version-v1.1.xsd" HomeFolder="Yes"/>
-			<File FilePath="xsd\netex_part_1\part1_frames\netex_siteFrame_version-v1.1.xsd"/>
-			<File FilePath="xsd\netex_part_2\part2_frames\netex_timetableFrame_version-v1.0.xsd"/>
-			<File FilePath="xsd\netex_part_2\part2_frames\netex_vehicleScheduleFrame_version-v1.0.xsd"/>
+			<File FilePath="xsd\netex_framework\netex_frames\netex_compositeFrame_version.xsd"/>
+			<File FilePath="xsd\netex_part_3\part3_frames\netex_fareFrame_version.xsd"/>
+			<File FilePath="xsd\netex_framework\netex_frames\netex_generalFrame_version.xsd"/>
+			<File FilePath="xsd\netex_part_1\part1_frames\netex_infrastructureFrame_version.xsd"/>
+			<File FilePath="xsd\netex_framework\netex_frames\netex_resourceFrame_version.xsd" HomeFolder="Yes"/>
+			<File FilePath="xsd\netex_framework\netex_frames\netex_serviceCalendarFrame_version.xsd"/>
+			<File FilePath="xsd\netex_part_2\part2_frames\netex_serviceFrame_version.xsd" HomeFolder="Yes"/>
+			<File FilePath="xsd\netex_part_1\part1_frames\netex_siteFrame_version.xsd"/>
+			<File FilePath="xsd\netex_part_2\part2_frames\netex_timetableFrame_version.xsd"/>
+			<File FilePath="xsd\netex_part_2\part2_frames\netex_vehicleScheduleFrame_version.xsd"/>
 		</Folder>
 		<Folder FolderName="netex_framework_TM_CC">
 			<Folder FolderName="netex_utility_TM_CC">
-				<File FilePath="xsd\netex_framework\netex_utility\netex_location_types-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_utility\netex_units-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_utility\netex_utility_contact-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_utility\netex_utility_time-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_utility\netex_utility_types-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_utility\netex_utility_xml-v1.0.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_utility\netex_location_types.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_utility\netex_units.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_utility\netex_utility_contact.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_utility\netex_utility_time.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_utility\netex_utility_types.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_utility\netex_utility_xml.xsd" HomeFolder="Yes"/>
 			</Folder>
 			<Folder FolderName="netex_responsibility_TM_CC">
-				<File FilePath="xsd\netex_framework\netex_responsibility\netex_alternativeText_support-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_responsibility\netex_alternativeText_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_responsibility\netex_dataSource_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_responsibility\netex_entity_entity-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_responsibility\netex_entity_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_responsibility\netex_entity_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_organisation_support-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_organisation_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_responsibility\netex_relationship-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_responsibility\netex_relationship_support-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_responsibility\netex_responsibility_support-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_responsibility\netex_responsibility_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_responsibility\netex_responsibilitySet_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_responsibility\netex_typeOfValue_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_responsibility\netex_validityCondition_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_responsibility\netex_version_support-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_responsibility\netex_version_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_responsibility\netex_versionDelta_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_responsibility\netex_versionFrame_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_responsibility\netex_versionFrame_version-v1.0.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_responsibility\netex_alternativeText_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_responsibility\netex_alternativeText_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_responsibility\netex_dataSource_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_responsibility\netex_entity_entity.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_responsibility\netex_entity_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_responsibility\netex_entity_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_organisation_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_organisation_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_responsibility\netex_relationship.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_responsibility\netex_relationship_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_responsibility\netex_responsibility_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_responsibility\netex_responsibility_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_responsibility\netex_responsibilitySet_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_responsibility\netex_typeOfValue_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_responsibility\netex_validityCondition_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_responsibility\netex_version_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_responsibility\netex_version_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_responsibility\netex_versionDelta_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_responsibility\netex_versionFrame_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_responsibility\netex_versionFrame_version.xsd" HomeFolder="Yes"/>
 			</Folder>
 			<Folder FolderName="netex_genericFramework_TM_CC">
 				<Folder FolderName="netex_accessibility">
-					<File FilePath="xsd\netex_framework\netex_genericFramework\netex_accessibility\netex_acsb_accessibility-v1.1.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_framework\netex_genericFramework\netex_accessibility\netex_acsb_all-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_framework\netex_genericFramework\netex_accessibility\netex_acsb_limitations-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_framework\netex_genericFramework\netex_accessibility\netex_acsb_passengerMobility-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_framework\netex_genericFramework\netex_accessibility\netex_acsb_support-v1.0.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_framework\netex_genericFramework\netex_accessibility\netex_acsb_accessibility.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_framework\netex_genericFramework\netex_accessibility\netex_acsb_all.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_framework\netex_genericFramework\netex_accessibility\netex_acsb_limitations.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_framework\netex_genericFramework\netex_accessibility\netex_acsb_passengerMobility.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_framework\netex_genericFramework\netex_accessibility\netex_acsb_support.xsd" HomeFolder="Yes"/>
 				</Folder>
-				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_assignment_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_assignment_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_grouping_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_grouping_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_layer_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_layer_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_loggable_support-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_loggable_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_place_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_place_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_pointAndLink_support-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_pointAndLink_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_pointAndLinkSequence_support-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_pointAndLinkSequence_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_projection_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_projection_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_section_support-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_section_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_spatialFeature_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_spatialFeature_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_responsibility\netex_validityCondition_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_zone_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_zone_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_zoneProjection_version-v1.0.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_assignment_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_assignment_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_grouping_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_grouping_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_layer_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_layer_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_loggable_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_loggable_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_place_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_place_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_pointAndLink_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_pointAndLink_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_pointAndLinkSequence_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_pointAndLinkSequence_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_projection_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_projection_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_section_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_section_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_spatialFeature_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_spatialFeature_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_responsibility\netex_validityCondition_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_zone_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_zone_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_genericFramework\netex_zoneProjection_version.xsd" HomeFolder="Yes"/>
 			</Folder>
 			<Folder FolderName="netex_reusableComponents_TM_RC">
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_access_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_address_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_address_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_all_objects_reusableComponents-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_alternativeName_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_alternativeName_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_availabilityCondition_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_availabilityCondition_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_country_support-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_dayType_propertiesOfDay-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_dayType_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_dayType_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_equipment_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_equipment_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_equipmentPlace_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_equipmentVehiclePassenger_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_equipmentVehiclePassenger_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_facility_support-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_facility_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_facilityUic_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_linkByValue_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_mode_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_mode_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_networkRestriction_support-v1.0.xsd"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_notice_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_notice_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_noticeAssignment_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_otherOrganisation_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_otherOrganisation_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_schematicMap_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_schematicMap_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_securityList_support-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_securityList_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_serviceCalendar_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_serviceCalendar_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_submode_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_topographicPlace_support-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_topographicPlace_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_trainElement_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_trainElement_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_transportOrganisation_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_transportOrganisation_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_travelRights_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_travelRights_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_vehicleType_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_vehicleType_version-v1.1.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_access_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_address_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_address_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_all_objects_reusableComponents.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_alternativeName_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_alternativeName_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_availabilityCondition_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_availabilityCondition_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_country_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_dayType_propertiesOfDay.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_dayType_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_dayType_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_equipment_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_equipment_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_equipmentPlace_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_equipmentVehiclePassenger_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_equipmentVehiclePassenger_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_facility_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_facility_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_facilityUic_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_linkByValue_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_mode_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_mode_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_networkRestriction_support.xsd"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_notice_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_notice_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_noticeAssignment_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_otherOrganisation_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_otherOrganisation_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_schematicMap_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_schematicMap_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_securityList_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_securityList_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_serviceCalendar_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_serviceCalendar_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_submode_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_topographicPlace_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_topographicPlace_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_trainElement_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_trainElement_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_transportOrganisation_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_transportOrganisation_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_travelRights_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_travelRights_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_vehicleType_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_reusableComponents\netex_vehicleType_version.xsd" HomeFolder="Yes"/>
 			</Folder>
 			<Folder FolderName="netex_framework_frames">
-				<File FilePath="xsd\netex_framework\netex_frames\netex_all_frames_framework-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_all_objects_framework-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_all_objects_generic-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_frames\netex_compositeFrame_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_frames\netex_generalFrame_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_frames\netex_resourceFrame_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_frames\netex_resourceFrame_version-v1.1.xsd"/>
-				<File FilePath="xsd\netex_framework\netex_frames\netex_serviceCalendarFrame_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_framework\netex_frames\netex_serviceCalendarFrame_version-v1.0.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_frames\netex_all_frames_framework.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_all_objects_framework.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_all_objects_generic.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_frames\netex_compositeFrame_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_frames\netex_generalFrame_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_frames\netex_resourceFrame_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_frames\netex_resourceFrame_version.xsd"/>
+				<File FilePath="xsd\netex_framework\netex_frames\netex_serviceCalendarFrame_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_framework\netex_frames\netex_serviceCalendarFrame_version.xsd" HomeFolder="Yes"/>
 			</Folder>
-			<File FilePath="xsd\netex_framework\netex_all_objects_framework-v1.0.xsd"/>
-			<File FilePath="xsd\netex_framework\netex_all_objects_generic-v1.0.xsd"/>
-			<File FilePath="xsd\netex_framework\netex_payload_framework-v1.0.xsd" HomeFolder="Yes"/>
+			<File FilePath="xsd\netex_framework\netex_all_objects_framework.xsd"/>
+			<File FilePath="xsd\netex_framework\netex_all_objects_generic.xsd"/>
+			<File FilePath="xsd\netex_framework\netex_payload_framework.xsd" HomeFolder="Yes"/>
 		</Folder>
 		<Folder FolderName="netex_part_1 Network">
 			<Folder FolderName="netex_part_1_frames">
-				<File FilePath="xsd\netex_part_1\netex_all_frames_part1-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\netex_all_objects_part1-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_frames\netex_infrastructureFrame_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_frames\netex_siteFrame_version-v1.1.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\netex_all_frames_part1.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\netex_all_objects_part1.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_frames\netex_infrastructureFrame_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_frames\netex_siteFrame_version.xsd" HomeFolder="Yes"/>
 			</Folder>
 			<Folder FolderName="netex_part_1_ND">
-				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_activation_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_activation_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_all_objects_part1_infrastructureFrame_contents-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_all_objects_part1_lineRoute-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_all_objects_part1_networkDescription-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_flexibleNetwork_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_flexibleNetwork_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_line_support-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_line_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_lineNetwork_support-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_lineNetwork_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_networkInfrastructure_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_networkInfrastructure_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_networkRestriction_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_networkRestriction_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_route_support-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_route_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_routeInstruction_support-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_routeInstruction_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_timingPattern_support-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_vehicleAndCrewPoint_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_vehicleAndCrewPoint_version-v1.1.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_activation_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_activation_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_all_objects_part1_infrastructureFrame_contents.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_all_objects_part1_lineRoute.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_all_objects_part1_networkDescription.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_flexibleNetwork_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_flexibleNetwork_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_line_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_line_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_lineNetwork_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_lineNetwork_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_networkInfrastructure_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_networkInfrastructure_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_networkRestriction_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_networkRestriction_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_route_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_route_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_routeInstruction_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_routeInstruction_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_timingPattern_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_vehicleAndCrewPoint_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_networkDescription\netex_vehicleAndCrewPoint_version.xsd" HomeFolder="Yes"/>
 			</Folder>
 			<Folder FolderName="netex_part_1_TP">
-				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_all_objects_part1_tacticalPlanning-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_commonSection_support-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_commonSection_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_fareZone_support-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_fareZone_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_journeyPattern_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_journeyPattern_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_journeyPatternTimings_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_journeyPatternTimings_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_journeyTiming_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_journeyTiming_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_passengerInformationEquipment_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_passengerInformationEquipment_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_pathAssignment_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_routingConstraint_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_routingConstraint_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_servicePattern_support-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_servicePattern_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_siteConnection_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_siteConnection_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_stopAssignment_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_stopAssignment_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_timeDemandType_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_timeDemandType_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_timingPattern_version-v1.1.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_all_objects_part1_tacticalPlanning.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_commonSection_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_commonSection_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_fareZone_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_fareZone_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_journeyPattern_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_journeyPattern_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_journeyPatternTimings_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_journeyPatternTimings_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_journeyTiming_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_journeyTiming_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_passengerInformationEquipment_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_passengerInformationEquipment_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_pathAssignment_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_routingConstraint_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_routingConstraint_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_servicePattern_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_servicePattern_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_siteConnection_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_siteConnection_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_stopAssignment_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_stopAssignment_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_timeDemandType_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_timeDemandType_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_timingPattern_version.xsd" HomeFolder="Yes"/>
 			</Folder>
 			<Folder FolderName="netex_part_1_ifopt">
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_assistanceBooking_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_assistanceBooking_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_all_objects-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_checkConstraint_support-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_checkConstraint_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_equipmentAccess_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_equipmentAccess_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_equipmentAll-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_equipmentParking_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_equipmentParking_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_equipmentPassenger_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_equipmentPassenger_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_equipmentSigns_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_equipmentSigns_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_equipmentTicketing_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_equipmentTicketing_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_equipmentWaiting_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_equipmentWaiting_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_flexibleStopPlace_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_flexibleStopPlace_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_localService_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_localService_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_localServiceCommercial_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_localServiceCommercial_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_navigationPath_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_parking_support-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_parking_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_path_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_path_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_pointOfInterest_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_pointOfInterest_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_serviceFeature_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_serviceFeature_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_site_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_site_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_stopPlace_support-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_stopPlace_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_vehicleStopping_support-v1.0.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_assistanceBooking_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_assistanceBooking_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_all_objects.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_checkConstraint_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_checkConstraint_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_equipmentAccess_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_equipmentAccess_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_equipmentAll.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_equipmentParking_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_equipmentParking_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_equipmentPassenger_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_equipmentPassenger_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_equipmentSigns_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_equipmentSigns_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_equipmentTicketing_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_equipmentTicketing_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_equipmentWaiting_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_equipmentWaiting_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_flexibleStopPlace_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_flexibleStopPlace_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_localService_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_localService_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_localServiceCommercial_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_localServiceCommercial_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_navigationPath_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_parking_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_parking_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_path_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_path_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_pointOfInterest_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_pointOfInterest_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_serviceFeature_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_serviceFeature_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_site_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_site_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_stopPlace_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_stopPlace_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_ifopt\netex_ifopt_vehicleStopping_support.xsd" HomeFolder="Yes"/>
 			</Folder>
 		</Folder>
 		<Folder FolderName="netex_part_2 Timetables">
 			<Folder FolderName="netex_part_2_frames">
-				<File FilePath="xsd\netex_part_2\netex_all_frames_part2-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_2\netex_all_objects_part2-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_2\part2_frames\netex_driverScheduleFrame_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_2\part2_frames\netex_serviceFrame_version-v1.1.xsd"/>
-				<File FilePath="xsd\netex_part_2\part2_frames\netex_timetableFrame_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_2\part2_frames\netex_timetableFrame_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_2\part2_frames\netex_vehicleScheduleFrame_version-v1.0.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\netex_all_frames_part2.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\netex_all_objects_part2.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_frames\netex_driverScheduleFrame_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_frames\netex_serviceFrame_version.xsd"/>
+				<File FilePath="xsd\netex_part_2\part2_frames\netex_timetableFrame_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_frames\netex_timetableFrame_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_frames\netex_vehicleScheduleFrame_version.xsd" HomeFolder="Yes"/>
 			</Folder>
 			<Folder FolderName="netex_part_2_TI_JT">
-				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_all_objects_part2_journeyTimes-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_call_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_call_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_coupledJourney_support-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_coupledJourney_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_datedPassingTimes_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_datedVehicleJourney_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_datedVehicleJourney_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_flexibleService_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_flexibleService_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_interchange_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_interchange_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_interchangeRule_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_journey_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_journeyAccounting_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_journeyAccounting_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_journeyDesignator_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_journeyPatternTimings_version-v1.0.xsd"/>
-				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_passingTimes_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_passingTimes_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_serviceJourney_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_serviceJourney_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_serviceView_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_timeDemandProfile_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_timeDemandTimes_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_vehicleJourney_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_vehicleJourney_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_vehicleJourneyFrequency_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_vehicleJourneyFrequency_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_vehicleJourneyTimes_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_vehicleJourneyTimes_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_vehicleService_support-v1.0.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_all_objects_part2_journeyTimes.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_call_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_call_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_coupledJourney_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_coupledJourney_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_datedPassingTimes_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_datedVehicleJourney_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_datedVehicleJourney_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_flexibleService_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_flexibleService_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_interchange_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_interchange_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_interchangeRule_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_journey_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_journeyAccounting_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_journeyAccounting_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_journeyDesignator_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_1\part1_tacticalPlanning\netex_journeyPatternTimings_version.xsd"/>
+				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_passingTimes_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_passingTimes_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_serviceJourney_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_serviceJourney_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_serviceView_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_timeDemandProfile_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_timeDemandTimes_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_vehicleJourney_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_vehicleJourney_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_vehicleJourneyFrequency_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_vehicleJourneyFrequency_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_vehicleJourneyTimes_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_vehicleJourneyTimes_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_journeyTimes\netex_vehicleService_support.xsd" HomeFolder="Yes"/>
 			</Folder>
 			<Folder FolderName="netex_part_2_TI_VS">
-				<File FilePath="xsd\netex_part_2\part2_vehicleService\netex_all_objects_part2_vehicleService-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_2\part2_vehicleService\netex_vehicleService_version-v1.1.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_vehicleService\netex_all_objects_part2_vehicleService.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_vehicleService\netex_vehicleService_version.xsd" HomeFolder="Yes"/>
 			</Folder>
 			<Folder FolderName="netex_part_2_DM_RO">
-				<File FilePath="xsd\netex_part_2\part2_vehicleService\netex_duty_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_2\part2_vehicleService\netex_duty_version-v1.0.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_vehicleService\netex_duty_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_vehicleService\netex_duty_version.xsd" HomeFolder="Yes"/>
 			</Folder>
 		</Folder>
 		<Folder FolderName="netex_part_3 Fares">
 			<Folder FolderName="netex_part_3_FM">
 				<Folder FolderName="netex_part_3_FM_FP">
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_all_objects_part3_fares_FP-v1.1.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_calculationParameters_support-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_calculationParameters_version-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_farePrice_support-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_farePrice_version-v1.1.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_fareTable_support-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_fareTable_version-v1.1.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_all_objects_part3_fares_FP.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_calculationParameters_support.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_calculationParameters_version.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_farePrice_support.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_farePrice_version.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_fareTable_support.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_fareTable_version.xsd" HomeFolder="Yes"/>
 				</Folder>
 				<Folder FolderName="netex_part_3_FM_AR">
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_accessRightParameter_support-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_accessRightParameter_version-v1.1.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_all_objects_part3_fares_AR-v1.1.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_fareConditionSummary_support-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_fareConditionSummary_version-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_fareProduct_support-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_fareProduct_version-v1.1.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_usageParameter_support-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_usageParameter_version-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_usageParameterAfterSales_support-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_usageParameterAfterSales_version-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_usageParameterBooking_support-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_usageParameterBooking_version-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_usageParameterCharging_support-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_usageParameterCharging_version-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_usageParameterEligibility_support-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_usageParameterEligibility_version-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_usageParameterEntitlement_support-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_usageParameterEntitlement_version-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_usageParameterLuggage_support-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_usageParameterLuggage_version-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_usageParametersAll_support-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_usageParameterTravel_support-v1.1.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_usageParameterTravel_version-v1.0.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_accessRightParameter_support.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_accessRightParameter_version.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_all_objects_part3_fares_AR.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_fareConditionSummary_support.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_fareConditionSummary_version.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_fareProduct_support.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_fareProduct_version.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_usageParameter_support.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_usageParameter_version.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_usageParameterAfterSales_support.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_usageParameterAfterSales_version.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_usageParameterBooking_support.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_usageParameterBooking_version.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_usageParameterCharging_support.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_usageParameterCharging_version.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_usageParameterEligibility_support.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_usageParameterEligibility_version.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_usageParameterEntitlement_support.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_usageParameterEntitlement_version.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_usageParameterLuggage_support.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_usageParameterLuggage_version.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_usageParametersAll_support.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_usageParameterTravel_support.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_usageParameterTravel_version.xsd" HomeFolder="Yes"/>
 				</Folder>
 				<Folder FolderName="netex_part_3_FM_FS">
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_all_objects_part3_fares_FS-v1.1.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_distanceMatrixElement_support-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_distanceMatrixElement_version-v1.1.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_fareSeries_support-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_fareSeries_version-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_fareStructure_support-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_fareStructure_version-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_fareStructureElement_support-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_fareStructureElement_version-v1.1.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_geographicStructureFactor_support-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_geographicStructureFactor_version-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_qualityStructureFactor_support-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_qualityStructureFactor_version-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_timeStructureFactor_support-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_timeStructureFactor_version-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_validableElement_support-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_validableElement_version-v1.0.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_all_objects_part3_fares_FS.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_distanceMatrixElement_support.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_distanceMatrixElement_version.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_fareSeries_support.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_fareSeries_version.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_fareStructure_support.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_fareStructure_version.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_fareStructureElement_support.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_fareStructureElement_version.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_geographicStructureFactor_support.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_geographicStructureFactor_version.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_qualityStructureFactor_support.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_qualityStructureFactor_version.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_timeStructureFactor_support.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_timeStructureFactor_version.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_validableElement_support.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_validableElement_version.xsd" HomeFolder="Yes"/>
 				</Folder>
 				<Folder FolderName="netex_part_3_FM_SD">
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_all_objects_part3_fares_SD-v1.1.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_salesDistribution_support-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_salesDistribution_version-v1.0.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_salesOfferPackage_support-v1.1.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_salesOfferPackage_version-v1.1.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_travelDocument_support-v1.1.xsd" HomeFolder="Yes"/>
-					<File FilePath="xsd\netex_part_3\part3_fares\netex_travelDocument_version-v1.1.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_all_objects_part3_fares_SD.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_salesDistribution_support.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_salesDistribution_version.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_salesOfferPackage_support.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_salesOfferPackage_version.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_travelDocument_support.xsd" HomeFolder="Yes"/>
+					<File FilePath="xsd\netex_part_3\part3_fares\netex_travelDocument_version.xsd" HomeFolder="Yes"/>
 				</Folder>
-				<File FilePath="xsd\netex_part_3\part3_fares\netex_all_objects_part3_fares-v1.1.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_3\part3_fares\netex_all_objects_part3_fares.xsd" HomeFolder="Yes"/>
 			</Folder>
 			<Folder FolderName="netex_part_3_SalesTransactions_FM_ST">
-				<File FilePath="xsd\netex_part_3\part3_salesTransactions\netex_all_objects_part3_salesTransactions-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_3\part3_salesTransactions\netex_customerEligibility_support-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_3\part3_salesTransactions\netex_customerEligibility_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_3\part3_salesTransactions\netex_customerPurchasePackage_support-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_3\part3_salesTransactions\netex_customerPurchasePackage_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_3\part3_salesTransactions\netex_retailConsortium_support-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_3\part3_salesTransactions\netex_retailConsortium_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_3\part3_salesTransactions\netex_salesContract_support-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_3\part3_salesTransactions\netex_salesContract_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_3\part3_salesTransactions\netex_salesTransaction_support-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_3\part3_salesTransactions\netex_salesTransaction_version-v1.1.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_3\part3_salesTransactions\netex_all_objects_part3_salesTransactions.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_3\part3_salesTransactions\netex_customerEligibility_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_3\part3_salesTransactions\netex_customerEligibility_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_3\part3_salesTransactions\netex_customerPurchasePackage_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_3\part3_salesTransactions\netex_customerPurchasePackage_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_3\part3_salesTransactions\netex_retailConsortium_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_3\part3_salesTransactions\netex_retailConsortium_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_3\part3_salesTransactions\netex_salesContract_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_3\part3_salesTransactions\netex_salesContract_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_3\part3_salesTransactions\netex_salesTransaction_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_3\part3_salesTransactions\netex_salesTransaction_version.xsd" HomeFolder="Yes"/>
 			</Folder>
 			<Folder FolderName="netex_part_3_frames">
-				<File FilePath="xsd\netex_part_3\part3_frames\netex_all_frames_part3-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_3\part3_frames\netex_fareFrame_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_3\part3_frames\netex_salesTransactionFrame_version-v1.1.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_3\part3_frames\netex_all_frames_part3.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_3\part3_frames\netex_fareFrame_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_3\part3_frames\netex_salesTransactionFrame_version.xsd" HomeFolder="Yes"/>
 			</Folder>
 			<Folder FolderName="netex_part_3_OM_OC">
-				<File FilePath="xsd\netex_part_3\part3_monitoring\netex_all_objects_part3_monitoring-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_3\part3_monitoring\netex_monitoredCall_version-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_3\part3_monitoring\netex_monitoredPassingTimes_version-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_3\part3_monitoring\netex_monitoredVehicleJourney_support-v1.0.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_3\part3_monitoring\netex_all_objects_part3_monitoring.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_3\part3_monitoring\netex_monitoredCall_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_3\part3_monitoring\netex_monitoredPassingTimes_version.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_3\part3_monitoring\netex_monitoredVehicleJourney_support.xsd" HomeFolder="Yes"/>
 			</Folder>
 			<Folder FolderName="netex_part_3_parking_tariff">
-				<File FilePath="xsd\netex_part_3\part3_parkingTariff\netex_all_objects_part3_parking-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_3\part3_parkingTariff\netex_parkingTariff_support-v1.1.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_3\part3_parkingTariff\netex_parkingTariff_version-v1.1.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_3\part3_parkingTariff\netex_all_objects_part3_parking.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_3\part3_parkingTariff\netex_parkingTariff_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_3\part3_parkingTariff\netex_parkingTariff_version.xsd" HomeFolder="Yes"/>
 			</Folder>
 			<Folder FolderName="netex_part_3_PiQuery">
-				<File FilePath="xsd\netex_part_3\part3_PiQuery\netex_all_objects_part3_piQuery-v1.0.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_3\part3_PiQuery\netex_piRequest_support-v1.1.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_3\part3_PiQuery\netex_all_objects_part3_piQuery.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_3\part3_PiQuery\netex_piRequest_support.xsd" HomeFolder="Yes"/>
 			</Folder>
 		</Folder>
 		<Folder FolderName="netex_service">
-			<File FilePath="xsd\netex_service\netex_all-v1.0.xsd" HomeFolder="Yes"/>
-			<File FilePath="xsd\netex_service\netex_dataObjectRequest_service-v1.0.xsd" HomeFolder="Yes"/>
-			<File FilePath="xsd\netex_service\netex_filter_frame-v1.0.xsd" HomeFolder="Yes"/>
-			<File FilePath="xsd\netex_service\netex_filter_object-v1.0.xsd" HomeFolder="Yes"/>
+			<File FilePath="xsd\netex_service\netex_all.xsd" HomeFolder="Yes"/>
+			<File FilePath="xsd\netex_service\netex_dataObjectRequest_service.xsd" HomeFolder="Yes"/>
+			<File FilePath="xsd\netex_service\netex_filter_frame.xsd" HomeFolder="Yes"/>
+			<File FilePath="xsd\netex_service\netex_filter_object.xsd" HomeFolder="Yes"/>
 		</Folder>
 		<Folder FolderName="netex_siri">
 			<File FilePath="xsd\siri\siri_all_framework-v2.0.xsd" HomeFolder="Yes"/>
@@ -430,7 +430,7 @@
 			<File FilePath="xsd\siri_utility\siri_participant-v2.0.xsd" HomeFolder="Yes"/>
 			<File FilePath="xsd\siri_utility\siri_permissions-v2.0.xsd" HomeFolder="Yes"/>
 			<File FilePath="xsd\siri_utility\siri_types-v2.0.xsd" HomeFolder="Yes"/>
-			<File FilePath="xsd\siri_utility\siri_utility-v1.1.xsd" HomeFolder="Yes"/>
+			<File FilePath="xsd\siri_utility\siri_utility.xsd" HomeFolder="Yes"/>
 		</Folder>
 		<Folder FolderName="gml">
 			<File FilePath="xsd\gml\basicTypes.xsd" HomeFolder="Yes"/>

From 9b794b85e88e2122997c3f86a3ce8bb0f08f7463 Mon Sep 17 00:00:00 2001
From: Christophe Duquesne <christophe.duquesne@aurigetech.com>
Date: Fri, 15 Feb 2019 15:54:40 +0100
Subject: [PATCH 2/2] Correction of the Oxygen project

Correction of the Oxygen project that was broken due to the removal of
version numbers in XSD filenames: NOT TEST (I don't have Oxygen)
---
 NeTEx.xpr | 644 +++++++++++++++++++++++++++---------------------------
 1 file changed, 322 insertions(+), 322 deletions(-)

diff --git a/NeTEx.xpr b/NeTEx.xpr
index 78784d7a9..0f8cbf5eb 100644
--- a/NeTEx.xpr
+++ b/NeTEx.xpr
@@ -15,376 +15,376 @@
             </folder>
             <folder name="netex_framework">
                 <folder name="netex_framework_frames">
-                    <file name="xsd/netex_framework/netex_frames/netex_all_frames_framework-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_frames/netex_commonFrame_version-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_frames/netex_generalFrame_version-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_frames/netex_resourceFrame_support-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_frames/netex_resourceFrame_version-v1.1.xsd"/>
-                    <file name="xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_support-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_version-v1.0.xsd"/>
+                    <file name="xsd/netex_framework/netex_frames/netex_all_frames_framework.xsd"/>
+                    <file name="xsd/netex_framework/netex_frames/netex_commonFrame_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_frames/netex_resourceFrame_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_version.xsd"/>
                 </folder>
                 <folder name="netex_genericFramework">
                     <folder name="netex_accessibility">
-                        <file name="xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility-v1.0.xsd"/>
-                        <file name="xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_all-v1.0.xsd"/>
-                        <file name="xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations-v1.0.xsd"/>
-                        <file name="xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_passengerMobility-v1.0.xsd"/>
-                        <file name="xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_support-v1.0.xsd"/>
+                        <file name="xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd"/>
+                        <file name="xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_all.xsd"/>
+                        <file name="xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd"/>
+                        <file name="xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_passengerMobility.xsd"/>
+                        <file name="xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_support.xsd"/>
                     </folder>
-                    <file name="xsd/netex_framework/netex_genericFramework/netex_alternativeName_version-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_genericFramework/netex_assignment_version-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_genericFramework/netex_grouping_support-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_genericFramework/netex_grouping_version-v1.1.xsd"/>
-                    <file name="xsd/netex_framework/netex_genericFramework/netex_layer_support-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_genericFramework/netex_layer_version-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_genericFramework/netex_loggable_support-v1.1.xsd"/>
-                    <file name="xsd/netex_framework/netex_genericFramework/netex_loggable_version-v1.1.xsd"/>
-                    <file name="xsd/netex_framework/netex_genericFramework/netex_organisation_support-v1.1.xsd"/>
-                    <file name="xsd/netex_framework/netex_genericFramework/netex_organisation_version-v1.1.xsd"/>
-                    <file name="xsd/netex_framework/netex_genericFramework/netex_place_support-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_genericFramework/netex_place_version-v1.1.xsd"/>
-                    <file name="xsd/netex_framework/netex_genericFramework/netex_pointAndLink_support-v1.1.xsd"/>
-                    <file name="xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version-v1.1.xsd"/>
-                    <file name="xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd"/>
-                    <file name="xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version-v1.1.xsd"/>
-                    <file name="xsd/netex_framework/netex_genericFramework/netex_projection_support-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_genericFramework/netex_projection_version-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_genericFramework/netex_section_support-v1.1.xsd"/>
-                    <file name="xsd/netex_framework/netex_genericFramework/netex_section_version-v1.1.xsd"/>
-                    <file name="xsd/netex_framework/netex_genericFramework/netex_spatialFeature_support-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_genericFramework/netex_spatialFeature_version-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_genericFramework/netex_zone_support-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_genericFramework/netex_zone_version-v1.1.xsd"/>
-                    <file name="xsd/netex_framework/netex_genericFramework/netex_zoneProjection_version-v1.0.xsd"/>
+                    <file name="xsd/netex_framework/netex_genericFramework/netex_alternativeName_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_genericFramework/netex_assignment_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_genericFramework/netex_assignment_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_genericFramework/netex_grouping_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_genericFramework/netex_grouping_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_genericFramework/netex_layer_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_genericFramework/netex_layer_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_genericFramework/netex_loggable_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_genericFramework/netex_loggable_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_genericFramework/netex_organisation_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_genericFramework/netex_place_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_genericFramework/netex_place_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_genericFramework/netex_projection_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_genericFramework/netex_section_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_genericFramework/netex_section_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_genericFramework/netex_spatialFeature_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_genericFramework/netex_spatialFeature_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_genericFramework/netex_zoneProjection_version.xsd"/>
                 </folder>
                 <folder name="netex_responsibility">
-                    <file name="xsd/netex_framework/netex_responsibility/netex_entity_entity-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_responsibility/netex_entity_support-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_responsibility/netex_entity_version-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_responsibility/netex_relationship-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_responsibility/netex_responsibility_support-v1.1.xsd"/>
-                    <file name="xsd/netex_framework/netex_responsibility/netex_responsibility_version-v1.1.xsd"/>
-                    <file name="xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_responsibility/netex_typeOfValue_version-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_responsibility/netex_validityCondition_support-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_responsibility/netex_validityCondition_version-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_responsibility/netex_version_support-v1.1.xsd"/>
-                    <file name="xsd/netex_framework/netex_responsibility/netex_version_version-v1.1.xsd"/>
-                    <file name="xsd/netex_framework/netex_responsibility/netex_versionFrame_support-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_responsibility/netex_versionFrame_version-v1.0.xsd"/>
+                    <file name="xsd/netex_framework/netex_responsibility/netex_entity_entity.xsd"/>
+                    <file name="xsd/netex_framework/netex_responsibility/netex_entity_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_responsibility/netex_entity_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_responsibility/netex_relationship.xsd"/>
+                    <file name="xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_responsibility/netex_responsibility_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_responsibility/netex_validityCondition_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_responsibility/netex_validityCondition_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_responsibility/netex_version_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_responsibility/netex_version_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_responsibility/netex_versionFrame_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_responsibility/netex_versionFrame_version.xsd"/>
                 </folder>
                 <folder name="netex_reusableComponents">
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_access_version-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_accounting_version-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_address_support-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_address_version-v1.1.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_support-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_version-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_country_support-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_dayType_propertiesOfDay-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_dayType_support-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_dayType_version-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_equipment_version-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_equipmentPlace_version-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_facility_support-v1.1.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_facilityUic_support-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_facilityUic_version-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_linkByValue_support-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_mode_support-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_mode_version-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_notice_support-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_notice_version-v1.1.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_noticeAssignment_version-v1.1.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_support-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_schematicMap_support-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_schematicMap_version-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_securityList_support-v1.1.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_securityList_version-v1.1.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_support-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_version-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_submode_version-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_submode_version-v1.1.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_support-v1.1.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version-v1.1.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_trainElement_support-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_trainElement_version-v1.1.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_travelRights_support-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_travelRights_version-v1.1.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version-v1.1.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_access_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_accounting_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_address_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_address_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_country_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_dayType_propertiesOfDay.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_dayType_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_dayType_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_equipment_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_equipmentPlace_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_facilityUic_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_facilityUic_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_linkByValue_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_mode_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_notice_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_notice_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_schematicMap_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_schematicMap_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_securityList_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_securityList_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_travelRights_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_travelRights_version.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd"/>
+                    <file name="xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd"/>
                 </folder>
                 <folder name="netex_utility">
-                    <file name="xsd/netex_framework/netex_utility/netex_location_types-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_utility/netex_units-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_utility/netex_utility_contact-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_utility/netex_utility_time-v1.0.xsd"/>
-                    <file name="xsd/netex_framework/netex_utility/netex_utility_types-v1.1.xsd"/>
-                    <file name="xsd/netex_framework/netex_utility/netex_utility_xml-v1.0.xsd"/>
-                </folder>
-                <file name="xsd/netex_framework/netex_all_objects_framework-v1.0.xsd"/>
-                <file name="xsd/netex_framework/netex_all_objects_generic-v1.0.xsd"/>
-                <file name="xsd/netex_framework/netex_payload_framework-v1.0.xsd"/>
+                    <file name="xsd/netex_framework/netex_utility/netex_location_types.xsd"/>
+                    <file name="xsd/netex_framework/netex_utility/netex_units.xsd"/>
+                    <file name="xsd/netex_framework/netex_utility/netex_utility_contact.xsd"/>
+                    <file name="xsd/netex_framework/netex_utility/netex_utility_time.xsd"/>
+                    <file name="xsd/netex_framework/netex_utility/netex_utility_types.xsd"/>
+                    <file name="xsd/netex_framework/netex_utility/netex_utility_xml.xsd"/>
+                </folder>
+                <file name="xsd/netex_framework/netex_all_objects_framework.xsd"/>
+                <file name="xsd/netex_framework/netex_all_objects_generic.xsd"/>
+                <file name="xsd/netex_framework/netex_payload_framework.xsd"/>
             </folder>
             <folder name="netex_part_1">
                 <folder name="part1_frames">
-                    <file name="xsd/netex_part_1/netex_all_frames_part1-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/netex_all_objects_part1-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_frames/netex_infrastructureFrame_version-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_frames/netex_siteFrame_version-v1.1.xsd"/>
+                    <file name="xsd/netex_part_1/netex_all_frames_part1.xsd"/>
+                    <file name="xsd/netex_part_1/netex_all_objects_part1.xsd"/>
+                    <file name="xsd/netex_part_1/part1_frames/netex_infrastructureFrame_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd"/>
                 </folder>
                 <folder name="part1_ifopt">
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_version-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_all_objects-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support-v1.1.xsd"/>
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_version-v1.1.xsd"/>
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAll-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version-v1.1.xsd"/>
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_version-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_version-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version-v1.1.xsd"/>
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_version-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version-v1.1.xsd"/>
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_support-v1.1.xsd"/>
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_version-v1.1.xsd"/>
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_version-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_version-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support-v1.1.xsd"/>
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version-v1.1.xsd"/>
-                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support-v1.0.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_all_objects.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAll.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support.xsd"/>
                 </folder>
                 <folder name="part1_networkDescription_ND">
-                    <file name="xsd/netex_part_1/part1_networkDescription/netex_activation_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_networkDescription/netex_activation_version-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_infrastructureFrame_contents-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_lineRoute-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_networkDescription-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_version-v1.1.xsd"/>
-                    <file name="xsd/netex_part_1/part1_networkDescription/netex_line_support-v1.1.xsd"/>
-                    <file name="xsd/netex_part_1/part1_networkDescription/netex_line_version-v1.1.xsd"/>
-                    <file name="xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_support-v1.1.xsd"/>
-                    <file name="xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version-v1.1.xsd"/>
-                    <file name="xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_version-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_version-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_networkDescription/netex_route_support-v1.1.xsd"/>
-                    <file name="xsd/netex_part_1/part1_networkDescription/netex_route_version-v1.1.xsd"/>
-                    <file name="xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_support-v1.1.xsd"/>
-                    <file name="xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version-v1.1.xsd"/>
-                    <file name="xsd/netex_part_1/part1_networkDescription/netex_timingPattern_support-v1.1.xsd"/>
-                    <file name="xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version-v1.1.xsd"/>
+                    <file name="xsd/netex_part_1/part1_networkDescription/netex_activation_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_networkDescription/netex_activation_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_infrastructureFrame_contents.xsd"/>
+                    <file name="xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_lineRoute.xsd"/>
+                    <file name="xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_networkDescription.xsd"/>
+                    <file name="xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_networkDescription/netex_line_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_networkDescription/netex_route_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_networkDescription/netex_timingPattern_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version.xsd"/>
                 </folder>
                 <folder name="part1_tacticalPlanning_TP">
-                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_support-v1.1.xsd"/>
-                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_version-v1.1.xsd"/>
-                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_support-v1.1.xsd"/>
-                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version-v1.1.xsd"/>
-                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version-v1.1.xsd"/>
-                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_pathAssignment_version-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_version-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support-v1.1.xsd"/>
-                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version-v1.1.xsd"/>
-                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_version-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version-v1.1.xsd"/>
-                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version-v1.0.xsd"/>
-                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version-v1.1.xsd"/>
+                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning.xsd"/>
+                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_pathAssignment_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support.xsd"/>
+                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version.xsd"/>
+                    <file name="xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd"/>
                 </folder>
             </folder>
             <folder name="netex_part_2">
                 <folder name="part2_frames">
-                    <file name="xsd/netex_part_2/part2_frames/netex_driverScheduleFrame_version-v1.0.xsd"/>
-                    <file name="xsd/netex_part_2/part2_frames/netex_serviceFrame_version-v1.1.xsd"/>
-                    <file name="xsd/netex_part_2/part2_frames/netex_timetableFrame_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_2/part2_frames/netex_timetableFrame_version-v1.0.xsd"/>
-                    <file name="xsd/netex_part_2/part2_frames/netex_vehicleScheduleFrame_version-v1.0.xsd"/>
+                    <file name="xsd/netex_part_2/part2_frames/netex_driverScheduleFrame_version.xsd"/>
+                    <file name="xsd/netex_part_2/part2_frames/netex_serviceFrame_version.xsd"/>
+                    <file name="xsd/netex_part_2/part2_frames/netex_timetableFrame_support.xsd"/>
+                    <file name="xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd"/>
+                    <file name="xsd/netex_part_2/part2_frames/netex_vehicleScheduleFrame_version.xsd"/>
                 </folder>
                 <folder name="part2_journeyTimes_TI_JT">
-                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes-v1.0.xsd"/>
-                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_call_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_call_version-v1.1.xsd"/>
-                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_support-v1.1.xsd"/>
-                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version-v1.1.xsd"/>
-                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_datedPassingTimes_version-v1.1.xsd"/>
-                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version-v1.0.xsd"/>
-                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_version-v1.0.xsd"/>
-                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_interchange_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_interchange_version-v1.1.xsd"/>
-                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_interchangeRule_version-v1.1.xsd"/>
-                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_journey_version-v1.1.xsd"/>
-                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_version-v1.0.xsd"/>
-                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_journeyDesignator_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version-v1.1.xsd"/>
-                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_version-v1.1.xsd"/>
-                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_serviceView_version-v1.0.xsd"/>
-                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_timeDemandProfile_version-v1.0.xsd"/>
-                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_timeDemandTimes_version-v1.0.xsd"/>
-                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version-v1.1.xsd"/>
-                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_version-v1.1.xsd"/>
-                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_version-v1.0.xsd"/>
-                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_vehicleService_support-v1.0.xsd"/>
+                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes.xsd"/>
+                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_call_support.xsd"/>
+                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd"/>
+                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_support.xsd"/>
+                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd"/>
+                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_datedPassingTimes_version.xsd"/>
+                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_support.xsd"/>
+                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version.xsd"/>
+                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_support.xsd"/>
+                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_version.xsd"/>
+                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_interchange_support.xsd"/>
+                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd"/>
+                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_interchangeRule_version.xsd"/>
+                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd"/>
+                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_support.xsd"/>
+                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_version.xsd"/>
+                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_journeyDesignator_support.xsd"/>
+                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_support.xsd"/>
+                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd"/>
+                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_support.xsd"/>
+                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_version.xsd"/>
+                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_serviceView_version.xsd"/>
+                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_timeDemandProfile_version.xsd"/>
+                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_timeDemandTimes_version.xsd"/>
+                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_support.xsd"/>
+                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd"/>
+                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_support.xsd"/>
+                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_version.xsd"/>
+                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_support.xsd"/>
+                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_version.xsd"/>
+                    <file name="xsd/netex_part_2/part2_journeyTimes/netex_vehicleService_support.xsd"/>
                 </folder>
                 <folder name="part2_vehicleService_TI_VS">
-                    <file name="xsd/netex_part_2/part2_vehicleService/netex_all_objects_part2_vehicleService-v1.0.xsd"/>
-                    <file name="xsd/netex_part_2/part2_vehicleService/netex_duty_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_2/part2_vehicleService/netex_duty_version-v1.0.xsd"/>
-                    <file name="xsd/netex_part_2/part2_vehicleService/netex_vehicleService_version-v1.1.xsd"/>
+                    <file name="xsd/netex_part_2/part2_vehicleService/netex_all_objects_part2_vehicleService.xsd"/>
+                    <file name="xsd/netex_part_2/part2_vehicleService/netex_duty_support.xsd"/>
+                    <file name="xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd"/>
+                    <file name="xsd/netex_part_2/part2_vehicleService/netex_vehicleService_version.xsd"/>
                 </folder>
-                <file name="xsd/netex_part_2/netex_all_frames_part2-v1.0.xsd"/>
-                <file name="xsd/netex_part_2/netex_all_objects_part2-v1.0.xsd"/>
+                <file name="xsd/netex_part_2/netex_all_frames_part2.xsd"/>
+                <file name="xsd/netex_part_2/netex_all_objects_part2.xsd"/>
             </folder>
             <folder name="netex_part_3">
                 <folder name="part3_fares_FM">
                     <folder name="part3_access_rights_FM_AR">
-                        <file name="xsd/netex_part_3/part3_fares/netex_accessRightParameter_support-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_accessRightParameter_version-v1.1.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_AR-v1.1.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_fareConditionSummary_support-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_fareProduct_support-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_fareProduct_version-v1.1.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_usageParameter_support-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_usageParameter_version-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_usageParameterBooking_support-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_usageParameterBooking_version-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_usageParameterCharging_support-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_usageParameterCharging_version-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_support-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_version-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_support-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_version-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_support-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_version-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_usageParametersAll_support-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_usageParameterTravel_support-v1.1.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version-v1.0.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_accessRightParameter_support.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_AR.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_fareConditionSummary_support.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_fareProduct_support.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_usageParameter_support.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_usageParameter_version.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_usageParameterBooking_support.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_usageParameterBooking_version.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_usageParameterCharging_support.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_usageParameterCharging_version.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_support.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_version.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_support.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_version.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_support.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_version.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_usageParametersAll_support.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_usageParameterTravel_support.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd"/>
                     </folder>
                     <folder name="part3_fare_prices_FM_FP">
-                        <file name="xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FP-v1.1.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_calculationParameters_support-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_calculationParameters_version-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_farePrice_support-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_farePrice_version-v1.1.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_fareTable_support-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_fareTable_version-v1.1.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FP.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_calculationParameters_support.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_calculationParameters_version.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_farePrice_support.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_farePrice_version.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_fareTable_support.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_fareTable_version.xsd"/>
                     </folder>
                     <folder name="part3_fare_structure_FM_FS">
-                        <file name="xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FS-v1.1.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_fareSeries_support-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_fareSeries_version-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_fareStructure_support-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_fareStructure_version-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_fareStructureElement_support-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_fareStructureElement_version-v1.1.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_support-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_version-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_support-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_version-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_timeStructureFactor_support-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_timeStructureFactor_version-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_validableElement_support-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_validableElement_version-v1.0.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FS.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_fareSeries_support.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_fareSeries_version.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_fareStructure_support.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_fareStructure_version.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_fareStructureElement_support.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_fareStructureElement_version.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_support.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_version.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_support.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_version.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_timeStructureFactor_support.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_timeStructureFactor_version.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_validableElement_support.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_validableElement_version.xsd"/>
                     </folder>
                     <folder name="part3_sales_description_FM_SD">
-                        <file name="xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_SD-v1.1.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_salesDistribution_support-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_salesDistribution_version-v1.0.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_salesOfferPackage_support-v1.1.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_salesOfferPackage_version-v1.1.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_travelDocument_support-v1.1.xsd"/>
-                        <file name="xsd/netex_part_3/part3_fares/netex_travelDocument_version-v1.1.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_SD.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_salesDistribution_support.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_salesDistribution_version.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_salesOfferPackage_support.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_salesOfferPackage_version.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_travelDocument_support.xsd"/>
+                        <file name="xsd/netex_part_3/part3_fares/netex_travelDocument_version.xsd"/>
                     </folder>
-                    <file name="xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares-v1.1.xsd"/>
+                    <file name="xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares.xsd"/>
                 </folder>
                 <folder name="part3_frames">
-                    <file name="xsd/netex_part_3/part3_frames/netex_all_frames_part3-v1.0.xsd"/>
-                    <file name="xsd/netex_part_3/part3_frames/netex_fareFrame_version-v1.0.xsd"/>
-                    <file name="xsd/netex_part_3/part3_frames/netex_salesTransactionFrame_version-v1.1.xsd"/>
+                    <file name="xsd/netex_part_3/part3_frames/netex_all_frames_part3.xsd"/>
+                    <file name="xsd/netex_part_3/part3_frames/netex_fareFrame_version.xsd"/>
+                    <file name="xsd/netex_part_3/part3_frames/netex_salesTransactionFrame_version.xsd"/>
                 </folder>
                 <folder name="part3_monitoring_OM_DM">
-                    <file name="xsd/netex_part_3/part3_monitoring/netex_all_objects_part3_monitoring-v1.0.xsd"/>
-                    <file name="xsd/netex_part_3/part3_monitoring/netex_monitoredCall_version-v1.0.xsd"/>
-                    <file name="xsd/netex_part_3/part3_monitoring/netex_monitoredPassingTimes_version-v1.1.xsd"/>
-                    <file name="xsd/netex_part_3/part3_monitoring/netex_monitoredVehicleJourney_support-v1.0.xsd"/>
+                    <file name="xsd/netex_part_3/part3_monitoring/netex_all_objects_part3_monitoring.xsd"/>
+                    <file name="xsd/netex_part_3/part3_monitoring/netex_monitoredCall_version.xsd"/>
+                    <file name="xsd/netex_part_3/part3_monitoring/netex_monitoredPassingTimes_version.xsd"/>
+                    <file name="xsd/netex_part_3/part3_monitoring/netex_monitoredVehicleJourney_support.xsd"/>
                 </folder>
                 <folder name="part3_parkingTariffs_FM_FP">
-                    <file name="xsd/netex_part_3/part3_parkingTariff/netex_all_objects_part3_parking-v1.0.xsd"/>
-                    <file name="xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_support-v1.1.xsd"/>
-                    <file name="xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_version-v1.1.xsd"/>
+                    <file name="xsd/netex_part_3/part3_parkingTariff/netex_all_objects_part3_parking.xsd"/>
+                    <file name="xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_support.xsd"/>
+                    <file name="xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_version.xsd"/>
                 </folder>
                 <folder name="part3_salesTransactions_FM_ST">
-                    <file name="xsd/netex_part_3/part3_salesTransactions/netex_all_objects_part3_salesTransactions-v1.0.xsd"/>
-                    <file name="xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_support-v1.1.xsd"/>
-                    <file name="xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_version-v1.1.xsd"/>
-                    <file name="xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_support-v1.1.xsd"/>
-                    <file name="xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version-v1.1.xsd"/>
-                    <file name="xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_support-v1.1.xsd"/>
-                    <file name="xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_version-v1.1.xsd"/>
-                    <file name="xsd/netex_part_3/part3_salesTransactions/netex_salesContract_support-v1.1.xsd"/>
-                    <file name="xsd/netex_part_3/part3_salesTransactions/netex_salesContract_version-v1.1.xsd"/>
-                    <file name="xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_support-v1.0.xsd"/>
-                    <file name="xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_version-v1.1.xsd"/>
+                    <file name="xsd/netex_part_3/part3_salesTransactions/netex_all_objects_part3_salesTransactions.xsd"/>
+                    <file name="xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_support.xsd"/>
+                    <file name="xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_version.xsd"/>
+                    <file name="xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_support.xsd"/>
+                    <file name="xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd"/>
+                    <file name="xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_support.xsd"/>
+                    <file name="xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_version.xsd"/>
+                    <file name="xsd/netex_part_3/part3_salesTransactions/netex_salesContract_support.xsd"/>
+                    <file name="xsd/netex_part_3/part3_salesTransactions/netex_salesContract_version.xsd"/>
+                    <file name="xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_support.xsd"/>
+                    <file name="xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_version.xsd"/>
                 </folder>
             </folder>
             <folder name="netex_service">
-                <file name="xsd/netex_service/netex_all-v1.0.xsd"/>
-                <file name="xsd/netex_service/netex_dataObjectRequest_service-v1.0.xsd"/>
-                <file name="xsd/netex_service/netex_filter_frame-v1.0.xsd"/>
-                <file name="xsd/netex_service/netex_filter_object-v1.0.xsd"/>
+                <file name="xsd/netex_service/netex_all.xsd"/>
+                <file name="xsd/netex_service/netex_dataObjectRequest_service.xsd"/>
+                <file name="xsd/netex_service/netex_filter_frame.xsd"/>
+                <file name="xsd/netex_service/netex_filter_object.xsd"/>
             </folder>
             <folder name="siri">
                 <file name="xsd/siri/siri_all_framework-v2.0.xsd"/>
@@ -400,7 +400,7 @@
                 <file name="xsd/siri_utility/siri_participant-v2.0.xsd"/>
                 <file name="xsd/siri_utility/siri_permissions-v2.0.xsd"/>
                 <file name="xsd/siri_utility/siri_types-v2.0.xsd"/>
-                <file name="xsd/siri_utility/siri_utility-v1.1.xsd"/>
+                <file name="xsd/siri_utility/siri_utility.xsd"/>
             </folder>
             <file name="xsd/NeTEx_publication-NoConstraint.xsd"/>
             <file name="xsd/NeTEx_publication_timetable.xsd"/>
@@ -649,6 +649,6 @@
                 </folder>
             </folder>
         </folder>
-        <file name="xsd/netex_framework/netex_genericFramework/netex_organisation_support-v1.1.xsd"/>
+        <file name="xsd/netex_framework/netex_genericFramework/netex_organisation_support.xsd"/>
     </projectTree>
 </project>
\ No newline at end of file