diff --git a/OJP.xsd b/OJP.xsd
index ef3f89cec..e22f138a9 100644
--- a/OJP.xsd
+++ b/OJP.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns="http://www.siri.org.uk/siri" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.siri.org.uk/siri" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="OJP_siri">
-	<xs:import namespace="http://www.vdv.de/ojp" schemaLocation="OJP_Requests.xsd"/>
+	<xs:import namespace="http://www.vdv.de/ojp" schemaLocation="./OJP/OJP_All.xsd"/>
 	<!-- ifopt must be imported before siri, otherwise xmllint fails -->
-	<xs:import namespace="http://www.ifopt.org.uk/ifopt" schemaLocation="./ifopt/ifopt_allStopPlace-v0.3.xsd"/>
-	<xs:include schemaLocation="./siri_model/siri_all-v2.0.xsd"/>
+	<xs:import namespace="http://www.ifopt.org.uk/ifopt" schemaLocation="./siri/ifopt/ifopt_allStopPlace-v0.3.xsd"/>
+	<xs:include schemaLocation="./siri/siri_model/siri_all-v2.0.xsd"/>
 	<!--== SIRI Request include OJP Requests ===================================================================== -->
 	<xs:element name="OJP">
 		<xs:annotation>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified">
+	<xs:include schemaLocation="OJP_Common.xsd"/>
+	<xs:include schemaLocation="OJP_FacilitySupport.xsd"/>
+	<xs:include schemaLocation="OJP_Fare.xsd"/>
+	<xs:include schemaLocation="OJP_FareSupport.xsd"/>
+	<xs:include schemaLocation="OJP_JourneySupport.xsd"/>
+	<xs:include schemaLocation="OJP_ModesSupport.xsd"/>
+	<xs:include schemaLocation="OJP_Places.xsd"/>
+	<xs:include schemaLocation="OJP_PlaceSupport.xsd"/>
+	<xs:include schemaLocation="OJP_Requests.xsd"/>
+	<xs:include schemaLocation="OJP_RequestSupport.xsd"/>
+	<xs:include schemaLocation="OJP_SituationSupport.xsd"/>
+	<xs:include schemaLocation="OJP_StopEvents.xsd"/>
+	<xs:include schemaLocation="OJP_TripInfo.xsd"/>
+	<xs:include schemaLocation="OJP_Trips.xsd"/>
+	<xs:include schemaLocation="OJP_Utility.xsd"/>
+</xs:schema>
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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_all-v2.0.xsd"/>
-	<xs:include schemaLocation="OJP_ModesSupport.xsd"/>
-	<xs:include schemaLocation="OJP_FacilitySupport.xsd"/>
+	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_model/siri_all-v2.0.xsd"/>
+	<xs:include schemaLocation="OJP_All.xsd"/>
 	<xs:annotation>
 		<xs:documentation>========================================= General ================================================</xs:documentation>
 	</xs:annotation>
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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_all-v2.0.xsd"/>
+	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_model/siri_all-v2.0.xsd"/>
+	<xs:include schemaLocation="OJP_All.xsd"/>
 	<xs:annotation>
 		<xs:documentation>==================================== Facilities from SIRI =============================================</xs:documentation>
 	</xs:annotation>
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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_all-v2.0.xsd"/>
-	<xs:include schemaLocation="OJP_Common.xsd"/>
-	<xs:include schemaLocation="OJP_FareSupport.xsd"/>
-	<xs:include schemaLocation="OJP_Trips.xsd"/>
+	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_model/siri_all-v2.0.xsd"/>
+	<xs:include schemaLocation="OJP_All.xsd"/>
 	<xs:annotation>
 		<xs:documentation>====================================================Request definitions====================================================</xs:documentation>
 	</xs:annotation>
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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:include schemaLocation="OJP_Common.xsd"/>
+	<xs:include schemaLocation="OJP_All.xsd"/>
 	<xs:simpleType name="TypeOfFareClassEnumeration">
 		<xs:annotation>
 			<xs:documentation>classes of travel available on a particular service which will affect the price to be paid</xs:documentation>
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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_all-v2.0.xsd"/>
-	<xs:include schemaLocation="OJP_Common.xsd"/>
-	<xs:include schemaLocation="OJP_PlaceSupport.xsd"/>
-	<xs:include schemaLocation="OJP_FareSupport.xsd"/>
-	<xs:include schemaLocation="OJP_SituationSupport.xsd"/>
+	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_model/siri_all-v2.0.xsd"/>
+	<xs:include schemaLocation="OJP_All.xsd"/>
 	<xs:complexType name="ServiceViaPointStructure">
 		<xs:annotation>
 			<xs:documentation>[a specialisation of VIA in TMv6] STOP PLACE or SCHEDULED STOP POINT as a VIA for a particular SERVICE PATTERN. Specialisation of a VIA.</xs:documentation>
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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_all-v2.0.xsd"/>
-	<xs:include schemaLocation="OJP_Utility.xsd"/>
+	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_model/siri_all-v2.0.xsd"/>
+	<xs:include schemaLocation="OJP_All.xsd"/>
 	<xs:annotation>
 		<xs:documentation>========================================= Individual Modes ============================</xs:documentation>
 	</xs:annotation>
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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_all-v2.0.xsd"/>
-	<xs:include schemaLocation="OJP_Common.xsd"/>
+	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_model/siri_all-v2.0.xsd"/>
+	<xs:include schemaLocation="OJP_All.xsd"/>
 	<xs:annotation>
 		<xs:documentation>========================================= Stop Points =============================================</xs:documentation>
 	</xs:annotation>
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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_all-v2.0.xsd"/>
-	<xs:include schemaLocation="OJP_Common.xsd"/>
-	<xs:include schemaLocation="OJP_PlaceSupport.xsd"/>
-	<xs:include schemaLocation="OJP_RequestSupport.xsd"/>
+	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_model/siri_all-v2.0.xsd"/>
+	<xs:include schemaLocation="OJP_All.xsd"/>
 	<xs:annotation>
 		<xs:documentation>FUNCTION 1: Place Identification</xs:documentation>
 	</xs:annotation>
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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_all-v2.0.xsd"/>
-	<xs:include schemaLocation="OJP_Common.xsd"/>
-	<xs:include schemaLocation="OJP_PlaceSupport.xsd"/>
-	<xs:include schemaLocation="OJP_SituationSupport.xsd"/>
+	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_model/siri_all-v2.0.xsd"/>
+	<xs:include schemaLocation="OJP_All.xsd"/>
 	<xs:annotation>
 		<xs:documentation>====================================================Simple Types ====================================================</xs:documentation>
 	</xs:annotation>
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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified" id="OJP_siri_service">
-	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_all-v2.0.xsd"/>
-	<xs:include schemaLocation="OJP_Fare.xsd"/>
-	<xs:include schemaLocation="OJP_Places.xsd"/>
-	<xs:include schemaLocation="OJP_RequestSupport.xsd"/>
-	<xs:include schemaLocation="OJP_StopEvents.xsd"/>
-	<xs:include schemaLocation="OJP_TripInfo.xsd"/>
-	<xs:include schemaLocation="OJP_Trips.xsd"/>
+	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_model/siri_all-v2.0.xsd"/>
+	<xs:include schemaLocation="OJP_All.xsd"/>
 	<!-- ==== Fare Service=============================================== -->
 	<xs:element name="OJPFareRequest" type="OJPFareRequestStructure" substitutionGroup="siri:AbstractFunctionalServiceRequest"/>
 	<xs:complexType name="OJPFareRequestStructure">
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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_all-v2.0.xsd"/>
+	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_model/siri_all-v2.0.xsd"/>
+	<xs:include schemaLocation="OJP_All.xsd"/>
 	<xs:complexType name="SituationsStructure">
 		<xs:annotation>
 			<xs:documentation>Wrapper type for SIRI PtSituationsElementStructure</xs:documentation>
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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_all-v2.0.xsd"/>
-	<xs:include schemaLocation="OJP_Common.xsd"/>
-	<xs:include schemaLocation="OJP_JourneySupport.xsd"/>
-	<xs:include schemaLocation="OJP_RequestSupport.xsd"/>
+	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_model/siri_all-v2.0.xsd"/>
+	<xs:include schemaLocation="OJP_All.xsd"/>
 	<xs:group name="StopEventRequestGroup">
 		<xs:annotation>
 			<xs:documentation>Request structure for departure and arrival events at stops</xs:documentation>
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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:include schemaLocation="OJP_Common.xsd"/>
-	<xs:include schemaLocation="OJP_JourneySupport.xsd"/>
-	<xs:include schemaLocation="OJP_RequestSupport.xsd"/>
+	<xs:include schemaLocation="OJP_All.xsd"/>
 	<xs:annotation>
 		<xs:documentation>===================== Request structures ============================================================</xs:documentation>
 	</xs:annotation>
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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_all-v2.0.xsd"/>
-	<xs:include schemaLocation="OJP_Common.xsd"/>
-	<xs:include schemaLocation="OJP_JourneySupport.xsd"/>
-	<xs:include schemaLocation="OJP_FareSupport.xsd"/>
-	<xs:include schemaLocation="OJP_RequestSupport.xsd"/>
+	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_model/siri_all-v2.0.xsd"/>
+	<xs:include schemaLocation="OJP_All.xsd"/>
 	<xs:annotation>
 		<xs:documentation>===== Request Structures ===============================================</xs:documentation>
 	</xs:annotation>
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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_all-v2.0.xsd"/>
+	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_model/siri_all-v2.0.xsd"/>
+	<xs:include schemaLocation="OJP_All.xsd"/>
 	<xs:annotation>
 		<xs:documentation>========================================= General ================================================</xs:documentation>
 	</xs:annotation>
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