From ca3023528a66d13c5c66341112a41bbe46576875 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20Gro=C3=9Fberndt?= Date: Mon, 23 Nov 2020 11:48:43 +0100 Subject: [PATCH] Change directory structure and add OJP_All.xsd (#117) - Move all siri related files to siri/ - Move all OJP includes to ojp/ - Add OJP_All.xsd which includes all other files from ojp/ - Import OJP_All.xsd in OJP.xsd - Include OJP_All.xsd in all files from ojp/ and remove the other includes there --- OJP.xsd | 6 +++--- OJP/OJP_All.xsd | 18 ++++++++++++++++++ OJP_Common.xsd => OJP/OJP_Common.xsd | 5 ++--- .../OJP_FacilitySupport.xsd | 3 ++- OJP_Fare.xsd => OJP/OJP_Fare.xsd | 6 ++---- OJP_FareSupport.xsd => OJP/OJP_FareSupport.xsd | 2 +- .../OJP_JourneySupport.xsd | 7 ++----- .../OJP_ModesSupport.xsd | 4 ++-- .../OJP_PlaceSupport.xsd | 4 ++-- OJP_Places.xsd => OJP/OJP_Places.xsd | 6 ++---- .../OJP_RequestSupport.xsd | 6 ++---- OJP_Requests.xsd => OJP/OJP_Requests.xsd | 9 ++------- .../OJP_SituationSupport.xsd | 3 ++- OJP_StopEvents.xsd => OJP/OJP_StopEvents.xsd | 6 ++---- OJP_TripInfo.xsd => OJP/OJP_TripInfo.xsd | 4 +--- OJP_Trips.xsd => OJP/OJP_Trips.xsd | 7 ++----- OJP_Utility.xsd => OJP/OJP_Utility.xsd | 3 ++- .../acsb}/acsb_accessibility-v0.3.xsd | 0 {acsb => siri/acsb}/acsb_all-v0.3.xsd | 0 {acsb => siri/acsb}/acsb_limitations-v0.2.xsd | 0 .../acsb}/acsb_passengerMobility-v0.3.xsd | 0 .../datex2}/DATEXIISchema_1_0_1_0.xsd | 0 ...TEXIISchema_2_0RC1_2_0 with definitions.xsd | 0 .../datex2}/DATEXIISchema_2_0RC1_2_0.xsd | 0 .../ifopt}/ifopt_administration-v0.3.xsd | 0 .../ifopt}/ifopt_allStopPlace-v0.3.xsd | 0 .../ifopt}/ifopt_checkpoint-v0.3.xsd | 0 {ifopt => siri/ifopt}/ifopt_countries-v0.2.xsd | 0 {ifopt => siri/ifopt}/ifopt_equipment-v0.3.xsd | 0 {ifopt => siri/ifopt}/ifopt_location-v0.3.xsd | 0 {ifopt => siri/ifopt}/ifopt_modes-v0.2.xsd | 0 .../ifopt}/ifopt_modification-v0.3.xsd | 0 {ifopt => siri/ifopt}/ifopt_path-v0.2.xsd | 0 {ifopt => siri/ifopt}/ifopt_stop-v0.3.xsd | 0 {ifopt => siri/ifopt}/ifopt_time-v0.2.xsd | 0 {ifopt => siri/ifopt}/ifopt_types-v0.2.xsd | 0 siri/{ => siri}/siri_all_framework-v2.0.xsd | 0 siri/{ => siri}/siri_base-v2.0.xsd | 0 siri/{ => siri}/siri_common_services-v2.0.xsd | 0 .../siri_request_errorConditions-v2.0.xsd | 0 siri/{ => siri}/siri_request_support-v2.0.xsd | 0 siri/{ => siri}/siri_requests-v2.0.xsd | 0 .../siri_model}/siri_all-v2.0.xsd | 0 .../siri_model}/siri_all_journeyModel-v2.0.xsd | 0 .../siri_model}/siri_all_model-v2.0.xsd | 0 .../siri_model}/siri_all_situation-v2.0.xsd | 0 .../siri_datedVehicleJourney-v2.0.xsd | 0 .../siri_estimatedVehicleJourney-v2.0.xsd | 0 .../siri_model}/siri_facilities-v1.2.xsd | 0 .../siri_model}/siri_facility-v2.0.xsd | 0 .../siri_model}/siri_feature_support-v2.0.xsd | 0 .../siri_interchangeJourney-v2.0.xsd | 0 .../siri_model}/siri_journey-v2.0.xsd | 0 .../siri_model}/siri_journey_support-v2.0.xsd | 0 .../siri_model}/siri_modelPermissions-v2.0.xsd | 0 .../siri_model}/siri_modes-v1.1.xsd | 0 .../siri_monitoredVehicleJourney-v2.0.xsd | 0 .../siri_model}/siri_operator_support-v2.0.xsd | 0 .../siri_model}/siri_reference-v2.0.xsd | 0 .../siri_model}/siri_situation-v2.0.xsd | 0 .../siri_model}/siri_situationActions-v2.0.xsd | 0 .../siri_model}/siri_situationAffects-v2.0.xsd | 0 .../siri_situationClassifiers-v1.1.xsd | 0 .../siri_situationIdentity-v1.1.xsd | 0 .../siri_model}/siri_situationReasons-v2.0.xsd | 0 .../siri_situationServiceTypes-v1.0.xsd | 0 .../siri_targetedVehicleJourney-v2.0.xsd | 0 .../siri_model}/siri_time-v2.0.xsd | 0 .../siri_utility}/siri_all_utility-v2.0.xsd | 0 .../siri_utility}/siri_location-v2.0.xsd | 0 .../siri_utility}/siri_participant-v2.0.xsd | 0 .../siri_utility}/siri_permissions-v2.0.xsd | 0 .../siri_utility}/siri_types-v2.0.xsd | 0 .../siri_utility}/siri_utility-v1.1.xsd | 0 {xml => siri/xml}/xml.xsd | 0 75 files changed, 49 insertions(+), 50 deletions(-) create mode 100644 OJP/OJP_All.xsd rename OJP_Common.xsd => OJP/OJP_Common.xsd (99%) rename OJP_FacilitySupport.xsd => OJP/OJP_FacilitySupport.xsd (93%) rename OJP_Fare.xsd => OJP/OJP_Fare.xsd (98%) rename OJP_FareSupport.xsd => OJP/OJP_FareSupport.xsd (99%) rename OJP_JourneySupport.xsd => OJP/OJP_JourneySupport.xsd (99%) rename OJP_ModesSupport.xsd => OJP/OJP_ModesSupport.xsd (98%) rename OJP_PlaceSupport.xsd => OJP/OJP_PlaceSupport.xsd (99%) rename OJP_Places.xsd => OJP/OJP_Places.xsd (98%) rename OJP_RequestSupport.xsd => OJP/OJP_RequestSupport.xsd (97%) rename OJP_Requests.xsd => OJP/OJP_Requests.xsd (96%) rename OJP_SituationSupport.xsd => OJP/OJP_SituationSupport.xsd (94%) rename OJP_StopEvents.xsd => OJP/OJP_StopEvents.xsd (98%) rename OJP_TripInfo.xsd => OJP/OJP_TripInfo.xsd (97%) rename OJP_Trips.xsd => OJP/OJP_Trips.xsd (99%) rename OJP_Utility.xsd => OJP/OJP_Utility.xsd (97%) rename {acsb => siri/acsb}/acsb_accessibility-v0.3.xsd (100%) rename {acsb => siri/acsb}/acsb_all-v0.3.xsd (100%) rename {acsb => siri/acsb}/acsb_limitations-v0.2.xsd (100%) rename {acsb => siri/acsb}/acsb_passengerMobility-v0.3.xsd (100%) rename {datex2 => siri/datex2}/DATEXIISchema_1_0_1_0.xsd (100%) rename {datex2 => siri/datex2}/DATEXIISchema_2_0RC1_2_0 with definitions.xsd (100%) rename {datex2 => siri/datex2}/DATEXIISchema_2_0RC1_2_0.xsd (100%) rename {ifopt => siri/ifopt}/ifopt_administration-v0.3.xsd (100%) rename {ifopt => siri/ifopt}/ifopt_allStopPlace-v0.3.xsd (100%) rename {ifopt => siri/ifopt}/ifopt_checkpoint-v0.3.xsd (100%) rename {ifopt => siri/ifopt}/ifopt_countries-v0.2.xsd (100%) rename {ifopt => siri/ifopt}/ifopt_equipment-v0.3.xsd (100%) rename {ifopt => siri/ifopt}/ifopt_location-v0.3.xsd (100%) rename {ifopt => siri/ifopt}/ifopt_modes-v0.2.xsd (100%) rename {ifopt => siri/ifopt}/ifopt_modification-v0.3.xsd (100%) rename {ifopt => siri/ifopt}/ifopt_path-v0.2.xsd (100%) rename {ifopt => siri/ifopt}/ifopt_stop-v0.3.xsd (100%) rename {ifopt => siri/ifopt}/ifopt_time-v0.2.xsd (100%) rename {ifopt => siri/ifopt}/ifopt_types-v0.2.xsd (100%) rename siri/{ => siri}/siri_all_framework-v2.0.xsd (100%) rename siri/{ => siri}/siri_base-v2.0.xsd (100%) rename siri/{ => siri}/siri_common_services-v2.0.xsd (100%) rename siri/{ => siri}/siri_request_errorConditions-v2.0.xsd (100%) rename siri/{ => siri}/siri_request_support-v2.0.xsd (100%) rename siri/{ => siri}/siri_requests-v2.0.xsd (100%) rename {siri_model => siri/siri_model}/siri_all-v2.0.xsd (100%) rename {siri_model => siri/siri_model}/siri_all_journeyModel-v2.0.xsd (100%) rename {siri_model => siri/siri_model}/siri_all_model-v2.0.xsd (100%) rename {siri_model => siri/siri_model}/siri_all_situation-v2.0.xsd (100%) rename {siri_model => siri/siri_model}/siri_datedVehicleJourney-v2.0.xsd (100%) rename {siri_model => siri/siri_model}/siri_estimatedVehicleJourney-v2.0.xsd (100%) rename {siri_model => siri/siri_model}/siri_facilities-v1.2.xsd (100%) rename {siri_model => siri/siri_model}/siri_facility-v2.0.xsd (100%) rename {siri_model => siri/siri_model}/siri_feature_support-v2.0.xsd (100%) rename {siri_model => siri/siri_model}/siri_interchangeJourney-v2.0.xsd (100%) rename {siri_model => siri/siri_model}/siri_journey-v2.0.xsd (100%) rename {siri_model => siri/siri_model}/siri_journey_support-v2.0.xsd (100%) rename {siri_model => siri/siri_model}/siri_modelPermissions-v2.0.xsd (100%) rename {siri_model => siri/siri_model}/siri_modes-v1.1.xsd (100%) rename {siri_model => siri/siri_model}/siri_monitoredVehicleJourney-v2.0.xsd (100%) rename {siri_model => siri/siri_model}/siri_operator_support-v2.0.xsd (100%) rename {siri_model => siri/siri_model}/siri_reference-v2.0.xsd (100%) rename {siri_model => siri/siri_model}/siri_situation-v2.0.xsd (100%) rename {siri_model => siri/siri_model}/siri_situationActions-v2.0.xsd (100%) rename {siri_model => siri/siri_model}/siri_situationAffects-v2.0.xsd (100%) rename {siri_model => siri/siri_model}/siri_situationClassifiers-v1.1.xsd (100%) rename {siri_model => siri/siri_model}/siri_situationIdentity-v1.1.xsd (100%) rename {siri_model => siri/siri_model}/siri_situationReasons-v2.0.xsd (100%) rename {siri_model => siri/siri_model}/siri_situationServiceTypes-v1.0.xsd (100%) rename {siri_model => siri/siri_model}/siri_targetedVehicleJourney-v2.0.xsd (100%) rename {siri_model => siri/siri_model}/siri_time-v2.0.xsd (100%) rename {siri_utility => siri/siri_utility}/siri_all_utility-v2.0.xsd (100%) rename {siri_utility => siri/siri_utility}/siri_location-v2.0.xsd (100%) rename {siri_utility => siri/siri_utility}/siri_participant-v2.0.xsd (100%) rename {siri_utility => siri/siri_utility}/siri_permissions-v2.0.xsd (100%) rename {siri_utility => siri/siri_utility}/siri_types-v2.0.xsd (100%) rename {siri_utility => siri/siri_utility}/siri_utility-v1.1.xsd (100%) rename {xml => siri/xml}/xml.xsd (100%) diff --git a/OJP.xsd b/OJP.xsd index ef3f89cec..e22f138a9 100644 --- a/OJP.xsd +++ b/OJP.xsd @@ -1,9 +1,9 @@ - + - - + + diff --git a/OJP/OJP_All.xsd b/OJP/OJP_All.xsd new file mode 100644 index 000000000..1e7b9ccbb --- /dev/null +++ b/OJP/OJP_All.xsd @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/OJP_Common.xsd b/OJP/OJP_Common.xsd similarity index 99% rename from OJP_Common.xsd rename to OJP/OJP_Common.xsd index 562d1d9a0..85f931e47 100644 --- a/OJP_Common.xsd +++ b/OJP/OJP_Common.xsd @@ -1,8 +1,7 @@ - - - + + ========================================= General ================================================ diff --git a/OJP_FacilitySupport.xsd b/OJP/OJP_FacilitySupport.xsd similarity index 93% rename from OJP_FacilitySupport.xsd rename to OJP/OJP_FacilitySupport.xsd index 8718238d6..45e43be30 100644 --- a/OJP_FacilitySupport.xsd +++ b/OJP/OJP_FacilitySupport.xsd @@ -1,6 +1,7 @@ - + + ==================================== Facilities from SIRI ============================================= diff --git a/OJP_Fare.xsd b/OJP/OJP_Fare.xsd similarity index 98% rename from OJP_Fare.xsd rename to OJP/OJP_Fare.xsd index 8287cd156..98a8f47de 100644 --- a/OJP_Fare.xsd +++ b/OJP/OJP_Fare.xsd @@ -1,9 +1,7 @@ - - - - + + ====================================================Request definitions==================================================== diff --git a/OJP_FareSupport.xsd b/OJP/OJP_FareSupport.xsd similarity index 99% rename from OJP_FareSupport.xsd rename to OJP/OJP_FareSupport.xsd index 8d17d950e..0b9af9fb5 100644 --- a/OJP_FareSupport.xsd +++ b/OJP/OJP_FareSupport.xsd @@ -1,6 +1,6 @@ - + classes of travel available on a particular service which will affect the price to be paid diff --git a/OJP_JourneySupport.xsd b/OJP/OJP_JourneySupport.xsd similarity index 99% rename from OJP_JourneySupport.xsd rename to OJP/OJP_JourneySupport.xsd index fffd012ab..72bd6118f 100644 --- a/OJP_JourneySupport.xsd +++ b/OJP/OJP_JourneySupport.xsd @@ -1,10 +1,7 @@ - - - - - + + [a specialisation of VIA in TMv6] STOP PLACE or SCHEDULED STOP POINT as a VIA for a particular SERVICE PATTERN. Specialisation of a VIA. diff --git a/OJP_ModesSupport.xsd b/OJP/OJP_ModesSupport.xsd similarity index 98% rename from OJP_ModesSupport.xsd rename to OJP/OJP_ModesSupport.xsd index 2bf333179..aea892374 100644 --- a/OJP_ModesSupport.xsd +++ b/OJP/OJP_ModesSupport.xsd @@ -1,7 +1,7 @@ - - + + ========================================= Individual Modes ============================ diff --git a/OJP_PlaceSupport.xsd b/OJP/OJP_PlaceSupport.xsd similarity index 99% rename from OJP_PlaceSupport.xsd rename to OJP/OJP_PlaceSupport.xsd index bd6b1233f..28a1c2629 100644 --- a/OJP_PlaceSupport.xsd +++ b/OJP/OJP_PlaceSupport.xsd @@ -1,7 +1,7 @@ - - + + ========================================= Stop Points ============================================= diff --git a/OJP_Places.xsd b/OJP/OJP_Places.xsd similarity index 98% rename from OJP_Places.xsd rename to OJP/OJP_Places.xsd index 1c364bcbe..438284c33 100644 --- a/OJP_Places.xsd +++ b/OJP/OJP_Places.xsd @@ -1,9 +1,7 @@ - - - - + + FUNCTION 1: Place Identification diff --git a/OJP_RequestSupport.xsd b/OJP/OJP_RequestSupport.xsd similarity index 97% rename from OJP_RequestSupport.xsd rename to OJP/OJP_RequestSupport.xsd index c4cba8b8c..cd7b10254 100644 --- a/OJP_RequestSupport.xsd +++ b/OJP/OJP_RequestSupport.xsd @@ -1,9 +1,7 @@ - - - - + + ====================================================Simple Types ==================================================== diff --git a/OJP_Requests.xsd b/OJP/OJP_Requests.xsd similarity index 96% rename from OJP_Requests.xsd rename to OJP/OJP_Requests.xsd index 5db82095c..1b308a999 100644 --- a/OJP_Requests.xsd +++ b/OJP/OJP_Requests.xsd @@ -1,12 +1,7 @@ - - - - - - - + + diff --git a/OJP_SituationSupport.xsd b/OJP/OJP_SituationSupport.xsd similarity index 94% rename from OJP_SituationSupport.xsd rename to OJP/OJP_SituationSupport.xsd index bbeb83edf..d03177a22 100644 --- a/OJP_SituationSupport.xsd +++ b/OJP/OJP_SituationSupport.xsd @@ -1,6 +1,7 @@ - + + Wrapper type for SIRI PtSituationsElementStructure diff --git a/OJP_StopEvents.xsd b/OJP/OJP_StopEvents.xsd similarity index 98% rename from OJP_StopEvents.xsd rename to OJP/OJP_StopEvents.xsd index 9780c337e..76dcf19b6 100644 --- a/OJP_StopEvents.xsd +++ b/OJP/OJP_StopEvents.xsd @@ -1,9 +1,7 @@ - - - - + + Request structure for departure and arrival events at stops diff --git a/OJP_TripInfo.xsd b/OJP/OJP_TripInfo.xsd similarity index 97% rename from OJP_TripInfo.xsd rename to OJP/OJP_TripInfo.xsd index 6592f84f9..a974551f8 100644 --- a/OJP_TripInfo.xsd +++ b/OJP/OJP_TripInfo.xsd @@ -1,8 +1,6 @@ - - - + ===================== Request structures ============================================================ diff --git a/OJP_Trips.xsd b/OJP/OJP_Trips.xsd similarity index 99% rename from OJP_Trips.xsd rename to OJP/OJP_Trips.xsd index 62210f58b..d56b4da56 100644 --- a/OJP_Trips.xsd +++ b/OJP/OJP_Trips.xsd @@ -1,10 +1,7 @@ - - - - - + + ===== Request Structures =============================================== diff --git a/OJP_Utility.xsd b/OJP/OJP_Utility.xsd similarity index 97% rename from OJP_Utility.xsd rename to OJP/OJP_Utility.xsd index 8283b7d55..bfe4a602d 100644 --- a/OJP_Utility.xsd +++ b/OJP/OJP_Utility.xsd @@ -1,6 +1,7 @@ - + + ========================================= General ================================================ diff --git a/acsb/acsb_accessibility-v0.3.xsd b/siri/acsb/acsb_accessibility-v0.3.xsd similarity index 100% rename from acsb/acsb_accessibility-v0.3.xsd rename to siri/acsb/acsb_accessibility-v0.3.xsd diff --git a/acsb/acsb_all-v0.3.xsd b/siri/acsb/acsb_all-v0.3.xsd similarity index 100% rename from acsb/acsb_all-v0.3.xsd rename to siri/acsb/acsb_all-v0.3.xsd diff --git a/acsb/acsb_limitations-v0.2.xsd b/siri/acsb/acsb_limitations-v0.2.xsd similarity index 100% rename from acsb/acsb_limitations-v0.2.xsd rename to siri/acsb/acsb_limitations-v0.2.xsd diff --git a/acsb/acsb_passengerMobility-v0.3.xsd b/siri/acsb/acsb_passengerMobility-v0.3.xsd similarity index 100% rename from acsb/acsb_passengerMobility-v0.3.xsd rename to siri/acsb/acsb_passengerMobility-v0.3.xsd diff --git a/datex2/DATEXIISchema_1_0_1_0.xsd b/siri/datex2/DATEXIISchema_1_0_1_0.xsd similarity index 100% rename from datex2/DATEXIISchema_1_0_1_0.xsd rename to siri/datex2/DATEXIISchema_1_0_1_0.xsd diff --git a/datex2/DATEXIISchema_2_0RC1_2_0 with definitions.xsd b/siri/datex2/DATEXIISchema_2_0RC1_2_0 with definitions.xsd similarity index 100% rename from datex2/DATEXIISchema_2_0RC1_2_0 with definitions.xsd rename to siri/datex2/DATEXIISchema_2_0RC1_2_0 with definitions.xsd diff --git a/datex2/DATEXIISchema_2_0RC1_2_0.xsd b/siri/datex2/DATEXIISchema_2_0RC1_2_0.xsd similarity index 100% rename from datex2/DATEXIISchema_2_0RC1_2_0.xsd rename to siri/datex2/DATEXIISchema_2_0RC1_2_0.xsd diff --git a/ifopt/ifopt_administration-v0.3.xsd b/siri/ifopt/ifopt_administration-v0.3.xsd similarity index 100% rename from ifopt/ifopt_administration-v0.3.xsd rename to siri/ifopt/ifopt_administration-v0.3.xsd diff --git a/ifopt/ifopt_allStopPlace-v0.3.xsd b/siri/ifopt/ifopt_allStopPlace-v0.3.xsd similarity index 100% rename from ifopt/ifopt_allStopPlace-v0.3.xsd rename to siri/ifopt/ifopt_allStopPlace-v0.3.xsd diff --git a/ifopt/ifopt_checkpoint-v0.3.xsd b/siri/ifopt/ifopt_checkpoint-v0.3.xsd similarity index 100% rename from ifopt/ifopt_checkpoint-v0.3.xsd rename to siri/ifopt/ifopt_checkpoint-v0.3.xsd diff --git a/ifopt/ifopt_countries-v0.2.xsd b/siri/ifopt/ifopt_countries-v0.2.xsd similarity index 100% rename from ifopt/ifopt_countries-v0.2.xsd rename to siri/ifopt/ifopt_countries-v0.2.xsd diff --git a/ifopt/ifopt_equipment-v0.3.xsd b/siri/ifopt/ifopt_equipment-v0.3.xsd similarity index 100% rename from ifopt/ifopt_equipment-v0.3.xsd rename to siri/ifopt/ifopt_equipment-v0.3.xsd diff --git a/ifopt/ifopt_location-v0.3.xsd b/siri/ifopt/ifopt_location-v0.3.xsd similarity index 100% rename from ifopt/ifopt_location-v0.3.xsd rename to siri/ifopt/ifopt_location-v0.3.xsd diff --git a/ifopt/ifopt_modes-v0.2.xsd b/siri/ifopt/ifopt_modes-v0.2.xsd similarity index 100% rename from ifopt/ifopt_modes-v0.2.xsd rename to siri/ifopt/ifopt_modes-v0.2.xsd diff --git a/ifopt/ifopt_modification-v0.3.xsd b/siri/ifopt/ifopt_modification-v0.3.xsd similarity index 100% rename from ifopt/ifopt_modification-v0.3.xsd rename to siri/ifopt/ifopt_modification-v0.3.xsd diff --git a/ifopt/ifopt_path-v0.2.xsd b/siri/ifopt/ifopt_path-v0.2.xsd similarity index 100% rename from ifopt/ifopt_path-v0.2.xsd rename to siri/ifopt/ifopt_path-v0.2.xsd diff --git a/ifopt/ifopt_stop-v0.3.xsd b/siri/ifopt/ifopt_stop-v0.3.xsd similarity index 100% rename from ifopt/ifopt_stop-v0.3.xsd rename to siri/ifopt/ifopt_stop-v0.3.xsd diff --git a/ifopt/ifopt_time-v0.2.xsd b/siri/ifopt/ifopt_time-v0.2.xsd similarity index 100% rename from ifopt/ifopt_time-v0.2.xsd rename to siri/ifopt/ifopt_time-v0.2.xsd diff --git a/ifopt/ifopt_types-v0.2.xsd b/siri/ifopt/ifopt_types-v0.2.xsd similarity index 100% rename from ifopt/ifopt_types-v0.2.xsd rename to siri/ifopt/ifopt_types-v0.2.xsd diff --git a/siri/siri_all_framework-v2.0.xsd b/siri/siri/siri_all_framework-v2.0.xsd similarity index 100% rename from siri/siri_all_framework-v2.0.xsd rename to siri/siri/siri_all_framework-v2.0.xsd diff --git a/siri/siri_base-v2.0.xsd b/siri/siri/siri_base-v2.0.xsd similarity index 100% rename from siri/siri_base-v2.0.xsd rename to siri/siri/siri_base-v2.0.xsd diff --git a/siri/siri_common_services-v2.0.xsd b/siri/siri/siri_common_services-v2.0.xsd similarity index 100% rename from siri/siri_common_services-v2.0.xsd rename to siri/siri/siri_common_services-v2.0.xsd diff --git a/siri/siri_request_errorConditions-v2.0.xsd b/siri/siri/siri_request_errorConditions-v2.0.xsd similarity index 100% rename from siri/siri_request_errorConditions-v2.0.xsd rename to siri/siri/siri_request_errorConditions-v2.0.xsd diff --git a/siri/siri_request_support-v2.0.xsd b/siri/siri/siri_request_support-v2.0.xsd similarity index 100% rename from siri/siri_request_support-v2.0.xsd rename to siri/siri/siri_request_support-v2.0.xsd diff --git a/siri/siri_requests-v2.0.xsd b/siri/siri/siri_requests-v2.0.xsd similarity index 100% rename from siri/siri_requests-v2.0.xsd rename to siri/siri/siri_requests-v2.0.xsd diff --git a/siri_model/siri_all-v2.0.xsd b/siri/siri_model/siri_all-v2.0.xsd similarity index 100% rename from siri_model/siri_all-v2.0.xsd rename to siri/siri_model/siri_all-v2.0.xsd diff --git a/siri_model/siri_all_journeyModel-v2.0.xsd b/siri/siri_model/siri_all_journeyModel-v2.0.xsd similarity index 100% rename from siri_model/siri_all_journeyModel-v2.0.xsd rename to siri/siri_model/siri_all_journeyModel-v2.0.xsd diff --git a/siri_model/siri_all_model-v2.0.xsd b/siri/siri_model/siri_all_model-v2.0.xsd similarity index 100% rename from siri_model/siri_all_model-v2.0.xsd rename to siri/siri_model/siri_all_model-v2.0.xsd diff --git a/siri_model/siri_all_situation-v2.0.xsd b/siri/siri_model/siri_all_situation-v2.0.xsd similarity index 100% rename from siri_model/siri_all_situation-v2.0.xsd rename to siri/siri_model/siri_all_situation-v2.0.xsd diff --git a/siri_model/siri_datedVehicleJourney-v2.0.xsd b/siri/siri_model/siri_datedVehicleJourney-v2.0.xsd similarity index 100% rename from siri_model/siri_datedVehicleJourney-v2.0.xsd rename to siri/siri_model/siri_datedVehicleJourney-v2.0.xsd diff --git a/siri_model/siri_estimatedVehicleJourney-v2.0.xsd b/siri/siri_model/siri_estimatedVehicleJourney-v2.0.xsd similarity index 100% rename from siri_model/siri_estimatedVehicleJourney-v2.0.xsd rename to siri/siri_model/siri_estimatedVehicleJourney-v2.0.xsd diff --git a/siri_model/siri_facilities-v1.2.xsd b/siri/siri_model/siri_facilities-v1.2.xsd similarity index 100% rename from siri_model/siri_facilities-v1.2.xsd rename to siri/siri_model/siri_facilities-v1.2.xsd diff --git a/siri_model/siri_facility-v2.0.xsd b/siri/siri_model/siri_facility-v2.0.xsd similarity index 100% rename from siri_model/siri_facility-v2.0.xsd rename to siri/siri_model/siri_facility-v2.0.xsd diff --git a/siri_model/siri_feature_support-v2.0.xsd b/siri/siri_model/siri_feature_support-v2.0.xsd similarity index 100% rename from siri_model/siri_feature_support-v2.0.xsd rename to siri/siri_model/siri_feature_support-v2.0.xsd diff --git a/siri_model/siri_interchangeJourney-v2.0.xsd b/siri/siri_model/siri_interchangeJourney-v2.0.xsd similarity index 100% rename from siri_model/siri_interchangeJourney-v2.0.xsd rename to siri/siri_model/siri_interchangeJourney-v2.0.xsd diff --git a/siri_model/siri_journey-v2.0.xsd b/siri/siri_model/siri_journey-v2.0.xsd similarity index 100% rename from siri_model/siri_journey-v2.0.xsd rename to siri/siri_model/siri_journey-v2.0.xsd diff --git a/siri_model/siri_journey_support-v2.0.xsd b/siri/siri_model/siri_journey_support-v2.0.xsd similarity index 100% rename from siri_model/siri_journey_support-v2.0.xsd rename to siri/siri_model/siri_journey_support-v2.0.xsd diff --git a/siri_model/siri_modelPermissions-v2.0.xsd b/siri/siri_model/siri_modelPermissions-v2.0.xsd similarity index 100% rename from siri_model/siri_modelPermissions-v2.0.xsd rename to siri/siri_model/siri_modelPermissions-v2.0.xsd diff --git a/siri_model/siri_modes-v1.1.xsd b/siri/siri_model/siri_modes-v1.1.xsd similarity index 100% rename from siri_model/siri_modes-v1.1.xsd rename to siri/siri_model/siri_modes-v1.1.xsd diff --git a/siri_model/siri_monitoredVehicleJourney-v2.0.xsd b/siri/siri_model/siri_monitoredVehicleJourney-v2.0.xsd similarity index 100% rename from siri_model/siri_monitoredVehicleJourney-v2.0.xsd rename to siri/siri_model/siri_monitoredVehicleJourney-v2.0.xsd diff --git a/siri_model/siri_operator_support-v2.0.xsd b/siri/siri_model/siri_operator_support-v2.0.xsd similarity index 100% rename from siri_model/siri_operator_support-v2.0.xsd rename to siri/siri_model/siri_operator_support-v2.0.xsd diff --git a/siri_model/siri_reference-v2.0.xsd b/siri/siri_model/siri_reference-v2.0.xsd similarity index 100% rename from siri_model/siri_reference-v2.0.xsd rename to siri/siri_model/siri_reference-v2.0.xsd diff --git a/siri_model/siri_situation-v2.0.xsd b/siri/siri_model/siri_situation-v2.0.xsd similarity index 100% rename from siri_model/siri_situation-v2.0.xsd rename to siri/siri_model/siri_situation-v2.0.xsd diff --git a/siri_model/siri_situationActions-v2.0.xsd b/siri/siri_model/siri_situationActions-v2.0.xsd similarity index 100% rename from siri_model/siri_situationActions-v2.0.xsd rename to siri/siri_model/siri_situationActions-v2.0.xsd diff --git a/siri_model/siri_situationAffects-v2.0.xsd b/siri/siri_model/siri_situationAffects-v2.0.xsd similarity index 100% rename from siri_model/siri_situationAffects-v2.0.xsd rename to siri/siri_model/siri_situationAffects-v2.0.xsd diff --git a/siri_model/siri_situationClassifiers-v1.1.xsd b/siri/siri_model/siri_situationClassifiers-v1.1.xsd similarity index 100% rename from siri_model/siri_situationClassifiers-v1.1.xsd rename to siri/siri_model/siri_situationClassifiers-v1.1.xsd diff --git a/siri_model/siri_situationIdentity-v1.1.xsd b/siri/siri_model/siri_situationIdentity-v1.1.xsd similarity index 100% rename from siri_model/siri_situationIdentity-v1.1.xsd rename to siri/siri_model/siri_situationIdentity-v1.1.xsd diff --git a/siri_model/siri_situationReasons-v2.0.xsd b/siri/siri_model/siri_situationReasons-v2.0.xsd similarity index 100% rename from siri_model/siri_situationReasons-v2.0.xsd rename to siri/siri_model/siri_situationReasons-v2.0.xsd diff --git a/siri_model/siri_situationServiceTypes-v1.0.xsd b/siri/siri_model/siri_situationServiceTypes-v1.0.xsd similarity index 100% rename from siri_model/siri_situationServiceTypes-v1.0.xsd rename to siri/siri_model/siri_situationServiceTypes-v1.0.xsd diff --git a/siri_model/siri_targetedVehicleJourney-v2.0.xsd b/siri/siri_model/siri_targetedVehicleJourney-v2.0.xsd similarity index 100% rename from siri_model/siri_targetedVehicleJourney-v2.0.xsd rename to siri/siri_model/siri_targetedVehicleJourney-v2.0.xsd diff --git a/siri_model/siri_time-v2.0.xsd b/siri/siri_model/siri_time-v2.0.xsd similarity index 100% rename from siri_model/siri_time-v2.0.xsd rename to siri/siri_model/siri_time-v2.0.xsd diff --git a/siri_utility/siri_all_utility-v2.0.xsd b/siri/siri_utility/siri_all_utility-v2.0.xsd similarity index 100% rename from siri_utility/siri_all_utility-v2.0.xsd rename to siri/siri_utility/siri_all_utility-v2.0.xsd diff --git a/siri_utility/siri_location-v2.0.xsd b/siri/siri_utility/siri_location-v2.0.xsd similarity index 100% rename from siri_utility/siri_location-v2.0.xsd rename to siri/siri_utility/siri_location-v2.0.xsd diff --git a/siri_utility/siri_participant-v2.0.xsd b/siri/siri_utility/siri_participant-v2.0.xsd similarity index 100% rename from siri_utility/siri_participant-v2.0.xsd rename to siri/siri_utility/siri_participant-v2.0.xsd diff --git a/siri_utility/siri_permissions-v2.0.xsd b/siri/siri_utility/siri_permissions-v2.0.xsd similarity index 100% rename from siri_utility/siri_permissions-v2.0.xsd rename to siri/siri_utility/siri_permissions-v2.0.xsd diff --git a/siri_utility/siri_types-v2.0.xsd b/siri/siri_utility/siri_types-v2.0.xsd similarity index 100% rename from siri_utility/siri_types-v2.0.xsd rename to siri/siri_utility/siri_types-v2.0.xsd diff --git a/siri_utility/siri_utility-v1.1.xsd b/siri/siri_utility/siri_utility-v1.1.xsd similarity index 100% rename from siri_utility/siri_utility-v1.1.xsd rename to siri/siri_utility/siri_utility-v1.1.xsd diff --git a/xml/xml.xsd b/siri/xml/xml.xsd similarity index 100% rename from xml/xml.xsd rename to siri/xml/xml.xsd