diff --git a/xsd/wsdl/NeTEx_publication-NoConstraint.xsd b/xsd/wsdl/NeTEx_publication-NoConstraint.xsd
index 74c3fb8ba..db04e9a7a 100644
--- a/xsd/wsdl/NeTEx_publication-NoConstraint.xsd
+++ b/xsd/wsdl/NeTEx_publication-NoConstraint.xsd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_publication">
 	<!-- ===SIRI system IDs for  request =========================================================== -->
-	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="siri/siri_base-v2.0.xsd"/>
-	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="siri_utility/siri_participant-v2.0.xsd"/>
-	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="siri/siri_requests-v2.0.xsd"/>
+	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_base-v2.0.xsd"/>
+	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri_utility/siri_participant-v2.0.xsd"/>
+	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_requests-v2.0.xsd"/>
 	<!-- ===Regular netex============================================================== -->
-	<xsd:include schemaLocation="netex_service/netex_dataObjectRequest_service.xsd"/>
-	<xsd:include schemaLocation="netex_service/netex_all.xsd"/>
+	<xsd:include schemaLocation="../netex_service/netex_dataObjectRequest_service.xsd"/>
+	<xsd:include schemaLocation="../netex_service/netex_all.xsd"/>
 	<!-- ===eGIF/GovTalk Documentation ======================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
diff --git a/xsd/wsdl_model/siri_wsConsumer-Framework.xsd b/xsd/wsdl_model/siri_wsConsumer-Framework.xsd
index f29d8106c..2385997f8 100644
--- a/xsd/wsdl_model/siri_wsConsumer-Framework.xsd
+++ b/xsd/wsdl_model/siri_wsConsumer-Framework.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" elementFormDefault="unqualified" attributeFormDefault="unqualified" version="1.3" id="siriWS">
-	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siriSg.xsd"/>
+	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_all_framework-v2.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
diff --git a/xsd/wsdl_model/siri_wsConsumer-Services.xsd b/xsd/wsdl_model/siri_wsConsumer-Services.xsd
index 235a15181..cfc65815d 100644
--- a/xsd/wsdl_model/siri_wsConsumer-Services.xsd
+++ b/xsd/wsdl_model/siri_wsConsumer-Services.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://wsdl.siri.org.uk" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://wsdl.siri.org.uk" elementFormDefault="unqualified" attributeFormDefault="unqualified" version="1.3" id="siriWS">
-	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri.xsd"/>
+	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_all_framework-v2.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
diff --git a/xsd/wsdl_model/siri_wsProducer-DiscoveryCapability.xsd b/xsd/wsdl_model/siri_wsProducer-DiscoveryCapability.xsd
index a1a22fa15..ac9482aba 100644
--- a/xsd/wsdl_model/siri_wsProducer-DiscoveryCapability.xsd
+++ b/xsd/wsdl_model/siri_wsProducer-DiscoveryCapability.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://wsdl.siri.org.uk" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://wsdl.siri.org.uk" elementFormDefault="unqualified" attributeFormDefault="unqualified" version="1.3" id="siriWS">
-	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri.xsd"/>
+	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_all_framework-v2.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
diff --git a/xsd/wsdl_model/siri_wsProducer-Services.xsd b/xsd/wsdl_model/siri_wsProducer-Services.xsd
index b05477b8c..a026a6d97 100644
--- a/xsd/wsdl_model/siri_wsProducer-Services.xsd
+++ b/xsd/wsdl_model/siri_wsProducer-Services.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://wsdl.siri.org.uk" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://wsdl.siri.org.uk" elementFormDefault="unqualified" attributeFormDefault="unqualified" version="1.3" id="siriWS">
-	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri.xsd"/>
+	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_all_framework-v2.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">