diff --git a/deegree-core/deegree-connectionprovider-datasource/src/main/resources/META-INF/schemas/connectionprovider/datasource/example_jndi.xml b/deegree-core/deegree-connectionprovider-datasource/src/main/resources/META-INF/schemas/connectionprovider/datasource/example_jndi.xml
index 9467235612..69266a2ca8 100644
--- a/deegree-core/deegree-connectionprovider-datasource/src/main/resources/META-INF/schemas/connectionprovider/datasource/example_jndi.xml
+++ b/deegree-core/deegree-connectionprovider-datasource/src/main/resources/META-INF/schemas/connectionprovider/datasource/example_jndi.xml
@@ -1,6 +1,6 @@
 <DataSourceConnectionProvider
   xmlns="http://www.deegree.org/connectionprovider/datasource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/connectionprovider/datasource http://schemas.deegree.org/3.5/jdbc/datasource/datasource.xsd">
+  xsi:schemaLocation="http://www.deegree.org/connectionprovider/datasource http://schemas.deegree.org/core/3.5/jdbc/datasource/datasource.xsd">
 
   <!-- Creation / lookup of javax.sql.DataSource instance -->
   <DataSource javaClass="org.deegree.db.datasource.JndiLookup" factoryMethod="lookup">
diff --git a/deegree-core/deegree-connectionprovider-datasource/src/main/resources/META-INF/schemas/connectionprovider/datasource/example_ucp.xml b/deegree-core/deegree-connectionprovider-datasource/src/main/resources/META-INF/schemas/connectionprovider/datasource/example_ucp.xml
index 8333436cca..275d756599 100644
--- a/deegree-core/deegree-connectionprovider-datasource/src/main/resources/META-INF/schemas/connectionprovider/datasource/example_ucp.xml
+++ b/deegree-core/deegree-connectionprovider-datasource/src/main/resources/META-INF/schemas/connectionprovider/datasource/example_ucp.xml
@@ -1,6 +1,6 @@
 <DataSourceConnectionProvider
   xmlns="http://www.deegree.org/connectionprovider/datasource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/connectionprovider/datasource http://schemas.deegree.org/3.5/jdbc/datasource/datasource.xsd">
+  xsi:schemaLocation="http://www.deegree.org/connectionprovider/datasource http://schemas.deegree.org/core/3.5/jdbc/datasource/datasource.xsd">
 
   <!-- Creation / lookup of javax.sql.DataSource instance -->
   <DataSource javaClass="oracle.ucp.jdbc.PoolDataSourceFactory" factoryMethod="getPoolDataSource" />
diff --git a/deegree-core/deegree-core-3d/src/main/resources/META-INF/schemas/datasource/3d/batchedmt/example.xml b/deegree-core/deegree-core-3d/src/main/resources/META-INF/schemas/datasource/3d/batchedmt/example.xml
index b44bf6110d..f91cf97d84 100644
--- a/deegree-core/deegree-core-3d/src/main/resources/META-INF/schemas/datasource/3d/batchedmt/example.xml
+++ b/deegree-core/deegree-core-3d/src/main/resources/META-INF/schemas/datasource/3d/batchedmt/example.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <BatchedMTFileStore xmlns="http://www.deegree.org/datasource/3d/batchedmt/file"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/3d/batchedmt/file http://schemas.deegree.org/3.5/datasource/3d/batchedmt/file.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/3d/batchedmt/file http://schemas.deegree.org/core/3.5/datasource/3d/batchedmt/file.xsd">
   <Directory>../../../data/batchedmt</Directory>
   <MaxDirectMemory>500048576</MaxDirectMemory>
 </BatchedMTFileStore>
\ No newline at end of file
diff --git a/deegree-core/deegree-core-3d/src/main/resources/META-INF/schemas/datasource/3d/renderable/file_example.xml b/deegree-core/deegree-core-3d/src/main/resources/META-INF/schemas/datasource/3d/renderable/file_example.xml
index bc2a45ff89..91cb35b1c4 100644
--- a/deegree-core/deegree-core-3d/src/main/resources/META-INF/schemas/datasource/3d/renderable/file_example.xml
+++ b/deegree-core/deegree-core-3d/src/main/resources/META-INF/schemas/datasource/3d/renderable/file_example.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <RenderableFileStore xmlns="http://www.deegree.org/datasource/3d/renderable/file"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/3d/renderable/file http://schemas.deegree.org/3.5/datasource/3d/renderable/file.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/3d/renderable/file http://schemas.deegree.org/core/3.5/datasource/3d/renderable/file.xsd">
   <EntityFile>../../../data/renderable/buildings/objects</EntityFile>
   <PrototypeFile>../../../data/renderable/buildings/prototypes</PrototypeFile>
 </RenderableFileStore>
\ No newline at end of file
diff --git a/deegree-core/deegree-core-3d/src/main/resources/META-INF/schemas/datasource/3d/renderable/sql_example.xml b/deegree-core/deegree-core-3d/src/main/resources/META-INF/schemas/datasource/3d/renderable/sql_example.xml
index 51d0b72de5..facc3a1446 100644
--- a/deegree-core/deegree-core-3d/src/main/resources/META-INF/schemas/datasource/3d/renderable/sql_example.xml
+++ b/deegree-core/deegree-core-3d/src/main/resources/META-INF/schemas/datasource/3d/renderable/sql_example.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <RenderableSQLStore xmlns="http://www.deegree.org/datasource/3d/renderable/sql"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/3d/renderable/sql http://schemas.deegree.org/3.5/datasource/3d/renderable/sql.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/3d/renderable/sql http://schemas.deegree.org/core/3.5/datasource/3d/renderable/sql.xsd">
   <JDBCConnId>conn1</JDBCConnId>
   <EntityTable>table</EntityTable>
 </RenderableSQLStore>
\ No newline at end of file
diff --git a/deegree-core/deegree-core-commons/src/main/resources/META-INF/schemas/proxy/example.xml b/deegree-core/deegree-core-commons/src/main/resources/META-INF/schemas/proxy/example.xml
index d1f5261f53..fdc1a70aef 100644
--- a/deegree-core/deegree-core-commons/src/main/resources/META-INF/schemas/proxy/example.xml
+++ b/deegree-core/deegree-core-commons/src/main/resources/META-INF/schemas/proxy/example.xml
@@ -1,5 +1,5 @@
 <ProxyConfiguration xmlns="http://www.deegree.org/proxy" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/proxy http://schemas.deegree.org/3.5/proxy/proxy.xsd"
+  xsi:schemaLocation="http://www.deegree.org/proxy http://schemas.deegree.org/core/3.5/proxy/proxy.xsd"
   overrideSystemSettings="true">
 
   <!-- set overrideSystemSettings above to true to be sure that these proxy settings are used -->
diff --git a/deegree-core/deegree-core-coverage/src/main/resources/META-INF/schemas/datasource/coverage/raster/directory.xml b/deegree-core/deegree-core-coverage/src/main/resources/META-INF/schemas/datasource/coverage/raster/directory.xml
index 91b5e68a98..f40d5127df 100644
--- a/deegree-core/deegree-core-coverage/src/main/resources/META-INF/schemas/datasource/coverage/raster/directory.xml
+++ b/deegree-core/deegree-core-coverage/src/main/resources/META-INF/schemas/datasource/coverage/raster/directory.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MultiResolutionRaster xmlns="http://www.deegree.org/datasource/coverage/raster"
   originLocation="outer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/coverage/raster http://schemas.deegree.org/3.5/datasource/coverage/raster/raster.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/coverage/raster http://schemas.deegree.org/core/3.5/datasource/coverage/raster/raster.xsd">
   <StorageCRS>EPSG:26912</StorageCRS>
   <Resolution res="2" nodata="0">
     <!--
diff --git a/deegree-core/deegree-core-coverage/src/main/resources/META-INF/schemas/datasource/coverage/raster/example.xml b/deegree-core/deegree-core-coverage/src/main/resources/META-INF/schemas/datasource/coverage/raster/example.xml
index 01079d37d4..1dc738829e 100644
--- a/deegree-core/deegree-core-coverage/src/main/resources/META-INF/schemas/datasource/coverage/raster/example.xml
+++ b/deegree-core/deegree-core-coverage/src/main/resources/META-INF/schemas/datasource/coverage/raster/example.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <Pyramid xmlns="http://www.deegree.org/datasource/coverage/pyramid" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/coverage/pyramid http://schemas.deegree.org/3.5/datasource/coverage/raster/pyramid.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/coverage/pyramid http://schemas.deegree.org/core/3.5/datasource/coverage/raster/pyramid.xsd">
   <PyramidFile>/tmp/test.tif</PyramidFile>
 </Pyramid>
\ No newline at end of file
diff --git a/deegree-core/deegree-core-coverage/src/main/resources/META-INF/schemas/datasource/coverage/raster/single.xml b/deegree-core/deegree-core-coverage/src/main/resources/META-INF/schemas/datasource/coverage/raster/single.xml
index 56e06b381b..13a1afeb60 100644
--- a/deegree-core/deegree-core-coverage/src/main/resources/META-INF/schemas/datasource/coverage/raster/single.xml
+++ b/deegree-core/deegree-core-coverage/src/main/resources/META-INF/schemas/datasource/coverage/raster/single.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Raster xmlns="http://www.deegree.org/datasource/coverage/raster" originLocation="outer"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/coverage/raster http://schemas.deegree.org/3.5/datasource/coverage/raster/raster.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/coverage/raster http://schemas.deegree.org/core/3.5/datasource/coverage/raster/raster.xsd">
   <StorageCRS>EPSG:26912</StorageCRS>
   <!--
     This example shows the configuration of a RasterFile as datasource for deegree WMS. Please think about indicating
diff --git a/deegree-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/deegree/example.xml b/deegree-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/deegree/example.xml
index fc0ac56936..1d44f4802a 100644
--- a/deegree-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/deegree/example.xml
+++ b/deegree-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/deegree/example.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <DeegreeCRSStore xmlns="http://www.deegree.org/crs/stores/deegree" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/stores/deegree/deegree.xsd">
+  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/stores/deegree/deegree.xsd">
   <!-- [1] -->
   <File>...</File>
 </DeegreeCRSStore>
\ No newline at end of file
diff --git a/deegree-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/deegree2/example.xml b/deegree-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/deegree2/example.xml
index c4831734ab..ca7dd462f8 100644
--- a/deegree-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/deegree2/example.xml
+++ b/deegree-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/deegree2/example.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <Deegree2CRSStore xmlns="http://www.deegree.org/crs/stores/deegree2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/stores/deegree2/deegree2.xsd">
+  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/stores/deegree2/deegree2.xsd">
   <!-- [1] -->
   <File>...</File>
 </Deegree2CRSStore>
\ No newline at end of file
diff --git a/deegree-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/gml/example.xml b/deegree-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/gml/example.xml
index af12b1c067..65a764e54f 100644
--- a/deegree-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/gml/example.xml
+++ b/deegree-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/gml/example.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <GMLCRSStore xmlns="http://www.deegree.org/crs/stores/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/stores/gml/gml.xsd">
+  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/stores/gml/gml.xsd">
   <!-- ONE of -->
   <GMLFile>...</GMLFile>
   <!-- or (must have an constructur as: GMLResourceClass(GMLCRSStore store, Map<String, List<String>> params ) -->
diff --git a/deegree-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/proj4/example.xml b/deegree-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/proj4/example.xml
index dec909e7e7..aaf3971174 100644
--- a/deegree-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/proj4/example.xml
+++ b/deegree-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/proj4/example.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <PROJ4CRSStore xmlns="http://www.deegree.org/crs/stores/proj4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/stores/proj4/proj4.xsd">
+  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/stores/proj4/proj4.xsd">
   <!-- [1] -->
   <File>...</File>
 </PROJ4CRSStore>
\ No newline at end of file
diff --git a/deegree-core/deegree-core-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/config/crs-definitions.xml b/deegree-core/deegree-core-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/config/crs-definitions.xml
index 1b26b8a76e..8d6fff7752 100644
--- a/deegree-core/deegree-core-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/config/crs-definitions.xml
+++ b/deegree-core/deegree-core-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/config/crs-definitions.xml
@@ -2,7 +2,7 @@
 <crs:CRSDefinitions xmlns:crs="http://www.deegree.org/crs"
                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                     configVersion="3.0.0"
-                    xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/crsdefinition.xsd">
+                    xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/crsdefinition.xsd">
         <crs:GeographicCRS>
                 <crs:Id>epsg:4002</crs:Id>
                 <crs:Id>http://www.opengis.net/gml/srs/epsg.xml#4002</crs:Id>
diff --git a/deegree-core/deegree-core-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/config/datum-definitions.xml b/deegree-core/deegree-core-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/config/datum-definitions.xml
index e4d49e9121..3b5e82e05a 100644
--- a/deegree-core/deegree-core-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/config/datum-definitions.xml
+++ b/deegree-core/deegree-core-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/config/datum-definitions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<crs:DatumDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/crsdefinition.xsd">
+<crs:DatumDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/crsdefinition.xsd">
     <crs:GeodeticDatum>
       <crs:Id>epsg:6005</crs:Id>
       <crs:Name>Not specified (based on Bessel Modified ellipsoid)</crs:Name>
diff --git a/deegree-core/deegree-core-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/config/ellipsoid-definitions.xml b/deegree-core/deegree-core-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/config/ellipsoid-definitions.xml
index 7b20c69f3c..22a77aaaa5 100644
--- a/deegree-core/deegree-core-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/config/ellipsoid-definitions.xml
+++ b/deegree-core/deegree-core-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/config/ellipsoid-definitions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<crs:EllipsoidDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/crsdefinition.xsd">
+<crs:EllipsoidDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/crsdefinition.xsd">
     <crs:Ellipsoid>
       <crs:Id>ellipsoid_81</crs:Id>
       <crs:Name>Proj4 defined ellipsoid</crs:Name>
diff --git a/deegree-core/deegree-core-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/config/pm-definitions.xml b/deegree-core/deegree-core-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/config/pm-definitions.xml
index 56d5160b08..c529b33cf8 100644
--- a/deegree-core/deegree-core-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/config/pm-definitions.xml
+++ b/deegree-core/deegree-core-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/config/pm-definitions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<crs:PMDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/crsdefinition.xsd">
+<crs:PMDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/crsdefinition.xsd">
     <crs:PrimeMeridian>
       <crs:Id>epsg:8908</crs:Id>
       <crs:Id>urn:ogc:def:crs:epsg::8908</crs:Id>
diff --git a/deegree-core/deegree-core-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/config/projection-definitions.xml b/deegree-core/deegree-core-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/config/projection-definitions.xml
index 9a53f79777..53bef4ade3 100644
--- a/deegree-core/deegree-core-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/config/projection-definitions.xml
+++ b/deegree-core/deegree-core-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/config/projection-definitions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<crs:ProjectionDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/crsdefinition.xsd">
+<crs:ProjectionDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/crsdefinition.xsd">
 	<crs:LambertAzimuthalEqualArea>
 		<crs:Id>epsg:19986</crs:Id>
 		<crs:Name>Europe Equal Area 2001</crs:Name>
diff --git a/deegree-core/deegree-core-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/config/transformation-definitions.xml b/deegree-core/deegree-core-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/config/transformation-definitions.xml
index 8d2f5799cb..0ded13587c 100644
--- a/deegree-core/deegree-core-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/config/transformation-definitions.xml
+++ b/deegree-core/deegree-core-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/config/transformation-definitions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<crs:TransformationDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/crsdefinition.xsd">
+<crs:TransformationDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/crsdefinition.xsd">
   <crs:Helmert>
     <crs:Id>epsg:1173</crs:Id>
     <crs:Id>urn:opengis:def:crs:epsg::1173</crs:Id>
diff --git a/deegree-core/deegree-core-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/parser-files.xml b/deegree-core/deegree-core-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/parser-files.xml
index 6533658212..a3561cc61a 100644
--- a/deegree-core/deegree-core-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/parser-files.xml
+++ b/deegree-core/deegree-core-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/parser-files.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <crs:CRSConfiguration xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/crsdefinition.xsd">
+  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/crsdefinition.xsd">
   <crs:ProjectionsFile>config/projection-definitions.xml</crs:ProjectionsFile>
   <crs:TransformationsFile>config/transformation-definitions.xml</crs:TransformationsFile>
   <crs:PrimeMeridiansFile>config/pm-definitions.xml</crs:PrimeMeridiansFile>
diff --git a/deegree-core/deegree-core-cs/src/main/resources/org/deegree/cs/persistence/default.xml b/deegree-core/deegree-core-cs/src/main/resources/org/deegree/cs/persistence/default.xml
index ffd8929ff6..ba187468ca 100644
--- a/deegree-core/deegree-core-cs/src/main/resources/org/deegree/cs/persistence/default.xml
+++ b/deegree-core/deegree-core-cs/src/main/resources/org/deegree/cs/persistence/default.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <DeegreeCRSStore xmlns="http://www.deegree.org/crs/stores/deegree" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/stores/deegree/deegree.xsd">
+  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/stores/deegree/deegree.xsd">
   <!-- [1] -->
   <File>deegree/d3/parser-files.xml</File>
 </DeegreeCRSStore>
\ No newline at end of file
diff --git a/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/deegree.xml b/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/deegree.xml
index ab0a87af01..456667a99f 100644
--- a/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/deegree.xml
+++ b/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/deegree.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <DeegreeCRSStore xmlns="http://www.deegree.org/crs/stores/deegree" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/stores/deegree/deegree.xsd">
+  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/stores/deegree/deegree.xsd">
   <!-- [1] -->
   <File>files/parser-files.xml</File>
 </DeegreeCRSStore>
\ No newline at end of file
diff --git a/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/files/deegree/crs-definitions.xml b/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/files/deegree/crs-definitions.xml
index 50dd60aba7..8d07820cf0 100644
--- a/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/files/deegree/crs-definitions.xml
+++ b/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/files/deegree/crs-definitions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<crs:CRSDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/crsdefinition.xsd" version="0.5.0">
+<crs:CRSDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/crsdefinition.xsd" version="0.5.0">
 	<crs:GeographicCRS>
     <crs:Id>epsg:4002</crs:Id>
     <crs:Id>http://www.opengis.net/gml/srs/epsg.xml#4002</crs:Id>
diff --git a/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/files/deegree/datum-definitions.xml b/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/files/deegree/datum-definitions.xml
index 3d1299c2be..0817879c7f 100644
--- a/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/files/deegree/datum-definitions.xml
+++ b/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/files/deegree/datum-definitions.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <crs:DatumDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/crsdefinition.xsd">
+  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/crsdefinition.xsd">
   <crs:GeodeticDatum>
     <crs:Id>epsg:6200</crs:Id>
     <crs:Name>Pulkovo 1995</crs:Name>
diff --git a/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/files/deegree/ellipsoid-definitions.xml b/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/files/deegree/ellipsoid-definitions.xml
index b2628ae08b..26faed4aa6 100644
--- a/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/files/deegree/ellipsoid-definitions.xml
+++ b/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/files/deegree/ellipsoid-definitions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<crs:EllipsoidDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/crsdefinition.xsd">
+<crs:EllipsoidDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/crsdefinition.xsd">
     <crs:Ellipsoid>
       <crs:Id>epsg:7002</crs:Id>
       <crs:Name>Airy Modified 1849</crs:Name>
diff --git a/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/files/deegree/pm-definitions.xml b/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/files/deegree/pm-definitions.xml
index 451c03b0a0..6f631f4c0e 100644
--- a/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/files/deegree/pm-definitions.xml
+++ b/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/files/deegree/pm-definitions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<crs:PMDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/crsdefinition.xsd">
+<crs:PMDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/crsdefinition.xsd">
     <crs:PrimeMeridian>
       <crs:Id>epsg:8901</crs:Id>
       <crs:Name>Greenwich</crs:Name>
diff --git a/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/files/deegree/projection-definitions.xml b/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/files/deegree/projection-definitions.xml
index 59eeb165b9..8e78850406 100644
--- a/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/files/deegree/projection-definitions.xml
+++ b/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/files/deegree/projection-definitions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<crs:ProjectionDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/crsdefinition.xsd">
+<crs:ProjectionDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/crsdefinition.xsd">
 	<crs:TransverseMercator>
     <crs:Id>epsg:16210</crs:Id>
 		<crs:Name>6-degree Gauss-Kruger zone 10</crs:Name>
diff --git a/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/files/deegree/transformation-definitions.xml b/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/files/deegree/transformation-definitions.xml
index 8d2f5799cb..0ded13587c 100644
--- a/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/files/deegree/transformation-definitions.xml
+++ b/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/files/deegree/transformation-definitions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<crs:TransformationDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/crsdefinition.xsd">
+<crs:TransformationDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/crsdefinition.xsd">
   <crs:Helmert>
     <crs:Id>epsg:1173</crs:Id>
     <crs:Id>urn:opengis:def:crs:epsg::1173</crs:Id>
diff --git a/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/files/parser-files.xml b/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/files/parser-files.xml
index 466ea2c63a..6da2aa8709 100644
--- a/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/files/parser-files.xml
+++ b/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/files/parser-files.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <crs:CRSConfiguration xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/crsdefinition.xsd">
+  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/crsdefinition.xsd">
   <crs:ProjectionsFile>deegree/projection-definitions.xml</crs:ProjectionsFile>
   <crs:TransformationsFile>deegree/transformation-definitions.xml</crs:TransformationsFile>
   <crs:PrimeMeridiansFile>deegree/pm-definitions.xml</crs:PrimeMeridiansFile>
diff --git a/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/gml-store1.xml b/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/gml-store1.xml
index c533bd3d99..c9b3486076 100644
--- a/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/gml-store1.xml
+++ b/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/crs/gml-store1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <GMLCRSStore xmlns="http://www.deegree.org/crs/stores/gml"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/stores/gml/gml.xsd"
+	xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/stores/gml/gml.xsd"
 	transformationType="NTV2">
 	<GMLFile>files/gmlDictionary1.xml</GMLFile>
 </GMLCRSStore>
\ No newline at end of file
diff --git a/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/deegree/d2/deegree2-store.xml b/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/deegree/d2/deegree2-store.xml
index 78b906bb61..8a75164e8e 100644
--- a/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/deegree/d2/deegree2-store.xml
+++ b/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/deegree/d2/deegree2-store.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <Deegree2CRSStore xmlns="http://www.deegree.org/crs/stores/deegree2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/stores/deegree/deegree2.xsd">
+  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/stores/deegree/deegree2.xsd">
   <File>deegree-crs-configuration.xml</File>
 </Deegree2CRSStore>
\ No newline at end of file
diff --git a/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/gml/gml-store.xml b/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/gml/gml-store.xml
index 8d21f7e548..6453ed80f4 100644
--- a/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/gml/gml-store.xml
+++ b/deegree-core/deegree-core-cs/src/test/resources/org/deegree/cs/persistence/gml/gml-store.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <GMLCRSStore xmlns="http://www.deegree.org/crs/stores/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/stores/gml/gml.xsd">
+  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/stores/gml/gml.xsd">
   <GMLFile>gmlDictionary.xml</GMLFile>
 </GMLCRSStore>
\ No newline at end of file
diff --git a/deegree-core/deegree-core-db/src/main/resources/META-INF/schemas/jdbc/example.xml b/deegree-core/deegree-core-db/src/main/resources/META-INF/schemas/jdbc/example.xml
index 6e4837c11b..f6a643e8de 100644
--- a/deegree-core/deegree-core-db/src/main/resources/META-INF/schemas/jdbc/example.xml
+++ b/deegree-core/deegree-core-db/src/main/resources/META-INF/schemas/jdbc/example.xml
@@ -1,5 +1,5 @@
 <JDBCConnection xmlns="http://www.deegree.org/jdbc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/jdbc http://schemas.deegree.org/3.5/jdbc/jdbc.xsd">
+  xsi:schemaLocation="http://www.deegree.org/jdbc http://schemas.deegree.org/core/3.5/jdbc/jdbc.xsd">
 
   <!-- [1] JDBC URL (without username / password) -->
   <Url>jdbc:postgresql://localhost:5432/${DB_NAME}</Url>
diff --git a/deegree-core/deegree-core-gdal/src/main/resources/META-INF/schemas/commons/gdal/example_complex.xml b/deegree-core/deegree-core-gdal/src/main/resources/META-INF/schemas/commons/gdal/example_complex.xml
index 27b016cb5e..95a1408773 100644
--- a/deegree-core/deegree-core-gdal/src/main/resources/META-INF/schemas/commons/gdal/example_complex.xml
+++ b/deegree-core/deegree-core-gdal/src/main/resources/META-INF/schemas/commons/gdal/example_complex.xml
@@ -1,5 +1,5 @@
 <GDALSettings xmlns="http://www.deegree.org/gdal" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/gdal http://schemas.deegree.org/3.5/commons/gdal/gdal.xsd" />
+  xsi:schemaLocation="http://www.deegree.org/gdal http://schemas.deegree.org/core/3.5/commons/gdal/gdal.xsd" />
   <OpenDatasets>10</OpenDatasets>
   <GDALOption name="GDAL_CACHEMAX">1000</GDALOption>
   <GDALOption name="ECW_CACHE_MAXMEM">419430400</GDALOption>
diff --git a/deegree-core/deegree-core-gdal/src/main/resources/META-INF/schemas/commons/gdal/example_minimal.xml b/deegree-core/deegree-core-gdal/src/main/resources/META-INF/schemas/commons/gdal/example_minimal.xml
index 9a4a90be26..faa6d0bc01 100644
--- a/deegree-core/deegree-core-gdal/src/main/resources/META-INF/schemas/commons/gdal/example_minimal.xml
+++ b/deegree-core/deegree-core-gdal/src/main/resources/META-INF/schemas/commons/gdal/example_minimal.xml
@@ -1,4 +1,4 @@
 <GDALSettings xmlns="http://www.deegree.org/gdal" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/gdal http://schemas.deegree.org/3.5/commons/gdal/gdal.xsd">
+  xsi:schemaLocation="http://www.deegree.org/gdal http://schemas.deegree.org/core/3.5/commons/gdal/gdal.xsd">
   <OpenDatasets>5</OpenDatasets>
 </GDALSettings>
diff --git a/deegree-core/deegree-core-remoteows/deegree-remoteows-wfs/src/main/resources/META-INF/schemas/datasource/remoteows/wfs/example.xml b/deegree-core/deegree-core-remoteows/deegree-remoteows-wfs/src/main/resources/META-INF/schemas/datasource/remoteows/wfs/example.xml
index c35667366f..fa811076c4 100644
--- a/deegree-core/deegree-core-remoteows/deegree-remoteows-wfs/src/main/resources/META-INF/schemas/datasource/remoteows/wfs/example.xml
+++ b/deegree-core/deegree-core-remoteows/deegree-remoteows-wfs/src/main/resources/META-INF/schemas/datasource/remoteows/wfs/example.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <RemoteWFS xmlns="http://www.deegree.org/datasource/remoteows/wfs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/remoteows/wfs http://schemas.deegree.org/3.5/datasource/remoteows/wfs/remotewfs.xsd"
+  xsi:schemaLocation="http://www.deegree.org/datasource/remoteows/wfs http://schemas.deegree.org/core/3.5/datasource/remoteows/wfs/remotewfs.xsd"
  >
   <CapabilitiesDocumentLocation location="http://demo.deegree.org/..." />
 </RemoteWFS>
diff --git a/deegree-core/deegree-core-remoteows/deegree-remoteows-wms/src/main/resources/META-INF/schemas/datasource/remoteows/wms/example.xml b/deegree-core/deegree-core-remoteows/deegree-remoteows-wms/src/main/resources/META-INF/schemas/datasource/remoteows/wms/example.xml
index 62c759a98f..84e01b0845 100644
--- a/deegree-core/deegree-core-remoteows/deegree-remoteows-wms/src/main/resources/META-INF/schemas/datasource/remoteows/wms/example.xml
+++ b/deegree-core/deegree-core-remoteows/deegree-remoteows-wms/src/main/resources/META-INF/schemas/datasource/remoteows/wms/example.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<RemoteWMSStore xmlns="http://www.deegree.org/datasource/remoteows/wms" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/remoteows/wms http://schemas.deegree.org/3.5/datasource/remoteows/wms/remotewms.xsd">
+<RemoteWMSStore xmlns="http://www.deegree.org/datasource/remoteows/wms" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/remoteows/wms http://schemas.deegree.org/core/3.5/datasource/remoteows/wms/remotewms.xsd">
   <CapabilitiesDocumentLocation location="http://demo.deegree.org/deegree-wms/services?request=GetCapabilities&amp;service=WMS&amp;version=1.1.1" />
   <DefaultRequestOptions>
     <ImageFormat>image/png</ImageFormat>
diff --git a/deegree-core/deegree-core-remoteows/deegree-remoteows-wms/src/main/resources/META-INF/schemas/remoteows/wms/example.xml b/deegree-core/deegree-core-remoteows/deegree-remoteows-wms/src/main/resources/META-INF/schemas/remoteows/wms/example.xml
index 2497b03ad0..cd3e1fd7d6 100644
--- a/deegree-core/deegree-core-remoteows/deegree-remoteows-wms/src/main/resources/META-INF/schemas/remoteows/wms/example.xml
+++ b/deegree-core/deegree-core-remoteows/deegree-remoteows-wms/src/main/resources/META-INF/schemas/remoteows/wms/example.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <RemoteWMS xmlns="http://www.deegree.org/remoteows/wms" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/remoteows/wms http://schemas.deegree.org/3.5/remoteows/wms/remotewms.xsd">
+  xsi:schemaLocation="http://www.deegree.org/remoteows/wms http://schemas.deegree.org/core/3.5/remoteows/wms/remotewms.xsd">
   <CapabilitiesDocumentLocation
     location="http://deegree3-demo.deegree.org/utah-workspace/services?request=GetCapabilities&amp;service=WMS&amp;version=1.1.1" />
 </RemoteWMS>
diff --git a/deegree-core/deegree-core-remoteows/deegree-remoteows-wmts/src/main/resources/META-INF/schemas/remoteows/wmts/example.xml b/deegree-core/deegree-core-remoteows/deegree-remoteows-wmts/src/main/resources/META-INF/schemas/remoteows/wmts/example.xml
index 53033e166b..b0c0c0c387 100644
--- a/deegree-core/deegree-core-remoteows/deegree-remoteows-wmts/src/main/resources/META-INF/schemas/remoteows/wmts/example.xml
+++ b/deegree-core/deegree-core-remoteows/deegree-remoteows-wmts/src/main/resources/META-INF/schemas/remoteows/wmts/example.xml
@@ -1,5 +1,5 @@
 <RemoteWMTS xmlns="http://www.deegree.org/remoteows/wmts" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/remoteows/wmts http://schemas.deegree.org/3.5/remoteows/wmts/remotewmts.xsd">
+  xsi:schemaLocation="http://www.deegree.org/remoteows/wmts http://schemas.deegree.org/core/3.5/remoteows/wmts/remotewmts.xsd">
   <CapabilitiesDocumentLocation
     location="http://v2.suite.opengeo.org/geoserver/gwc/service/wmts?service=WMTS&amp;version=1.0.0&amp;request=GetCapabilities" />
 </RemoteWMTS>
diff --git a/deegree-core/deegree-core-remoteows/deegree-remoteows-wmts/src/test/resources/org/deegree/remoteows/wmts/example.xml b/deegree-core/deegree-core-remoteows/deegree-remoteows-wmts/src/test/resources/org/deegree/remoteows/wmts/example.xml
index a9fe2029ad..2471830e09 100644
--- a/deegree-core/deegree-core-remoteows/deegree-remoteows-wmts/src/test/resources/org/deegree/remoteows/wmts/example.xml
+++ b/deegree-core/deegree-core-remoteows/deegree-remoteows-wmts/src/test/resources/org/deegree/remoteows/wmts/example.xml
@@ -1,4 +1,4 @@
 <RemoteWMTS xmlns="http://www.deegree.org/remoteows/wmts" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/remoteows/wmts http://schemas.deegree.org/3.5/remoteows/wmts/remotewmts.xsd">
+  xsi:schemaLocation="http://www.deegree.org/remoteows/wmts http://schemas.deegree.org/core/3.5/remoteows/wmts/remotewmts.xsd">
   <CapabilitiesDocumentLocation location="capabilities_example.xml" />
 </RemoteWMTS>
diff --git a/deegree-core/deegree-core-style/src/main/resources/META-INF/schemas/se/lines.xml b/deegree-core/deegree-core-style/src/main/resources/META-INF/schemas/se/lines.xml
index 5524f6562f..edbc373768 100644
--- a/deegree-core/deegree-core-style/src/main/resources/META-INF/schemas/se/lines.xml
+++ b/deegree-core/deegree-core-style/src/main/resources/META-INF/schemas/se/lines.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FeatureTypeStyle xmlns="http://www.opengis.net/se" xmlns:app="http://www.deegree.org/app" xmlns:ogc="http://www.opengis.net/ogc" xmlns:sed="http://www.deegree.org/se"
     xmlns:deegreeogc="http://www.deegree.org/ogc" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/3.5/se/symbology-1.1.0.xsd">
+    xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/core/3.5/se/symbology-1.1.0.xsd">
   <Name>Roads</Name>
   <Rule>
     <Name>Roads</Name>
diff --git a/deegree-core/deegree-core-style/src/main/resources/META-INF/schemas/se/point.xml b/deegree-core/deegree-core-style/src/main/resources/META-INF/schemas/se/point.xml
index 3a139de7c4..3ee213d73f 100644
--- a/deegree-core/deegree-core-style/src/main/resources/META-INF/schemas/se/point.xml
+++ b/deegree-core/deegree-core-style/src/main/resources/META-INF/schemas/se/point.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FeatureTypeStyle xmlns="http://www.opengis.net/se" xmlns:app="http://www.deegree.org/app" xmlns:ogc="http://www.opengis.net/ogc" xmlns:sed="http://www.deegree.org/se"
     xmlns:deegreeogc="http://www.deegree.org/ogc" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/3.5/se/symbology-1.1.0.xsd">
+    xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/core/3.5/se/symbology-1.1.0.xsd">
  <Name>Cities</Name>
  <FeatureTypeName>app:SGID93_LOCATION_UDOTMap_CityLocations</FeatureTypeName>
  <!-- The following rule shows the use of interpolation of a vector layer -->
diff --git a/deegree-core/deegree-core-style/src/main/resources/META-INF/schemas/se/polygons.xml b/deegree-core/deegree-core-style/src/main/resources/META-INF/schemas/se/polygons.xml
index c72909e860..f03beff3fd 100644
--- a/deegree-core/deegree-core-style/src/main/resources/META-INF/schemas/se/polygons.xml
+++ b/deegree-core/deegree-core-style/src/main/resources/META-INF/schemas/se/polygons.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FeatureTypeStyle xmlns="http://www.opengis.net/se" xmlns:app="http://www.deegree.org/app" xmlns:ogc="http://www.opengis.net/ogc" xmlns:sed="http://www.deegree.org/se"
     xmlns:deegreeogc="http://www.deegree.org/ogc" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/3.5/se/symbology-1.1.0.xsd">
+    xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/core/3.5/se/symbology-1.1.0.xsd">
   <Name>ZipCodes</Name>
   <Rule>
     <Name>ZipCodes</Name>
diff --git a/deegree-core/deegree-core-style/src/main/resources/META-INF/schemas/se/text.xml b/deegree-core/deegree-core-style/src/main/resources/META-INF/schemas/se/text.xml
index eee9abad80..15475443a9 100644
--- a/deegree-core/deegree-core-style/src/main/resources/META-INF/schemas/se/text.xml
+++ b/deegree-core/deegree-core-style/src/main/resources/META-INF/schemas/se/text.xml
@@ -2,7 +2,7 @@
 <FeatureTypeStyle xmlns="http://www.opengis.net/se" xmlns:app="http://www.deegree.org/app" xmlns:ogc="http://www.opengis.net/ogc"
   xmlns:sed="http://www.deegree.org/se" xmlns:deegreeogc="http://www.deegree.org/ogc" xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/se ./symbology-1.1.0.xsd">
-  <!-- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/se http://schemas.deegree.org/3.5/se/symbology-1.1.0.xsd" -->
+  <!-- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/se http://schemas.deegree.org/core/3.5/se/symbology-1.1.0.xsd" -->
 
   <Name>CountyNames</Name>
   <!-- This rule shows the use of a Halo within a TextSymbolizer -->
diff --git a/deegree-core/deegree-core-style/src/test/resources/org/deegree/style/se/parser/lineplacement_ext.xml b/deegree-core/deegree-core-style/src/test/resources/org/deegree/style/se/parser/lineplacement_ext.xml
index 075c30205d..f88274761b 100644
--- a/deegree-core/deegree-core-style/src/test/resources/org/deegree/style/se/parser/lineplacement_ext.xml
+++ b/deegree-core/deegree-core-style/src/test/resources/org/deegree/style/se/parser/lineplacement_ext.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <FeatureTypeStyle xmlns="http://www.opengis.net/se" xmlns:ogc="http://www.opengis.net/ogc" xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1.0"
-  xsi:schemaLocation="http://www.opengis.net/se http://schemas.deegree.org/3.5/se/symbology.xsd">
+  xsi:schemaLocation="http://www.opengis.net/se http://schemas.deegree.org/core/3.5/se/symbology.xsd">
   <Rule>
     <PolygonSymbolizer>
       <Name>MyPolygonSymbolizer</Name>
diff --git a/deegree-core/deegree-core-style/src/test/resources/org/deegree/style/se/parser/setest21.xml b/deegree-core/deegree-core-style/src/test/resources/org/deegree/style/se/parser/setest21.xml
index e60590ad64..7a27c20bc0 100644
--- a/deegree-core/deegree-core-style/src/test/resources/org/deegree/style/se/parser/setest21.xml
+++ b/deegree-core/deegree-core-style/src/test/resources/org/deegree/style/se/parser/setest21.xml
@@ -2,7 +2,7 @@
 <RasterSymbolizer version="1.1.0" xmlns="http://www.opengis.net/se"
 	xmlns:ogc="http://www.opengis.net/ogc" xmlns:xlink="http://www.w3.org/1999/xlink"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sed="http://www.deegree.org/se"
-	xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/Symbolizer.xsd http://www.deegree.org/se http://schemas.deegree.org/3.5/se/Symbolizer-deegree.xsd">
+	xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/Symbolizer.xsd http://www.deegree.org/se http://schemas.deegree.org/core/3.5/se/Symbolizer-deegree.xsd">
 	<Opacity>0.7</Opacity>
 	<sed:ShadedRelief>
 		<ReliefFactor>55</ReliefFactor>
diff --git a/deegree-core/deegree-core-style/src/test/resources/org/deegree/style/se/parser/setest22.xml b/deegree-core/deegree-core-style/src/test/resources/org/deegree/style/se/parser/setest22.xml
index 4d5c8f0f6d..738337a9fd 100644
--- a/deegree-core/deegree-core-style/src/test/resources/org/deegree/style/se/parser/setest22.xml
+++ b/deegree-core/deegree-core-style/src/test/resources/org/deegree/style/se/parser/setest22.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <LineSymbolizer xmlns="http://www.opengis.net/se"
                  xmlns:ogc="http://www.opengis.net/ogc" xmlns:sed="http://www.deegree.org/se"
-                 xmlns:app="http://www.deegree.org/app" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/Symbolizer.xsd http://www.deegree.org/se http://schemas.deegree.org/3.5/se/Symbolizer-deegree.xsd">
+                 xmlns:app="http://www.deegree.org/app" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/Symbolizer.xsd http://www.deegree.org/se http://schemas.deegree.org/core/3.5/se/Symbolizer-deegree.xsd">
   <Name>My Name</Name>
   <Geometry>
     <ogc:PropertyName>app:someGeometryProp</ogc:PropertyName>
diff --git a/deegree-core/deegree-core-theme/src/main/resources/META-INF/schemas/themes/example.xml b/deegree-core/deegree-core-theme/src/main/resources/META-INF/schemas/themes/example.xml
index c99f862f0e..42de52029b 100644
--- a/deegree-core/deegree-core-theme/src/main/resources/META-INF/schemas/themes/example.xml
+++ b/deegree-core/deegree-core-theme/src/main/resources/META-INF/schemas/themes/example.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <Themes xmlns="http://www.deegree.org/themes/standard" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xmlns:d="http://www.deegree.org/metadata/description"
-  xmlns:s="http://www.deegree.org/metadata/spatial" xsi:schemaLocation="http://www.deegree.org/themes/standard http://schemas.deegree.org/3.5/themes/themes.xsd">
+  xmlns:s="http://www.deegree.org/metadata/spatial" xsi:schemaLocation="http://www.deegree.org/themes/standard http://schemas.deegree.org/core/3.5/themes/themes.xsd">
 
   <LayerStoreId>layerstore</LayerStoreId>
   <LayerStoreId>layerstore2</LayerStoreId>
diff --git a/deegree-datastores/deegree-coveragestores/deegree-coveragestore-oracle-georaster/src/main/resources/META-INF/schemas/datasource/coverage/oraclegeoraster/example.xml b/deegree-datastores/deegree-coveragestores/deegree-coveragestore-oracle-georaster/src/main/resources/META-INF/schemas/datasource/coverage/oraclegeoraster/example.xml
index 60ce632fd6..f6a5e59507 100644
--- a/deegree-datastores/deegree-coveragestores/deegree-coveragestore-oracle-georaster/src/main/resources/META-INF/schemas/datasource/coverage/oraclegeoraster/example.xml
+++ b/deegree-datastores/deegree-coveragestores/deegree-coveragestore-oracle-georaster/src/main/resources/META-INF/schemas/datasource/coverage/oraclegeoraster/example.xml
@@ -2,7 +2,7 @@
 <OracleGeoraster
 	xmlns="http://www.deegree.org/datasource/coverage/oraclegeoraster"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.deegree.org/datasource/coverage/oraclegeoraster http://schemas.deegree.org/3.5/datasource/coverage/oraclegeoraster/oraclegeoraster.xsd">
+	xsi:schemaLocation="http://www.deegree.org/datasource/coverage/oraclegeoraster http://schemas.deegree.org/core/3.5/datasource/coverage/oraclegeoraster/oraclegeoraster.xsd">
 	<JDBCConnId>oracle</JDBCConnId>
 	<StorageCRS>EPSG:31468</StorageCRS>
 	
diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-memory/src/main/resources/META-INF/schemas/datasource/feature/memory/example.xml b/deegree-datastores/deegree-featurestores/deegree-featurestore-memory/src/main/resources/META-INF/schemas/datasource/feature/memory/example.xml
index b2a7e41c3b..28c6b55ace 100644
--- a/deegree-datastores/deegree-featurestores/deegree-featurestore-memory/src/main/resources/META-INF/schemas/datasource/feature/memory/example.xml
+++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-memory/src/main/resources/META-INF/schemas/datasource/feature/memory/example.xml
@@ -1,6 +1,6 @@
 <MemoryFeatureStore xmlns="http://www.deegree.org/datasource/feature/memory"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/feature/memory http://schemas.deegree.org/3.5/datasource/feature/memory/memory.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/feature/memory http://schemas.deegree.org/core/3.5/datasource/feature/memory/memory.xsd">
 
   <!-- [1] CRS for storing geometries -->
   <StorageCRS>EPSG:4326</StorageCRS>
diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-remotewfs/src/main/resources/META-INF/schemas/datasource/feature/remotewfs/example.xml b/deegree-datastores/deegree-featurestores/deegree-featurestore-remotewfs/src/main/resources/META-INF/schemas/datasource/feature/remotewfs/example.xml
index b32770bfab..11613fc94f 100644
--- a/deegree-datastores/deegree-featurestores/deegree-featurestore-remotewfs/src/main/resources/META-INF/schemas/datasource/feature/remotewfs/example.xml
+++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-remotewfs/src/main/resources/META-INF/schemas/datasource/feature/remotewfs/example.xml
@@ -1,5 +1,5 @@
 <RemoteWFSFeatureStore
   xmlns="http://www.deegree.org/datasource/feature/remotewfs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/feature/remotewfs http://schemas.deegree.org/3.5/datasource/feature/remotewfs/remotewfs.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/feature/remotewfs http://schemas.deegree.org/core/3.5/datasource/feature/remotewfs/remotewfs.xsd">
   <CapabilitiesURL>http://deegree3-testing.deegree.org:80/utah-workspace/services?service=WFS&amp;version=1.1.0&amp;request=GetCapabilities</CapabilitiesURL>
 </RemoteWFSFeatureStore>
\ No newline at end of file
diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-shape/src/main/resources/META-INF/schemas/datasource/feature/shape/mapped.xml b/deegree-datastores/deegree-featurestores/deegree-featurestore-shape/src/main/resources/META-INF/schemas/datasource/feature/shape/mapped.xml
index ee95423198..ecd0bd4c6c 100644
--- a/deegree-datastores/deegree-featurestores/deegree-featurestore-shape/src/main/resources/META-INF/schemas/datasource/feature/shape/mapped.xml
+++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-shape/src/main/resources/META-INF/schemas/datasource/feature/shape/mapped.xml
@@ -1,6 +1,6 @@
 <ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
 
   <!-- [0...1] CRS for storing geometries -->
   <StorageCRS>EPSG:4326</StorageCRS>
diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-shape/src/main/resources/META-INF/schemas/datasource/feature/shape/simple.xml b/deegree-datastores/deegree-featurestores/deegree-featurestore-shape/src/main/resources/META-INF/schemas/datasource/feature/shape/simple.xml
index 85f80e3ad3..54812b1599 100644
--- a/deegree-datastores/deegree-featurestores/deegree-featurestore-shape/src/main/resources/META-INF/schemas/datasource/feature/shape/simple.xml
+++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-shape/src/main/resources/META-INF/schemas/datasource/feature/shape/simple.xml
@@ -1,6 +1,6 @@
 <ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
 
   <!-- [0...1] CRS for storing geometries -->
   <StorageCRS>EPSG:4326</StorageCRS>
diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-simplesql/src/main/resources/META-INF/schemas/datasource/feature/simplesql/example.xml b/deegree-datastores/deegree-featurestores/deegree-featurestore-simplesql/src/main/resources/META-INF/schemas/datasource/feature/simplesql/example.xml
index 578daf4d2e..6d2836c440 100644
--- a/deegree-datastores/deegree-featurestores/deegree-featurestore-simplesql/src/main/resources/META-INF/schemas/datasource/feature/simplesql/example.xml
+++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-simplesql/src/main/resources/META-INF/schemas/datasource/feature/simplesql/example.xml
@@ -1,6 +1,6 @@
 <SimpleSQLFeatureStore xmlns="http://www.deegree.org/datasource/feature/simplesql"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/feature/simplesql http://schemas.deegree.org/3.5/datasource/feature/simplesql/simplesql.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/feature/simplesql http://schemas.deegree.org/core/3.5/datasource/feature/simplesql/simplesql.xsd">
 
   <!-- [1] CRS for storing geometries -->
   <StorageCRS>EPSG:4326</StorageCRS>
diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/main/java/org/deegree/feature/persistence/sql/config/SQLFeatureStoreConfigWriter.java b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/main/java/org/deegree/feature/persistence/sql/config/SQLFeatureStoreConfigWriter.java
index 9fe8a40822..2cbe9159ec 100644
--- a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/main/java/org/deegree/feature/persistence/sql/config/SQLFeatureStoreConfigWriter.java
+++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/main/java/org/deegree/feature/persistence/sql/config/SQLFeatureStoreConfigWriter.java
@@ -87,7 +87,7 @@ public class SQLFeatureStoreConfigWriter {
 
     private static final String CONFIG_NS = "http://www.deegree.org/datasource/feature/sql";
 
-    private static final String SCHEMA_LOCATION = "http://www.deegree.org/datasource/feature/sql http://schemas.deegree.org/3.5/datasource/feature/sql/sql.xsd";
+    private static final String SCHEMA_LOCATION = "http://www.deegree.org/datasource/feature/sql http://schemas.deegree.org/core/3.5/datasource/feature/sql/sql.xsd";
 
     private final MappedAppSchema schema;
 
diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/main/resources/META-INF/schemas/datasource/feature/sql/example_complex.xml b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/main/resources/META-INF/schemas/datasource/feature/sql/example_complex.xml
index eab5efda77..5b122ce0ea 100644
--- a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/main/resources/META-INF/schemas/datasource/feature/sql/example_complex.xml
+++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/main/resources/META-INF/schemas/datasource/feature/sql/example_complex.xml
@@ -1,7 +1,7 @@
 <SQLFeatureStore xmlns="http://www.deegree.org/datasource/feature/sql" xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:base="urn:x-inspire:specification:gmlas:BaseTypes:3.2" xmlns:ad="urn:x-inspire:specification:gmlas:Addresses:3.0"
   xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/feature/sql http://schemas.deegree.org/3.5/datasource/feature/sql/sql.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/feature/sql http://schemas.deegree.org/core/3.5/datasource/feature/sql/sql.xsd">
   <JDBCConnId>inspire</JDBCConnId>
   <StorageCRS srid="0" dim="2D">EPSG:4258</StorageCRS>
   <GMLSchema>../../appschemas/inspire/annex1/Addresses.xsd</GMLSchema>
diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/main/resources/META-INF/schemas/datasource/feature/sql/example_minimal.xml b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/main/resources/META-INF/schemas/datasource/feature/sql/example_minimal.xml
index e9941a87aa..fa5ff56304 100644
--- a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/main/resources/META-INF/schemas/datasource/feature/sql/example_minimal.xml
+++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/main/resources/META-INF/schemas/datasource/feature/sql/example_minimal.xml
@@ -1,6 +1,6 @@
 <SQLFeatureStore xmlns="http://www.deegree.org/datasource/feature/sql" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.deegree.org/datasource/feature/sql
-  http://schemas.deegree.org/3.5/datasource/feature/sql/sql.xsd">
+  http://schemas.deegree.org/core/3.5/datasource/feature/sql/sql.xsd">
   <JDBCConnId>myconn</JDBCConnId>
 
   <!-- Map table country to Feature Type -->
diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/test/resources/org/deegree/feature/persistence/postgis/inspire-db.xml b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/test/resources/org/deegree/feature/persistence/postgis/inspire-db.xml
index 18a9be2c62..9c196ae8c4 100644
--- a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/test/resources/org/deegree/feature/persistence/postgis/inspire-db.xml
+++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/test/resources/org/deegree/feature/persistence/postgis/inspire-db.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <PooledConnection xmlns="http://www.deegree.org/jdbc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/jdbc http://schemas.deegree.org/3.5/jdbc/jdbc.xsd">
+  xsi:schemaLocation="http://www.deegree.org/jdbc http://schemas.deegree.org/core/3.5/jdbc/jdbc.xsd">
   <Url>jdbc:postgresql://hurricane:5432/inspire</Url>
   <User>postgres</User>
   <Password>postgres</Password>
diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/test/resources/org/deegree/feature/persistence/postgis/inspire-hybrid.xml b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/test/resources/org/deegree/feature/persistence/postgis/inspire-hybrid.xml
index 86df528295..006a724a25 100644
--- a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/test/resources/org/deegree/feature/persistence/postgis/inspire-hybrid.xml
+++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/test/resources/org/deegree/feature/persistence/postgis/inspire-hybrid.xml
@@ -1,4 +1,4 @@
-<PostGISFeatureStore xmlns="http://www.deegree.org/datasource/feature/postgis" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/postgis http://schemas.deegree.org/3.5/datasource/feature/postgis/postgis.xsd" xmlns:ad="urn:x-inspire:specification:gmlas:Addresses:3.0" xmlns:au="urn:x-inspire:specification:gmlas:AdministrativeUnits:3.0" xmlns:tn-a="urn:x-inspire:specification:gmlas:AirTransportNetwork:3.0" xmlns:base="urn:x-inspire:specification:gmlas:BaseTypes:3.2" xmlns:bui="urn:x-inspire:specification:gmlas:Buildings:0.0" xmlns:cp="urn:x-inspire:specification:gmlas:CadastralParcels:3.0" xmlns:tn="urn:x-inspire:specification:gmlas:CommonTransportElements:3.0" xmlns:gn="urn:x-inspire:specification:gmlas:GeographicalNames:3.0" xmlns:net="urn:x-inspire:specification:gmlas:Network:3.2" xmlns:stat="urn:x-inspire:specification:gmlas:StatisticalUnits:0.0">
+<PostGISFeatureStore xmlns="http://www.deegree.org/datasource/feature/postgis" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/postgis http://schemas.deegree.org/core/3.5/datasource/feature/postgis/postgis.xsd" xmlns:ad="urn:x-inspire:specification:gmlas:Addresses:3.0" xmlns:au="urn:x-inspire:specification:gmlas:AdministrativeUnits:3.0" xmlns:tn-a="urn:x-inspire:specification:gmlas:AirTransportNetwork:3.0" xmlns:base="urn:x-inspire:specification:gmlas:BaseTypes:3.2" xmlns:bui="urn:x-inspire:specification:gmlas:Buildings:0.0" xmlns:cp="urn:x-inspire:specification:gmlas:CadastralParcels:3.0" xmlns:tn="urn:x-inspire:specification:gmlas:CommonTransportElements:3.0" xmlns:gn="urn:x-inspire:specification:gmlas:GeographicalNames:3.0" xmlns:net="urn:x-inspire:specification:gmlas:Network:3.2" xmlns:stat="urn:x-inspire:specification:gmlas:StatisticalUnits:0.0">
   <StorageCRS>EPSG:4258</StorageCRS>
   <NamespaceHint prefix="tn" namespaceURI="urn:x-inspire:specification:gmlas:CommonTransportElements:3.0"/>
   <NamespaceHint prefix="gco" namespaceURI="http://www.isotc211.org/2005/gco"/>
diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/test/resources/org/deegree/feature/persistence/postgis/philosopher-db.xml b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/test/resources/org/deegree/feature/persistence/postgis/philosopher-db.xml
index 556e031553..bec78ee0c6 100644
--- a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/test/resources/org/deegree/feature/persistence/postgis/philosopher-db.xml
+++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/test/resources/org/deegree/feature/persistence/postgis/philosopher-db.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <PooledConnection xmlns="http://www.deegree.org/jdbc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/jdbc http://schemas.deegree.org/3.5/jdbc/jdbc.xsd">
+  xsi:schemaLocation="http://www.deegree.org/jdbc http://schemas.deegree.org/core/3.5/jdbc/jdbc.xsd">
   <Url>jdbc:postgresql://hurricane:5432/d3_philosopher</Url>
   <User>postgres</User>
   <Password>postgres</Password>
diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/test/resources/org/deegree/feature/persistence/postgis/philosopher.xml b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/test/resources/org/deegree/feature/persistence/postgis/philosopher.xml
index da18977763..1fe5346a85 100644
--- a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/test/resources/org/deegree/feature/persistence/postgis/philosopher.xml
+++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/test/resources/org/deegree/feature/persistence/postgis/philosopher.xml
@@ -1,6 +1,6 @@
 <PostGISFeatureStore xmlns="http://www.deegree.org/datasource/feature/postgis"
   xmlns:app="http://www.deegree.org/app" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/feature/postgis http://schemas.deegree.org/3.5/datasource/feature/postgis/postgis.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/feature/postgis http://schemas.deegree.org/core/3.5/datasource/feature/postgis/postgis.xsd">
   <StorageCRS>EPSG:4326</StorageCRS>
   <NamespaceHint prefix="app" namespaceURI="http://www.deegree.org/app" />  
   <JDBCConnId>philosopher-db</JDBCConnId>
diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/test/resources/org/deegree/feature/persistence/postgis/simple_feature.xml b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/test/resources/org/deegree/feature/persistence/postgis/simple_feature.xml
index f95e511360..7c0d181460 100644
--- a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/test/resources/org/deegree/feature/persistence/postgis/simple_feature.xml
+++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/test/resources/org/deegree/feature/persistence/postgis/simple_feature.xml
@@ -1,6 +1,6 @@
 <PostGISFeatureStore xmlns="http://www.deegree.org/datasource/feature/postgis"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/feature/postgis http://schemas.deegree.org/3.5/datasource/feature/postgis/postgis.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/feature/postgis http://schemas.deegree.org/core/3.5/datasource/feature/postgis/postgis.xsd">
 
   <StorageCRS>EPSG:31467</StorageCRS>
 
diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/test/resources/org/deegree/feature/persistence/sql/aixm/datasources/feature/aixm.xml b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/test/resources/org/deegree/feature/persistence/sql/aixm/datasources/feature/aixm.xml
index 333dd4c6a7..dacc42fbe0 100644
--- a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/test/resources/org/deegree/feature/persistence/sql/aixm/datasources/feature/aixm.xml
+++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/test/resources/org/deegree/feature/persistence/sql/aixm/datasources/feature/aixm.xml
@@ -1,5 +1,5 @@
 <SQLFeatureStore xmlns="http://www.deegree.org/datasource/feature/sql" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/feature/sql http://schemas.deegree.org/3.5/datasource/feature/sql/sql.xsd"
+  xsi:schemaLocation="http://www.deegree.org/datasource/feature/sql http://schemas.deegree.org/core/3.5/datasource/feature/sql/sql.xsd"
   xmlns:aixm="http://www.aixm.aero/schema/5.1" xmlns:message="http://www.aixm.aero/schema/5.1/message" xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:gml="http://www.opengis.net/gml/3.2">
   <JDBCConnId>deegree-test</JDBCConnId>
diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/test/resources/org/deegree/feature/persistence/sql/topp_states/datasources/feature/topp_states.xml b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/test/resources/org/deegree/feature/persistence/sql/topp_states/datasources/feature/topp_states.xml
index 84541051c6..685628166d 100644
--- a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/test/resources/org/deegree/feature/persistence/sql/topp_states/datasources/feature/topp_states.xml
+++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/test/resources/org/deegree/feature/persistence/sql/topp_states/datasources/feature/topp_states.xml
@@ -1,6 +1,6 @@
 <SQLFeatureStore xmlns:topp="http://www.openplans.org/topp" xmlns="http://www.deegree.org/datasource/feature/sql" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 
-  xsi:schemaLocation="http://www.deegree.org/datasource/feature/sql http://schemas.deegree.org/3.5/datasource/feature/sql/sql.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/feature/sql http://schemas.deegree.org/core/3.5/datasource/feature/sql/sql.xsd">
   <JDBCConnId>deegree-test</JDBCConnId>
   <FeatureType table="states" name="topp:states">
     <FIDMapping>
diff --git a/deegree-datastores/deegree-mdstores/deegree-mdstore-ebrim-eo/src/main/resources/META-INF/schemas/datasource/metadata/ebrim/eo/example_ebrimEO.xml b/deegree-datastores/deegree-mdstores/deegree-mdstore-ebrim-eo/src/main/resources/META-INF/schemas/datasource/metadata/ebrim/eo/example_ebrimEO.xml
index d1d93f1fd8..a7025fef82 100644
--- a/deegree-datastores/deegree-mdstores/deegree-mdstore-ebrim-eo/src/main/resources/META-INF/schemas/datasource/metadata/ebrim/eo/example_ebrimEO.xml
+++ b/deegree-datastores/deegree-mdstores/deegree-mdstore-ebrim-eo/src/main/resources/META-INF/schemas/datasource/metadata/ebrim/eo/example_ebrimEO.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EbrimEOMDStore xmlns="http://www.deegree.org/datasource/metadata/ebrim/eo"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/metadata/ebrim/eo http://schemas.deegree.org/3.5/datasource/metadata/ebrim/eo/ebrim-eo.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/metadata/ebrim/eo http://schemas.deegree.org/core/3.5/datasource/metadata/ebrim/eo/ebrim-eo.xsd">
   <!-- [1] Identifier of JDBC connection -->
   <JDBCConnId>conn1</JDBCConnId>
   <ExtensionPackage>../path/to/ebrim-profile.xml</ExtensionPackage>
diff --git a/deegree-datastores/deegree-mdstores/deegree-mdstore-ebrim-eo/src/test/resources/org/deegree/metadata/persistence/ebrim/eo/eotest/datasources/metadata/ebrimEO.xml b/deegree-datastores/deegree-mdstores/deegree-mdstore-ebrim-eo/src/test/resources/org/deegree/metadata/persistence/ebrim/eo/eotest/datasources/metadata/ebrimEO.xml
index 8845524ee9..14655365c5 100644
--- a/deegree-datastores/deegree-mdstores/deegree-mdstore-ebrim-eo/src/test/resources/org/deegree/metadata/persistence/ebrim/eo/eotest/datasources/metadata/ebrimEO.xml
+++ b/deegree-datastores/deegree-mdstores/deegree-mdstore-ebrim-eo/src/test/resources/org/deegree/metadata/persistence/ebrim/eo/eotest/datasources/metadata/ebrimEO.xml
@@ -1,6 +1,6 @@
 <EbrimEOMDStore xmlns="http://www.deegree.org/datasource/metadata/ebrimEO" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 
-  xsi:schemaLocation="http://www.deegree.org/datasource/metadata/ebrimEO http://schemas.deegree.org/3.5/datasource/metadata/ebrimEO/ebrimEO.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/metadata/ebrimEO http://schemas.deegree.org/core/3.5/datasource/metadata/ebrimEO/ebrimEO.xsd">
 
   <!-- [1] Identifier of JDBC connection -->
   <JDBCConnId>rapideye-csw-ebrim</JDBCConnId>
diff --git a/deegree-datastores/deegree-mdstores/deegree-mdstore-ebrim-eo/src/test/resources/org/deegree/metadata/persistence/ebrim/eo/eotest/jdbc/rapideye-csw-ebrim.xml b/deegree-datastores/deegree-mdstores/deegree-mdstore-ebrim-eo/src/test/resources/org/deegree/metadata/persistence/ebrim/eo/eotest/jdbc/rapideye-csw-ebrim.xml
index 4c5e8fe5d3..2bbb147fb0 100644
--- a/deegree-datastores/deegree-mdstores/deegree-mdstore-ebrim-eo/src/test/resources/org/deegree/metadata/persistence/ebrim/eo/eotest/jdbc/rapideye-csw-ebrim.xml
+++ b/deegree-datastores/deegree-mdstores/deegree-mdstore-ebrim-eo/src/test/resources/org/deegree/metadata/persistence/ebrim/eo/eotest/jdbc/rapideye-csw-ebrim.xml
@@ -1,4 +1,4 @@
-<JDBCConnection xmlns="http://www.deegree.org/jdbc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/jdbc http://schemas.deegree.org/3.5/jdbc/jdbc.xsd">
+<JDBCConnection xmlns="http://www.deegree.org/jdbc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/jdbc http://schemas.deegree.org/core/3.5/jdbc/jdbc.xsd">
 
   <!-- [1] JDBC URL (without username / password) -->
   <Url>jdbc:postgresql://localhost:5432/cswebrimeo</Url>
diff --git a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso-memory/src/main/resources/META-INF/schemas/datasource/metadata/iso19139/memory/example.xml b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso-memory/src/main/resources/META-INF/schemas/datasource/metadata/iso19139/memory/example.xml
index 567209c451..9d50293877 100644
--- a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso-memory/src/main/resources/META-INF/schemas/datasource/metadata/iso19139/memory/example.xml
+++ b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso-memory/src/main/resources/META-INF/schemas/datasource/metadata/iso19139/memory/example.xml
@@ -1,6 +1,6 @@
 <ISOMemoryMetadataStore xmlns="http://www.deegree.org/datasource/metadata/iso19139/memory"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/metadata/iso19139/memory http://schemas.deegree.org/3.5/datasource/metadata/iso19139/memory/memory.xsd"
+  xsi:schemaLocation="http://www.deegree.org/datasource/metadata/iso19139/memory http://schemas.deegree.org/core/3.5/datasource/metadata/iso19139/memory/memory.xsd"
  >
   <!-- [1...n] directory to be used -->
   <ISORecordDirectory>../../metadata</ISORecordDirectory>
diff --git a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/main/resources/META-INF/schemas/datasource/metadata/iso19115/example_iso19115.xml b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/main/resources/META-INF/schemas/datasource/metadata/iso19115/example_iso19115.xml
index e6b0230775..34e3e4dbf2 100644
--- a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/main/resources/META-INF/schemas/datasource/metadata/iso19115/example_iso19115.xml
+++ b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/main/resources/META-INF/schemas/datasource/metadata/iso19115/example_iso19115.xml
@@ -2,7 +2,7 @@
 <ISOMetadataStore
 	xmlns="http://www.deegree.org/datasource/metadata/iso19115"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.deegree.org/datasource/metadata/iso19115 http://schemas.deegree.org/3.5/datasource/metadata/iso19115/iso19115.xsd">
+	xsi:schemaLocation="http://www.deegree.org/datasource/metadata/iso19115 http://schemas.deegree.org/core/3.5/datasource/metadata/iso19115/iso19115.xsd">
 
   <!-- [1] Identifier of JDBC connection -->
   <JDBCConnId>conn1</JDBCConnId>
diff --git a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/anyText_All.xml b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/anyText_All.xml
index 81520420db..00af32656a 100644
--- a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/anyText_All.xml
+++ b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/anyText_All.xml
@@ -2,7 +2,7 @@
 <ISOMetadataStore
 	xmlns="http://www.deegree.org/datasource/metadata/iso19115"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.deegree.org/datasource/metadata/iso19115 http://schemas.deegree.org/3.5/datasource/metadata/iso19115/iso19115.xsd">
+	xsi:schemaLocation="http://www.deegree.org/datasource/metadata/iso19115 http://schemas.deegree.org/core/3.5/datasource/metadata/iso19115/iso19115.xsd">
   <JDBCConnId>iso_pg_set_up_tables</JDBCConnId>
   <AnyText>
     <All/>
diff --git a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/anyText_Core.xml b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/anyText_Core.xml
index 5214eaae27..77c40b560c 100644
--- a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/anyText_Core.xml
+++ b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/anyText_Core.xml
@@ -2,7 +2,7 @@
 <ISOMetadataStore
 	xmlns="http://www.deegree.org/datasource/metadata/iso19115"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.deegree.org/datasource/metadata/iso19115 http://schemas.deegree.org/3.5/datasource/metadata/iso19115/iso19115.xsd">
+	xsi:schemaLocation="http://www.deegree.org/datasource/metadata/iso19115 http://schemas.deegree.org/core/3.5/datasource/metadata/iso19115/iso19115.xsd">
     <JDBCConnId>iso_pg_set_up_tables</JDBCConnId>
   <AnyText>
     <Core/>
diff --git a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/anyText_Custom.xml b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/anyText_Custom.xml
index 18bbe694b3..8ae3caf44c 100644
--- a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/anyText_Custom.xml
+++ b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/anyText_Custom.xml
@@ -2,7 +2,7 @@
 <ISOMetadataStore
 	xmlns="http://www.deegree.org/datasource/metadata/iso19115"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.deegree.org/datasource/metadata/iso19115 http://schemas.deegree.org/3.5/datasource/metadata/iso19115/iso19115.xsd">
+	xsi:schemaLocation="http://www.deegree.org/datasource/metadata/iso19115 http://schemas.deegree.org/core/3.5/datasource/metadata/iso19115/iso19115.xsd">
     <JDBCConnId>iso_pg_set_up_tables</JDBCConnId>
   <AnyText>
     <Custom>
diff --git a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/iso19115_RS_Available_Generate_FALSE.xml b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/iso19115_RS_Available_Generate_FALSE.xml
index 789c2e8899..a582907e68 100644
--- a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/iso19115_RS_Available_Generate_FALSE.xml
+++ b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/iso19115_RS_Available_Generate_FALSE.xml
@@ -2,7 +2,7 @@
 <ISOMetadataStore
 	xmlns="http://www.deegree.org/datasource/metadata/iso19115"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.deegree.org/datasource/metadata/iso19115 http://schemas.deegree.org/3.5/datasource/metadata/iso19115/iso19115.xsd">
+	xsi:schemaLocation="http://www.deegree.org/datasource/metadata/iso19115 http://schemas.deegree.org/core/3.5/datasource/metadata/iso19115/iso19115.xsd">
       <JDBCConnId>iso_pg_set_up_tables</JDBCConnId>
     <Inspectors>
 	  <FileIdentifierInspector rejectEmpty="false"/>
diff --git a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/iso19115_RS_Available_Generate_TRUE.xml b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/iso19115_RS_Available_Generate_TRUE.xml
index 833eae5eed..5e33d49ff3 100644
--- a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/iso19115_RS_Available_Generate_TRUE.xml
+++ b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/iso19115_RS_Available_Generate_TRUE.xml
@@ -2,7 +2,7 @@
 <ISOMetadataStore
 	xmlns="http://www.deegree.org/datasource/metadata/iso19115"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.deegree.org/datasource/metadata/iso19115 http://schemas.deegree.org/3.5/datasource/metadata/iso19115/iso19115.xsd">
+	xsi:schemaLocation="http://www.deegree.org/datasource/metadata/iso19115 http://schemas.deegree.org/core/3.5/datasource/metadata/iso19115/iso19115.xsd">
 	  <JDBCConnId>iso_pg_set_up_tables</JDBCConnId>
   <Inspectors>
 	  <FileIdentifierInspector rejectEmpty="false"/>
diff --git a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/iso19115_Reject_FI_FALSE.xml b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/iso19115_Reject_FI_FALSE.xml
index 0997911935..3d88f45ee2 100644
--- a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/iso19115_Reject_FI_FALSE.xml
+++ b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/iso19115_Reject_FI_FALSE.xml
@@ -2,7 +2,7 @@
 <ISOMetadataStore
 	xmlns="http://www.deegree.org/datasource/metadata/iso19115"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.deegree.org/datasource/metadata/iso19115 http://schemas.deegree.org/3.5/datasource/metadata/iso19115/iso19115.xsd">
+	xsi:schemaLocation="http://www.deegree.org/datasource/metadata/iso19115 http://schemas.deegree.org/core/3.5/datasource/metadata/iso19115/iso19115.xsd">
 	  <JDBCConnId>iso_pg_set_up_tables</JDBCConnId>
   <Inspectors>
 	  <FileIdentifierInspector rejectEmpty="false"/>
diff --git a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/iso19115_Reject_FI_TRUE.xml b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/iso19115_Reject_FI_TRUE.xml
index 8a78768414..77ece9f4f1 100644
--- a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/iso19115_Reject_FI_TRUE.xml
+++ b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/iso19115_Reject_FI_TRUE.xml
@@ -2,7 +2,7 @@
 <ISOMetadataStore
 	xmlns="http://www.deegree.org/datasource/metadata/iso19115"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.deegree.org/datasource/metadata/iso19115 http://schemas.deegree.org/3.5/datasource/metadata/iso19115/iso19115.xsd">
+	xsi:schemaLocation="http://www.deegree.org/datasource/metadata/iso19115 http://schemas.deegree.org/core/3.5/datasource/metadata/iso19115/iso19115.xsd">
 	  <JDBCConnId>iso_pg_set_up_tables</JDBCConnId>
   <Inspectors>
 	  <FileIdentifierInspector rejectEmpty="true"/>
diff --git a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/iso19115_SetUpTables.xml b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/iso19115_SetUpTables.xml
index e1080bef1e..3f5920129e 100644
--- a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/iso19115_SetUpTables.xml
+++ b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/iso19115_SetUpTables.xml
@@ -2,6 +2,6 @@
 <ISOMetadataStore
 	xmlns="http://www.deegree.org/datasource/metadata/iso19115"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.deegree.org/datasource/metadata/iso19115 http://schemas.deegree.org/3.5/datasource/metadata/iso19115/iso19115.xsd">
+	xsi:schemaLocation="http://www.deegree.org/datasource/metadata/iso19115 http://schemas.deegree.org/core/3.5/datasource/metadata/iso19115/iso19115.xsd">
 <JDBCConnId>iso_pg_set_up_tables</JDBCConnId>
 </ISOMetadataStore>
\ No newline at end of file
diff --git a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/iso19115_coupling_accept.xml b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/iso19115_coupling_accept.xml
index edddecd24c..c8a82eff6d 100644
--- a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/iso19115_coupling_accept.xml
+++ b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/iso19115_coupling_accept.xml
@@ -2,7 +2,7 @@
 <ISOMetadataStore
 	xmlns="http://www.deegree.org/datasource/metadata/iso19115"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.deegree.org/datasource/metadata/iso19115 http://schemas.deegree.org/3.5/datasource/metadata/iso19115/iso19115.xsd">
+	xsi:schemaLocation="http://www.deegree.org/datasource/metadata/iso19115 http://schemas.deegree.org/core/3.5/datasource/metadata/iso19115/iso19115.xsd">
 	  <JDBCConnId>iso_pg_set_up_tables</JDBCConnId>
   <Inspectors>
 	  <CoupledResourceInspector throwConsistencyError="false" />
diff --git a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/iso19115_coupling_reject.xml b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/iso19115_coupling_reject.xml
index 70ddbb76b4..52c8e11901 100644
--- a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/iso19115_coupling_reject.xml
+++ b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/resources/org/deegree/metadata/iso/persistence/configdocs/iso19115_coupling_reject.xml
@@ -2,7 +2,7 @@
 <ISOMetadataStore
 	xmlns="http://www.deegree.org/datasource/metadata/iso19115"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.deegree.org/datasource/metadata/iso19115 http://schemas.deegree.org/3.5/datasource/metadata/iso19115/iso19115.xsd">
+	xsi:schemaLocation="http://www.deegree.org/datasource/metadata/iso19115 http://schemas.deegree.org/core/3.5/datasource/metadata/iso19115/iso19115.xsd">
 	  <JDBCConnId>iso_pg_set_up_tables</JDBCConnId>
   <Inspectors>
 	  <CoupledResourceInspector throwConsistencyError="true" />
diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-cache/src/main/resources/META-INF/schemas/datasource/tile/cache/example.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-cache/src/main/resources/META-INF/schemas/datasource/tile/cache/example.xml
index e66847c6c9..8bae87eada 100644
--- a/deegree-datastores/deegree-tilestores/deegree-tilestore-cache/src/main/resources/META-INF/schemas/datasource/tile/cache/example.xml
+++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-cache/src/main/resources/META-INF/schemas/datasource/tile/cache/example.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <CachingTileStore xmlns="http://www.deegree.org/datasource/tile/cache" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/tile/cache http://schemas.deegree.org/3.5/datasource/tile/cache/cache.xsd"
+  xsi:schemaLocation="http://www.deegree.org/datasource/tile/cache http://schemas.deegree.org/core/3.5/datasource/tile/cache/cache.xsd"
  >
 
   <TileStoreId>tilestore1</TileStoreId>
diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/src/main/resources/META-INF/schemas/datasource/tile/tilematrixset/example.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/src/main/resources/META-INF/schemas/datasource/tile/tilematrixset/example.xml
index bfe7b3fc73..a6ba46deac 100644
--- a/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/src/main/resources/META-INF/schemas/datasource/tile/tilematrixset/example.xml
+++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/src/main/resources/META-INF/schemas/datasource/tile/tilematrixset/example.xml
@@ -1,5 +1,5 @@
 <TileMatrixSet xmlns="http://www.deegree.org/datasource/tile/tilematrixset" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/tile/tilematrixset http://schemas.deegree.org/3.5/datasource/tile/tilematrixset/tilematrixset.xsd"
+  xsi:schemaLocation="http://www.deegree.org/datasource/tile/tilematrixset http://schemas.deegree.org/core/3.5/datasource/tile/tilematrixset/tilematrixset.xsd"
  >
 
   <CRS>urn:ogc:def:crs:OGC:1.3:CRS84</CRS>
diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/src/main/resources/org/deegree/tile/tilematrixset/globalcrs84pixel.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/src/main/resources/org/deegree/tile/tilematrixset/globalcrs84pixel.xml
index 6e95a5e29a..a66dd19937 100644
--- a/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/src/main/resources/org/deegree/tile/tilematrixset/globalcrs84pixel.xml
+++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/src/main/resources/org/deegree/tile/tilematrixset/globalcrs84pixel.xml
@@ -1,5 +1,5 @@
 <TileMatrixSet xmlns="http://www.deegree.org/datasource/tile/tilematrixset" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/tile/tilematrixset http://schemas.deegree.org/3.5/datasource/tile/tilematrixset/tilematrixset.xsd"
+  xsi:schemaLocation="http://www.deegree.org/datasource/tile/tilematrixset http://schemas.deegree.org/core/3.5/datasource/tile/tilematrixset/tilematrixset.xsd"
  >
 
   <CRS>urn:ogc:def:crs:OGC:1.3:CRS84</CRS>
diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/src/main/resources/org/deegree/tile/tilematrixset/globalcrs84scale.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/src/main/resources/org/deegree/tile/tilematrixset/globalcrs84scale.xml
index 833c5e61f7..58b444750e 100644
--- a/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/src/main/resources/org/deegree/tile/tilematrixset/globalcrs84scale.xml
+++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/src/main/resources/org/deegree/tile/tilematrixset/globalcrs84scale.xml
@@ -1,5 +1,5 @@
 <TileMatrixSet xmlns="http://www.deegree.org/datasource/tile/tilematrixset" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/tile/tilematrixset http://schemas.deegree.org/3.5/datasource/tile/tilematrixset/tilematrixset.xsd"
+  xsi:schemaLocation="http://www.deegree.org/datasource/tile/tilematrixset http://schemas.deegree.org/core/3.5/datasource/tile/tilematrixset/tilematrixset.xsd"
  >
 
   <CRS>urn:ogc:def:crs:OGC:1.3:CRS84</CRS>
diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/src/main/resources/org/deegree/tile/tilematrixset/googlecrs84quad.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/src/main/resources/org/deegree/tile/tilematrixset/googlecrs84quad.xml
index 18672d73ec..a0f836356a 100644
--- a/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/src/main/resources/org/deegree/tile/tilematrixset/googlecrs84quad.xml
+++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/src/main/resources/org/deegree/tile/tilematrixset/googlecrs84quad.xml
@@ -1,5 +1,5 @@
 <TileMatrixSet xmlns="http://www.deegree.org/datasource/tile/tilematrixset" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/tile/tilematrixset http://schemas.deegree.org/3.5/datasource/tile/tilematrixset/tilematrixset.xsd"
+  xsi:schemaLocation="http://www.deegree.org/datasource/tile/tilematrixset http://schemas.deegree.org/core/3.5/datasource/tile/tilematrixset/tilematrixset.xsd"
  >
 
   <CRS>urn:ogc:def:crs:OGC:1.3:CRS84</CRS>
diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/src/main/resources/org/deegree/tile/tilematrixset/googlemapscompatible.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/src/main/resources/org/deegree/tile/tilematrixset/googlemapscompatible.xml
index 09a0df4d60..85b907b482 100644
--- a/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/src/main/resources/org/deegree/tile/tilematrixset/googlemapscompatible.xml
+++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/src/main/resources/org/deegree/tile/tilematrixset/googlemapscompatible.xml
@@ -1,5 +1,5 @@
 <TileMatrixSet xmlns="http://www.deegree.org/datasource/tile/tilematrixset" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/tile/tilematrixset http://schemas.deegree.org/3.5/datasource/tile/tilematrixset/tilematrixset.xsd"
+  xsi:schemaLocation="http://www.deegree.org/datasource/tile/tilematrixset http://schemas.deegree.org/core/3.5/datasource/tile/tilematrixset/tilematrixset.xsd"
  >
 
   <CRS>urn:ogc:def:crs:EPSG::3857</CRS>
diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/src/main/resources/org/deegree/tile/tilematrixset/inspirecrs84quad.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/src/main/resources/org/deegree/tile/tilematrixset/inspirecrs84quad.xml
index 337282c1d8..092a52a984 100644
--- a/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/src/main/resources/org/deegree/tile/tilematrixset/inspirecrs84quad.xml
+++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/src/main/resources/org/deegree/tile/tilematrixset/inspirecrs84quad.xml
@@ -1,5 +1,5 @@
 <TileMatrixSet xmlns="http://www.deegree.org/datasource/tile/tilematrixset" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/tile/tilematrixset http://schemas.deegree.org/3.5/datasource/tile/tilematrixset/tilematrixset.xsd"
+  xsi:schemaLocation="http://www.deegree.org/datasource/tile/tilematrixset http://schemas.deegree.org/core/3.5/datasource/tile/tilematrixset/tilematrixset.xsd"
  >
 
   <CRS>urn:ogc:def:crs:OGC:1.3:CRS84</CRS>
diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-filesystem/src/main/resources/META-INF/schemas/datasource/tile/filesystem/example.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-filesystem/src/main/resources/META-INF/schemas/datasource/tile/filesystem/example.xml
index 78c364f328..f45c8e7e5e 100644
--- a/deegree-datastores/deegree-tilestores/deegree-tilestore-filesystem/src/main/resources/META-INF/schemas/datasource/tile/filesystem/example.xml
+++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-filesystem/src/main/resources/META-INF/schemas/datasource/tile/filesystem/example.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <FileSystemTileStore xmlns="http://www.deegree.org/datasource/tile/filesystem" xmlns:md="http://www.deegree.org/metadata/spatial"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/tile/filesystem http://schemas.deegree.org/3.5/datasource/tile/filesystem/filesystem.xsd"
+  xsi:schemaLocation="http://www.deegree.org/datasource/tile/filesystem http://schemas.deegree.org/core/3.5/datasource/tile/filesystem/filesystem.xsd"
  >
 
   <TileDataSet>
diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-gdal/src/main/resources/META-INF/schemas/datasource/tile/gdal/example_complex.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-gdal/src/main/resources/META-INF/schemas/datasource/tile/gdal/example_complex.xml
index 82ac1f476c..ab9c8ddc53 100644
--- a/deegree-datastores/deegree-tilestores/deegree-tilestore-gdal/src/main/resources/META-INF/schemas/datasource/tile/gdal/example_complex.xml
+++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-gdal/src/main/resources/META-INF/schemas/datasource/tile/gdal/example_complex.xml
@@ -1,6 +1,6 @@
 <GDALTileStore
   xmlns="http://www.deegree.org/datasource/tile/gdal" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/tile/gdal http://schemas.deegree.org/3.5/datasource/tile/gdal/gdal.xsd">  
+  xsi:schemaLocation="http://www.deegree.org/datasource/tile/gdal http://schemas.deegree.org/core/3.5/datasource/tile/gdal/gdal.xsd">
   <TileDataSet>
     <Identifier>2010</Identifier>
     <TileMatrixSetId>NLDEPSG28992Scale</TileMatrixSetId>
diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-gdal/src/main/resources/META-INF/schemas/datasource/tile/gdal/example_minimal.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-gdal/src/main/resources/META-INF/schemas/datasource/tile/gdal/example_minimal.xml
index 11c4550b9e..a31e235cac 100644
--- a/deegree-datastores/deegree-tilestores/deegree-tilestore-gdal/src/main/resources/META-INF/schemas/datasource/tile/gdal/example_minimal.xml
+++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-gdal/src/main/resources/META-INF/schemas/datasource/tile/gdal/example_minimal.xml
@@ -1,6 +1,6 @@
 <GDALTileStore
   xmlns="http://www.deegree.org/datasource/tile/gdal" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/tile/gdal http://schemas.deegree.org/3.5/datasource/tile/gdal/gdal.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/tile/gdal http://schemas.deegree.org/core/3.5/datasource/tile/gdal/gdal.xsd">
   <TileDataSet>
     <TileMatrixSetId>utah</TileMatrixSetId>
     <File>../../data/test.tif</File>
diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-geotiff/src/main/resources/META-INF/schemas/datasource/tile/geotiff/example.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-geotiff/src/main/resources/META-INF/schemas/datasource/tile/geotiff/example.xml
index f390016785..4fa9e55569 100644
--- a/deegree-datastores/deegree-tilestores/deegree-tilestore-geotiff/src/main/resources/META-INF/schemas/datasource/tile/geotiff/example.xml
+++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-geotiff/src/main/resources/META-INF/schemas/datasource/tile/geotiff/example.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <GeoTIFFTileStore xmlns="http://www.deegree.org/datasource/tile/geotiff" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/tile/geotiff http://schemas.deegree.org/3.5/datasource/tile/geotiff/geotiff.xsd"
+  xsi:schemaLocation="http://www.deegree.org/datasource/tile/geotiff http://schemas.deegree.org/core/3.5/datasource/tile/geotiff/geotiff.xsd"
  >
 
   <TileDataSet>
diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-geotiff/src/main/resources/META-INF/schemas/datasource/tile/tilematrixset/geotiff/example.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-geotiff/src/main/resources/META-INF/schemas/datasource/tile/tilematrixset/geotiff/example.xml
index 54b474ecfd..08b0856988 100644
--- a/deegree-datastores/deegree-tilestores/deegree-tilestore-geotiff/src/main/resources/META-INF/schemas/datasource/tile/tilematrixset/geotiff/example.xml
+++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-geotiff/src/main/resources/META-INF/schemas/datasource/tile/tilematrixset/geotiff/example.xml
@@ -1,6 +1,6 @@
 <GeoTIFFTileMatrixSet xmlns="http://www.deegree.org/datasource/tile/tilematrixset/geotiff"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/tile/tilematrixset/geotiff http://schemas.deegree.org/3.5/datasource/tile/tilematrixset/geotiff/geotiff.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/tile/tilematrixset/geotiff http://schemas.deegree.org/core/3.5/datasource/tile/tilematrixset/geotiff/geotiff.xsd">
 
   <StorageCRS>EPSG:26912</StorageCRS>
   <File>../../../data/utah.tif</File>
diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewms/src/main/resources/META-INF/schemas/datasource/tile/remotewms/example.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewms/src/main/resources/META-INF/schemas/datasource/tile/remotewms/example.xml
index 61c86b792e..d70276cc2c 100644
--- a/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewms/src/main/resources/META-INF/schemas/datasource/tile/remotewms/example.xml
+++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewms/src/main/resources/META-INF/schemas/datasource/tile/remotewms/example.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <RemoteWMSTileStore xmlns="http://www.deegree.org/datasource/tile/remotewms" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/tile/remotewms http://schemas.deegree.org/3.5/datasource/tile/remotewms/remotewms.xsd"
+  xsi:schemaLocation="http://www.deegree.org/datasource/tile/remotewms http://schemas.deegree.org/core/3.5/datasource/tile/remotewms/remotewms.xsd"
  >
 
   <!-- [1]: Id of the remote WMS to connect to -->
diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewms/src/test/resources/org/deegree/tile/persistence/remotewms/workspace/datasources/tile/tiles26912.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewms/src/test/resources/org/deegree/tile/persistence/remotewms/workspace/datasources/tile/tiles26912.xml
index f27976b14c..da9d4b10ad 100644
--- a/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewms/src/test/resources/org/deegree/tile/persistence/remotewms/workspace/datasources/tile/tiles26912.xml
+++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewms/src/test/resources/org/deegree/tile/persistence/remotewms/workspace/datasources/tile/tiles26912.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <RemoteWMSTileStore xmlns="http://www.deegree.org/datasource/tile/remotewms" xmlns:md="http://www.deegree.org/metadata/spatial"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/tile/remotewms http://schemas.deegree.org/3.5/datasource/tile/remotewms/remotewms.xsd"
+  xsi:schemaLocation="http://www.deegree.org/datasource/tile/remotewms http://schemas.deegree.org/core/3.5/datasource/tile/remotewms/remotewms.xsd"
  >
 
 
diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewms/src/test/resources/org/deegree/tile/persistence/remotewms/workspace/datasources/tile/tiles4326.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewms/src/test/resources/org/deegree/tile/persistence/remotewms/workspace/datasources/tile/tiles4326.xml
index aa5194ecc4..70ce4464af 100644
--- a/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewms/src/test/resources/org/deegree/tile/persistence/remotewms/workspace/datasources/tile/tiles4326.xml
+++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewms/src/test/resources/org/deegree/tile/persistence/remotewms/workspace/datasources/tile/tiles4326.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <RemoteWMSTileStore xmlns="http://www.deegree.org/datasource/tile/remotewms" xmlns:md="http://www.deegree.org/metadata/spatial"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/tile/remotewms http://schemas.deegree.org/3.5/datasource/tile/remotewms/remotewms.xsd"
+  xsi:schemaLocation="http://www.deegree.org/datasource/tile/remotewms http://schemas.deegree.org/core/3.5/datasource/tile/remotewms/remotewms.xsd"
  >
 
   <!-- [1]: Id of the remote OWS to connect to (must be a WMS instance) -->
diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewmts/src/main/resources/META-INF/schemas/datasource/tile/remotewmts/example.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewmts/src/main/resources/META-INF/schemas/datasource/tile/remotewmts/example.xml
index aa45fbecbe..7f7d13b4f4 100644
--- a/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewmts/src/main/resources/META-INF/schemas/datasource/tile/remotewmts/example.xml
+++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewmts/src/main/resources/META-INF/schemas/datasource/tile/remotewmts/example.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <RemoteWMTSTileStore xmlns="http://www.deegree.org/datasource/tile/remotewmts" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/tile/remotewmts http://schemas.deegree.org/3.5/datasource/tile/remotewmts/remotewmts.xsd"
+  xsi:schemaLocation="http://www.deegree.org/datasource/tile/remotewmts http://schemas.deegree.org/core/3.5/datasource/tile/remotewmts/remotewmts.xsd"
  >
 
   <!-- [1] Id of the remote WMTS to connect to -->
diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewmts/src/test/resources/org/deegree/tile/persistence/remotewmts/workspace/datasources/remoteows/wmts.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewmts/src/test/resources/org/deegree/tile/persistence/remotewmts/workspace/datasources/remoteows/wmts.xml
index d6e161a1ab..39f5962b2f 100644
--- a/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewmts/src/test/resources/org/deegree/tile/persistence/remotewmts/workspace/datasources/remoteows/wmts.xml
+++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewmts/src/test/resources/org/deegree/tile/persistence/remotewmts/workspace/datasources/remoteows/wmts.xml
@@ -1,4 +1,4 @@
 <RemoteWMTS xmlns="http://www.deegree.org/remoteows/wmts" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/remoteows/wmts http://schemas.deegree.org/3.5/remoteows/wmts/remotewmts.xsd">
+  xsi:schemaLocation="http://www.deegree.org/remoteows/wmts http://schemas.deegree.org/core/3.5/remoteows/wmts/remotewmts.xsd">
   <CapabilitiesDocumentLocation location="../../other/remotewmts_capabilities.xml" />
 </RemoteWMTS>
diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewmts/src/test/resources/org/deegree/tile/persistence/remotewmts/workspace/datasources/tile/medford_buildings.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewmts/src/test/resources/org/deegree/tile/persistence/remotewmts/workspace/datasources/tile/medford_buildings.xml
index 21a5e1cafd..8701bb7da0 100644
--- a/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewmts/src/test/resources/org/deegree/tile/persistence/remotewmts/workspace/datasources/tile/medford_buildings.xml
+++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewmts/src/test/resources/org/deegree/tile/persistence/remotewmts/workspace/datasources/tile/medford_buildings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <RemoteWMTSTileStore xmlns="http://www.deegree.org/datasource/tile/remotewmts" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/tile/remotewmts http://schemas.deegree.org/3.5/datasource/tile/remotewmts/remotewmts.xsd"
+  xsi:schemaLocation="http://www.deegree.org/datasource/tile/remotewmts http://schemas.deegree.org/core/3.5/datasource/tile/remotewmts/remotewmts.xsd"
  >
   <!-- [1] Id of the remote WMTS to connect to -->
   <RemoteWMTSId>wmts</RemoteWMTSId>
diff --git a/deegree-layers/deegree-layers-coverage/src/main/resources/META-INF/schemas/layers/coverage/example.xml b/deegree-layers/deegree-layers-coverage/src/main/resources/META-INF/schemas/layers/coverage/example.xml
index 40922aebc6..b4c544d81b 100644
--- a/deegree-layers/deegree-layers-coverage/src/main/resources/META-INF/schemas/layers/coverage/example.xml
+++ b/deegree-layers/deegree-layers-coverage/src/main/resources/META-INF/schemas/layers/coverage/example.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <CoverageLayers xmlns="http://www.deegree.org/layers/coverage" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:d="http://www.deegree.org/metadata/description" xmlns:l="http://www.deegree.org/layers/base" xmlns:s="http://www.deegree.org/metadata/spatial" xsi:schemaLocation="http://www.deegree.org/layers/coverage http://schemas.deegree.org/3.5/layers/coverage/coverage.xsd"
+  xmlns:d="http://www.deegree.org/metadata/description" xmlns:l="http://www.deegree.org/layers/base" xmlns:s="http://www.deegree.org/metadata/spatial" xsi:schemaLocation="http://www.deegree.org/layers/coverage http://schemas.deegree.org/core/3.5/layers/coverage/coverage.xsd"
  >
   <CoverageStoreId>inspire</CoverageStoreId>
   <CoverageLayer>
diff --git a/deegree-layers/deegree-layers-feature/src/main/resources/META-INF/schemas/layers/feature/example.xml b/deegree-layers/deegree-layers-feature/src/main/resources/META-INF/schemas/layers/feature/example.xml
index 4fbc58d658..068af04bdd 100644
--- a/deegree-layers/deegree-layers-feature/src/main/resources/META-INF/schemas/layers/feature/example.xml
+++ b/deegree-layers/deegree-layers-feature/src/main/resources/META-INF/schemas/layers/feature/example.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/3.5/layers/feature/feature.xsd"
+   xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/core/3.5/layers/feature/feature.xsd"
  >
   <FeatureStoreId>inspire</FeatureStoreId>
   <FeatureLayer>
diff --git a/deegree-layers/deegree-layers-remotewms/src/main/resources/META-INF/schemas/layers/remotewms/example.xml b/deegree-layers/deegree-layers-remotewms/src/main/resources/META-INF/schemas/layers/remotewms/example.xml
index 21a1870713..975bc0b332 100644
--- a/deegree-layers/deegree-layers-remotewms/src/main/resources/META-INF/schemas/layers/remotewms/example.xml
+++ b/deegree-layers/deegree-layers-remotewms/src/main/resources/META-INF/schemas/layers/remotewms/example.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<RemoteWMSLayers xmlns="http://www.deegree.org/layers/remotewms" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/remotewms http://schemas.deegree.org/3.5/layers/remotewms/remotewms.xsd">
+<RemoteWMSLayers xmlns="http://www.deegree.org/layers/remotewms" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/remotewms http://schemas.deegree.org/core/3.5/layers/remotewms/remotewms.xsd">
   
   <RemoteWMSId>cascade_demo_deegree_wms</RemoteWMSId>
   
diff --git a/deegree-layers/deegree-layers-tile/src/main/resources/META-INF/schemas/layers/tile/example.xml b/deegree-layers/deegree-layers-tile/src/main/resources/META-INF/schemas/layers/tile/example.xml
index 31d7acf468..4917f1cfcd 100644
--- a/deegree-layers/deegree-layers-tile/src/main/resources/META-INF/schemas/layers/tile/example.xml
+++ b/deegree-layers/deegree-layers-tile/src/main/resources/META-INF/schemas/layers/tile/example.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <TileLayers xmlns="http://www.deegree.org/layers/tile" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:d="http://www.deegree.org/metadata/description" xmlns:l="http://www.deegree.org/layers/base" xsi:schemaLocation="http://www.deegree.org/layers/tile http://schemas.deegree.org/3.5/layers/tile/tile.xsd"
+  xmlns:d="http://www.deegree.org/metadata/description" xmlns:l="http://www.deegree.org/layers/base" xsi:schemaLocation="http://www.deegree.org/layers/tile http://schemas.deegree.org/core/3.5/layers/tile/tile.xsd"
  >
   <TileLayer>
     <l:Name>example</l:Name>
diff --git a/deegree-processproviders/deegree-processprovider-example/src/main/webapp/WEB-INF/workspace/services/main.xml b/deegree-processproviders/deegree-processprovider-example/src/main/webapp/WEB-INF/workspace/services/main.xml
index 449049cff6..cbc05828b7 100644
--- a/deegree-processproviders/deegree-processprovider-example/src/main/webapp/WEB-INF/workspace/services/main.xml
+++ b/deegree-processproviders/deegree-processprovider-example/src/main/webapp/WEB-INF/workspace/services/main.xml
@@ -1,3 +1,3 @@
 <deegreeServiceController xmlns="http://www.deegree.org/services/controller"
-  xsi:schemaLocation="http://www.deegree.org/services/controller http://schemas.deegree.org/3.5/services/controller/controller.xsd"
+  xsi:schemaLocation="http://www.deegree.org/services/controller http://schemas.deegree.org/core/3.5/services/controller/controller.xsd"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
\ No newline at end of file
diff --git a/deegree-processproviders/deegree-processprovider-example/src/main/webapp/WEB-INF/workspace/services/metadata.xml b/deegree-processproviders/deegree-processprovider-example/src/main/webapp/WEB-INF/workspace/services/metadata.xml
index b0d362ce13..b9de4470ff 100644
--- a/deegree-processproviders/deegree-processprovider-example/src/main/webapp/WEB-INF/workspace/services/metadata.xml
+++ b/deegree-processproviders/deegree-processprovider-example/src/main/webapp/WEB-INF/workspace/services/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deegreeServicesMetadata xmlns="http://www.deegree.org/services/metadata"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/metadata http://schemas.deegree.org/3.5/services/metadata/metadata.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/metadata http://schemas.deegree.org/core/3.5/services/metadata/metadata.xsd">
   <!-- General service information for all services. Used in the GetCapabilities responses. -->
   <ServiceIdentification>
     <Title>deegree 3 demo service</Title>
diff --git a/deegree-processproviders/deegree-processprovider-example/src/main/webapp/WEB-INF/workspace/services/wps.xml b/deegree-processproviders/deegree-processprovider-example/src/main/webapp/WEB-INF/workspace/services/wps.xml
index 6c1835d569..2678f2c132 100644
--- a/deegree-processproviders/deegree-processprovider-example/src/main/webapp/WEB-INF/workspace/services/wps.xml
+++ b/deegree-processproviders/deegree-processprovider-example/src/main/webapp/WEB-INF/workspace/services/wps.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deegreeWPS xmlns="http://www.deegree.org/services/wps" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/services/wps http://schemas.deegree.org/3.5/services/wps/wps_configuration.xsd">
+  xsi:schemaLocation="http://www.deegree.org/services/wps http://schemas.deegree.org/core/3.5/services/wps/wps_configuration.xsd">
   <SupportedVersions>
     <Version>1.0.0</Version>
   </SupportedVersions>
diff --git a/deegree-services/deegree-services-commons/src/main/resources/META-INF/schemas/services/controller/example.xml b/deegree-services/deegree-services-commons/src/main/resources/META-INF/schemas/services/controller/example.xml
index 65b0bf80c7..9ebab260da 100644
--- a/deegree-services/deegree-services-commons/src/main/resources/META-INF/schemas/services/controller/example.xml
+++ b/deegree-services/deegree-services-commons/src/main/resources/META-INF/schemas/services/controller/example.xml
@@ -1,5 +1,5 @@
 <deegreeServiceController xmlns="http://www.deegree.org/services/controller"
-  xsi:schemaLocation="http://www.deegree.org/services/controller http://schemas.deegree.org/3.5/services/controller/controller.xsd"
+  xsi:schemaLocation="http://www.deegree.org/services/controller http://schemas.deegree.org/core/3.5/services/controller/controller.xsd"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <ReportedUrls>
     <Services>http://www.mygeoportal.com/services</Services>
diff --git a/deegree-services/deegree-services-commons/src/main/resources/META-INF/schemas/services/metadata/example.xml b/deegree-services/deegree-services-commons/src/main/resources/META-INF/schemas/services/metadata/example.xml
index 192ab613df..9bc074a29f 100644
--- a/deegree-services/deegree-services-commons/src/main/resources/META-INF/schemas/services/metadata/example.xml
+++ b/deegree-services/deegree-services-commons/src/main/resources/META-INF/schemas/services/metadata/example.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deegreeServicesMetadata xmlns="http://www.deegree.org/services/metadata"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/metadata http://schemas.deegree.org/3.5/services/metadata/metadata.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/metadata http://schemas.deegree.org/core/3.5/services/metadata/metadata.xsd">
 
   <ServiceIdentification>
     <Title>My own OGC service</Title>
diff --git a/deegree-services/deegree-services-csw/src/main/resources/META-INF/schemas/services/csw/example.xml b/deegree-services/deegree-services-csw/src/main/resources/META-INF/schemas/services/csw/example.xml
index 32ae7911fb..551fa44ec0 100644
--- a/deegree-services/deegree-services-csw/src/main/resources/META-INF/schemas/services/csw/example.xml
+++ b/deegree-services/deegree-services-csw/src/main/resources/META-INF/schemas/services/csw/example.xml
@@ -2,7 +2,7 @@
 <deegreeCSW
   xmlns="http://www.deegree.org/services/csw" xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/services/csw http://schemas.deegree.org/3.5/services/csw/csw_configuration.xsd">
+  xsi:schemaLocation="http://www.deegree.org/services/csw http://schemas.deegree.org/core/3.5/services/csw/csw_configuration.xsd">
 
   <!-- [0...1] Activated OGC protocol versions, default: latest implementation 
     of CSW spec - 2.0.2 -->
diff --git a/deegree-services/deegree-services-wfs/src/main/resources/META-INF/schemas/services/wfs/example_complex.xml b/deegree-services/deegree-services-wfs/src/main/resources/META-INF/schemas/services/wfs/example_complex.xml
index e7b89df37c..ae666fb1e9 100644
--- a/deegree-services/deegree-services-wfs/src/main/resources/META-INF/schemas/services/wfs/example_complex.xml
+++ b/deegree-services/deegree-services-wfs/src/main/resources/META-INF/schemas/services/wfs/example_complex.xml
@@ -2,7 +2,7 @@
   xmlns="http://www.deegree.org/services/wfs"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.deegree.org/services/wfs
-  http://schemas.deegree.org/3.5/services/wfs/wfs_configuration.xsd">
+  http://schemas.deegree.org/core/3.5/services/wfs/wfs_configuration.xsd">
   
   <SupportedVersions>
     <Version>2.0.0</Version>
diff --git a/deegree-services/deegree-services-wfs/src/main/resources/META-INF/schemas/services/wfs/example_minimal.xml b/deegree-services/deegree-services-wfs/src/main/resources/META-INF/schemas/services/wfs/example_minimal.xml
index 5a195a44b5..35d508b15e 100644
--- a/deegree-services/deegree-services-wfs/src/main/resources/META-INF/schemas/services/wfs/example_minimal.xml
+++ b/deegree-services/deegree-services-wfs/src/main/resources/META-INF/schemas/services/wfs/example_minimal.xml
@@ -2,7 +2,7 @@
   xmlns="http://www.deegree.org/services/wfs"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.deegree.org/services/wfs
-  http://schemas.deegree.org/3.5/services/wfs/wfs_configuration.xsd">
+  http://schemas.deegree.org/core/3.5/services/wfs/wfs_configuration.xsd">
   
   <QueryCRS>urn:ogc:def:crs:EPSG::4258</QueryCRS>
 
diff --git a/deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/controller/capabilities/Wms130SoapExtendedCapabilitesWriter.java b/deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/controller/capabilities/Wms130SoapExtendedCapabilitesWriter.java
index 383d07203c..a8211471a4 100644
--- a/deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/controller/capabilities/Wms130SoapExtendedCapabilitesWriter.java
+++ b/deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/controller/capabilities/Wms130SoapExtendedCapabilitesWriter.java
@@ -60,7 +60,7 @@
  */
 public class Wms130SoapExtendedCapabilitesWriter {
 
-    private static final String SOAPWMS_XSD_LOCATION = "http://schemas.deegree.org/3.5/extensions/services/wms/soapwms.xsd";
+    private static final String SOAPWMS_XSD_LOCATION = "http://schemas.deegree.org/core/3.5/extensions/services/wms/soapwms.xsd";
 
     public static final String SOAPWMS_NS = "http://schemas.deegree.org/extensions/services/wms/1.3.0";
 
diff --git a/deegree-services/deegree-services-wms/src/main/resources/META-INF/schemas/services/wms/example.xml b/deegree-services/deegree-services-wms/src/main/resources/META-INF/schemas/services/wms/example.xml
index cc7a2ce003..12f37e0e56 100644
--- a/deegree-services/deegree-services-wms/src/main/resources/META-INF/schemas/services/wms/example.xml
+++ b/deegree-services/deegree-services-wms/src/main/resources/META-INF/schemas/services/wms/example.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <wms:deegreeWMS xmlns:wms="http://www.deegree.org/services/wms" xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dgws="http://www.deegree.org/webservices"
-  xsi:schemaLocation="http://www.deegree.org/services/wms http://schemas.deegree.org/3.5/services/wms/wms_configuration.xsd">
+  xsi:schemaLocation="http://www.deegree.org/services/wms http://schemas.deegree.org/core/3.5/services/wms/wms_configuration.xsd">
 
   <wms:ServiceConfiguration>
     <wms:ThemeId>theme</wms:ThemeId>
diff --git a/deegree-services/deegree-services-wms/src/main/resources/META-INF/schemas/services/wms/example_complex.xml b/deegree-services/deegree-services-wms/src/main/resources/META-INF/schemas/services/wms/example_complex.xml
index ab360f9fef..62b8d52fc6 100644
--- a/deegree-services/deegree-services-wms/src/main/resources/META-INF/schemas/services/wms/example_complex.xml
+++ b/deegree-services/deegree-services-wms/src/main/resources/META-INF/schemas/services/wms/example_complex.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <wms:deegreeWMS xmlns:wms="http://www.deegree.org/services/wms"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                xsi:schemaLocation="http://www.deegree.org/services/wms http://schemas.deegree.org/3.5/services/wms/wms_configuration.xsd">
+                xsi:schemaLocation="http://www.deegree.org/services/wms http://schemas.deegree.org/core/3.5/services/wms/wms_configuration.xsd">
 
 
   <wms:SupportedVersions>
diff --git a/deegree-services/deegree-services-wmts/src/main/resources/META-INF/schemas/services/wmts/example.xml b/deegree-services/deegree-services-wmts/src/main/resources/META-INF/schemas/services/wmts/example.xml
index deead87195..cc835bf2e7 100644
--- a/deegree-services/deegree-services-wmts/src/main/resources/META-INF/schemas/services/wmts/example.xml
+++ b/deegree-services/deegree-services-wmts/src/main/resources/META-INF/schemas/services/wmts/example.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <deegreeWMTS xmlns='http://www.deegree.org/services/wmts' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation='http://www.deegree.org/services/wmts http://schemas.deegree.org/3.5/services/wmts/wmts.xsd'>
+  xsi:schemaLocation='http://www.deegree.org/services/wmts http://schemas.deegree.org/core/3.5/services/wmts/wmts.xsd'>
 
   <MetadataURLTemplate>http://some.service/services?service=CSW&amp;request=GetRecordById&amp;version=2.0.2&amp;outputSchema=http://www.isotc211.org/2005/gmd&amp;elementSetName=full&amp;id=${metadataSetId}</MetadataURLTemplate>
 
diff --git a/deegree-services/deegree-services-wps/src/api/java/org/deegree/services/wps/Processlet.java b/deegree-services/deegree-services-wps/src/api/java/org/deegree/services/wps/Processlet.java
index 18b931e35c..d5771b6122 100644
--- a/deegree-services/deegree-services-wps/src/api/java/org/deegree/services/wps/Processlet.java
+++ b/deegree-services/deegree-services-wps/src/api/java/org/deegree/services/wps/Processlet.java
@@ -54,8 +54,8 @@
  * </p>
  * <p>
  * A deegree WPS process consists of a Java class implementing the {@link Processlet} interface and an XML configuration
- * file that has to validate against <a href="http://schemas.deegree.org/3.5/wps/process_definition.xsd">
- * http://schemas.deegree.org/3.5/wps/process_definition.xsd</a>). Besides the definition of metadata, the XML
+ * file that has to validate against <a href="http://schemas.deegree.org/core/3.5/wps/process_definition.xsd">
+ * http://schemas.deegree.org/core/3.5/wps/process_definition.xsd</a>). Besides the definition of metadata, the XML
  * configuration file references the implementation class with its fully qualified class name.
  * </p>
  * <p>
diff --git a/deegree-services/deegree-services-wps/src/main/resources/META-INF/schemas/processes/java/example.xml b/deegree-services/deegree-services-wps/src/main/resources/META-INF/schemas/processes/java/example.xml
index 5e92e3fba9..e9aed04e5e 100644
--- a/deegree-services/deegree-services-wps/src/main/resources/META-INF/schemas/processes/java/example.xml
+++ b/deegree-services/deegree-services-wps/src/main/resources/META-INF/schemas/processes/java/example.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ProcessDefinition processVersion="1.0.0" storeSupported="true" statusSupported="false"
   xmlns="http://www.deegree.org/processes/java" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/processes/java http://schemas.deegree.org/3.5/processes/java/java.xsd">
+  xsi:schemaLocation="http://www.deegree.org/processes/java http://schemas.deegree.org/core/3.5/processes/java/java.xsd">
   <Identifier>Buffer</Identifier>
   <JavaClass>org.deegree.wps.jts.BufferProcesslet</JavaClass>
   <Title>Process for creating a buffer around a GML geometry.</Title>
diff --git a/deegree-services/deegree-services-wps/src/main/resources/META-INF/schemas/services/wps/example.xml b/deegree-services/deegree-services-wps/src/main/resources/META-INF/schemas/services/wps/example.xml
index 06afbe228d..204a1bda6d 100644
--- a/deegree-services/deegree-services-wps/src/main/resources/META-INF/schemas/services/wps/example.xml
+++ b/deegree-services/deegree-services-wps/src/main/resources/META-INF/schemas/services/wps/example.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deegreeWPS xmlns="http://www.deegree.org/services/wps" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/services/wps http://schemas.deegree.org/3.5/services/wps/wps_configuration.xsd">
+  xsi:schemaLocation="http://www.deegree.org/services/wps http://schemas.deegree.org/core/3.5/services/wps/wps_configuration.xsd">
 
   <SupportedVersions>
     <Version>1.0.0</Version>
diff --git a/deegree-services/deegree-services-wpvs/src/main/resources/META-INF/schemas/services/wpvs/example.xml b/deegree-services/deegree-services-wpvs/src/main/resources/META-INF/schemas/services/wpvs/example.xml
index 3d5c6afb1a..3bdde7f2b1 100644
--- a/deegree-services/deegree-services-wpvs/src/main/resources/META-INF/schemas/services/wpvs/example.xml
+++ b/deegree-services/deegree-services-wpvs/src/main/resources/META-INF/schemas/services/wpvs/example.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deegreeWPVS xmlns="http://www.deegree.org/services/wpvs" xmlns:md="http://www.deegree.org/webservices"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/wpvs http://schemas.deegree.org/3.5/services/wpvs/wpvs_configuration.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/wpvs http://schemas.deegree.org/core/3.5/services/wpvs/wpvs_configuration.xsd">
   <ServiceConfiguration>
     <!-- Configures the number of textures stored in GPU (Graphic Processing Unit) memory, i.e. ready for rendering. -->
     <TexturesInGPUMem>300</TexturesInGPUMem>
diff --git a/deegree-services/deegree-webservices-handbook/src/main/asciidoc/basics.adoc b/deegree-services/deegree-webservices-handbook/src/main/asciidoc/basics.adoc
index 49ec77a61c..1543c7221f 100644
--- a/deegree-services/deegree-webservices-handbook/src/main/asciidoc/basics.adoc
+++ b/deegree-services/deegree-webservices-handbook/src/main/asciidoc/basics.adoc
@@ -271,7 +271,7 @@ documented for each resource configuration format.
 ==== Proxy configuration
 
 The configuration format for the deegree proxy configuration is defined
-by schema file http://schemas.deegree.org/3.5/proxy/proxy.xsd. The
+by schema file http://schemas.deegree.org/core/3.5/proxy/proxy.xsd. The
 following table lists all available configuration options. When
 specifiying them, their order must be respected.
 
@@ -327,7 +327,7 @@ specifiying them, their order must be respected.
 <ProxyConfiguration
                     xmlns="http://www.deegree.org/proxy"
                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                    xsi:schemaLocation="http://www.deegree.org/proxy http://schemas.deegree.org/3.5/proxy/proxy.xsd"
+                    xsi:schemaLocation="http://www.deegree.org/proxy http://schemas.deegree.org/core/3.5/proxy/proxy.xsd"
                     overrideSystemSettings="true">
 
     <HttpProxyHost>proxy.example.com</HttpProxyHost>
diff --git a/deegree-services/deegree-webservices-handbook/src/main/asciidoc/coveragestores.adoc b/deegree-services/deegree-webservices-handbook/src/main/asciidoc/coveragestores.adoc
index 5e565edc76..36e8cbcb6c 100644
--- a/deegree-services/deegree-webservices-handbook/src/main/asciidoc/coveragestores.adoc
+++ b/deegree-services/deegree-webservices-handbook/src/main/asciidoc/coveragestores.adoc
@@ -27,7 +27,7 @@ configuration:
 
 [source,xml]
 ----
-<Raster xmlns="http://www.deegree.org/datasource/coverage/raster" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/coverage/raster http://schemas.deegree.org/3.5/datasource/coverage/raster/raster.xsd" originLocation="outer">
+<Raster xmlns="http://www.deegree.org/datasource/coverage/raster" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/coverage/raster http://schemas.deegree.org/core/3.5/datasource/coverage/raster/raster.xsd" originLocation="outer">
   <StorageCRS>EPSG:26912</StorageCRS>
   <RasterFile>../../../data/utah/raster/dem.tiff</RasterFile>
 </Raster>
@@ -35,7 +35,7 @@ configuration:
 
 [source,xml]
 ----
-<Raster xmlns="http://www.deegree.org/datasource/coverage/raster" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/coverage/raster http://schemas.deegree.org/3.5/datasource/coverage/raster/raster.xsd" originLocation="outer">
+<Raster xmlns="http://www.deegree.org/datasource/coverage/raster" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/coverage/raster http://schemas.deegree.org/core/3.5/datasource/coverage/raster/raster.xsd" originLocation="outer">
   <StorageCRS>EPSG:26912</StorageCRS>
   <RasterDirectory>../../../data/utah/raster/Satellite_Provo/</RasterDirectory>
 </Raster>
@@ -73,7 +73,7 @@ Here is an example for a MultiResolutionRaster:
 
 [source,xml]
 ----
-<MultiResolutionRaster xmlns="http://www.deegree.org/datasource/coverage/raster" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/coverage/raster http://schemas.deegree.org/3.5/datasource/coverage/raster/raster.xsd" originLocation="outer">
+<MultiResolutionRaster xmlns="http://www.deegree.org/datasource/coverage/raster" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/coverage/raster http://schemas.deegree.org/core/3.5/datasource/coverage/raster/raster.xsd" originLocation="outer">
   <StorageCRS>EPSG:26912</StorageCRS>
   <Resolution>
     <Raster originLocation="outer" res="1.0">
@@ -118,7 +118,7 @@ The following example shows, how to configure a coverage pyramid:
 
 [source,xml]
 ----
-<Pyramid xmlns="http://www.deegree.org/datasource/coverage/pyramid" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/coverage/pyramid http://schemas.deegree.org/3.5/datasource/coverage/raster/pyramid.xsd">
+<Pyramid xmlns="http://www.deegree.org/datasource/coverage/pyramid" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/coverage/pyramid http://schemas.deegree.org/core/3.5/datasource/coverage/raster/pyramid.xsd">
   <PyramidFile>data/example.tif</PyramidFile>
   <CRS>EPSG:4326</CRS>
 </Pyramid>
@@ -151,7 +151,7 @@ The following example shows, how to configure a GeoRaster coverage
 <OracleGeoraster
 xmlns="http://www.deegree.org/datasource/coverage/oraclegeoraster"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://www.deegree.org/datasource/coverage/oraclegeoraster http://schemas.deegree.org/3.5/datasource/coverage/oraclegeoraster/oraclegeoraster.xsd">]
+xsi:schemaLocation="http://www.deegree.org/datasource/coverage/oraclegeoraster http://schemas.deegree.org/core/3.5/datasource/coverage/oraclegeoraster/oraclegeoraster.xsd">]
   <JDBCConnId>oracle</JDBCConnId>
   <StorageCRS>EPSG:25832</StorageCRS>
   <Raster id="17" />
@@ -167,7 +167,7 @@ store.
 <OracleGeoraster
   xmlns="http://www.deegree.org/datasource/coverage/oraclegeoraster"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/coverage/oraclegeoraster http://schemas.deegree.org/3.5/datasource/coverage/oraclegeoraster/oraclegeoraster.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/coverage/oraclegeoraster http://schemas.deegree.org/core/3.5/datasource/coverage/oraclegeoraster/oraclegeoraster.xsd">
 
   <JDBCConnId>oracle</JDBCConnId>
   <StorageCRS>EPSG:31468</StorageCRS>
diff --git a/deegree-services/deegree-webservices-handbook/src/main/asciidoc/featurestores.adoc b/deegree-services/deegree-webservices-handbook/src/main/asciidoc/featurestores.adoc
index 7c274acbe4..ce2e93eb5b 100644
--- a/deegree-services/deegree-webservices-handbook/src/main/asciidoc/featurestores.adoc
+++ b/deegree-services/deegree-webservices-handbook/src/main/asciidoc/featurestores.adoc
@@ -136,7 +136,7 @@ example looks like this:
   xmlns="http://www.deegree.org/datasource/feature/shape"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape
-  http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+  http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
 
   <!-- Required: Path to shape file on file system (can be relative) -->
   <File>/tmp/rivers.shp</File>
@@ -171,7 +171,7 @@ A more complex example that uses all available configuration options:
   xmlns="http://www.deegree.org/datasource/feature/shape"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape
-  http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+  http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
   <StorageCRS>EPSG:4326</StorageCRS>
   <FeatureTypeName>River</FeatureTypeName>
   <FeatureTypeNamespace>http://www.deegree.org/app</FeatureTypeNamespace>
@@ -206,7 +206,7 @@ file
 
 The configuration format for the deegree shape feature store is defined
 by schema file
-http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd. The
+http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd. The
 following table lists all available configuration options. When
 specifiying them, their order must be respected.
 
@@ -254,7 +254,7 @@ configuration example looks like this:
   xmlns="http://www.deegree.org/datasource/feature/memory"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.deegree.org/datasource/feature/memory
-  http://schemas.deegree.org/3.5/datasource/feature/memory/memory.xsd">
+  http://schemas.deegree.org/core/3.5/datasource/feature/memory/memory.xsd">
 
   <!-- Required: GML application schema file / directory to read feature types from -->
   <GMLSchema version="GML_32">../../appschemas/inspire/annex1/addresses.xsd</GMLSchema>
@@ -282,7 +282,7 @@ A more complex example that uses all available configuration options:
 <MemoryFeatureStore xmlns="http://www.deegree.org/datasource/feature/memory"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.deegree.org/datasource/feature/memory
-  http://schemas.deegree.org/3.5/datasource/feature/memory/memory.xsd">
+  http://schemas.deegree.org/core/3.5/datasource/feature/memory/memory.xsd">
   <StorageCRS>urn:ogc:def:crs:EPSG::4258</StorageCRS>
   <GMLSchema version="GML_32">../../appschemas/inspire/annex1/</GMLSchema>
   <GMLFeatureCollection version="GML_32">../../data/gml/address.gml</GMLFeatureCollection>
@@ -309,7 +309,7 @@ _urn:ogc:def:crs:EPSG::4258_.
 
 The configuration format for the deegree memory feature store is defined
 by schema file
-http://schemas.deegree.org/3.5/datasource/feature/memory/memory.xsd.
+http://schemas.deegree.org/core/3.5/datasource/feature/memory/memory.xsd.
 The following table lists all available configuration options (the
 complex ones contain nested options themselves). When specifiying them,
 their order must be respected.
@@ -351,7 +351,7 @@ _BBoxStatement_. A minimal configuration example looks like this:
   xmlns="http://www.deegree.org/datasource/feature/simplesql"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.deegree.org/datasource/feature/simplesql
-  http://schemas.deegree.org/3.5/datasource/feature/simplesql/simplesql.xsd">
+  http://schemas.deegree.org/core/3.5/datasource/feature/simplesql/simplesql.xsd">
 
   <!-- Required: Database connection -->
   <JDBCConnId>connid</JDBCConnId>
@@ -378,7 +378,7 @@ _BBoxStatement_. A minimal configuration example looks like this:
   xmlns="http://www.deegree.org/datasource/feature/simplesql"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.deegree.org/datasource/feature/simplesql
-  http://schemas.deegree.org/3.5/datasource/feature/simplesql/simplesql.xsd">
+  http://schemas.deegree.org/core/3.5/datasource/feature/simplesql/simplesql.xsd">
 
   <!-- Required: Database connection -->
   <JDBCConnId>connid</JDBCConnId>
@@ -398,7 +398,7 @@ _BBoxStatement_. A minimal configuration example looks like this:
 ==== Configuration options
 
 The configuration format is defined by schema file
-http://schemas.deegree.org/3.5/datasource/feature/simplesql/simplesql.xsd.
+http://schemas.deegree.org/core/3.5/datasource/feature/simplesql/simplesql.xsd.
 The following table lists all available configuration options (the
 complex ones contain nested options themselves). When specifiying them,
 their order must be respected.
@@ -456,7 +456,7 @@ A very minimal valid configuration example looks like this:
   xmlns="http://www.deegree.org/datasource/feature/sql"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.deegree.org/datasource/feature/sql
-  http://schemas.deegree.org/3.5/datasource/feature/sql/sql.xsd">
+  http://schemas.deegree.org/core/3.5/datasource/feature/sql/sql.xsd">
   <JDBCConnId>postgis</JDBCConnId>
   <FeatureTypeMapping table="country"/>
 </SQLFeatureStore>
@@ -493,7 +493,7 @@ A more complex example:
 <SQLFeatureStore xmlns="http://www.deegree.org/datasource/feature/sql" xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:base="urn:x-inspire:specification:gmlas:BaseTypes:3.2" xmlns:ad="urn:x-inspire:specification:gmlas:Addresses:3.0"
   xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/feature/sql http://schemas.deegree.org/3.5/datasource/feature/sql/sql.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/feature/sql http://schemas.deegree.org/core/3.5/datasource/feature/sql/sql.xsd">
   <JDBCConnId>inspire</JDBCConnId>
   <StorageCRS srid="-1" dim="2D">EPSG:4258</StorageCRS>
   <GMLSchema>../../appschemas/inspire/annex1/Addresses.xsd</GMLSchema>
@@ -602,7 +602,7 @@ PostgreSQL)
 ==== Overview of configuration options
 
 The SQL feature store configuration format is defined by schema file
-http://schemas.deegree.org/3.5/datasource/feature/sql/sql.xsd. The
+http://schemas.deegree.org/core/3.5/datasource/feature/sql/sql.xsd. The
 following table lists all available configuration options (the complex
 ones contain nested options themselves). When specifying them, their
 order must be respected:
@@ -648,7 +648,7 @@ between one table and one feature type:
 xmlns="http://www.deegree.org/datasource/feature/sql"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="http://www.deegree.org/datasource/feature/sql
-  http://schemas.deegree.org/3.5/datasource/feature/sql/sql.xsd">
+  http://schemas.deegree.org/core/3.5/datasource/feature/sql/sql.xsd">
 <JDBCConnId>postgis</JDBCConnId>
 <FeatureTypeMapping table="country"/>
 </SQLFeatureStore>
@@ -680,7 +680,7 @@ _cities_.
   xmlns="http://www.deegree.org/datasource/feature/sql"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.deegree.org/datasource/feature/sql
-  http://schemas.deegree.org/3.5/datasource/feature/sql/sql.xsd">
+  http://schemas.deegree.org/core/3.5/datasource/feature/sql/sql.xsd">
   <JDBCConnId>postgis</JDBCConnId>
   <FeatureTypeMapping table="country"/>
   <FeatureTypeMapping table="city"/>
@@ -967,7 +967,7 @@ GML application schema files:
   xmlns="http://www.deegree.org/datasource/feature/sql"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.deegree.org/datasource/feature/sql
-  http://schemas.deegree.org/3.5/datasource/feature/sql/sql.xsd">
+  http://schemas.deegree.org/core/3.5/datasource/feature/sql/sql.xsd">
 
   <JDBCConnId>postgis</JDBCConnId>
   <StorageCRS dim="2D" srid="-1">EPSG:4258</StorageCRS>
diff --git a/deegree-services/deegree-webservices-handbook/src/main/asciidoc/gdal.adoc b/deegree-services/deegree-webservices-handbook/src/main/asciidoc/gdal.adoc
index 0c8d553293..ee068bffcc 100644
--- a/deegree-services/deegree-webservices-handbook/src/main/asciidoc/gdal.adoc
+++ b/deegree-services/deegree-webservices-handbook/src/main/asciidoc/gdal.adoc
@@ -98,7 +98,7 @@ configuration example looks like this:
 ----
 <GDALSettings
   xmlns="http://www.deegree.org/gdal" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/gdal http://schemas.deegree.org/3.5/commons/gdal/gdal.xsd">
+  xsi:schemaLocation="http://www.deegree.org/gdal http://schemas.deegree.org/core/3.5/commons/gdal/gdal.xsd">
   <OpenDatasets>5</OpenDatasets>
 </GDALSettings>
 ----
@@ -114,7 +114,7 @@ maximum of five GDAL datasets to be kept open for simultaneous access.
 ----
 <GDALSettings
   xmlns="http://www.deegree.org/gdal" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/gdal http://schemas.deegree.org/3.5/commons/gdal/gdal.xsd" />
+  xsi:schemaLocation="http://www.deegree.org/gdal http://schemas.deegree.org/core/3.5/commons/gdal/gdal.xsd" />
   <OpenDatasets>10</OpenDatasets>
   <GDALOption name="GDAL_CACHEMAX">1000</GDALOption>
   <GDALOption name="ECW_CACHE_MAXMEM">419430400</GDALOption>
@@ -137,7 +137,7 @@ pages in the GDAL documentation.
 ==== Configuration options
 
 The configuration format for the GDAL settings file is defined by schema
-file http://schemas.deegree.org/3.5/commons/gdal/gdal.xsd. The
+file http://schemas.deegree.org/core/3.5/commons/gdal/gdal.xsd. The
 following table lists the two available configuration options. When
 specifiying them, their order must be respected.
 
@@ -213,7 +213,7 @@ A minimal valid configuration example looks like this:
 ----
 <GDALTileStore
   xmlns="http://www.deegree.org/datasource/tile/gdal" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/tile/gdal http://schemas.deegree.org/3.5/datasource/tile/gdal/gdal.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/tile/gdal http://schemas.deegree.org/core/3.5/datasource/tile/gdal/gdal.xsd">
   <TileDataSet>
     <TileMatrixSetId>utah</TileMatrixSetId>
     <File>../../data/test.tif</File>
@@ -241,7 +241,7 @@ A more complex example that uses all available configuration options:
 ----
 <GDALTileStore
   xmlns="http://www.deegree.org/datasource/tile/gdal" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/tile/gdal http://schemas.deegree.org/3.5/datasource/tile/gdal/gdal.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/tile/gdal http://schemas.deegree.org/core/3.5/datasource/tile/gdal/gdal.xsd">
   <TileDataSet>
     <Identifier>2010</Identifier>
     <TileMatrixSetId>NLDEPSG28992Scale</TileMatrixSetId>
@@ -270,7 +270,7 @@ following settings:
 ==== Configuration options
 
 The configuration format for the GDAL tile store is defined by schema
-file http://schemas.deegree.org/3.5/datasource/tile/gdal/gdal.xsd.
+file http://schemas.deegree.org/core/3.5/datasource/tile/gdal/gdal.xsd.
 There's only a single configuration element, but it may occur several
 times:
 
diff --git a/deegree-services/deegree-webservices-handbook/src/main/asciidoc/metadatastores.adoc b/deegree-services/deegree-webservices-handbook/src/main/asciidoc/metadatastores.adoc
index 24b0308a9b..79b5ee61ea 100644
--- a/deegree-services/deegree-webservices-handbook/src/main/asciidoc/metadatastores.adoc
+++ b/deegree-services/deegree-webservices-handbook/src/main/asciidoc/metadatastores.adoc
@@ -22,7 +22,7 @@ The memory ISO metadata store implementation is transactional and works
 file based.
 
 The memory metadata store configuration is defined by schema file
-http://schemas.deegree.org/3.5/datasource/metadata/iso19139/memory.xsd
+http://schemas.deegree.org/core/3.5/datasource/metadata/iso19139/memory.xsd
 
 *Memory ISO Metadatastore config (skeleton)*
 
@@ -54,7 +54,7 @@ of the directories declared in the element _ISORecordDirectory_.
 === SQL ISO Metadata store
 
 The SQL metadata store configuration is defined by schema file
-http://schemas.deegree.org/3.5/datasource/metadata/iso19115/iso19115.xsd
+http://schemas.deegree.org/core/3.5/datasource/metadata/iso19115/iso19115.xsd
 
 *SQL ISO Metadatastore config (skeleton)*
 
@@ -65,7 +65,7 @@ http://schemas.deegree.org/3.5/datasource/metadata/iso19115/iso19115.xsd
   xmlns="http://www.deegree.org/datasource/metadata/iso19115"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.deegree.org/datasource/metadata/iso19115
-  http://schemas.deegree.org/3.5/datasource/metadata/iso19115/iso19115.xsd">
+  http://schemas.deegree.org/core/3.5/datasource/metadata/iso19115/iso19115.xsd">
 
   <!-- [1] Identifier of JDBC connection -->
   <JDBCConnId>conn1</JDBCConnId>
diff --git a/deegree-services/deegree-webservices-handbook/src/main/asciidoc/processproviders.adoc b/deegree-services/deegree-webservices-handbook/src/main/asciidoc/processproviders.adoc
index 27e905d9ee..9dcfb6d9f6 100644
--- a/deegree-services/deegree-webservices-handbook/src/main/asciidoc/processproviders.adoc
+++ b/deegree-services/deegree-webservices-handbook/src/main/asciidoc/processproviders.adoc
@@ -41,7 +41,7 @@ A very minimal valid configuration example looks like this:
 [source,xml]
 ----
 <ProcessDefinition processVersion="1.0.0" xmlns="http://www.deegree.org/processes/java"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/processes/java http://schemas.deegree.org/3.5/processes/java/java.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/processes/java http://schemas.deegree.org/core/3.5/processes/java/java.xsd">
   <Identifier>Process42</Identifier>
   <JavaClass>Processlet42</JavaClass>
   <Title>Calculates the answer to life, the universe and everything</Title>
@@ -109,7 +109,7 @@ A more complex configuration example looks like this:
 ----
 <ProcessDefinition processVersion="1.0.0" storeSupported="true" statusSupported="false"
   xmlns="http://www.deegree.org/processes/java" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/processes/java http://schemas.deegree.org/3.5/processes/java/java.xsd">
+  xsi:schemaLocation="http://www.deegree.org/processes/java http://schemas.deegree.org/core/3.5/processes/java/java.xsd">
   <Identifier>Addition</Identifier>
   <JavaClass>AdditionProcesslet</JavaClass>
   <Title>Process for adding two integer values.</Title>
@@ -192,7 +192,7 @@ public class AdditionProcesslet implements Processlet {
 ==== Configuration options
 
 The configuration format for the Java process provider is defined by
-schema file http://schemas.deegree.org/3.5/processes/java/java.xsd.
+schema file http://schemas.deegree.org/core/3.5/processes/java/java.xsd.
 The following table lists all available configuration options. When
 specifiying them, their order must be respected.
 
@@ -765,7 +765,7 @@ clients. For the sub-options of the _AllowedValues_ and
 _ValidValueReference_ options, please refer to the
 http://www.opengeospatial.org/standards/wps[WPS 1.0.0 specification] or
 the XML schema for the Java process provider configuration format
-(http://schemas.deegree.org/3.5/processes/java/java.xsd).
+(http://schemas.deegree.org/core/3.5/processes/java/java.xsd).
 
 In order to work with a _LiteralInput_ parameter in the Processlet
 code, the corresponding Java type offers the following methods:
@@ -1119,7 +1119,7 @@ A very minimal valid configuration example looks like this:
 [source,xml]
 ----
 <FMEServer xmlns="http://www.deegree.org/processes/fme" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://www.deegree.org/processes/fme http://schemas.deegree.org/3.5/processes/fme/fme.xsd">
+           xsi:schemaLocation="http://www.deegree.org/processes/fme http://schemas.deegree.org/core/3.5/processes/fme/fme.xsd">
   <Address>http://fmeserver.example.com/</Address>
   <Username>guest</Username>
   <Password>guest</Password>
diff --git a/deegree-services/deegree-webservices-handbook/src/main/asciidoc/renderstyles.adoc b/deegree-services/deegree-webservices-handbook/src/main/asciidoc/renderstyles.adoc
index b4cb084d64..1da76d4f23 100644
--- a/deegree-services/deegree-webservices-handbook/src/main/asciidoc/renderstyles.adoc
+++ b/deegree-services/deegree-webservices-handbook/src/main/asciidoc/renderstyles.adoc
@@ -69,7 +69,7 @@ It is constructed like this:
 
 [source,xml]
 ----
-<FeatureTypeStyle xmlns="http://www.opengis.net/se" xmlns:ogc="http://www.opengis.net/ogc" xmlns:sed="http://www.deegree.org/se" xmlns:deegreeogc="http://www.deegree.org/ogc" xmlns:plan="http://www.deegree.org/plan" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/3.5/se/Symbolizer-deegree.xsd">
+<FeatureTypeStyle xmlns="http://www.opengis.net/se" xmlns:ogc="http://www.opengis.net/ogc" xmlns:sed="http://www.deegree.org/se" xmlns:deegreeogc="http://www.deegree.org/ogc" xmlns:plan="http://www.deegree.org/plan" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/core/3.5/se/Symbolizer-deegree.xsd">
     <FeatureTypeName>plan:yourFeatureType</FeatureTypeName>
     <Rule>
         ...
@@ -453,7 +453,7 @@ xmlns:ogc="http://www.opengis.net/ogc"
 xmlns:sed="http://www.deegree.org/se"
 xmlns:deegreeogc="http://www.deegree.org/ogc"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/3.5/se/Symbolizer-deegree.xsd">
+xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/core/3.5/se/Symbolizer-deegree.xsd">
  <Name>Weatherstations</Name>
  <Rule>
     <Name>Weatherstations</Name>
@@ -496,7 +496,7 @@ xmlns:ogc="http://www.opengis.net/ogc"
 xmlns:sed="http://www.deegree.org/se"
 xmlns:deegreeogc="http://www.deegree.org/ogc"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/3.5/se/Symbolizer-deegree.xsd">
+xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/core/3.5/se/Symbolizer-deegree.xsd">
   <Name>Railroads</Name>
   <Rule>
     <Name>Railroads</Name>
@@ -538,7 +538,7 @@ xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.
  xmlns:sed="http://www.deegree.org/se"
  xmlns:deegreeogc="http://www.deegree.org/ogc"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/3.5/se/Symbolizer-deegree.xsd">
+ xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/core/3.5/se/Symbolizer-deegree.xsd">
   <Name>LandslideAreas</Name>
   <Rule>
     <Name>LandslideAreas</Name>
@@ -571,7 +571,7 @@ xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.
  xmlns:sed="http://www.deegree.org/se"
  xmlns:deegreeogc="http://www.deegree.org/ogc"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/3.5/se/Symbolizer-deegree.xsd">
+ xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/core/3.5/se/Symbolizer-deegree.xsd">
   <Name>Municipalities</Name>
   <Rule>
     <Name>Municipalities</Name>
diff --git a/deegree-services/deegree-webservices-handbook/src/main/asciidoc/serverconnections.adoc b/deegree-services/deegree-webservices-handbook/src/main/asciidoc/serverconnections.adoc
index 176207e186..bab0b84964 100644
--- a/deegree-services/deegree-webservices-handbook/src/main/asciidoc/serverconnections.adoc
+++ b/deegree-services/deegree-webservices-handbook/src/main/asciidoc/serverconnections.adoc
@@ -52,7 +52,7 @@ database:
 ----
 <DataSourceConnectionProvider
   xmlns="http://www.deegree.org/connectionprovider/datasource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/connectionprovider/datasource http://schemas.deegree.org/3.5/jdbc/datasource/datasource.xsd">
+  xsi:schemaLocation="http://www.deegree.org/connectionprovider/datasource http://schemas.deegree.org/core/3.5/jdbc/datasource/datasource.xsd">
 
   <!-- Creation of javax.sql.DataSource instance -->
   <DataSource javaClass="org.apache.commons.dbcp2.BasicDataSource" destroyMethod="close" />
@@ -99,7 +99,7 @@ This example defines a connection pool for an Oracle database:
 ----
 <DataSourceConnectionProvider
   xmlns="http://www.deegree.org/connectionprovider/datasource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/connectionprovider/datasource http://schemas.deegree.org/3.5/jdbc/datasource/datasource.xsd">
+  xsi:schemaLocation="http://www.deegree.org/connectionprovider/datasource http://schemas.deegree.org/core/3.5/jdbc/datasource/datasource.xsd">
 
   <!-- Creation of javax.sql.DataSource instance -->
   <DataSource javaClass="org.apache.commons.dbcp2.BasicDataSource" destroyMethod="close" />
@@ -144,7 +144,7 @@ This example defines a connection pool for a Microsoft SQL Server:
 ----
 <DataSourceConnectionProvider
   xmlns="http://www.deegree.org/connectionprovider/datasource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/connectionprovider/datasource http://schemas.deegree.org/3.5/jdbc/datasource/datasource.xsd">
+  xsi:schemaLocation="http://www.deegree.org/connectionprovider/datasource http://schemas.deegree.org/core/3.5/jdbc/datasource/datasource.xsd">
 
   <!-- Creation of javax.sql.DataSource instance -->
   <DataSource javaClass="org.apache.commons.dbcp2.BasicDataSource" destroyMethod="close" />
@@ -185,7 +185,7 @@ servlet container that runs deegree webservices (e.g. Apache Tomcat):
 ----
 <DataSourceConnectionProvider
   xmlns="http://www.deegree.org/connectionprovider/datasource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/connectionprovider/datasource http://schemas.deegree.org/3.5/jdbc/datasource/datasource.xsd">
+  xsi:schemaLocation="http://www.deegree.org/connectionprovider/datasource http://schemas.deegree.org/core/3.5/jdbc/datasource/datasource.xsd">
 
   <!-- Lookup of javax.sql.DataSource instance via JNDI -->
   <DataSource javaClass="org.deegree.db.datasource.JndiLookup" factoryMethod="lookup">
@@ -215,7 +215,7 @@ Connection Pool):
 ----
 <DataSourceConnectionProvider
   xmlns="http://www.deegree.org/connectionprovider/datasource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/connectionprovider/datasource http://schemas.deegree.org/3.5/jdbc/datasource/datasource.xsd">
+  xsi:schemaLocation="http://www.deegree.org/connectionprovider/datasource http://schemas.deegree.org/core/3.5/jdbc/datasource/datasource.xsd">
 
   <!-- Creation / lookup of javax.sql.DataSource instance -->
   <DataSource javaClass="oracle.ucp.jdbc.PoolDataSourceFactory" factoryMethod="getPoolDataSource" />
@@ -242,7 +242,7 @@ creating an Oracle UCP connection pool.
 ==== Configuration options
 
 The database connection config file format is defined by schema file
-http://schemas.deegree.org/3.5/jdbc/datasource/datasource.xsd. The
+http://schemas.deegree.org/core/3.5/jdbc/datasource/datasource.xsd. The
 root element is _DataSourceConnectionProvider_ and the optional
 attribute `config` can be set to _3.5.0_. The following table lists the available
 configuration options. When specifiying them, their order must be
@@ -382,7 +382,7 @@ is called 'inspire', the database user is 'postgres' and password is
 [source,xml]
 ----
 <JDBCConnection xmlns="http://www.deegree.org/jdbc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                xsi:schemaLocation="http://www.deegree.org/jdbc http://schemas.deegree.org/3.5/jdbc/jdbc.xsd">
+                xsi:schemaLocation="http://www.deegree.org/jdbc http://schemas.deegree.org/core/3.5/jdbc/jdbc.xsd">
   <Url>jdbc:postgresql://localhost:5432/inspire</Url>
   <User>postgres</User>
   <Password>postgres</Password>
@@ -390,7 +390,7 @@ is called 'inspire', the database user is 'postgres' and password is
 ----
 
 The legacy connection config file format is defined by schema file
-http://schemas.deegree.org/3.5/jdbc/jdbc.xsd. The root element is
+http://schemas.deegree.org/core/3.5/jdbc/jdbc.xsd. The root element is
 _JDBCConnection_ and the config attribute must be _3.0.0_. The
 following table lists the available configuration options. When
 specifiying them, their order must be respected.
diff --git a/deegree-services/deegree-webservices-handbook/src/main/asciidoc/webservices.adoc b/deegree-services/deegree-webservices-handbook/src/main/asciidoc/webservices.adoc
index 2a8184824a..a67929097f 100644
--- a/deegree-services/deegree-webservices-handbook/src/main/asciidoc/webservices.adoc
+++ b/deegree-services/deegree-webservices-handbook/src/main/asciidoc/webservices.adoc
@@ -49,7 +49,7 @@ configuration example looks like this:
   xmlns="http://www.deegree.org/services/wfs"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.deegree.org/services/wfs
-  http://schemas.deegree.org/3.5/services/wfs/wfs_configuration.xsd">
+  http://schemas.deegree.org/core/3.5/services/wfs/wfs_configuration.xsd">
 
   <QueryCRS>urn:ogc:def:crs:EPSG::4258</QueryCRS>
 
@@ -73,7 +73,7 @@ A more complex configuration example looks like this:
   xmlns="http://www.deegree.org/services/wfs"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.deegree.org/services/wfs
-  http://schemas.deegree.org/3.5/services/wfs/wfs_configuration.xsd">
+  http://schemas.deegree.org/core/3.5/services/wfs/wfs_configuration.xsd">
 
   <SupportedVersions>
     <Version>2.0.0</Version>
@@ -126,7 +126,7 @@ A more complex configuration example looks like this:
 ==== Configuration overview
 
 The deegree WFS config file format is defined by schema file
-http://schemas.deegree.org/3.5/services/wfs/wfs_configuration.xsd. The
+http://schemas.deegree.org/core/3.5/services/wfs/wfs_configuration.xsd. The
 root element is <deegreeWFS> and the optional
 attribute `config` can be set to _3.5.0_. The following table lists all available configuration options
 (complex ones contain nested options themselves). When specifiying them,
@@ -1980,7 +1980,7 @@ empty), therefore a minimal WMTS configuration example looks like this:
   xmlns="http://www.deegree.org/services/wmts"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.deegree.org/services/wmts
-  http://schemas.deegree.org/3.5/services/wmts/wmts.xsd">
+  http://schemas.deegree.org/core/3.5/services/wmts/wmts.xsd">
 
   <ServiceConfiguration />
 
@@ -2003,7 +2003,7 @@ like this:
   xmlns="http://www.deegree.org/services/wmts"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.deegree.org/services/wmts
-  http://schemas.deegree.org/3.5/services/wmts/wmts.xsd">
+  http://schemas.deegree.org/core/3.5/services/wmts/wmts.xsd">
 
   <ServiceConfiguration>
     <ThemeId>water</ThemeId>
@@ -2016,7 +2016,7 @@ like this:
 ==== Configuration overview
 
 The deegree WMTS config file format is defined by schema file
-http://schemas.deegree.org/3.5/services/wmts/wmts.xsd. The root
+http://schemas.deegree.org/core/3.5/services/wmts/wmts.xsd. The root
 element is _deegreeWMTS_ and the optional attribute `config` can be set to _3.5.0_.
 
 The following table lists all available configuration options. When
@@ -2060,7 +2060,7 @@ WMS tile store backends.
 [source,xml]
 <GeoTIFFTileMatrixSet   xmlns="http://www.deegree.org/datasource/tile/tilematrixset/geotiff"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.deegree.org/datasource/tile/tilematrixset/geotiff http://schemas.deegree.org/3.5/datasource/tile/tilematrixset/geotiff/geotiff.xsd">
+    xsi:schemaLocation="http://www.deegree.org/datasource/tile/tilematrixset/geotiff http://schemas.deegree.org/core/3.5/datasource/tile/tilematrixset/geotiff/geotiff.xsd">
  <StorageCRS>EPSG:25832</StorageCRS>
  <File>../../../data/geotiff/kulturlandschaft.tif</File>
 </GeoTIFFTileMatrixSet>
@@ -2071,7 +2071,7 @@ WMS tile store backends.
 [source,xml]
 <GeoTIFFTileStore xmlns="http://www.deegree.org/datasource/tile/geotiff"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.deegree.org/datasource/tile/geotiff http://schemas.deegree.org/3.5/datasource/tile/geotiff/geotiff.xsd">
+    xsi:schemaLocation="http://www.deegree.org/datasource/tile/geotiff http://schemas.deegree.org/core/3.5/datasource/tile/geotiff/geotiff.xsd">
     <TileDataSet>
         <Identifier>wmts_acrit</Identifier>
         <TileMatrixSetId>tilematrixset_wmts_acrit</TileMatrixSetId>
@@ -2092,7 +2092,7 @@ NOTE: Use "image/png" as ImageFormat even if the source is GeoTIFF.
            xmlns:d="http://www.deegree.org/metadata/description"
            xmlns:s="http://www.deegree.org/metadata/spatial"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://www.deegree.org/layers/tile http://schemas.deegree.org/3.5/layers/tile/tile.xsd">
+           xsi:schemaLocation="http://www.deegree.org/layers/tile http://schemas.deegree.org/core/3.5/layers/tile/tile.xsd">
  <TileLayer>
    <l:Name>wmts_acrit</l:Name>
    <d:Title>Wmts Acrit tiled</d:Title>
@@ -2112,7 +2112,7 @@ NOTE: Use "image/png" as ImageFormat even if the source is GeoTIFF.
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xmlns:d="http://www.deegree.org/metadata/description"
 xmlns:s="http://www.deegree.org/metadata/spatial"
-xsi:schemaLocation="http://www.deegree.org/themes/standard http://schemas.deegree.org/3.5/themes/themes.xsd">
+xsi:schemaLocation="http://www.deegree.org/themes/standard http://schemas.deegree.org/core/3.5/themes/themes.xsd">
  <LayerStoreId>layer_tile_wmts_acrit</LayerStoreId>
  <Theme>
    <d:Title>Root theme</d:Title>
@@ -2131,7 +2131,7 @@ xsi:schemaLocation="http://www.deegree.org/themes/standard http://schemas.deegre
 [source,xml]
 <deegreeWMTS xmlns="http://www.deegree.org/services/wmts"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://www.deegree.org/services/wmts http://schemas.deegree.org/3.5/services/wmts/wmts.xsd">
+            xsi:schemaLocation="http://www.deegree.org/services/wmts http://schemas.deegree.org/core/3.5/services/wmts/wmts.xsd">
  <MetadataURLTemplate>http://some.service/services?service=CSW&amp;request=GetRecordById&amp;version=2.0.2&amp;outputSchema=http://www.isotc211.org/2005/gmd&amp;elementSetName=full&amp;id=${metadataSetId}</MetadataURLTemplate>
  <ServiceConfiguration>
    <ThemeId>wmts_acrit_theme</ThemeId>
@@ -2173,7 +2173,7 @@ NOTE: Further information of the configuration of the cache can be found in http
 [source,xml]
 <CachingTileStore xmlns="http://www.deegree.org/datasource/tile/cache"
                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                 xsi:schemaLocation="http://www.deegree.org/datasource/tile/cache http://schemas.deegree.org/3.5/datasource/tile/cache/cache.xsd">
+                 xsi:schemaLocation="http://www.deegree.org/datasource/tile/cache http://schemas.deegree.org/core/3.5/datasource/tile/cache/cache.xsd">
    <!-- TileStoreId refers to tile store config file wmts_acrit.xml in the same directory -->
    <TileStoreId>wmts_acrit</TileStoreId>
    <!-- The related ehcache configuration file in the root directory of the deegree workspace -->
@@ -2223,14 +2223,14 @@ example looks like this:
   xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.deegree.org/services/csw
-  http://schemas.deegree.org/3.5/services/csw/csw_configuration.xsd">
+  http://schemas.deegree.org/core/3.5/services/csw/csw_configuration.xsd">
 </deegreeCSW>
 ----
 
 ==== Configuration overview
 
 The deegree CSW config file format is defined by schema file
-http://schemas.deegree.org/3.5/services/csw/csw_configuration.xsd. The
+http://schemas.deegree.org/core/3.5/services/csw/csw_configuration.xsd. The
 root element is _deegreeCSW_ and the optional attribute `config` can be set to _3.5.0_.
 
 The following table lists all available configuration options. When
@@ -2308,7 +2308,7 @@ A minimal valid WPS configuration example looks like this:
 [source,xml]
 ----
 <deegreeWPS xmlns="http://www.deegree.org/services/wps" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/services/wps http://schemas.deegree.org/3.5/services/wps/wps_configuration.xsd">
+  xsi:schemaLocation="http://www.deegree.org/services/wps http://schemas.deegree.org/core/3.5/services/wps/wps_configuration.xsd">
 </deegreeWPS>
 ----
 
@@ -2331,7 +2331,7 @@ A more complex configuration example looks like this:
 [source,xml]
 ----
 <deegreeWPS xmlns="http://www.deegree.org/services/wps" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/services/wps http://schemas.deegree.org/3.5/services/wps/wps_configuration.xsd">
+  xsi:schemaLocation="http://www.deegree.org/services/wps http://schemas.deegree.org/core/3.5/services/wps/wps_configuration.xsd">
 
   <SupportedVersions>
     <Version>1.0.0</Version>
@@ -2361,7 +2361,7 @@ storage directory.
 ==== Configuration overview
 
 The deegree WPS config file format is defined by schema file
-http://schemas.deegree.org/3.5/services/wps/wps_configuration.xsd. The
+http://schemas.deegree.org/core/3.5/services/wps/wps_configuration.xsd. The
 root element is _deegreeWPS_ and the config attribute must be
 _3.1.0_. The following table lists all available configuration options
 (complex ones contain nested options themselves). When specifiying them,
@@ -2425,7 +2425,7 @@ configuration works for all types of service alike.
 ----
 <deegreeServicesMetadata xmlns="http://www.deegree.org/services/metadata"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/services/metadata http://schemas.deegree.org/3.5/services/metadata/metadata.xsd">
+  xsi:schemaLocation="http://www.deegree.org/services/metadata http://schemas.deegree.org/core/3.5/services/metadata/metadata.xsd">
 
   <ServiceIdentification>
     <Title>INSPIRE Addresses</Title>
@@ -2491,7 +2491,7 @@ configuration works for all types of service alike.
 ----
 
 The metadata config file format is defined by schema file
-http://schemas.deegree.org/3.5/services/metadata/metadata.xsd. The
+http://schemas.deegree.org/core/3.5/services/metadata/metadata.xsd. The
 root element is _deegreeServicesMetadata_ and the optional
 attribute `config` can be set to _3.5.0_. The following table lists all available configuration
 options (complex ones contain nested options themselves). When
diff --git a/deegree-tests/deegree-integration-tests/src/test/resources/deegree-acceptance-tests-soapui-project.xml b/deegree-tests/deegree-integration-tests/src/test/resources/deegree-acceptance-tests-soapui-project.xml
index 226bb5de65..4771ea5873 100644
--- a/deegree-tests/deegree-integration-tests/src/test/resources/deegree-acceptance-tests-soapui-project.xml
+++ b/deegree-tests/deegree-integration-tests/src/test/resources/deegree-acceptance-tests-soapui-project.xml
@@ -123,7 +123,7 @@
           <con:request><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
 <deegreeWFS xmlns="http://www.deegree.org/services/wfs"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://www.deegree.org/services/wfs http://schemas.deegree.org/3.5/services/wfs/wfs_configuration.xsd"
+            xsi:schemaLocation="http://www.deegree.org/services/wfs http://schemas.deegree.org/core/3.5/services/wfs/wfs_configuration.xsd"
            >
 
   <SupportedVersions>
diff --git a/deegree-tests/deegree-resource-deps-tests/src/test/resources/workspace/datasources/feature/simplesql-fail-invalid-config.xml b/deegree-tests/deegree-resource-deps-tests/src/test/resources/workspace/datasources/feature/simplesql-fail-invalid-config.xml
index 5157d12dbf..260968e5b7 100644
--- a/deegree-tests/deegree-resource-deps-tests/src/test/resources/workspace/datasources/feature/simplesql-fail-invalid-config.xml
+++ b/deegree-tests/deegree-resource-deps-tests/src/test/resources/workspace/datasources/feature/simplesql-fail-invalid-config.xml
@@ -1,6 +1,6 @@
 <SimpleSQLFeatureStore xmlns="http://www.deegree.org/datasource/feature/simplesql"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/feature/simplesql http://schemas.deegree.org/3.5/datasource/feature/simplesql/simplesql.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/feature/simplesql http://schemas.deegree.org/core/3.5/datasource/feature/simplesql/simplesql.xsd">
 
 
 </SimpleSQLFeatureStore>
diff --git a/deegree-tests/deegree-resource-deps-tests/src/test/resources/workspace/datasources/feature/simplesql-fail-missing-dep.xml b/deegree-tests/deegree-resource-deps-tests/src/test/resources/workspace/datasources/feature/simplesql-fail-missing-dep.xml
index 93e204dd68..621d0d778c 100644
--- a/deegree-tests/deegree-resource-deps-tests/src/test/resources/workspace/datasources/feature/simplesql-fail-missing-dep.xml
+++ b/deegree-tests/deegree-resource-deps-tests/src/test/resources/workspace/datasources/feature/simplesql-fail-missing-dep.xml
@@ -1,6 +1,6 @@
 <SimpleSQLFeatureStore xmlns="http://www.deegree.org/datasource/feature/simplesql"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/feature/simplesql http://schemas.deegree.org/3.5/datasource/feature/simplesql/simplesql.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/feature/simplesql http://schemas.deegree.org/core/3.5/datasource/feature/simplesql/simplesql.xsd">
 
   <!-- [1] CRS for storing geometries -->
   <StorageCRS>EPSG:4326</StorageCRS>
diff --git a/deegree-tests/deegree-resource-deps-tests/src/test/resources/workspace/datasources/feature/simplesql-ok.xml b/deegree-tests/deegree-resource-deps-tests/src/test/resources/workspace/datasources/feature/simplesql-ok.xml
index 633e8a12e2..f6b30cdc92 100644
--- a/deegree-tests/deegree-resource-deps-tests/src/test/resources/workspace/datasources/feature/simplesql-ok.xml
+++ b/deegree-tests/deegree-resource-deps-tests/src/test/resources/workspace/datasources/feature/simplesql-ok.xml
@@ -1,6 +1,6 @@
 <SimpleSQLFeatureStore xmlns="http://www.deegree.org/datasource/feature/simplesql"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/feature/simplesql http://schemas.deegree.org/3.5/datasource/feature/simplesql/simplesql.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/feature/simplesql http://schemas.deegree.org/core/3.5/datasource/feature/simplesql/simplesql.xsd">
 
   <!-- [1] CRS for storing geometries -->
   <StorageCRS>EPSG:4326</StorageCRS>
diff --git a/deegree-tests/deegree-resource-deps-tests/src/test/resources/workspace/jdbc/simplesqlh2.xml b/deegree-tests/deegree-resource-deps-tests/src/test/resources/workspace/jdbc/simplesqlh2.xml
index 6cceecd1e3..d8de766e12 100644
--- a/deegree-tests/deegree-resource-deps-tests/src/test/resources/workspace/jdbc/simplesqlh2.xml
+++ b/deegree-tests/deegree-resource-deps-tests/src/test/resources/workspace/jdbc/simplesqlh2.xml
@@ -1,5 +1,5 @@
 <JDBCConnection xmlns="http://www.deegree.org/jdbc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/jdbc http://schemas.deegree.org/3.5/jdbc/jdbc.xsd">
+  xsi:schemaLocation="http://www.deegree.org/jdbc http://schemas.deegree.org/core/3.5/jdbc/jdbc.xsd">
 
   <!-- [1] JDBC URL (without username / password) -->
   <Url>jdbc:h2:/tmp/test</Url>
diff --git a/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/datasources/feature/utah_railroads.xml b/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/datasources/feature/utah_railroads.xml
index 531fe47f84..9fdd6db2ca 100644
--- a/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/datasources/feature/utah_railroads.xml
+++ b/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/datasources/feature/utah_railroads.xml
@@ -1,4 +1,4 @@
-<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
   <StorageCRS>EPSG:26912</StorageCRS>
   <File>../../data/SGID100_RailroadsDLG100</File>
 </ShapeFeatureStore>
diff --git a/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/datasources/feature/utah_roads.xml b/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/datasources/feature/utah_roads.xml
index f183861978..537d977d2f 100644
--- a/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/datasources/feature/utah_roads.xml
+++ b/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/datasources/feature/utah_roads.xml
@@ -1,4 +1,4 @@
-<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
   <StorageCRS>EPSG:26912</StorageCRS>
   <File>../../data/SGID100_RoadsDLG100</File>
 </ShapeFeatureStore>
diff --git a/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/datasources/feature/utah_zipcodes.xml b/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/datasources/feature/utah_zipcodes.xml
index 2c74a501a7..91da713ce5 100644
--- a/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/datasources/feature/utah_zipcodes.xml
+++ b/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/datasources/feature/utah_zipcodes.xml
@@ -1,4 +1,4 @@
-<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
   <StorageCRS>EPSG:26912</StorageCRS>
   <File>../../data/SGID500_ZipCodes</File>
 </ShapeFeatureStore>
diff --git a/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/datasources/remoteows/timeout.xml b/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/datasources/remoteows/timeout.xml
index e8f43b97c5..f57d73f8d7 100644
--- a/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/datasources/remoteows/timeout.xml
+++ b/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/datasources/remoteows/timeout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <RemoteWMS xmlns="http://www.deegree.org/remoteows/wms" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/remoteows/wms /http://schemas.deegree.org/3.5/datasource/remoteows/wms/remotewms.xsd"
+  xsi:schemaLocation="http://www.deegree.org/datasource/remoteows/wms /http://schemas.deegree.org/core/3.5/datasource/remoteows/wms/remotewms.xsd"
  >
   <CapabilitiesDocumentLocation
     location="http://demo.deegree.org/deegree-wms/services?request=capabilities&amp;service=WMS&amp;version=1.1.1" />
diff --git a/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/layers/layer_feature_utah_railroads.xml b/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/layers/layer_feature_utah_railroads.xml
index 5e38989067..22e10af144 100644
--- a/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/layers/layer_feature_utah_railroads.xml
+++ b/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/layers/layer_feature_utah_railroads.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/3.5/layers/feature/feature.xsd">
+  xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/core/3.5/layers/feature/feature.xsd">
   
   <FeatureStoreId>utah_railroads</FeatureStoreId>
   
diff --git a/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/layers/layer_feature_utah_roads.xml b/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/layers/layer_feature_utah_roads.xml
index 394d24773c..a16acfaa44 100644
--- a/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/layers/layer_feature_utah_roads.xml
+++ b/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/layers/layer_feature_utah_roads.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/3.5/layers/feature/feature.xsd">
+  xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/core/3.5/layers/feature/feature.xsd">
   
   <FeatureStoreId>utah_roads</FeatureStoreId>
   
diff --git a/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/layers/layer_feature_utah_zipcodes.xml b/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/layers/layer_feature_utah_zipcodes.xml
index 05071a6fdc..5fc9271a03 100644
--- a/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/layers/layer_feature_utah_zipcodes.xml
+++ b/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/layers/layer_feature_utah_zipcodes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/3.5/layers/feature/feature.xsd"
+<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/core/3.5/layers/feature/feature.xsd"
  >
   <FeatureStoreId>utah_zipcodes</FeatureStoreId>
   <FeatureLayer>    
diff --git a/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/layers/timeout.xml b/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/layers/timeout.xml
index 890d460871..dbe21604cd 100644
--- a/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/layers/timeout.xml
+++ b/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/layers/timeout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <RemoteWMSLayers xmlns="http://www.deegree.org/layers/remotewms" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/layers/remotewms http://schemas.deegree.org/3.5/datasource/remoteows/wms/remotewms.xsd"
+  xsi:schemaLocation="http://www.deegree.org/layers/remotewms http://schemas.deegree.org/core/3.5/datasource/remoteows/wms/remotewms.xsd"
  >
   <RemoteWMSId>timeout</RemoteWMSId>
 </RemoteWMSLayers>
diff --git a/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/services/internal.xml b/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/services/internal.xml
index 04283ee708..9b431d41f3 100644
--- a/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/services/internal.xml
+++ b/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/services/internal.xml
@@ -1,4 +1,4 @@
-<wms:deegreeWMS xmlns:wms="http://www.deegree.org/services/wms" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dgws="http://www.deegree.org/webservices" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/wms http://schemas.deegree.org/3.5/services/wms/wms_configuration.xsd">
+<wms:deegreeWMS xmlns:wms="http://www.deegree.org/services/wms" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dgws="http://www.deegree.org/webservices" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/wms http://schemas.deegree.org/core/3.5/services/wms/wms_configuration.xsd">
   <wms:SupportedVersions>
     <wms:Version>1.1.1</wms:Version>
     <wms:Version>1.3.0</wms:Version>
diff --git a/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/services/metadata.xml b/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/services/metadata.xml
index 819e12e1fc..33e26e9c4e 100644
--- a/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/services/metadata.xml
+++ b/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/services/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deegreeServicesMetadata xmlns="http://www.deegree.org/services/metadata"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/metadata http://schemas.deegree.org/3.5/services/metadata/metadata.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/metadata http://schemas.deegree.org/core/3.5/services/metadata/metadata.xsd">
   <!--
     General service information for all services. Used in the GetCapabilities
     responses.
diff --git a/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/services/wms.xml b/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/services/wms.xml
index 89725bc544..6103d63027 100644
--- a/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/services/wms.xml
+++ b/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/services/wms.xml
@@ -1,4 +1,4 @@
-<wms:deegreeWMS xmlns:wms="http://www.deegree.org/services/wms" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dgws="http://www.deegree.org/webservices" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/wms http://schemas.deegree.org/3.5/wms/wms_configuration.xsd">
+<wms:deegreeWMS xmlns:wms="http://www.deegree.org/services/wms" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dgws="http://www.deegree.org/webservices" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/wms http://schemas.deegree.org/core/3.5/wms/wms_configuration.xsd">
 
   <wms:ServiceConfiguration>
 
diff --git a/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/styles/utah_railroads.xml b/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/styles/utah_railroads.xml
index 83497ef5b4..91c4e87502 100644
--- a/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/styles/utah_railroads.xml
+++ b/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/styles/utah_railroads.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FeatureTypeStyle xmlns="http://www.opengis.net/se" xmlns:app="http://www.deegree.org/app" xmlns:ogc="http://www.opengis.net/ogc"
   xmlns:sed="http://www.deegree.org/se" xmlns:deegreeogc="http://www.deegree.org/ogc" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/3.5/se/Symbolizer-deegree.xsd">
+  xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/core/3.5/se/Symbolizer-deegree.xsd">
   <Name>Railroads</Name>
   <!-- This style file shows the use of complex function for styling railroads with typical "railroad" appearance -->
   <Rule>
diff --git a/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/styles/utah_roads.xml b/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/styles/utah_roads.xml
index 879d5494ca..2ebe7991fb 100644
--- a/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/styles/utah_roads.xml
+++ b/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/styles/utah_roads.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FeatureTypeStyle xmlns="http://www.opengis.net/se" xmlns:app="http://www.deegree.org/app" xmlns:ogc="http://www.opengis.net/ogc" xmlns:sed="http://www.deegree.org/se"
     xmlns:deegreeogc="http://www.deegree.org/ogc" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/3.5/se/Symbolizer-deegree.xsd">
+    xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/core/3.5/se/Symbolizer-deegree.xsd">
   <Name>Roads</Name>
   <Rule>
     <Name>Roads</Name>
diff --git a/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/styles/utah_zipcodes.xml b/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/styles/utah_zipcodes.xml
index 22e1617518..829d49287b 100644
--- a/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/styles/utah_zipcodes.xml
+++ b/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/styles/utah_zipcodes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FeatureTypeStyle xmlns="http://www.opengis.net/se" xmlns:app="http://www.deegree.org/app" xmlns:ogc="http://www.opengis.net/ogc" xmlns:sed="http://www.deegree.org/se"
     xmlns:deegreeogc="http://www.deegree.org/ogc" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/3.5/se/Symbolizer-deegree.xsd">
+    xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/core/3.5/se/Symbolizer-deegree.xsd">
   <Name>ZipCodes</Name>
   <Rule>
     <Name>ZipCodes</Name>
diff --git a/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/themes/internal.xml b/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/themes/internal.xml
index 3ca5687aa8..0113dbc5a0 100644
--- a/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/themes/internal.xml
+++ b/deegree-tests/deegree-wms-remoteows-tests/src/main/webapp/WEB-INF/workspace/themes/internal.xml
@@ -1,4 +1,4 @@
-<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:l="http://www.deegree.org/layers/base" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/themes/standard http://schemas.deegree.org/3.5/themes/themes.xsd">
+<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:l="http://www.deegree.org/layers/base" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/themes/standard http://schemas.deegree.org/core/3.5/themes/themes.xsd">
 
   <LayerStoreId>layer_feature_utah_railroads</LayerStoreId>
   <LayerStoreId>layer_feature_utah_roads</LayerStoreId>
diff --git a/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/datasources/coverage/utah_satellite_provo.xml b/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/datasources/coverage/utah_satellite_provo.xml
index 083ed7dcc0..e43efdc9f8 100644
--- a/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/datasources/coverage/utah_satellite_provo.xml
+++ b/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/datasources/coverage/utah_satellite_provo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Raster xmlns="http://www.deegree.org/datasource/coverage/raster" originLocation="outer"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/coverage/raster http://schemas.deegree.org/3.5/datasource/coverage/raster/raster.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/coverage/raster http://schemas.deegree.org/core/3.5/datasource/coverage/raster/raster.xsd">
   <StorageCRS>EPSG:26912</StorageCRS>
   <!--
     DEPRECATED!!!
diff --git a/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/datasources/feature/contours.xml b/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/datasources/feature/contours.xml
index 0bb66dca72..626b625bb5 100644
--- a/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/datasources/feature/contours.xml
+++ b/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/datasources/feature/contours.xml
@@ -1,6 +1,6 @@
 <ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
   <FeatureTypeNamespace>http://www.deegree.org/app</FeatureTypeNamespace>
   <File>../../data/utah/SGID500_Contours500Ft.shp</File>
 </ShapeFeatureStore>
diff --git a/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/datasources/feature/dominant.xml b/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/datasources/feature/dominant.xml
index ebcf14e9ca..d9774a7126 100644
--- a/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/datasources/feature/dominant.xml
+++ b/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/datasources/feature/dominant.xml
@@ -1,6 +1,6 @@
 <ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
   <FeatureTypeNamespace>http://www.deegree.org/app</FeatureTypeNamespace>
   <File>../../data/utah/SGID500_DominantVegetation.shp</File>
 </ShapeFeatureStore>
diff --git a/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/datasources/feature/springs.xml b/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/datasources/feature/springs.xml
index d01ec674ca..82d96bff4c 100644
--- a/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/datasources/feature/springs.xml
+++ b/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/datasources/feature/springs.xml
@@ -1,6 +1,6 @@
 <ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
   <FeatureTypeNamespace>http://www.deegree.org/app</FeatureTypeNamespace>
   <File>../../data/utah/SGID024_Springs.shp</File>
 </ShapeFeatureStore>
diff --git a/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/datasources/feature/ttf.xml b/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/datasources/feature/ttf.xml
index 675b1263f0..047f887c4d 100644
--- a/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/datasources/feature/ttf.xml
+++ b/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/datasources/feature/ttf.xml
@@ -1,6 +1,6 @@
 <ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
   <FeatureTypeNamespace>http://www.deegree.org/app</FeatureTypeNamespace>
   <File>../../data/utah/ttfsymbol.shp</File>
 </ShapeFeatureStore>
diff --git a/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/layers/contours.xml b/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/layers/contours.xml
index 22ab3263b7..92f4528ee9 100644
--- a/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/layers/contours.xml
+++ b/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/layers/contours.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:d="http://www.deegree.org/metadata/description" xmlns:l="http://www.deegree.org/layers/base"
-  xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/3.5/layers/feature/feature.xsd"
+  xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/core/3.5/layers/feature/feature.xsd"
   xmlns:g="http://www.deegree.org/metadata/spatial">
   <FeatureStoreId>contours</FeatureStoreId>
   <FeatureLayer>
diff --git a/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/layers/satellite_provo.xml b/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/layers/satellite_provo.xml
index 4d0e120850..6fa875c596 100644
--- a/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/layers/satellite_provo.xml
+++ b/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/layers/satellite_provo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<CoverageLayers xmlns="http://www.deegree.org/layers/coverage" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/coverage http://schemas.deegree.org/3.5/layers/coverage/coverage.xsd">
+<CoverageLayers xmlns="http://www.deegree.org/layers/coverage" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/coverage http://schemas.deegree.org/core/3.5/layers/coverage/coverage.xsd">
   <CoverageStoreId>utah_satellite_provo</CoverageStoreId>
   <CoverageLayer>
     <l:Name>satellite_provo</l:Name>
diff --git a/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/services/main.xml b/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/services/main.xml
index 188af32448..0b357f11eb 100644
--- a/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/services/main.xml
+++ b/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/services/main.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deegreeServiceController xmlns="http://www.deegree.org/services/controller"
-  xsi:schemaLocation="http://www.deegree.org/webservices http://schemas.deegree.org/3.5/services/controller/controller.xsd"
+  xsi:schemaLocation="http://www.deegree.org/webservices http://schemas.deegree.org/core/3.5/services/controller/controller.xsd"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <!--   <DCP>-->
   <!--
diff --git a/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/services/metadata.xml b/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/services/metadata.xml
index e9d78e39f0..c771c833d5 100644
--- a/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/services/metadata.xml
+++ b/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/services/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deegreeServicesMetadata xmlns="http://www.deegree.org/services/metadata"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/metadata http://schemas.deegree.org/3.5/services/metadata/metadata.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/metadata http://schemas.deegree.org/core/3.5/services/metadata/metadata.xsd">
   <!--
     General service information for all services. Used in the GetCapabilities
     responses.
diff --git a/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/services/wms.xml b/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/services/wms.xml
index ed65ded1aa..b6d2dc734d 100644
--- a/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/services/wms.xml
+++ b/deegree-tests/deegree-wms-similarity-tests/src/main/webapp/WEB-INF/workspace/services/wms.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deegreeWMS xmlns="http://www.deegree.org/services/wms" xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dgws="http://www.deegree.org/webservices"
-  xsi:schemaLocation="http://www.deegree.org/services/wms http://schemas.deegree.org/3.5/wms/wms_configuration.xsd">
+  xsi:schemaLocation="http://www.deegree.org/services/wms http://schemas.deegree.org/core/3.5/wms/wms_configuration.xsd">
   <ServiceConfiguration>
     <DefaultLayerOptions>
       <AntiAliasing>NONE</AntiAliasing>
diff --git a/deegree-tests/deegree-wms-tiling-tests/src/main/webapp/WEB-INF/workspace/services/wms.xml b/deegree-tests/deegree-wms-tiling-tests/src/main/webapp/WEB-INF/workspace/services/wms.xml
index b0d9beba2b..ffe08f7dd4 100644
--- a/deegree-tests/deegree-wms-tiling-tests/src/main/webapp/WEB-INF/workspace/services/wms.xml
+++ b/deegree-tests/deegree-wms-tiling-tests/src/main/webapp/WEB-INF/workspace/services/wms.xml
@@ -1,6 +1,6 @@
 <deegreeWMS xmlns="http://www.deegree.org/services/wms" xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:dgws="http://www.deegree.org/webservices" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/services/wms http://schemas.deegree.org/3.5/services/wms/wms_configuration.xsd">
+  xsi:schemaLocation="http://www.deegree.org/services/wms http://schemas.deegree.org/core/3.5/services/wms/wms_configuration.xsd">
 
   <ServiceConfiguration>
     <ThemeId>theme</ThemeId>
diff --git a/deegree-tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/remoteows/wmts.xml b/deegree-tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/remoteows/wmts.xml
index f375744ef0..be561309e8 100644
--- a/deegree-tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/remoteows/wmts.xml
+++ b/deegree-tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/remoteows/wmts.xml
@@ -1,3 +1,3 @@
-<RemoteWMTS xmlns="http://www.deegree.org/remoteows/wmts" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/remoteows/wmts http://schemas.deegree.org/3.5/remoteows/wmts/remotewmts.xsd">
+<RemoteWMTS xmlns="http://www.deegree.org/remoteows/wmts" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/remoteows/wmts http://schemas.deegree.org/core/3.5/remoteows/wmts/remotewmts.xsd">
   <CapabilitiesDocumentLocation location="http://deegree3-testing.deegree.org/utah-workspace/services/wmts?service=WMTS&amp;version=1.0.0&amp;request=GetCapabilities"/>
 </RemoteWMTS>
\ No newline at end of file
diff --git a/deegree-tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/faulty.xml b/deegree-tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/faulty.xml
index 7f810ddeda..50d536e22e 100644
--- a/deegree-tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/faulty.xml
+++ b/deegree-tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/faulty.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <RemoteWMSTileStore xmlns="http://www.deegree.org/datasource/tile/remotewms" xmlns:md="http://www.deegree.org/metadata/spatial"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/tile/remotewms http://schemas.deegree.org/3.5/datasource/tile/remotewms/remotewms.xsd"
+  xsi:schemaLocation="http://www.deegree.org/datasource/tile/remotewms http://schemas.deegree.org/core/3.5/datasource/tile/remotewms/remotewms.xsd"
  >
 
   <RemoteWMSId>faulty</RemoteWMSId>
diff --git a/deegree-tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/remotewms.xml b/deegree-tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/remotewms.xml
index c8b534fc93..7c32bb7697 100644
--- a/deegree-tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/remotewms.xml
+++ b/deegree-tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/remotewms.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <RemoteWMSTileStore xmlns="http://www.deegree.org/datasource/tile/remotewms" xmlns:md="http://www.deegree.org/metadata/spatial"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/tile/remotewms http://schemas.deegree.org/3.5/datasource/tile/remotewms/remotewms.xsd"
+  xsi:schemaLocation="http://www.deegree.org/datasource/tile/remotewms http://schemas.deegree.org/core/3.5/datasource/tile/remotewms/remotewms.xsd"
  >
 
   <RemoteWMSId>utah</RemoteWMSId>
diff --git a/deegree-tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/remotewms130.xml b/deegree-tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/remotewms130.xml
index 2bf2218650..5d01469c93 100644
--- a/deegree-tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/remotewms130.xml
+++ b/deegree-tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/remotewms130.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <RemoteWMSTileStore xmlns="http://www.deegree.org/datasource/tile/remotewms" xmlns:md="http://www.deegree.org/metadata/spatial"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/tile/remotewms http://schemas.deegree.org/3.5/datasource/tile/remotewms/remotewms.xsd"
+  xsi:schemaLocation="http://www.deegree.org/datasource/tile/remotewms http://schemas.deegree.org/core/3.5/datasource/tile/remotewms/remotewms.xsd"
  >
 
 
diff --git a/deegree-tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/remotewms4326.xml b/deegree-tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/remotewms4326.xml
index db88c79df8..407911668f 100644
--- a/deegree-tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/remotewms4326.xml
+++ b/deegree-tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/remotewms4326.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <RemoteWMSTileStore xmlns="http://www.deegree.org/datasource/tile/remotewms" xmlns:md="http://www.deegree.org/metadata/spatial"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/tile/remotewms http://schemas.deegree.org/3.5/datasource/tile/remotewms/remotewms.xsd"
+  xsi:schemaLocation="http://www.deegree.org/datasource/tile/remotewms http://schemas.deegree.org/core/3.5/datasource/tile/remotewms/remotewms.xsd"
  >
 
 
diff --git a/deegree-tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/remotewms4326_130.xml b/deegree-tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/remotewms4326_130.xml
index 61e59f45f8..f9a1540097 100644
--- a/deegree-tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/remotewms4326_130.xml
+++ b/deegree-tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/remotewms4326_130.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <RemoteWMSTileStore xmlns="http://www.deegree.org/datasource/tile/remotewms" xmlns:md="http://www.deegree.org/metadata/spatial"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/tile/remotewms http://schemas.deegree.org/3.5/datasource/tile/remotewms/remotewms.xsd"
+  xsi:schemaLocation="http://www.deegree.org/datasource/tile/remotewms http://schemas.deegree.org/core/3.5/datasource/tile/remotewms/remotewms.xsd"
  >
 
 
diff --git a/deegree-tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/remotewms_gif.xml b/deegree-tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/remotewms_gif.xml
index 9a1ec39f0f..2fd7e06d3f 100644
--- a/deegree-tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/remotewms_gif.xml
+++ b/deegree-tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/remotewms_gif.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <RemoteWMSTileStore xmlns="http://www.deegree.org/datasource/tile/remotewms" xmlns:md="http://www.deegree.org/metadata/spatial"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/tile/remotewms http://schemas.deegree.org/3.5/datasource/tile/remotewms/remotewms.xsd"
+  xsi:schemaLocation="http://www.deegree.org/datasource/tile/remotewms http://schemas.deegree.org/core/3.5/datasource/tile/remotewms/remotewms.xsd"
  >
 
 
diff --git a/deegree-tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/remotewmts.xml b/deegree-tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/remotewmts.xml
index 37aee902f4..1fdf88bd77 100644
--- a/deegree-tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/remotewmts.xml
+++ b/deegree-tests/deegree-wmts-tests/src/main/webapp/WEB-INF/workspace/datasources/tile/remotewmts.xml
@@ -1,4 +1,4 @@
-<RemoteWMTSTileStore xmlns="http://www.deegree.org/datasource/tile/remotewmts" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/tile/remotewmts http://schemas.deegree.org/3.5/datasource/tile/remotewmts/remotewmts.xsd">
+<RemoteWMTSTileStore xmlns="http://www.deegree.org/datasource/tile/remotewmts" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/tile/remotewmts http://schemas.deegree.org/core/3.5/datasource/tile/remotewmts/remotewmts.xsd">
 
   <!-- [1] Id of the remote WMTS to connect to -->
   <RemoteWMTSId>wmts</RemoteWMTSId>
diff --git a/deegree-tools/deegree-tools-base/src/main/java/org/deegree/tools/feature/gml/ApplicationSchemaTool.java b/deegree-tools/deegree-tools-base/src/main/java/org/deegree/tools/feature/gml/ApplicationSchemaTool.java
index 3782b3bf3a..289db8a0ba 100644
--- a/deegree-tools/deegree-tools-base/src/main/java/org/deegree/tools/feature/gml/ApplicationSchemaTool.java
+++ b/deegree-tools/deegree-tools-base/src/main/java/org/deegree/tools/feature/gml/ApplicationSchemaTool.java
@@ -197,7 +197,7 @@ public int compare( FeatureType o1, FeatureType o2 ) {
         // Marshaller m = jc.createMarshaller();
         // m.setProperty( Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE );
         // m.setProperty( Marshaller.JAXB_SCHEMA_LOCATION,
-        // "http://www.deegree.org/feature/featuretype http://schemas.deegree.org/3.5/feature/postgis_appschema.xsd"
+        // "http://www.deegree.org/feature/featuretype http://schemas.deegree.org/core/3.5/feature/postgis_appschema.xsd"
         // );
         // m.marshal( jaxbSchema, System.out );
     }
diff --git a/deegree-tools/deegree-tools-base/src/main/java/org/deegree/tools/services/wms/FeatureTypesToLayerTree.java b/deegree-tools/deegree-tools-base/src/main/java/org/deegree/tools/services/wms/FeatureTypesToLayerTree.java
index 1cc339e2ff..7554ec5d76 100644
--- a/deegree-tools/deegree-tools-base/src/main/java/org/deegree/tools/services/wms/FeatureTypesToLayerTree.java
+++ b/deegree-tools/deegree-tools-base/src/main/java/org/deegree/tools/services/wms/FeatureTypesToLayerTree.java
@@ -165,7 +165,7 @@ public static void main( String[] args ) {
             out.writeAttribute( "configVersion", "0.5.0" );
             out.writeNamespace( "xsi", "http://www.w3.org/2001/XMLSchema-instance" );
             out.writeAttribute( "http://www.w3.org/2001/XMLSchema-instance", "schemaLocation",
-                                "http://www.deegree.org/services/wms http://schemas.deegree.org/3.5/wms/wms_configuration.xsd" );
+                                "http://www.deegree.org/services/wms http://schemas.deegree.org/core/3.5/wms/wms_configuration.xsd" );
             out.writeStartElement( ns, "ServiceConfiguration" );
 
             HashSet<FeatureType> visited = new HashSet<FeatureType>();
diff --git a/deegree-workspaces/deegree-workspace-aixm/src/main/resources/datasources/feature/aixm-memory.xml b/deegree-workspaces/deegree-workspace-aixm/src/main/resources/datasources/feature/aixm-memory.xml
index 98af20e23c..c342709309 100644
--- a/deegree-workspaces/deegree-workspace-aixm/src/main/resources/datasources/feature/aixm-memory.xml
+++ b/deegree-workspaces/deegree-workspace-aixm/src/main/resources/datasources/feature/aixm-memory.xml
@@ -1,6 +1,6 @@
 <MemoryFeatureStore xmlns="http://www.deegree.org/datasource/feature/memory"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/feature/memory http://schemas.deegree.org/3.5/datasource/feature/memory/memory.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/feature/memory http://schemas.deegree.org/core/3.5/datasource/feature/memory/memory.xsd">
 
   <!-- Namespace bindings to be used (0...n) -->
   <NamespaceHint prefix="aixm" namespaceURI="http://www.aixm.aero/schema/5.1" />
diff --git a/deegree-workspaces/deegree-workspace-aixm/src/main/resources/services/main.xml b/deegree-workspaces/deegree-workspace-aixm/src/main/resources/services/main.xml
index d861c30349..75d3674175 100644
--- a/deegree-workspaces/deegree-workspace-aixm/src/main/resources/services/main.xml
+++ b/deegree-workspaces/deegree-workspace-aixm/src/main/resources/services/main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deegreeServiceController xmlns="http://www.deegree.org/services/controller"
-  xsi:schemaLocation="http://www.deegree.org/services/controller http://schemas.deegree.org/3.5/services/controller/controller.xsd"
+  xsi:schemaLocation="http://www.deegree.org/services/controller http://schemas.deegree.org/core/3.5/services/controller/controller.xsd"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 </deegreeServiceController>
diff --git a/deegree-workspaces/deegree-workspace-aixm/src/main/resources/services/metadata.xml b/deegree-workspaces/deegree-workspace-aixm/src/main/resources/services/metadata.xml
index 6d3d9e22c0..c8d3b824b0 100644
--- a/deegree-workspaces/deegree-workspace-aixm/src/main/resources/services/metadata.xml
+++ b/deegree-workspaces/deegree-workspace-aixm/src/main/resources/services/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deegreeServicesMetadata xmlns="http://www.deegree.org/services/metadata"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/metadata http://schemas.deegree.org/3.5/services/metadata/metadata.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/metadata http://schemas.deegree.org/core/3.5/services/metadata/metadata.xsd">
   <!-- General service information for all services. Used in the GetCapabilities responses. -->
   <ServiceIdentification>
     <Title>deegree 3 AIXM Service</Title>
diff --git a/deegree-workspaces/deegree-workspace-aixm/src/main/resources/services/wfs.xml b/deegree-workspaces/deegree-workspace-aixm/src/main/resources/services/wfs.xml
index a5d7f77657..18d34b7d18 100644
--- a/deegree-workspaces/deegree-workspace-aixm/src/main/resources/services/wfs.xml
+++ b/deegree-workspaces/deegree-workspace-aixm/src/main/resources/services/wfs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deegreeWFS xmlns="http://www.deegree.org/services/wfs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/services/wfs http://schemas.deegree.org/3.5/wfs/wfs_configuration.xsd">
+  xsi:schemaLocation="http://www.deegree.org/services/wfs http://schemas.deegree.org/core/3.5/wfs/wfs_configuration.xsd">
   <EnableTransactions>true</EnableTransactions>
   <QueryCRS>urn:ogc:def:crs:EPSG:4326</QueryCRS>
 </deegreeWFS>
diff --git a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/coverage/terrain.xml b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/coverage/terrain.xml
index 55f92de186..f112523f2a 100644
--- a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/coverage/terrain.xml
+++ b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/coverage/terrain.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Raster xmlns="http://www.deegree.org/datasource/coverage/raster"
         originLocation="outer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://www.deegree.org/datasource/coverage/raster http://schemas.deegree.org/3.5/datasource/coverage/raster/raster.xsd">
+        xsi:schemaLocation="http://www.deegree.org/datasource/coverage/raster http://schemas.deegree.org/core/3.5/datasource/coverage/raster/raster.xsd">
   <StorageCRS>EPSG:4326</StorageCRS>
   <RasterFile>../../data/cite/terrain.tif</RasterFile>
 </Raster>
diff --git a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/coverage/utah_dop.xml b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/coverage/utah_dop.xml
index e4321291f9..c701356ef5 100644
--- a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/coverage/utah_dop.xml
+++ b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/coverage/utah_dop.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MultiResolutionRaster xmlns="http://www.deegree.org/datasource/coverage/raster"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/coverage/raster http://schemas.deegree.org/3.5/datasource/coverage/raster/raster.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/coverage/raster http://schemas.deegree.org/core/3.5/datasource/coverage/raster/raster.xsd">
   <StorageCRS>EPSG:26912</StorageCRS>
   <Resolution res="16.0">
     <RasterDirectory recursive="true">../../data/utah/raster/dop/16.0</RasterDirectory>
diff --git a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/autos.xml b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/autos.xml
index 38be47bcd1..dae30dd7aa 100644
--- a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/autos.xml
+++ b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/autos.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
   <FeatureTypeNamespace>http://www.deegree.org/app</FeatureTypeNamespace>
   <File>../../data/cite/Autos.shp</File>
 </ShapeFeatureStore>
diff --git a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/basicpolygons.xml b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/basicpolygons.xml
index ddfa0e70dc..efc7d6ad85 100644
--- a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/basicpolygons.xml
+++ b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/basicpolygons.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
   <FeatureTypeNamespace>http://www.deegree.org/app</FeatureTypeNamespace>
   <File>../../data/cite/BasicPolygons.shp</File>
 </ShapeFeatureStore>
diff --git a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/bridges.xml b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/bridges.xml
index e29ff656a6..ca7e0587e3 100644
--- a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/bridges.xml
+++ b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/bridges.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
   <FeatureTypeNamespace>http://www.deegree.org/app</FeatureTypeNamespace>
   <File>../../data/cite/Bridges.shp</File>
 </ShapeFeatureStore>
diff --git a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/buildingcenters.xml b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/buildingcenters.xml
index ddb15ad6bf..d0c013cc7e 100644
--- a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/buildingcenters.xml
+++ b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/buildingcenters.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
   <FeatureTypeNamespace>http://www.deegree.org/app</FeatureTypeNamespace>
   <File>../../data/cite/BuildingCenters.shp</File>
 </ShapeFeatureStore>
diff --git a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/buildings.xml b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/buildings.xml
index 66bb431df4..89f7feccd0 100644
--- a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/buildings.xml
+++ b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/buildings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
   <FeatureTypeNamespace>http://www.deegree.org/app</FeatureTypeNamespace>
   <File>../../data/cite/Buildings.shp</File>
 </ShapeFeatureStore>
diff --git a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/cite100.xml b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/cite100.xml
index 2d4fb8527e..53f40be768 100644
--- a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/cite100.xml
+++ b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/cite100.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MemoryFeatureStore xmlns="http://www.deegree.org/datasource/feature/memory"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/feature/memory http://schemas.deegree.org/3.5/datasource/feature/memory/memory.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/feature/memory http://schemas.deegree.org/core/3.5/datasource/feature/memory/memory.xsd">
   <NamespaceHint prefix="cgf" namespaceURI="http://www.opengis.net/cite/geometry"></NamespaceHint>
   <NamespaceHint prefix="ccf" namespaceURI="http://www.opengis.net/cite/complex"></NamespaceHint>
   <NamespaceHint prefix="cdf" namespaceURI="http://www.opengis.net/cite/data"></NamespaceHint>
diff --git a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/cite110.xml b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/cite110.xml
index 16e21a0e24..9b91891d88 100644
--- a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/cite110.xml
+++ b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/cite110.xml
@@ -1,4 +1,4 @@
-<MemoryFeatureStore xmlns="http://www.deegree.org/datasource/feature/memory" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/memory http://schemas.deegree.org/3.5/datasource/feature/memory/memory.xsd">
+<MemoryFeatureStore xmlns="http://www.deegree.org/datasource/feature/memory" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/memory http://schemas.deegree.org/core/3.5/datasource/feature/memory/memory.xsd">
   <NamespaceHint prefix="sf" namespaceURI="http://cite.opengeospatial.org/gmlsf"/>
   <GMLSchema version="GML_31">../../appschemas/cite-gmlsf2.xsd</GMLSchema>
   <GMLFeatureCollection version="GML_31">gml/dataset-sf0-2.gml</GMLFeatureCollection>
diff --git a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/dividedroutes.xml b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/dividedroutes.xml
index fbaeef1ed1..54b740ec32 100644
--- a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/dividedroutes.xml
+++ b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/dividedroutes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
   <FeatureTypeNamespace>http://www.deegree.org/app</FeatureTypeNamespace>
   <File>../../data/cite/DividedRoutes.shp</File>
 </ShapeFeatureStore>
diff --git a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/forests.xml b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/forests.xml
index 3525d9e5ae..1f5fc2d18e 100644
--- a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/forests.xml
+++ b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/forests.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
   <FeatureTypeNamespace>http://www.deegree.org/app</FeatureTypeNamespace>
   <File>../../data/cite/Forests.shp</File>
 </ShapeFeatureStore>
diff --git a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/lakes.xml b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/lakes.xml
index 89c885f9f7..13fa01a039 100644
--- a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/lakes.xml
+++ b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/lakes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
   <FeatureTypeNamespace>http://www.deegree.org/app</FeatureTypeNamespace>
   <File>../../data/cite/Lakes.shp</File>
 </ShapeFeatureStore>
diff --git a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/mapneatline.xml b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/mapneatline.xml
index 255f634686..73378e2876 100644
--- a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/mapneatline.xml
+++ b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/mapneatline.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
   <FeatureTypeNamespace>http://www.deegree.org/app</FeatureTypeNamespace>
   <File>../../data/cite/MapNeatline.shp</File>
 </ShapeFeatureStore>
diff --git a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/namedplaces.xml b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/namedplaces.xml
index f58ad8ca72..11a0b49b9f 100644
--- a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/namedplaces.xml
+++ b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/namedplaces.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
   <FeatureTypeNamespace>http://www.deegree.org/app</FeatureTypeNamespace>
   <File>../../data/cite/NamedPlaces.shp</File>
 </ShapeFeatureStore>
diff --git a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/ponds.xml b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/ponds.xml
index 200c3cf2b4..b8aa7225f6 100644
--- a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/ponds.xml
+++ b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/ponds.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
   <FeatureTypeNamespace>http://www.deegree.org/app</FeatureTypeNamespace>
   <File>../../data/cite/Ponds.shp</File>
 </ShapeFeatureStore>
diff --git a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/roadsegments.xml b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/roadsegments.xml
index e2ff4868ad..2cecc05a65 100644
--- a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/roadsegments.xml
+++ b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/roadsegments.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
   <FeatureTypeNamespace>http://www.deegree.org/app</FeatureTypeNamespace>
   <File>../../data/cite/RoadSegments.shp</File>
 </ShapeFeatureStore>
diff --git a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/streams.xml b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/streams.xml
index 322095d93f..90d2187875 100644
--- a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/streams.xml
+++ b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/feature/streams.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
   <FeatureTypeNamespace>http://www.deegree.org/app</FeatureTypeNamespace>
   <File>../../data/cite/Streams.shp</File>
 </ShapeFeatureStore>
diff --git a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/remoteows/deegree-cite.xml b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/remoteows/deegree-cite.xml
index 760caf5770..13df2c9fb7 100644
--- a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/remoteows/deegree-cite.xml
+++ b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/remoteows/deegree-cite.xml
@@ -1,3 +1,3 @@
-<RemoteWMS xmlns="http://www.deegree.org/remoteows/wms" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/remoteows/wms http://schemas.deegree.org/3.5/remoteows/wms/remotewms.xsd">
+<RemoteWMS xmlns="http://www.deegree.org/remoteows/wms" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/remoteows/wms http://schemas.deegree.org/core/3.5/remoteows/wms/remotewms.xsd">
   <CapabilitiesDocumentLocation location="http://cite.deegree.org/deegree-webservices-3.4.0/services/wms111?request=GetCapabilities&amp;service=WMS&amp;version=1.1.1"/>
 </RemoteWMS>
\ No newline at end of file
diff --git a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/tile/deegree-cite-tiles.xml b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/tile/deegree-cite-tiles.xml
index dd9ed8d5c2..4d96539320 100644
--- a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/tile/deegree-cite-tiles.xml
+++ b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/tile/deegree-cite-tiles.xml
@@ -1,4 +1,4 @@
-<RemoteWMSTileStore xmlns="http://www.deegree.org/datasource/tile/remotewms" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/tile/remotewms http://schemas.deegree.org/3.5/datasource/tile/remotewms/remotewms.xsd">
+<RemoteWMSTileStore xmlns="http://www.deegree.org/datasource/tile/remotewms" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/tile/remotewms http://schemas.deegree.org/core/3.5/datasource/tile/remotewms/remotewms.xsd">
 
   <!-- [1]: Id of the remote WMS to connect to -->
   <RemoteWMSId>deegree-cite</RemoteWMSId>
diff --git a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/tile/tilematrixset/InspireCrs84Quad.xml b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/tile/tilematrixset/InspireCrs84Quad.xml
index 0613d7fadf..0eb5b11dfa 100644
--- a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/tile/tilematrixset/InspireCrs84Quad.xml
+++ b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/datasources/tile/tilematrixset/InspireCrs84Quad.xml
@@ -1,5 +1,5 @@
 <TileMatrixSet xmlns="http://www.deegree.org/datasource/tile/tilematrixset" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/tile/tilematrixset http://schemas.deegree.org/3.5/datasource/tile/tilematrixset/tilematrixset.xsd"
+  xsi:schemaLocation="http://www.deegree.org/datasource/tile/tilematrixset http://schemas.deegree.org/core/3.5/datasource/tile/tilematrixset/tilematrixset.xsd"
  >
 
   <CRS>urn:ogc:def:crs:OGC:1.3:CRS84</CRS>
diff --git a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/layers/deegree-cite-tilelayers.xml b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/layers/deegree-cite-tilelayers.xml
index 6aed97421f..a76b57c117 100644
--- a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/layers/deegree-cite-tilelayers.xml
+++ b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/layers/deegree-cite-tilelayers.xml
@@ -1,4 +1,4 @@
-<TileLayers xmlns="http://www.deegree.org/layers/tile" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/tile http://schemas.deegree.org/3.5/layers/tile/tile.xsd">
+<TileLayers xmlns="http://www.deegree.org/layers/tile" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/tile http://schemas.deegree.org/core/3.5/layers/tile/tile.xsd">
   <TileLayer>
     <l:Name>cite</l:Name>
     <d:Title>cite</d:Title>
diff --git a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/services/metadata.xml b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/services/metadata.xml
index 54f518e980..3cbbe8e6ca 100644
--- a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/services/metadata.xml
+++ b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/services/metadata.xml
@@ -1,4 +1,4 @@
-<deegreeServicesMetadata xmlns="http://www.deegree.org/services/metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/metadata http://schemas.deegree.org/3.5/services/metadata/metadata.xsd">
+<deegreeServicesMetadata xmlns="http://www.deegree.org/services/metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/metadata http://schemas.deegree.org/core/3.5/services/metadata/metadata.xsd">
   <!--
     General service information for all services. Used in the GetCapabilities
     responses.
diff --git a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/services/wcs.xml b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/services/wcs.xml
index fbaa2828ce..2661c50c31 100644
--- a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/services/wcs.xml
+++ b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/services/wcs.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deegreeWCS xmlns="http://www.deegree.org/services/wcs" xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="http://www.deegree.org/webservices"
-  xsi:schemaLocation="http://www.deegree.org/services/wcs http://schemas.deegree.org/3.5/services/wcs/wcs_configuration.xsd">
+  xsi:schemaLocation="http://www.deegree.org/services/wcs http://schemas.deegree.org/core/3.5/services/wcs/wcs_configuration.xsd">
   <ServiceConfiguration>
     <SupportOptions>
       <OutputFormat>tiff</OutputFormat>
diff --git a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/services/wfs100.xml b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/services/wfs100.xml
index b555e06cf2..d732a93be5 100644
--- a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/services/wfs100.xml
+++ b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/services/wfs100.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deegreeWFS xmlns="http://www.deegree.org/services/wfs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/services/wfs http://schemas.deegree.org/3.5/wfs/wfs_configuration.xsd">
+  xsi:schemaLocation="http://www.deegree.org/services/wfs http://schemas.deegree.org/core/3.5/wfs/wfs_configuration.xsd">
   <SupportedVersions>
     <Version>1.0.0</Version>
   </SupportedVersions>
diff --git a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/services/wfs110.xml b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/services/wfs110.xml
index f281f336d7..40453fdc40 100644
--- a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/services/wfs110.xml
+++ b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/services/wfs110.xml
@@ -1,4 +1,4 @@
-<deegreeWFS xmlns="http://www.deegree.org/services/wfs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/wfs http://schemas.deegree.org/3.5/services/wfs/wfs_configuration.xsd">
+<deegreeWFS xmlns="http://www.deegree.org/services/wfs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/wfs http://schemas.deegree.org/core/3.5/services/wfs/wfs_configuration.xsd">
   <SupportedVersions>
     <Version>1.1.0</Version>
   </SupportedVersions>
diff --git a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/services/wfs200.xml b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/services/wfs200.xml
index ba4febfec4..3930831a41 100644
--- a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/services/wfs200.xml
+++ b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/services/wfs200.xml
@@ -1,6 +1,6 @@
 <deegreeWFS xmlns="http://www.deegree.org/services/wfs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 
-  xsi:schemaLocation="http://www.deegree.org/services/wfs http://schemas.deegree.org/3.5/services/wfs/wfs_configuration.xsd">
+  xsi:schemaLocation="http://www.deegree.org/services/wfs http://schemas.deegree.org/core/3.5/services/wfs/wfs_configuration.xsd">
   <SupportedVersions>
     <Version>2.0.0</Version>
   </SupportedVersions>
diff --git a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/services/wms.xml b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/services/wms.xml
index dfc0d26bc2..d44fe20544 100644
--- a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/services/wms.xml
+++ b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/services/wms.xml
@@ -1,4 +1,4 @@
-<wms:deegreeWMS xmlns:wms="http://www.deegree.org/services/wms" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dgws="http://www.deegree.org/webservices" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/wms http://schemas.deegree.org/3.5/wms/wms_configuration.xsd">
+<wms:deegreeWMS xmlns:wms="http://www.deegree.org/services/wms" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dgws="http://www.deegree.org/webservices" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/wms http://schemas.deegree.org/core/3.5/wms/wms_configuration.xsd">
 
   <wms:ServiceConfiguration>
     <wms:ThemeId>theme</wms:ThemeId>
diff --git a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/themes/wmts-theme.xml b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/themes/wmts-theme.xml
index 613d03bb5b..eec1535138 100644
--- a/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/themes/wmts-theme.xml
+++ b/deegree-workspaces/deegree-workspace-compliance-tests/src/main/resources/themes/wmts-theme.xml
@@ -1,4 +1,4 @@
-<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/themes/standard http://schemas.deegree.org/3.5/themes/themes.xsd">
+<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/themes/standard http://schemas.deegree.org/core/3.5/themes/themes.xsd">
 
   <LayerStoreId>deegree-cite-tilelayers</LayerStoreId>
 
diff --git a/deegree-workspaces/deegree-workspace-csw-memory-tests/src/main/resources/crs/config/crs-definitions.xml b/deegree-workspaces/deegree-workspace-csw-memory-tests/src/main/resources/crs/config/crs-definitions.xml
index 0b65c1db3f..f5735304ac 100644
--- a/deegree-workspaces/deegree-workspace-csw-memory-tests/src/main/resources/crs/config/crs-definitions.xml
+++ b/deegree-workspaces/deegree-workspace-csw-memory-tests/src/main/resources/crs/config/crs-definitions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<crs:CRSDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/crsdefinition.xsd">
+<crs:CRSDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/crsdefinition.xsd">
         <crs:GeographicCRS>
                 <crs:Id>epsg:4326</crs:Id>
                 <crs:Id>urn:ogc:def:crs:EPSG:7.4:4326</crs:Id>
diff --git a/deegree-workspaces/deegree-workspace-csw-memory-tests/src/main/resources/crs/config/datum-definitions.xml b/deegree-workspaces/deegree-workspace-csw-memory-tests/src/main/resources/crs/config/datum-definitions.xml
index 0d2685cb3b..613db272fe 100644
--- a/deegree-workspaces/deegree-workspace-csw-memory-tests/src/main/resources/crs/config/datum-definitions.xml
+++ b/deegree-workspaces/deegree-workspace-csw-memory-tests/src/main/resources/crs/config/datum-definitions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<crs:DatumDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/crsdefinition.xsd">
+<crs:DatumDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/crsdefinition.xsd">
     <crs:GeodeticDatum>
       <crs:Id>epsg:6326</crs:Id>
       <crs:Id>urn:ogc:def:crs:epsg::6326</crs:Id>
diff --git a/deegree-workspaces/deegree-workspace-csw-memory-tests/src/main/resources/crs/config/ellipsoid-definitions.xml b/deegree-workspaces/deegree-workspace-csw-memory-tests/src/main/resources/crs/config/ellipsoid-definitions.xml
index 6689a706d5..052e3099e0 100644
--- a/deegree-workspaces/deegree-workspace-csw-memory-tests/src/main/resources/crs/config/ellipsoid-definitions.xml
+++ b/deegree-workspaces/deegree-workspace-csw-memory-tests/src/main/resources/crs/config/ellipsoid-definitions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<crs:EllipsoidDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/crsdefinition.xsd">
+<crs:EllipsoidDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/crsdefinition.xsd">
     <crs:Ellipsoid>
       <crs:Id>epsg:7030</crs:Id>
       <crs:Name>WGS84_Ellipsoid</crs:Name>
diff --git a/deegree-workspaces/deegree-workspace-csw-memory-tests/src/main/resources/crs/config/parser-files.xml b/deegree-workspaces/deegree-workspace-csw-memory-tests/src/main/resources/crs/config/parser-files.xml
index 984678a3b6..1364cc7fb9 100644
--- a/deegree-workspaces/deegree-workspace-csw-memory-tests/src/main/resources/crs/config/parser-files.xml
+++ b/deegree-workspaces/deegree-workspace-csw-memory-tests/src/main/resources/crs/config/parser-files.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <crs:CRSConfiguration xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/crsdefinition.xsd">
+  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/crsdefinition.xsd">
   <crs:ProjectionsFile>projection-definitions.xml</crs:ProjectionsFile>
   <crs:TransformationsFile>transformation-definitions.xml</crs:TransformationsFile>
   <crs:PrimeMeridiansFile>pm-definitions.xml</crs:PrimeMeridiansFile>
diff --git a/deegree-workspaces/deegree-workspace-csw-memory-tests/src/main/resources/crs/config/pm-definitions.xml b/deegree-workspaces/deegree-workspace-csw-memory-tests/src/main/resources/crs/config/pm-definitions.xml
index 1bb360ba3a..3a5375a1a8 100644
--- a/deegree-workspaces/deegree-workspace-csw-memory-tests/src/main/resources/crs/config/pm-definitions.xml
+++ b/deegree-workspaces/deegree-workspace-csw-memory-tests/src/main/resources/crs/config/pm-definitions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<crs:PMDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/crsdefinition.xsd">
+<crs:PMDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/crsdefinition.xsd">
     <crs:PrimeMeridian>
       <crs:Id>urn:opengis:def:crs:epsg::8901</crs:Id>
       <crs:Id>epsg:8901</crs:Id>
diff --git a/deegree-workspaces/deegree-workspace-csw-memory-tests/src/main/resources/crs/config/projection-definitions.xml b/deegree-workspaces/deegree-workspace-csw-memory-tests/src/main/resources/crs/config/projection-definitions.xml
index 77c4747e78..e0c08edc8a 100644
--- a/deegree-workspaces/deegree-workspace-csw-memory-tests/src/main/resources/crs/config/projection-definitions.xml
+++ b/deegree-workspaces/deegree-workspace-csw-memory-tests/src/main/resources/crs/config/projection-definitions.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
-<crs:ProjectionDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/crsdefinition.xsd">
+<crs:ProjectionDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/crsdefinition.xsd">
 	
 </crs:ProjectionDefinitions>
diff --git a/deegree-workspaces/deegree-workspace-csw-memory-tests/src/main/resources/crs/config/transformation-definitions.xml b/deegree-workspaces/deegree-workspace-csw-memory-tests/src/main/resources/crs/config/transformation-definitions.xml
index a5a017dbcf..19780d27ab 100644
--- a/deegree-workspaces/deegree-workspace-csw-memory-tests/src/main/resources/crs/config/transformation-definitions.xml
+++ b/deegree-workspaces/deegree-workspace-csw-memory-tests/src/main/resources/crs/config/transformation-definitions.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
-<crs:TransformationDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/crsdefinition.xsd">
+<crs:TransformationDefinitions xmlns:crs="http://www.deegree.org/crs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/crsdefinition.xsd">
   
 </crs:TransformationDefinitions>
diff --git a/deegree-workspaces/deegree-workspace-csw-memory-tests/src/main/resources/crs/csw-bkg.xml b/deegree-workspaces/deegree-workspace-csw-memory-tests/src/main/resources/crs/csw-bkg.xml
index 94eb115547..407aaa91cf 100644
--- a/deegree-workspaces/deegree-workspace-csw-memory-tests/src/main/resources/crs/csw-bkg.xml
+++ b/deegree-workspaces/deegree-workspace-csw-memory-tests/src/main/resources/crs/csw-bkg.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <DeegreeCRSStore xmlns="http://www.deegree.org/crs/stores/deegree" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/3.5/crs/stores/deegree/deegree.xsd">
+  xsi:schemaLocation="http://www.deegree.org/crs http://schemas.deegree.org/core/3.5/crs/stores/deegree/deegree.xsd">
   <!-- [1] -->
   <File>config/parser-files.xml</File>
 </DeegreeCRSStore>
diff --git a/deegree-workspaces/deegree-workspace-csw-memory-tests/src/main/resources/services/csw.xml b/deegree-workspaces/deegree-workspace-csw-memory-tests/src/main/resources/services/csw.xml
index ddd0fbbeb1..5bbaae9761 100644
--- a/deegree-workspaces/deegree-workspace-csw-memory-tests/src/main/resources/services/csw.xml
+++ b/deegree-workspaces/deegree-workspace-csw-memory-tests/src/main/resources/services/csw.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deegreeCSW xmlns="http://www.deegree.org/services/csw" xmlns:xlink="http://www.w3.org/1999/xlink"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/csw http://schemas.deegree.org/3.5/csw/csw_configuration.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/csw http://schemas.deegree.org/core/3.5/csw/csw_configuration.xsd">
   <EnableTransactions>true</EnableTransactions>
   <EnableInspireExtensions></EnableInspireExtensions>
 </deegreeCSW>
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/resources/datasources/metadata/iso19115.xml b/deegree-workspaces/deegree-workspace-csw/src/main/resources/datasources/metadata/iso19115.xml
index e6b0230775..34e3e4dbf2 100644
--- a/deegree-workspaces/deegree-workspace-csw/src/main/resources/datasources/metadata/iso19115.xml
+++ b/deegree-workspaces/deegree-workspace-csw/src/main/resources/datasources/metadata/iso19115.xml
@@ -2,7 +2,7 @@
 <ISOMetadataStore
 	xmlns="http://www.deegree.org/datasource/metadata/iso19115"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.deegree.org/datasource/metadata/iso19115 http://schemas.deegree.org/3.5/datasource/metadata/iso19115/iso19115.xsd">
+	xsi:schemaLocation="http://www.deegree.org/datasource/metadata/iso19115 http://schemas.deegree.org/core/3.5/datasource/metadata/iso19115/iso19115.xsd">
 
   <!-- [1] Identifier of JDBC connection -->
   <JDBCConnId>conn1</JDBCConnId>
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/resources/jdbc/conn1.xml b/deegree-workspaces/deegree-workspace-csw/src/main/resources/jdbc/conn1.xml
index 78edf498d6..9f3f13d824 100644
--- a/deegree-workspaces/deegree-workspace-csw/src/main/resources/jdbc/conn1.xml
+++ b/deegree-workspaces/deegree-workspace-csw/src/main/resources/jdbc/conn1.xml
@@ -1,4 +1,4 @@
-<JDBCConnection xmlns="http://www.deegree.org/jdbc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/jdbc http://schemas.deegree.org/3.5/jdbc/jdbc.xsd">
+<JDBCConnection xmlns="http://www.deegree.org/jdbc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/jdbc http://schemas.deegree.org/core/3.5/jdbc/jdbc.xsd">
   <Url>jdbc:postgresql://database:5432/cite</Url>
   <User>cite</User>
   <Password>cite</Password>
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/resources/services/csw.xml b/deegree-workspaces/deegree-workspace-csw/src/main/resources/services/csw.xml
index d2c9a84678..ef060828c7 100644
--- a/deegree-workspaces/deegree-workspace-csw/src/main/resources/services/csw.xml
+++ b/deegree-workspaces/deegree-workspace-csw/src/main/resources/services/csw.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deegreeCSW xmlns="http://www.deegree.org/services/csw" xmlns:xlink="http://www.w3.org/1999/xlink"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/csw http://schemas.deegree.org/3.5/services/csw/csw_configuration.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/csw http://schemas.deegree.org/core/3.5/services/csw/csw_configuration.xsd">
   <EnableTransactions>true</EnableTransactions>
   <EnableInspireExtensions/>
 </deegreeCSW>
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/resources/services/main.xml b/deegree-workspaces/deegree-workspace-csw/src/main/resources/services/main.xml
index 8d2ec0183d..db13f9eba1 100644
--- a/deegree-workspaces/deegree-workspace-csw/src/main/resources/services/main.xml
+++ b/deegree-workspaces/deegree-workspace-csw/src/main/resources/services/main.xml
@@ -1,5 +1,5 @@
 <deegreeServiceController xmlns="http://www.deegree.org/services/controller"
-  xsi:schemaLocation="http://www.deegree.org/services/controller http://schemas.deegree.org/3.5/services/controller/controller.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  xsi:schemaLocation="http://www.deegree.org/services/controller http://schemas.deegree.org/core/3.5/services/controller/controller.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <!--   <DCP>-->
   <!--
     Only provide the URLs below, if you need to hard-wire the URLs returned in GetCapabilities responses (e.g. for
diff --git a/deegree-workspaces/deegree-workspace-csw/src/main/resources/services/metadata.xml b/deegree-workspaces/deegree-workspace-csw/src/main/resources/services/metadata.xml
index 245adc9c9b..37793a9fd7 100644
--- a/deegree-workspaces/deegree-workspace-csw/src/main/resources/services/metadata.xml
+++ b/deegree-workspaces/deegree-workspace-csw/src/main/resources/services/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deegreeServicesMetadata xmlns="http://www.deegree.org/services/metadata"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/metadata http://schemas.deegree.org/3.5/services/metadata/metadata.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/metadata http://schemas.deegree.org/core/3.5/services/metadata/metadata.xsd">
   <!--
     General service information for all services. Used in the GetCapabilities
     responses.
diff --git a/deegree-workspaces/deegree-workspace-fme/src/main/resources/processes/fmeServer.xml b/deegree-workspaces/deegree-workspace-fme/src/main/resources/processes/fmeServer.xml
index f7e2d58c7d..fdd6a3a933 100755
--- a/deegree-workspaces/deegree-workspace-fme/src/main/resources/processes/fmeServer.xml
+++ b/deegree-workspaces/deegree-workspace-fme/src/main/resources/processes/fmeServer.xml
@@ -1,5 +1,5 @@
 <FMEServer xmlns="http://www.deegree.org/processes/fme" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://www.deegree.org/processes/fme http://schemas.deegree.org/3.5/processes/fme/fme.xsd">
+           xsi:schemaLocation="http://www.deegree.org/processes/fme http://schemas.deegree.org/core/3.5/processes/fme/fme.xsd">
   <Address>http://fmeserver.example.com/</Address>
   <Username>guest</Username>
   <Password>guest</Password>
diff --git a/deegree-workspaces/deegree-workspace-fme/src/main/resources/services/wps.xml b/deegree-workspaces/deegree-workspace-fme/src/main/resources/services/wps.xml
index 3ec67417a9..ea46dfffaf 100644
--- a/deegree-workspaces/deegree-workspace-fme/src/main/resources/services/wps.xml
+++ b/deegree-workspaces/deegree-workspace-fme/src/main/resources/services/wps.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deegreeWPS xmlns="http://www.deegree.org/services/wps"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://www.deegree.org/services/wps http://schemas.deegree.org/3.5/services/wps/wps_configuration.xsd">
+            xsi:schemaLocation="http://www.deegree.org/services/wps http://schemas.deegree.org/core/3.5/services/wps/wps_configuration.xsd">
 
   <SupportedVersions>
     <Version>1.0.0</Version>
diff --git a/deegree-workspaces/deegree-workspace-geosciml/src/main/resources/datasources/feature/geosciml.xml b/deegree-workspaces/deegree-workspace-geosciml/src/main/resources/datasources/feature/geosciml.xml
index 7a372fdab1..d643e99178 100644
--- a/deegree-workspaces/deegree-workspace-geosciml/src/main/resources/datasources/feature/geosciml.xml
+++ b/deegree-workspaces/deegree-workspace-geosciml/src/main/resources/datasources/feature/geosciml.xml
@@ -1,4 +1,4 @@
-<MemoryFeatureStore xmlns="http://www.deegree.org/datasource/feature/memory" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/memory http://schemas.deegree.org/3.5/datasource/feature/memory/memory.xsd">
+<MemoryFeatureStore xmlns="http://www.deegree.org/datasource/feature/memory" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/memory http://schemas.deegree.org/core/3.5/datasource/feature/memory/memory.xsd">
   <NamespaceHint prefix="cgu" namespaceURI="urn:cgi:xmlns:CGI:Utilities:1.0"/>
   <NamespaceHint prefix="gsml" namespaceURI="urn:cgi:xmlns:CGI:GeoSciML:2.0"/>
   <NamespaceHint prefix="om" namespaceURI="http://www.opengis.net/om/1.0"/>
diff --git a/deegree-workspaces/deegree-workspace-geosciml/src/main/resources/services/metadata.xml b/deegree-workspaces/deegree-workspace-geosciml/src/main/resources/services/metadata.xml
index e1f5bb0c31..581bb82e70 100644
--- a/deegree-workspaces/deegree-workspace-geosciml/src/main/resources/services/metadata.xml
+++ b/deegree-workspaces/deegree-workspace-geosciml/src/main/resources/services/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deegreeServicesMetadata
   xmlns="http://www.deegree.org/services/metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/services/metadata http://schemas.deegree.org/3.5/services/metadata/metadata.xsd">
+  xsi:schemaLocation="http://www.deegree.org/services/metadata http://schemas.deegree.org/core/3.5/services/metadata/metadata.xsd">
   <!--
     General service information for all services. Used in the GetCapabilities
     responses.
diff --git a/deegree-workspaces/deegree-workspace-geosciml/src/main/resources/services/wfs.xml b/deegree-workspaces/deegree-workspace-geosciml/src/main/resources/services/wfs.xml
index 795b753f72..c0d7b2a201 100644
--- a/deegree-workspaces/deegree-workspace-geosciml/src/main/resources/services/wfs.xml
+++ b/deegree-workspaces/deegree-workspace-geosciml/src/main/resources/services/wfs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deegreeWFS xmlns="http://www.deegree.org/services/wfs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/services/wfs http://schemas.deegree.org/3.5/services/wfs/wfs_configuration.xsd">
+  xsi:schemaLocation="http://www.deegree.org/services/wfs http://schemas.deegree.org/core/3.5/services/wfs/wfs_configuration.xsd">
   <SupportedVersions>
     <Version>1.1.0</Version>
   </SupportedVersions>
diff --git a/deegree-workspaces/deegree-workspace-geosciml/src/main/resources/styles/MappedFeature.se b/deegree-workspaces/deegree-workspace-geosciml/src/main/resources/styles/MappedFeature.se
index 8f8c1bfcf6..2b263fb8b1 100644
--- a/deegree-workspaces/deegree-workspace-geosciml/src/main/resources/styles/MappedFeature.se
+++ b/deegree-workspaces/deegree-workspace-geosciml/src/main/resources/styles/MappedFeature.se
@@ -2,7 +2,7 @@
 <FeatureTypeStyle xmlns="http://www.opengis.net/se" xmlns:gsml="urn:cgi:xmlns:CGI:GeoSciML:2.0"
   xmlns:app="http://www.deegree.org/app" xmlns:ogc="http://www.opengis.net/ogc" xmlns:sed="http://www.deegree.org/se"
   xmlns:deegreeogc="http://www.deegree.org/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink"
-  xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/3.5/se/Symbolizer-deegree.xsd">
+  xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/core/3.5/se/Symbolizer-deegree.xsd">
   <Name>MappedFeature</Name>
   <FeatureTypeName>gsml:MappedFeature</FeatureTypeName>
   <Rule>
diff --git a/deegree-workspaces/deegree-workspace-geosciml/src/main/resources/styles/MappedFeatureLabel.se b/deegree-workspaces/deegree-workspace-geosciml/src/main/resources/styles/MappedFeatureLabel.se
index 70ecfed7b4..cb32b4fb85 100644
--- a/deegree-workspaces/deegree-workspace-geosciml/src/main/resources/styles/MappedFeatureLabel.se
+++ b/deegree-workspaces/deegree-workspace-geosciml/src/main/resources/styles/MappedFeatureLabel.se
@@ -2,7 +2,7 @@
 <FeatureTypeStyle xmlns="http://www.opengis.net/se" xmlns:gsml="urn:cgi:xmlns:CGI:GeoSciML:2.0"
   xmlns:app="http://www.deegree.org/app" xmlns:ogc="http://www.opengis.net/ogc" xmlns:sed="http://www.deegree.org/se"
   xmlns:deegreeogc="http://www.deegree.org/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink"
-  xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/3.5/se/Symbolizer-deegree.xsd">
+  xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/core/3.5/se/Symbolizer-deegree.xsd">
   <Name>MappedFeature</Name>
   <FeatureTypeName>gsml:MappedFeature</FeatureTypeName>
   <Rule>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/coverage/utah_dem.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/coverage/utah_dem.xml
index 037493df23..ad4cc4c6ae 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/coverage/utah_dem.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/coverage/utah_dem.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Raster xmlns="http://www.deegree.org/datasource/coverage/raster" originLocation="outer"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/coverage/raster http://schemas.deegree.org/3.5/datasource/coverage/raster/raster.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/coverage/raster http://schemas.deegree.org/core/3.5/datasource/coverage/raster/raster.xsd">
   <StorageCRS>EPSG:26912</StorageCRS>
   <!--
     DEPRECATED!!!
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/coverage/utah_dem30.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/coverage/utah_dem30.xml
index 6d8c8ce291..75e499bfbe 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/coverage/utah_dem30.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/coverage/utah_dem30.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Raster xmlns="http://www.deegree.org/datasource/coverage/raster" originLocation="outer"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/coverage/raster http://schemas.deegree.org/3.5/datasource/coverage/raster/raster.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/coverage/raster http://schemas.deegree.org/core/3.5/datasource/coverage/raster/raster.xsd">
   <StorageCRS>EPSG:26912</StorageCRS>
   <!--
     DEPRECATED!!!
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/coverage/utah_geotiff_dem30.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/coverage/utah_geotiff_dem30.xml
index 1a56a51e49..aa7ec0ab2f 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/coverage/utah_geotiff_dem30.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/coverage/utah_geotiff_dem30.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Pyramid xmlns="http://www.deegree.org/datasource/coverage/pyramid" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/coverage/pyramid http://schemas.deegree.org/3.5/datasource/coverage/raster/pyramid.xsd">
+<Pyramid xmlns="http://www.deegree.org/datasource/coverage/pyramid" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/coverage/pyramid http://schemas.deegree.org/core/3.5/datasource/coverage/raster/pyramid.xsd">
   <PyramidFile>../../data/utah/raster/dem/dem30_geotiff_tiled.tiff</PyramidFile>
 </Pyramid>
\ No newline at end of file
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/coverage/utah_geotiff_dem90.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/coverage/utah_geotiff_dem90.xml
index f8d7c79bab..fb687b86ac 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/coverage/utah_geotiff_dem90.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/coverage/utah_geotiff_dem90.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Pyramid xmlns="http://www.deegree.org/datasource/coverage/pyramid" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/coverage/pyramid http://schemas.deegree.org/3.5/datasource/coverage/raster/pyramid.xsd">
+<Pyramid xmlns="http://www.deegree.org/datasource/coverage/pyramid" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/coverage/pyramid http://schemas.deegree.org/core/3.5/datasource/coverage/raster/pyramid.xsd">
   <PyramidFile>../../data/utah/raster/dem/dem90_geotiff_tiled.tiff</PyramidFile>
 </Pyramid>
\ No newline at end of file
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/coverage/utah_geotiff_ortho.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/coverage/utah_geotiff_ortho.xml
index 89410b526b..684b1b4608 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/coverage/utah_geotiff_ortho.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/coverage/utah_geotiff_ortho.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Pyramid xmlns="http://www.deegree.org/datasource/coverage/pyramid" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/coverage/pyramid http://schemas.deegree.org/3.5/datasource/coverage/raster/pyramid.xsd">
+<Pyramid xmlns="http://www.deegree.org/datasource/coverage/pyramid" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/coverage/pyramid http://schemas.deegree.org/core/3.5/datasource/coverage/raster/pyramid.xsd">
   <PyramidFile>../../data/utah/raster/Satellite_Provo/Satellite_Provo.tif</PyramidFile>
 </Pyramid>
\ No newline at end of file
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_airports.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_airports.xml
index 840002d608..84ccc4893b 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_airports.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_airports.xml
@@ -1,6 +1,6 @@
 <ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-	xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+	xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
 	<!--
 		This is an example for a complete datasource configuration of
 		ShapeFeatureStores for deegree WMS.
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_cities.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_cities.xml
index 77b67c9020..cb1661b00d 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_cities.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_cities.xml
@@ -1,4 +1,4 @@
-<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
   <StorageCRS>EPSG:26912</StorageCRS>
   <File>../../data/utah/vector/SGID93_LOCATION_UDOTMap_CityLocations</File>
 </ShapeFeatureStore>
\ No newline at end of file
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_contours1000ft.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_contours1000ft.xml
index 0bdbdb0cb3..abb050d98d 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_contours1000ft.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_contours1000ft.xml
@@ -1,4 +1,4 @@
-<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
   <StorageCRS>EPSG:26912</StorageCRS>
   <File>../../data/utah/vector/SGID500_Contours1000Ft</File>
 </ShapeFeatureStore>
\ No newline at end of file
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_contours2500ft.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_contours2500ft.xml
index cd0fa54aa5..fb519df1ec 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_contours2500ft.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_contours2500ft.xml
@@ -1,4 +1,4 @@
-<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
   <StorageCRS>EPSG:26912</StorageCRS>
   <File>../../data/utah/vector/SGID500_Contours500Ft</File>
 </ShapeFeatureStore>
\ No newline at end of file
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_contours500ft.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_contours500ft.xml
index 47d8709fa3..dbf1eec9a2 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_contours500ft.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_contours500ft.xml
@@ -1,4 +1,4 @@
-<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
   <StorageCRS>EPSG:26912</StorageCRS>
   <File>../../data/utah/vector/SGID500_Contours2500Ft</File>
 </ShapeFeatureStore>
\ No newline at end of file
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_counties.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_counties.xml
index 7002393ee0..f712dc485d 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_counties.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_counties.xml
@@ -1,4 +1,4 @@
-<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
   <StorageCRS>EPSG:26912</StorageCRS>
   <File>../../data/utah/vector/SGID100_CountyBoundaries_edited</File>
 </ShapeFeatureStore>
\ No newline at end of file
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_dominantvegetation.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_dominantvegetation.xml
index 78952a1590..02987e09b8 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_dominantvegetation.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_dominantvegetation.xml
@@ -1,4 +1,4 @@
-<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
 
   <StorageCRS>EPSG:26912</StorageCRS>
   
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_energyresources.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_energyresources.xml
index e9e471780d..c384a2d614 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_energyresources.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_energyresources.xml
@@ -1,4 +1,4 @@
-<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
   <StorageCRS>EPSG:26912</StorageCRS>
   <File>../../data/utah/vector/SGID500_EnergyResourcesPoly</File>
 </ShapeFeatureStore>
\ No newline at end of file
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_groundwater.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_groundwater.xml
index 8e112d4789..e69185b9f7 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_groundwater.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_groundwater.xml
@@ -1,4 +1,4 @@
-<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
   <StorageCRS>EPSG:26912</StorageCRS>
   <File>../../data/utah/vector/SGID93_GEOSCIENCE_ShallowGroundWater</File>
 </ShapeFeatureStore>
\ No newline at end of file
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_lakes.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_lakes.xml
index 0989794217..db3b2ef83b 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_lakes.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_lakes.xml
@@ -1,4 +1,4 @@
-<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
   <StorageCRS>EPSG:26912</StorageCRS>
   <File>../../data/utah/vector/SGID100_LakesDLG100</File>
 </ShapeFeatureStore>
\ No newline at end of file
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_municipalities.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_municipalities.xml
index 83d9b9f70a..9f48dab781 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_municipalities.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_municipalities.xml
@@ -1,4 +1,4 @@
-<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
   <StorageCRS>EPSG:26912</StorageCRS>
   <File>../../data/utah/vector/SGID024_Municipalities2004_edited</File>
 </ShapeFeatureStore>
\ No newline at end of file
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_railroads.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_railroads.xml
index 101504160f..31131c436f 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_railroads.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_railroads.xml
@@ -1,4 +1,4 @@
-<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
   <StorageCRS>EPSG:26912</StorageCRS>
   <File>../../data/utah/vector/SGID100_RailroadsDLG100</File>
 </ShapeFeatureStore>
\ No newline at end of file
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_rivers.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_rivers.xml
index c88293fa20..dcea07d27d 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_rivers.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_rivers.xml
@@ -1,4 +1,4 @@
-<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
   <StorageCRS>EPSG:26912</StorageCRS>
   <File>../../data/utah/vector/SGID93_WATER_UtahMajorRivers</File>
 </ShapeFeatureStore>
\ No newline at end of file
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_roads.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_roads.xml
index f787a4c99a..628ecdb3b8 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_roads.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_roads.xml
@@ -1,4 +1,4 @@
-<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
   <StorageCRS>EPSG:26912</StorageCRS>
   <File>../../data/utah/vector/SGID100_RoadsDLG100</File>
 </ShapeFeatureStore>
\ No newline at end of file
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_springs.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_springs.xml
index 777a80d914..07dcfd7e05 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_springs.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_springs.xml
@@ -1,4 +1,4 @@
-<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
   <StorageCRS>EPSG:26912</StorageCRS>
   <File>../../data/utah/vector/SGID024_Springs</File>
 </ShapeFeatureStore>
\ No newline at end of file
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_stateboundary.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_stateboundary.xml
index 37baf8710c..b5975136c3 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_stateboundary.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_stateboundary.xml
@@ -2,7 +2,7 @@
   xmlns="http://www.deegree.org/datasource/feature/shape" 
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 
-  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
  
     <!--
     This is an example for a complete datasource configuration of
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_weather.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_weather.xml
index d8ccd6bcdd..822a240cff 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_weather.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_weather.xml
@@ -1,4 +1,4 @@
-<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
   <StorageCRS>EPSG:26912</StorageCRS>
   <File>../../data/utah/vector/weathertime</File>
 </ShapeFeatureStore>
\ No newline at end of file
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_zipcodes.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_zipcodes.xml
index ba49e3505f..0ec768d1ac 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_zipcodes.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/feature/utah_zipcodes.xml
@@ -1,4 +1,4 @@
-<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/3.5/datasource/feature/shape/shape.xsd">
+<ShapeFeatureStore xmlns="http://www.deegree.org/datasource/feature/shape" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/feature/shape http://schemas.deegree.org/core/3.5/datasource/feature/shape/shape.xsd">
   <StorageCRS>EPSG:26912</StorageCRS>
   <File>../../data/utah/vector/SGID500_ZipCodes</File>
 </ShapeFeatureStore>
\ No newline at end of file
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/remoteows/cascade_demo_deegree_wms.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/remoteows/cascade_demo_deegree_wms.xml
index 5f1eb3f176..952e18f176 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/remoteows/cascade_demo_deegree_wms.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/remoteows/cascade_demo_deegree_wms.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<RemoteWMS xmlns="http://www.deegree.org/remoteows/wms"  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/remoteows/wms http://schemas.deegree.org/3.5/remoteows/wms/remotewms.xsd">
+<RemoteWMS xmlns="http://www.deegree.org/remoteows/wms"  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/remoteows/wms http://schemas.deegree.org/core/3.5/remoteows/wms/remotewms.xsd">
   <CapabilitiesDocumentLocation location="https://deegree3-demo.deegree.org/utah-workspace/services?request=GetCapabilities&amp;service=WMS&amp;version=1.1.1" />
 </RemoteWMS>
  
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/remoteows/cascade_utah_geology_wms.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/remoteows/cascade_utah_geology_wms.xml
index 085b6ddeb0..3ea85cab06 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/remoteows/cascade_utah_geology_wms.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/remoteows/cascade_utah_geology_wms.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<RemoteWMS xmlns="http://www.deegree.org/remoteows/wms" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/remoteows/wms http://schemas.deegree.org/3.5/remoteows/wms/remotewms.xsd">
+<RemoteWMS xmlns="http://www.deegree.org/remoteows/wms" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/remoteows/wms http://schemas.deegree.org/core/3.5/remoteows/wms/remotewms.xsd">
   <CapabilitiesDocumentLocation location="https://mrdata.usgs.gov/services/sgmc2?service=WMS&amp;version=1.3.0&amp;request=GetCapabilities"/>
 </RemoteWMS>
\ No newline at end of file
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/tile/tilematrixset/tilematrixset_utah_ortho.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/tile/tilematrixset/tilematrixset_utah_ortho.xml
index a66ab78666..b0e815d059 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/tile/tilematrixset/tilematrixset_utah_ortho.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/tile/tilematrixset/tilematrixset_utah_ortho.xml
@@ -1,4 +1,4 @@
-<GeoTIFFTileMatrixSet xmlns="http://www.deegree.org/datasource/tile/tilematrixset/geotiff"  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/tile/tilematrixset/geotiff http://schemas.deegree.org/3.5/datasource/tile/tilematrixset/geotiff/geotiff.xsd">
+<GeoTIFFTileMatrixSet xmlns="http://www.deegree.org/datasource/tile/tilematrixset/geotiff"  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/tile/tilematrixset/geotiff http://schemas.deegree.org/core/3.5/datasource/tile/tilematrixset/geotiff/geotiff.xsd">
   <StorageCRS>EPSG:26912</StorageCRS>
   <File>../../../data/utah/raster/Satellite_Provo/Satellite_Provo.tif</File>
 </GeoTIFFTileMatrixSet>
\ No newline at end of file
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/tile/utah_ortho.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/tile/utah_ortho.xml
index e2d78495d2..8e7c66b292 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/tile/utah_ortho.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/datasources/tile/utah_ortho.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<GeoTIFFTileStore xmlns="http://www.deegree.org/datasource/tile/geotiff" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/tile/geotiff http://schemas.deegree.org/3.5/datasource/tile/geotiff/geotiff.xsd">
+<GeoTIFFTileStore xmlns="http://www.deegree.org/datasource/tile/geotiff" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/tile/geotiff http://schemas.deegree.org/core/3.5/datasource/tile/geotiff/geotiff.xsd">
 
  <TileDataSet>
     <Identifier>utah_ortho</Identifier>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_coverage_utah_dem30.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_coverage_utah_dem30.xml
index c7c4bd17be..e2f2e00ba9 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_coverage_utah_dem30.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_coverage_utah_dem30.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<CoverageLayers xmlns="http://www.deegree.org/layers/coverage" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/coverage http://schemas.deegree.org/3.5/layers/coverage/coverage.xsd">
+<CoverageLayers xmlns="http://www.deegree.org/layers/coverage" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/coverage http://schemas.deegree.org/core/3.5/layers/coverage/coverage.xsd">
   <CoverageStoreId>utah_geotiff_dem30</CoverageStoreId>
   <CoverageLayer>
     <l:Name>DEM30</l:Name>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_coverage_utah_dem90.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_coverage_utah_dem90.xml
index 6852b0768a..ac010edfd2 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_coverage_utah_dem90.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_coverage_utah_dem90.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<CoverageLayers xmlns="http://www.deegree.org/layers/coverage" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/coverage http://schemas.deegree.org/3.5/layers/coverage/coverage.xsd">
+<CoverageLayers xmlns="http://www.deegree.org/layers/coverage" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/coverage http://schemas.deegree.org/core/3.5/layers/coverage/coverage.xsd">
   <CoverageStoreId>utah_geotiff_dem90</CoverageStoreId>
   <CoverageLayer>
     <l:Name>DEM90</l:Name>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_coverage_utah_ortho.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_coverage_utah_ortho.xml
index d2d2b64046..a33e05bc40 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_coverage_utah_ortho.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_coverage_utah_ortho.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CoverageLayers xmlns="http://www.deegree.org/layers/coverage" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/layers/coverage http://schemas.deegree.org/3.5/layers/coverage/coverage.xsd">
+  xsi:schemaLocation="http://www.deegree.org/layers/coverage http://schemas.deegree.org/core/3.5/layers/coverage/coverage.xsd">
   <CoverageStoreId>utah_geotiff_ortho</CoverageStoreId>
   <CoverageLayer>
     <l:Name>orthophoto</l:Name>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_airports.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_airports.xml
index 8acf570fc2..c88091d83d 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_airports.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_airports.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/3.5/layers/feature/feature.xsd"
+<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/core/3.5/layers/feature/feature.xsd"
  >
   <FeatureStoreId>utah_airports</FeatureStoreId>
   <FeatureLayer>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_cities.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_cities.xml
index c456b8af02..c148951b76 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_cities.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_cities.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/3.5/layers/feature/feature.xsd"
+<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/core/3.5/layers/feature/feature.xsd"
  >
   <FeatureStoreId>utah_cities</FeatureStoreId>
   <FeatureLayer>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_contours1000ft.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_contours1000ft.xml
index 5c7dbd16e6..e9bbd66f35 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_contours1000ft.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_contours1000ft.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/3.5/layers/feature/feature.xsd">
+  xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/core/3.5/layers/feature/feature.xsd">
   
   <FeatureStoreId>utah_contours1000ft</FeatureStoreId>
   
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_contours2500ft.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_contours2500ft.xml
index 12850a1c08..03709315e2 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_contours2500ft.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_contours2500ft.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/3.5/layers/feature/feature.xsd">
+  xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/core/3.5/layers/feature/feature.xsd">
    
   <FeatureStoreId>utah_contours2500ft</FeatureStoreId>
   
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_contours500ft.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_contours500ft.xml
index 5db6a741de..702679277a 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_contours500ft.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_contours500ft.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/3.5/layers/feature/feature.xsd">
+  xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/core/3.5/layers/feature/feature.xsd">
   
   <FeatureStoreId>utah_contours500ft</FeatureStoreId>
   
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_counties.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_counties.xml
index 225dd83d74..78b4a14879 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_counties.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_counties.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/3.5/layers/feature/feature.xsd">
+  xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/core/3.5/layers/feature/feature.xsd">
   
   <FeatureStoreId>utah_counties</FeatureStoreId>
   
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_dominantvegetation.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_dominantvegetation.xml
index 803157f3f9..2f894c039e 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_dominantvegetation.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_dominantvegetation.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/3.5/layers/feature/feature.xsd"
+<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/core/3.5/layers/feature/feature.xsd"
  >
   <FeatureStoreId>utah_dominantvegetation</FeatureStoreId>
   <FeatureLayer>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_energyresources.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_energyresources.xml
index 8567c7f6c4..aa5d64f03e 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_energyresources.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_energyresources.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/3.5/layers/feature/feature.xsd"
+<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/core/3.5/layers/feature/feature.xsd"
  >
   <FeatureStoreId>utah_energyresources</FeatureStoreId>
   <FeatureLayer>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_groundwater.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_groundwater.xml
index cc32c15ecd..cf4fe0ea9f 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_groundwater.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_groundwater.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/3.5/layers/feature/feature.xsd"
+<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/core/3.5/layers/feature/feature.xsd"
  >
   <FeatureStoreId>utah_groundwater</FeatureStoreId>
   <FeatureLayer>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_lakes.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_lakes.xml
index 3000f9f4ad..eb23042b54 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_lakes.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_lakes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/3.5/layers/feature/feature.xsd"
+<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/core/3.5/layers/feature/feature.xsd"
  >
   <FeatureStoreId>utah_lakes</FeatureStoreId>
   <FeatureLayer>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_municipalities.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_municipalities.xml
index 8f6c06dc58..303564d2d5 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_municipalities.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_municipalities.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/3.5/layers/feature/feature.xsd"
+<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/core/3.5/layers/feature/feature.xsd"
  >
   <FeatureStoreId>utah_municipalities</FeatureStoreId>
   <FeatureLayer>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_railroads.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_railroads.xml
index 5e38989067..22e10af144 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_railroads.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_railroads.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/3.5/layers/feature/feature.xsd">
+  xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/core/3.5/layers/feature/feature.xsd">
   
   <FeatureStoreId>utah_railroads</FeatureStoreId>
   
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_rivers.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_rivers.xml
index 1f866a5bc0..d81f8d7513 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_rivers.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_rivers.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/3.5/layers/feature/feature.xsd"
+<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/core/3.5/layers/feature/feature.xsd"
  >
   <FeatureStoreId>utah_rivers</FeatureStoreId>
   <FeatureLayer>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_roads.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_roads.xml
index 394d24773c..a16acfaa44 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_roads.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_roads.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/3.5/layers/feature/feature.xsd">
+  xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/core/3.5/layers/feature/feature.xsd">
   
   <FeatureStoreId>utah_roads</FeatureStoreId>
   
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_springs.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_springs.xml
index f3e7071564..85423c8030 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_springs.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_springs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/3.5/layers/feature/feature.xsd"
+<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/core/3.5/layers/feature/feature.xsd"
  >
   <FeatureStoreId>utah_springs</FeatureStoreId>
   <FeatureLayer>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_stateboundary.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_stateboundary.xml
index e86670a594..ebb59ad031 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_stateboundary.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_stateboundary.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/3.5/layers/feature/feature.xsd"
+<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/core/3.5/layers/feature/feature.xsd"
  >
   <FeatureStoreId>utah_stateboundary</FeatureStoreId>
   <FeatureLayer>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_weatherstations.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_weatherstations.xml
index 8e4eaf3f48..f6a0a07023 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_weatherstations.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_weatherstations.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/3.5/layers/feature/feature.xsd"
+<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/core/3.5/layers/feature/feature.xsd"
  >
   <FeatureStoreId>utah_weather</FeatureStoreId>
   <FeatureLayer>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_zipcodes.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_zipcodes.xml
index 05071a6fdc..5fc9271a03 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_zipcodes.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_feature_utah_zipcodes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/3.5/layers/feature/feature.xsd"
+<FeatureLayers xmlns="http://www.deegree.org/layers/feature" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/feature http://schemas.deegree.org/core/3.5/layers/feature/feature.xsd"
  >
   <FeatureStoreId>utah_zipcodes</FeatureStoreId>
   <FeatureLayer>    
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_remotewms_utah_geology.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_remotewms_utah_geology.xml
index 68c202e692..058262c6ce 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_remotewms_utah_geology.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_remotewms_utah_geology.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<RemoteWMSLayers xmlns="http://www.deegree.org/layers/remotewms" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/remotewms http://schemas.deegree.org/3.5/layers/remotewms/remotewms.xsd">
+<RemoteWMSLayers xmlns="http://www.deegree.org/layers/remotewms" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/remotewms http://schemas.deegree.org/core/3.5/layers/remotewms/remotewms.xsd">
   
   <RemoteWMSId>cascade_utah_geology_wms</RemoteWMSId>
   
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_remotewms_utah_springs.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_remotewms_utah_springs.xml
index a3b42360e8..57c52f26d7 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_remotewms_utah_springs.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_remotewms_utah_springs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<RemoteWMSLayers xmlns="http://www.deegree.org/layers/remotewms" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/remotewms http://schemas.deegree.org/3.5/layers/remotewms/remotewms.xsd">
+<RemoteWMSLayers xmlns="http://www.deegree.org/layers/remotewms" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/remotewms http://schemas.deegree.org/core/3.5/layers/remotewms/remotewms.xsd">
   
   <RemoteWMSId>cascade_demo_deegree_wms</RemoteWMSId>
   
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_tile_utah_ortho.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_tile_utah_ortho.xml
index 4fe50e9d25..404d35ed0b 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_tile_utah_ortho.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/layers/layer_tile_utah_ortho.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<TileLayers xmlns="http://www.deegree.org/layers/tile" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/tile http://schemas.deegree.org/3.5/layers/tile/tile.xsd">
+<TileLayers xmlns="http://www.deegree.org/layers/tile" xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/layers/tile http://schemas.deegree.org/core/3.5/layers/tile/tile.xsd">
   
   <TileLayer>
     <l:Name>utah_ortho</l:Name>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/main.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/main.xml
index 2f1701dfd3..f70a664463 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/main.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/main.xml
@@ -1,5 +1,5 @@
 <deegreeServiceController xmlns="http://www.deegree.org/services/controller"
-  xsi:schemaLocation="http://www.deegree.org/services/controller http://schemas.deegree.org/3.5/services/controller/controller.xsd"
+  xsi:schemaLocation="http://www.deegree.org/services/controller http://schemas.deegree.org/core/3.5/services/controller/controller.xsd"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <!-- 
   OutputDirectory: Optional. Default is the java temp directory (java.io.tmpdir).
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/metadata.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/metadata.xml
index 04fd165090..6297e26346 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/metadata.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deegreeServicesMetadata xmlns="http://www.deegree.org/services/metadata"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/metadata http://schemas.deegree.org/3.5/services/metadata/metadata.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/metadata http://schemas.deegree.org/core/3.5/services/metadata/metadata.xsd">
   <!--
     General service information for all services. Used in the GetCapabilities
     responses.
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wfs.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wfs.xml
index 11b962a357..02a43b101d 100755
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wfs.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wfs.xml
@@ -1,5 +1,5 @@
 <deegreeWFS xmlns="http://www.deegree.org/services/wfs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/services/wfs http://schemas.deegree.org/3.5/services/wfs/wfs_configuration.xsd">
+  xsi:schemaLocation="http://www.deegree.org/services/wfs http://schemas.deegree.org/core/3.5/services/wfs/wfs_configuration.xsd">
   <SupportedVersions>
     <Version>1.0.0</Version>
     <Version>1.1.0</Version>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wfs110.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wfs110.xml
index f9b12bfd41..50e0648821 100755
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wfs110.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wfs110.xml
@@ -1,5 +1,5 @@
 <deegreeWFS xmlns="http://www.deegree.org/services/wfs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/services/wfs http://schemas.deegree.org/3.5/services/wfs/wfs_configuration.xsd">
+  xsi:schemaLocation="http://www.deegree.org/services/wfs http://schemas.deegree.org/core/3.5/services/wfs/wfs_configuration.xsd">
   <SupportedVersions>
     <Version>1.0.0</Version>
     <Version>1.1.0</Version>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wfs110_metadata.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wfs110_metadata.xml
index 245151d360..005d772d79 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wfs110_metadata.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wfs110_metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deegreeServicesMetadata xmlns="http://www.deegree.org/services/metadata"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/metadata http://schemas.deegree.org/3.5/services/metadata/metadata.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/metadata http://schemas.deegree.org/core/3.5/services/metadata/metadata.xsd">
   <!--
     General service information for all services. Used in the GetCapabilities
     responses.
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wfs_metadata.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wfs_metadata.xml
index 245151d360..005d772d79 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wfs_metadata.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wfs_metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deegreeServicesMetadata xmlns="http://www.deegree.org/services/metadata"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/metadata http://schemas.deegree.org/3.5/services/metadata/metadata.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/metadata http://schemas.deegree.org/core/3.5/services/metadata/metadata.xsd">
   <!--
     General service information for all services. Used in the GetCapabilities
     responses.
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wms.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wms.xml
index e47523023d..03f379d953 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wms.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wms.xml
@@ -1,4 +1,4 @@
-<wms:deegreeWMS xmlns:wms="http://www.deegree.org/services/wms" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dgws="http://www.deegree.org/webservices" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/wms http://schemas.deegree.org/3.5/services/wms/wms_configuration.xsd">
+<wms:deegreeWMS xmlns:wms="http://www.deegree.org/services/wms" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dgws="http://www.deegree.org/webservices" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/wms http://schemas.deegree.org/core/3.5/services/wms/wms_configuration.xsd">
   <wms:SupportedVersions>
     <wms:Version>1.1.1</wms:Version>
     <wms:Version>1.3.0</wms:Version>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wms_metadata.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wms_metadata.xml
index 639ab22932..841990f138 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wms_metadata.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wms_metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deegreeServicesMetadata xmlns="http://www.deegree.org/services/metadata"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/metadata http://schemas.deegree.org/3.5/services/metadata/metadata.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/metadata http://schemas.deegree.org/core/3.5/services/metadata/metadata.xsd">
   <!--
     General service information for all services. Used in the GetCapabilities
     responses.
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wmts_metadata.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wmts_metadata.xml
index 95b7a5bac4..08d70302b8 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wmts_metadata.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/services/wmts_metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deegreeServicesMetadata xmlns="http://www.deegree.org/services/metadata"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/metadata http://schemas.deegree.org/3.5/services/metadata/metadata.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/metadata http://schemas.deegree.org/core/3.5/services/metadata/metadata.xsd">
   <!--
     General service information for all services. Used in the GetCapabilities
     responses.
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_airports.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_airports.xml
index 8a201efd75..8d7b70cf82 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_airports.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_airports.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FeatureTypeStyle xmlns="http://www.opengis.net/se" xmlns:app="http://www.deegree.org/app" xmlns:ogc="http://www.opengis.net/ogc" xmlns:sed="http://www.deegree.org/se" xmlns:deegreeogc="http://www.deegree.org/ogc" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/3.5/se/Symbolizer-deegree.xsd">
+  xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/core/3.5/se/Symbolizer-deegree.xsd">
   <Name>Airports</Name>
   <!-- The following rules show the use of PerpendicularOffsets within LineSymbolizers -->
   <Rule>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_cities.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_cities.xml
index 4253426877..0983bb470d 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_cities.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_cities.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FeatureTypeStyle xmlns="http://www.opengis.net/se" xmlns:app="http://www.deegree.org/app" xmlns:ogc="http://www.opengis.net/ogc" xmlns:sed="http://www.deegree.org/se"
     xmlns:deegreeogc="http://www.deegree.org/ogc" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/3.5/se/Symbolizer-deegree.xsd">
+    xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/core/3.5/se/Symbolizer-deegree.xsd">
  <Name>Cities</Name>
  <FeatureTypeName>app:SGID93_LOCATION_UDOTMap_CityLocations</FeatureTypeName>
  <!-- The following rule shows the use of interpolation of a vector layer -->
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_counties_1.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_counties_1.xml
index 23bf2e5b65..45658256fe 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_counties_1.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_counties_1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FeatureTypeStyle xmlns="http://www.opengis.net/se" xmlns:app="http://www.deegree.org/app" xmlns:ogc="http://www.opengis.net/ogc" xmlns:sed="http://www.deegree.org/se"
     xmlns:deegreeogc="http://www.deegree.org/ogc" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/3.5/se/Symbolizer-deegree.xsd">
+    xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/core/3.5/se/Symbolizer-deegree.xsd">
   <Name>CountyBoundary</Name>
   <Rule>
     <Name>CountyBoundary</Name>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_counties_2.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_counties_2.xml
index fce6f638df..46a396af5c 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_counties_2.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_counties_2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FeatureTypeStyle xmlns="http://www.opengis.net/se" xmlns:app="http://www.deegree.org/app" xmlns:ogc="http://www.opengis.net/ogc" xmlns:sed="http://www.deegree.org/se"
     xmlns:deegreeogc="http://www.deegree.org/ogc" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/3.5/se/Symbolizer-deegree.xsd">
+    xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/core/3.5/se/Symbolizer-deegree.xsd">
   <Name>CountyBoundary</Name>
   <Rule>
     <Name>CountyBoundary</Name>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_countynames.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_countynames.xml
index 3a8f19cd49..f69c3b8c11 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_countynames.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_countynames.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FeatureTypeStyle  xmlns="http://www.opengis.net/se" xmlns:app="http://www.deegree.org/app" xmlns:ogc="http://www.opengis.net/ogc" xmlns:sed="http://www.deegree.org/se"
     xmlns:deegreeogc="http://www.deegree.org/ogc" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/3.5/se/Symbolizer-deegree.xsd">
+    xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/core/3.5/se/Symbolizer-deegree.xsd">
   <Name>CountyNames</Name>
   <!--  This rule shows the use of a Halo within a TextSymbolizer -->
   <Rule>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_dem30.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_dem30.xml
index bf68a39ab9..f07cf2f03f 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_dem30.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_dem30.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FeatureTypeStyle xmlns="http://www.opengis.net/se" xmlns:ogc="http://www.opengis.net/ogc" xmlns:sed="http://www.deegree.org/se"
   xmlns:deegreeogc="http://www.deegree.org/ogc" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/3.5/se/Symbolizer-deegree.xsd">
+  xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/core/3.5/se/Symbolizer-deegree.xsd">
   <Name>DEM</Name>
   <Rule>
     <Name>DEM 30m Raster</Name>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_dem90.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_dem90.xml
index 3ab49d0cea..744e702950 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_dem90.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_dem90.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FeatureTypeStyle xmlns="http://www.opengis.net/se" xmlns:ogc="http://www.opengis.net/ogc" xmlns:sed="http://www.deegree.org/se"
   xmlns:deegreeogc="http://www.deegree.org/ogc" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/3.5/se/Symbolizer-deegree.xsd">
+  xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/core/3.5/se/Symbolizer-deegree.xsd">
   <Name>DEM</Name>
   
   <!-- This rule shows the use of interpolation with rasterdata -->
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_dominantvegetation.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_dominantvegetation.xml
index b235cd4712..90c305e563 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_dominantvegetation.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_dominantvegetation.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FeatureTypeStyle xmlns="http://www.opengis.net/se" xmlns:app="http://www.deegree.org/app" xmlns:ogc="http://www.opengis.net/ogc" xmlns:sed="http://www.deegree.org/se"
     xmlns:deegreeogc="http://www.deegree.org/ogc" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/3.5/se/Symbolizer-deegree.xsd">
+    xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/core/3.5/se/Symbolizer-deegree.xsd">
   <Name>DominantVegetation</Name>
   <Rule>
     <Name>DominantVegetation</Name>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_energyresources.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_energyresources.xml
index 2ab0de4b13..113f839717 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_energyresources.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_energyresources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sld:StyledLayerDescriptor xmlns:sld="http://www.opengis.net/sld" xmlns:se="http://www.opengis.net/se" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:app="http://www.deegree.org/app" xmlns:gml="http://www.opengis.net/gml"
-  xmlns:ogc="http://www.opengis.net/ogc" xmlns="http://www.opengis.net/sld" version="1.1.0" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd http://www.opengis.net/se http://schemas.deegree.org/3.5/se/symbology.xsd">
+  xmlns:ogc="http://www.opengis.net/ogc" xmlns="http://www.opengis.net/sld" version="1.1.0" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd http://www.opengis.net/se http://schemas.deegree.org/core/3.5/se/symbology.xsd">
   <sld:NamedLayer>
     <se:Name>EnergyResources</se:Name>
     <sld:UserStyle>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_energyresources_legend.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_energyresources_legend.xml
index fa7bd06afe..a74a2c292f 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_energyresources_legend.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_energyresources_legend.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FeatureTypeStyle xmlns="http://www.opengis.net/se" xmlns:app="http://www.deegree.org/app" xmlns:ogc="http://www.opengis.net/ogc" xmlns:sed="http://www.deegree.org/se"
     xmlns:deegreeogc="http://www.deegree.org/ogc" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.opengis.net/se http://schemas.deegree.org/3.5/se/symbology.xsd">
+    xsi:schemaLocation="http://www.opengis.net/se http://schemas.deegree.org/core/3.5/se/symbology.xsd">
   <Name>EnergyResources</Name>
   <Rule>
     <Description>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_groundwater.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_groundwater.xml
index 9667e4f20a..fe3428beba 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_groundwater.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_groundwater.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FeatureTypeStyle xmlns="http://www.opengis.net/se" xmlns:app="http://www.deegree.org/app" xmlns:ogc="http://www.opengis.net/ogc" xmlns:sed="http://www.deegree.org/se" xmlns:deegreeogc="http://www.deegree.org/ogc" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/3.5/se/Symbolizer-deegree.xsd">
+  xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/core/3.5/se/Symbolizer-deegree.xsd">
   <!-- 
   The following style will make use of 
   1. SVG as vector source for 'Mark' and
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_lakes.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_lakes.xml
index f69cfff9ea..2264fb9863 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_lakes.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_lakes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FeatureTypeStyle xmlns="http://www.opengis.net/se" xmlns:app="http://www.deegree.org/app" xmlns:ogc="http://www.opengis.net/ogc" xmlns:sed="http://www.deegree.org/se" xmlns:deegreeogc="http://www.deegree.org/ogc" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/3.5/se/Symbolizer-deegree.xsd">
+  xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/core/3.5/se/Symbolizer-deegree.xsd">
   <Name>Lakes</Name>
   <Rule>
     <Name>Lakes</Name>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_municipalities.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_municipalities.xml
index 8ec0058dd3..3893be8618 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_municipalities.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_municipalities.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FeatureTypeStyle xmlns="http://www.opengis.net/se" xmlns:app="http://www.deegree.org/app" xmlns:ogc="http://www.opengis.net/ogc" xmlns:sed="http://www.deegree.org/se"
     xmlns:deegreeogc="http://www.deegree.org/ogc" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/3.5/se/Symbolizer-deegree.xsd">
+    xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/core/3.5/se/Symbolizer-deegree.xsd">
   <Name>Municipalities</Name>
   <Rule>
   <!-- The following rules show the use of Categorize with vector data -->
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_railroads.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_railroads.xml
index 83497ef5b4..91c4e87502 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_railroads.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_railroads.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FeatureTypeStyle xmlns="http://www.opengis.net/se" xmlns:app="http://www.deegree.org/app" xmlns:ogc="http://www.opengis.net/ogc"
   xmlns:sed="http://www.deegree.org/se" xmlns:deegreeogc="http://www.deegree.org/ogc" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/3.5/se/Symbolizer-deegree.xsd">
+  xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/core/3.5/se/Symbolizer-deegree.xsd">
   <Name>Railroads</Name>
   <!-- This style file shows the use of complex function for styling railroads with typical "railroad" appearance -->
   <Rule>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_rivers.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_rivers.xml
index 49f7b3a62a..ae17dd6f6e 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_rivers.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_rivers.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FeatureTypeStyle xmlns="http://www.opengis.net/se" xmlns:app="http://www.deegree.org/app" xmlns:ogc="http://www.opengis.net/ogc" xmlns:sed="http://www.deegree.org/se"
     xmlns:deegreeogc="http://www.deegree.org/ogc" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/3.5/se/Symbolizer-deegree.xsd">
+    xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/core/3.5/se/Symbolizer-deegree.xsd">
   <Name>Rivers</Name>
   <Rule>
     <Name>Rivers</Name>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_roads.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_roads.xml
index 879d5494ca..2ebe7991fb 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_roads.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_roads.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FeatureTypeStyle xmlns="http://www.opengis.net/se" xmlns:app="http://www.deegree.org/app" xmlns:ogc="http://www.opengis.net/ogc" xmlns:sed="http://www.deegree.org/se"
     xmlns:deegreeogc="http://www.deegree.org/ogc" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/3.5/se/Symbolizer-deegree.xsd">
+    xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/core/3.5/se/Symbolizer-deegree.xsd">
   <Name>Roads</Name>
   <Rule>
     <Name>Roads</Name>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_springs.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_springs.xml
index 68673dde44..dfa14601a0 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_springs.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_springs.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FeatureTypeStyle xmlns="http://www.opengis.net/se" xmlns:app="http://www.deegree.org/app" xmlns:ogc="http://www.opengis.net/ogc" xmlns:sed="http://www.deegree.org/se"
     xmlns:deegreeogc="http://www.deegree.org/ogc" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/3.5/se/Symbolizer-deegree.xsd">
+    xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/core/3.5/se/Symbolizer-deegree.xsd">
   <Name>Springs</Name>
   <!--  This rule shows how to combine different symbolizers within one rule and how to recode labels -->
   <Rule>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_stateboundary.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_stateboundary.xml
index c418b2fcef..4261295f48 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_stateboundary.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_stateboundary.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FeatureTypeStyle xmlns="http://www.opengis.net/se" xmlns:app="http://www.deegree.org/app" xmlns:ogc="http://www.opengis.net/ogc" xmlns:sed="http://www.deegree.org/se"
     xmlns:deegreeogc="http://www.deegree.org/ogc" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/3.5/se/Symbolizer-deegree.xsd">
+    xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/core/3.5/se/Symbolizer-deegree.xsd">
   <Name>StateBoundary</Name>
   <Rule>
     <Name>StateBoundary</Name>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_weather.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_weather.xml
index 7e635de4e6..a1db6403ec 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_weather.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_weather.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FeatureTypeStyle xmlns="http://www.opengis.net/se" xmlns:app="http://www.deegree.org/app" xmlns:ogc="http://www.opengis.net/ogc" xmlns:sed="http://www.deegree.org/se"
     xmlns:deegreeogc="http://www.deegree.org/ogc" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/3.5/se/Symbolizer-deegree.xsd">
+    xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/core/3.5/se/Symbolizer-deegree.xsd">
  <Name>Weatherstations</Name>
  <Rule>
     <Name>Weatherstations</Name>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_zipcodes.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_zipcodes.xml
index 22e1617518..829d49287b 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_zipcodes.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/styles/utah_zipcodes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FeatureTypeStyle xmlns="http://www.opengis.net/se" xmlns:app="http://www.deegree.org/app" xmlns:ogc="http://www.opengis.net/ogc" xmlns:sed="http://www.deegree.org/se"
     xmlns:deegreeogc="http://www.deegree.org/ogc" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/3.5/se/Symbolizer-deegree.xsd">
+    xsi:schemaLocation="http://www.opengis.net/se http://schemas.opengis.net/se/1.1.0/FeatureStyle.xsd http://www.deegree.org/se http://schemas.deegree.org/core/3.5/se/Symbolizer-deegree.xsd">
   <Name>ZipCodes</Name>
   <Rule>
     <Name>ZipCodes</Name>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/themes/theme_wms.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/themes/theme_wms.xml
index 8cd62bfc08..af70c86522 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/themes/theme_wms.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/themes/theme_wms.xml
@@ -1,4 +1,4 @@
-<Themes xmlns="http://www.deegree.org/themes/standard"  xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/themes/standard http://schemas.deegree.org/3.5/themes/themes.xsd">
+<Themes xmlns="http://www.deegree.org/themes/standard"  xmlns:l="http://www.deegree.org/layers/base" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/themes/standard http://schemas.deegree.org/core/3.5/themes/themes.xsd">
 
   <LayerStoreId>layer_feature_utah_airports</LayerStoreId>
   <LayerStoreId>layer_feature_utah_cities</LayerStoreId>
diff --git a/deegree-workspaces/deegree-workspace-utah/src/main/resources/themes/theme_wmts.xml b/deegree-workspaces/deegree-workspace-utah/src/main/resources/themes/theme_wmts.xml
index 4c4b1d674d..a1fd7071b1 100644
--- a/deegree-workspaces/deegree-workspace-utah/src/main/resources/themes/theme_wmts.xml
+++ b/deegree-workspaces/deegree-workspace-utah/src/main/resources/themes/theme_wmts.xml
@@ -1,4 +1,4 @@
-<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/themes/standard http://schemas.deegree.org/3.5/themes/themes.xsd">
+<Themes xmlns="http://www.deegree.org/themes/standard" xmlns:d="http://www.deegree.org/metadata/description" xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/themes/standard http://schemas.deegree.org/core/3.5/themes/themes.xsd">
 
   <LayerStoreId>layer_tile_utah_ortho</LayerStoreId>
   
diff --git a/deegree-workspaces/deegree-workspace-wcts/src/main/resources/processes/TransformCoordinatesProcess.xml b/deegree-workspaces/deegree-workspace-wcts/src/main/resources/processes/TransformCoordinatesProcess.xml
index e42c436104..a61dbf1830 100644
--- a/deegree-workspaces/deegree-workspace-wcts/src/main/resources/processes/TransformCoordinatesProcess.xml
+++ b/deegree-workspaces/deegree-workspace-wcts/src/main/resources/processes/TransformCoordinatesProcess.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ProcessDefinition storeSupported="true" processVersion="1.0.0" statusSupported="false"
   xmlns="http://www.deegree.org/processes/java" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/services/wps http://schemas.deegree.org/3.5/processes/java/java.xsd">
+  xsi:schemaLocation="http://www.deegree.org/services/wps http://schemas.deegree.org/core/3.5/processes/java/java.xsd">
   <Identifier>TransformCoordinates</Identifier>
   <JavaClass>org.deegree.services.wps.ap.wcts.TransformCoordinates</JavaClass>
   <Title>Process for transforming a GML geometry from a given sourceCRS to a given targetCRS.</Title>
diff --git a/deegree-workspaces/deegree-workspace-wcts/src/main/resources/services/main.xml b/deegree-workspaces/deegree-workspace-wcts/src/main/resources/services/main.xml
index 8d2ec0183d..db13f9eba1 100644
--- a/deegree-workspaces/deegree-workspace-wcts/src/main/resources/services/main.xml
+++ b/deegree-workspaces/deegree-workspace-wcts/src/main/resources/services/main.xml
@@ -1,5 +1,5 @@
 <deegreeServiceController xmlns="http://www.deegree.org/services/controller"
-  xsi:schemaLocation="http://www.deegree.org/services/controller http://schemas.deegree.org/3.5/services/controller/controller.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  xsi:schemaLocation="http://www.deegree.org/services/controller http://schemas.deegree.org/core/3.5/services/controller/controller.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <!--   <DCP>-->
   <!--
     Only provide the URLs below, if you need to hard-wire the URLs returned in GetCapabilities responses (e.g. for
diff --git a/deegree-workspaces/deegree-workspace-wcts/src/main/resources/services/metadata.xml b/deegree-workspaces/deegree-workspace-wcts/src/main/resources/services/metadata.xml
index fff01de94a..30f85141ea 100644
--- a/deegree-workspaces/deegree-workspace-wcts/src/main/resources/services/metadata.xml
+++ b/deegree-workspaces/deegree-workspace-wcts/src/main/resources/services/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deegreeServicesMetadata xmlns="http://www.deegree.org/services/metadata"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/metadata http://schemas.deegree.org/3.5/services/metadata/metadata.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/metadata http://schemas.deegree.org/core/3.5/services/metadata/metadata.xsd">
   <!--
     General service information for all services. Used in the GetCapabilities
     responses.
diff --git a/deegree-workspaces/deegree-workspace-wcts/src/main/resources/services/wps.xml b/deegree-workspaces/deegree-workspace-wcts/src/main/resources/services/wps.xml
index 8a5cc3bb59..673a187fba 100644
--- a/deegree-workspaces/deegree-workspace-wcts/src/main/resources/services/wps.xml
+++ b/deegree-workspaces/deegree-workspace-wcts/src/main/resources/services/wps.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deegreeWPS
 	xmlns="http://www.deegree.org/services/wps" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.deegree.org/services/wps http://schemas.deegree.org/3.5/services/wps/wps_configuration.xsd">
+	xsi:schemaLocation="http://www.deegree.org/services/wps http://schemas.deegree.org/core/3.5/services/wps/wps_configuration.xsd">
 
 	<SupportedVersions>
 		<Version>1.0.0</Version>
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/BufferProcess.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/BufferProcess.xml
index 5e92e3fba9..e9aed04e5e 100644
--- a/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/BufferProcess.xml
+++ b/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/BufferProcess.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ProcessDefinition processVersion="1.0.0" storeSupported="true" statusSupported="false"
   xmlns="http://www.deegree.org/processes/java" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/processes/java http://schemas.deegree.org/3.5/processes/java/java.xsd">
+  xsi:schemaLocation="http://www.deegree.org/processes/java http://schemas.deegree.org/core/3.5/processes/java/java.xsd">
   <Identifier>Buffer</Identifier>
   <JavaClass>org.deegree.wps.jts.BufferProcesslet</JavaClass>
   <Title>Process for creating a buffer around a GML geometry.</Title>
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/CentroidProcess.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/CentroidProcess.xml
index e96a7a0051..02be241f24 100644
--- a/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/CentroidProcess.xml
+++ b/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/CentroidProcess.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ProcessDefinition processVersion="1.0.0" storeSupported="true" statusSupported="false"
   xmlns="http://www.deegree.org/processes/java" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/processes/java http://schemas.deegree.org/3.5/processes/java/java.xsd">
+  xsi:schemaLocation="http://www.deegree.org/processes/java http://schemas.deegree.org/core/3.5/processes/java/java.xsd">
   <Identifier>Centroid</Identifier>
   <JavaClass>org.deegree.wps.jts.CentroidProcesslet</JavaClass>
   <Title>Process for finding the centroid of a GML geometry.</Title>
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/ContainsProcess.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/ContainsProcess.xml
index d0435146ca..9f93b9c500 100644
--- a/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/ContainsProcess.xml
+++ b/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/ContainsProcess.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ProcessDefinition processVersion="1.0.0" storeSupported="true" statusSupported="false"
   xmlns="http://www.deegree.org/processes/java" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/processes/java http://schemas.deegree.org/3.5/processes/java/java.xsd">
+  xsi:schemaLocation="http://www.deegree.org/processes/java http://schemas.deegree.org/core/3.5/processes/java/java.xsd">
   <Identifier>Contains</Identifier>
   <JavaClass>org.deegree.wps.jts.ContainsProcesslet</JavaClass>
   <Title>Determining whether a GML geometry contain another.</Title>
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/ConvexHullProcess.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/ConvexHullProcess.xml
index 12faf077a0..391b64a5fa 100644
--- a/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/ConvexHullProcess.xml
+++ b/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/ConvexHullProcess.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ProcessDefinition processVersion="1.0.0" storeSupported="true" statusSupported="false"
   xmlns="http://www.deegree.org/processes/java" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/processes/java http://schemas.deegree.org/3.5/processes/java/java.xsd">
+  xsi:schemaLocation="http://www.deegree.org/processes/java http://schemas.deegree.org/core/3.5/processes/java/java.xsd">
   <Identifier>ConvexHull</Identifier>
   <JavaClass>org.deegree.wps.jts.ConvexHullProcesslet</JavaClass>
   <Title>Calculating the Convex Hull of a GML geometry.</Title>
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/CrossesProcess.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/CrossesProcess.xml
index 08ac6cca36..eafb839838 100644
--- a/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/CrossesProcess.xml
+++ b/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/CrossesProcess.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ProcessDefinition processVersion="1.0.0" storeSupported="true" statusSupported="false"
   xmlns="http://www.deegree.org/processes/java" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/processes/java http://schemas.deegree.org/3.5/processes/java/java.xsd">
+  xsi:schemaLocation="http://www.deegree.org/processes/java http://schemas.deegree.org/core/3.5/processes/java/java.xsd">
   <Identifier>Crosses</Identifier>
   <JavaClass>org.deegree.wps.jts.CrossesProcesslet</JavaClass>
   <Title>Determining whether two geometries cross each other.</Title>
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/DifferenceProcess.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/DifferenceProcess.xml
index 5dd4fe9dc8..1780e43fad 100644
--- a/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/DifferenceProcess.xml
+++ b/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/DifferenceProcess.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ProcessDefinition processVersion="1.0.0" storeSupported="true" statusSupported="false"
   xmlns="http://www.deegree.org/processes/java" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/processes/java http://schemas.deegree.org/3.5/processes/java/java.xsd">
+  xsi:schemaLocation="http://www.deegree.org/processes/java http://schemas.deegree.org/core/3.5/processes/java/java.xsd">
   <Identifier>Difference</Identifier>
   <JavaClass>org.deegree.wps.jts.DifferenceProcesslet</JavaClass>
   <Title>Calculating the geometric-difference of two geometies.</Title>
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/DistanceProcess.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/DistanceProcess.xml
index 13bfd55729..c2013152b9 100644
--- a/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/DistanceProcess.xml
+++ b/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/DistanceProcess.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ProcessDefinition processVersion="1.0.0" storeSupported="true" statusSupported="false"
   xmlns="http://www.deegree.org/processes/java" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/processes/java http://schemas.deegree.org/3.5/processes/java/java.xsd">
+  xsi:schemaLocation="http://www.deegree.org/processes/java http://schemas.deegree.org/core/3.5/processes/java/java.xsd">
   <Identifier>Distance</Identifier>
   <JavaClass>org.deegree.wps.jts.DistanceProcesslet</JavaClass>
   <Title>Calculating the distance between two GML Geometries.</Title>
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/EqualsProcess.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/EqualsProcess.xml
index 862f0127d6..3d827d281c 100644
--- a/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/EqualsProcess.xml
+++ b/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/EqualsProcess.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ProcessDefinition processVersion="1.0.0" storeSupported="true" statusSupported="false"
   xmlns="http://www.deegree.org/processes/java" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/processes/java http://schemas.deegree.org/3.5/processes/java/java.xsd">
+  xsi:schemaLocation="http://www.deegree.org/processes/java http://schemas.deegree.org/core/3.5/processes/java/java.xsd">
   <Identifier>Equals</Identifier>
   <JavaClass>org.deegree.wps.jts.EqualsProcesslet</JavaClass>
   <Title>Determining whether two GML Geometries are equal.</Title>
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/IntersectionProcess.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/IntersectionProcess.xml
index 9fd567b11d..20b3af9ac7 100644
--- a/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/IntersectionProcess.xml
+++ b/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/IntersectionProcess.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ProcessDefinition processVersion="1.0.0" storeSupported="true" statusSupported="false"
   xmlns="http://www.deegree.org/processes/java" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/processes/java http://schemas.deegree.org/3.5/processes/java/java.xsd">
+  xsi:schemaLocation="http://www.deegree.org/processes/java http://schemas.deegree.org/core/3.5/processes/java/java.xsd">
   <Identifier>Intersection</Identifier>
   <JavaClass>org.deegree.wps.jts.IntersectionProcesslet</JavaClass>
   <Title>Determining the intersection points between two GML Geometries.</Title>
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/ParameterDemoProcess.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/ParameterDemoProcess.xml
index 86c7f9b6fc..a4fdc80a26 100644
--- a/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/ParameterDemoProcess.xml
+++ b/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/ParameterDemoProcess.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ProcessDefinition processVersion="1.0.0" storeSupported="true" statusSupported="true"
   xmlns="http://www.deegree.org/processes/java" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/processes/java http://schemas.deegree.org/3.5/processes/java/java.xsd">
+  xsi:schemaLocation="http://www.deegree.org/processes/java http://schemas.deegree.org/core/3.5/processes/java/java.xsd">
   <Identifier>ParameterDemoProcess</Identifier>
   <JavaClass>org.deegree.wps.ParameterDemoProcesslet</JavaClass>
   <Title>Process for demonstrating the use of different types of input and output parameters.</Title>
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/TouchesProcess.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/TouchesProcess.xml
index a0fce68d46..2f0b011547 100644
--- a/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/TouchesProcess.xml
+++ b/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/TouchesProcess.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ProcessDefinition processVersion="1.0.0" storeSupported="true" statusSupported="false"
   xmlns="http://www.deegree.org/processes/java" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/processes/java http://schemas.deegree.org/3.5/processes/java/java.xsd">
+  xsi:schemaLocation="http://www.deegree.org/processes/java http://schemas.deegree.org/core/3.5/processes/java/java.xsd">
   <Identifier>Touches</Identifier>
   <JavaClass>org.deegree.wps.jts.TouchesProcesslet</JavaClass>
   <Title>Determining whether two GML Geometries touch or not.</Title>
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/UnionProcess.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/UnionProcess.xml
index a22d9b34a1..71615e9219 100644
--- a/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/UnionProcess.xml
+++ b/deegree-workspaces/deegree-workspace-wps/src/main/resources/processes/UnionProcess.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ProcessDefinition processVersion="1.0.0" storeSupported="true" statusSupported="false"
   xmlns="http://www.deegree.org/processes/java" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/processes/java http://schemas.deegree.org/3.5/processes/java/java.xsd">
+  xsi:schemaLocation="http://www.deegree.org/processes/java http://schemas.deegree.org/core/3.5/processes/java/java.xsd">
   <Identifier>Union</Identifier>
   <JavaClass>org.deegree.wps.jts.UnionProcesslet</JavaClass>
   <Title>Calculates the union of two GML Geometries.</Title>
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/resources/services/main.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/services/main.xml
index 449049cff6..cbc05828b7 100644
--- a/deegree-workspaces/deegree-workspace-wps/src/main/resources/services/main.xml
+++ b/deegree-workspaces/deegree-workspace-wps/src/main/resources/services/main.xml
@@ -1,3 +1,3 @@
 <deegreeServiceController xmlns="http://www.deegree.org/services/controller"
-  xsi:schemaLocation="http://www.deegree.org/services/controller http://schemas.deegree.org/3.5/services/controller/controller.xsd"
+  xsi:schemaLocation="http://www.deegree.org/services/controller http://schemas.deegree.org/core/3.5/services/controller/controller.xsd"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
\ No newline at end of file
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/resources/services/metadata.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/services/metadata.xml
index e7889de44b..1316ff35c2 100644
--- a/deegree-workspaces/deegree-workspace-wps/src/main/resources/services/metadata.xml
+++ b/deegree-workspaces/deegree-workspace-wps/src/main/resources/services/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deegreeServicesMetadata xmlns="http://www.deegree.org/services/metadata"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/metadata http://schemas.deegree.org/3.5/services/metadata/metadata.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/services/metadata http://schemas.deegree.org/core/3.5/services/metadata/metadata.xsd">
   <!-- General service information for all services. Used in the GetCapabilities responses. -->
   <ServiceIdentification>
     <Title>deegree 3 demo service</Title>
diff --git a/deegree-workspaces/deegree-workspace-wps/src/main/resources/services/wps.xml b/deegree-workspaces/deegree-workspace-wps/src/main/resources/services/wps.xml
index 6c1835d569..2678f2c132 100644
--- a/deegree-workspaces/deegree-workspace-wps/src/main/resources/services/wps.xml
+++ b/deegree-workspaces/deegree-workspace-wps/src/main/resources/services/wps.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deegreeWPS xmlns="http://www.deegree.org/services/wps" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/services/wps http://schemas.deegree.org/3.5/services/wps/wps_configuration.xsd">
+  xsi:schemaLocation="http://www.deegree.org/services/wps http://schemas.deegree.org/core/3.5/services/wps/wps_configuration.xsd">
   <SupportedVersions>
     <Version>1.0.0</Version>
   </SupportedVersions>