diff --git a/oaipmh-core/pom.xml b/oaipmh-core/pom.xml
index aa6f88cf4eb27092f42ed1b314b4d25c851ea35b..1d9d48d10a78ae17d86ad2eefe5c6708775835cb 100644
--- a/oaipmh-core/pom.xml
+++ b/oaipmh-core/pom.xml
@@ -153,29 +153,29 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<!-- We use this plugin to ensure that our usage of the maven-jaxb2-plugin 
-					is JDK 8 compatible in absence of a fix for https://java.net/jira/browse/MAVEN_JAXB2_PLUGIN-80. -->
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>properties-maven-plugin</artifactId>
-				<version>${properties-maven-plugin.version}</version>
-				<executions>
-					<execution>
-						<id>set-additional-system-properties</id>
-						<goals>
-							<goal>set-system-properties</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<properties>
-						<property>
-							<name>javax.xml.accessExternalSchema</name>
-							<value>file,http</value>
-						</property>
-					</properties>
-				</configuration>
-			</plugin>
+			<!-- <plugin> -->
+			<!-- We use this plugin to ensure that our usage of the maven-jaxb2-plugin 
+				is JDK 8 compatible in absence of a fix for https://java.net/jira/browse/MAVEN_JAXB2_PLUGIN-80. -->
+			<!-- <groupId>org.codehaus.mojo</groupId> -->
+			<!-- <artifactId>properties-maven-plugin</artifactId> -->
+			<!-- <version>${properties-maven-plugin.version}</version> -->
+			<!-- <executions> -->
+			<!-- <execution> -->
+			<!-- <id>set-additional-system-properties</id> -->
+			<!-- <goals> -->
+			<!-- <goal>set-system-properties</goal> -->
+			<!-- </goals> -->
+			<!-- </execution> -->
+			<!-- </executions> -->
+			<!-- <configuration> -->
+			<!-- <properties> -->
+			<!-- <property> -->
+			<!-- <name>javax.xml.accessExternalSchema</name> -->
+			<!-- <value>file,http</value> -->
+			<!-- </property> -->
+			<!-- </properties> -->
+			<!-- </configuration> -->
+			<!-- </plugin> -->
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>jaxb2-maven-plugin</artifactId>
@@ -196,16 +196,16 @@
 							<generateDirectory>${project.build.directory}/generated-sources/xjc1</generateDirectory>
 							<staleFile>${project.build.directory}/jaxb2/.oaiDCSchemaXjcStaleFlag</staleFile>
 							<clearOutputDir>false</clearOutputDir>
-							<!-- <transformSchemas> -->
-							<!-- <transformSchema> -->
-							<!-- <uri>http://purl.org/dc/elements/1.1/</uri> -->
-							<!-- <toPrefix>dc</toPrefix> -->
-							<!-- </transformSchema> -->
-							<!-- <transformSchema> -->
-							<!-- <uri>http://www.openarchives.org/OAI/2.0/oai_dc/</uri> -->
-							<!-- <toPrefix>oai_dc</toPrefix> -->
-							<!-- </transformSchema> -->
-							<!-- </transformSchemas> -->
+							<transformSchemas>
+								<transformSchema>
+									<uri>http://purl.org/dc/elements/1.1/</uri>
+									<toPrefix>dc</toPrefix>
+								</transformSchema>
+								<transformSchema>
+									<uri>http://www.openarchives.org/OAI/2.0/oai_dc/</uri>
+									<toPrefix>oai_dc</toPrefix>
+								</transformSchema>
+							</transformSchemas>
 						</configuration>
 					</execution>
 					<execution>
@@ -214,12 +214,13 @@
 							<goal>xjc</goal>
 						</goals>
 						<configuration>
-							<schemaFile>oai_pmh.xsd</schemaFile>
+							<!-- <schemaFile>oai_pmh.xsd</schemaFile> -->
+							<schemaFile>http://www.openarchives.org/OAI/2.0/OAI-PMH.xsd</schemaFile>
 							<packageName>info.textgrid.middleware.oaipmh</packageName>
-							<schemaDirectory>src/main/xsd</schemaDirectory>
-							<schemaIncludes>
-								<include>oai_pmh.xsd</include>
-							</schemaIncludes>
+							<!-- <schemaDirectory>src/main/xsd</schemaDirectory> -->
+							<!-- <schemaIncludes> -->
+							<!-- <include>oai_pmh.xsd</include> -->
+							<!-- </schemaIncludes> -->
 							<generateDirectory>${project.build.directory}/generated-sources/xjc2</generateDirectory>
 							<staleFile>${project.build.directory}/jaxb2/.oaipmhSchemaXjcStaleFlag</staleFile>
 							<clearOutputDir>false</clearOutputDir>
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java b/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java
index 0832297a2ffb17a88fed3a71700550d2a6cd27c6..e8a98fd410da53dcce7f9793764c0b16ccd5a977 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java
@@ -1,4 +1,4 @@
-wpackage info.textgrid.middleware;
+package info.textgrid.middleware;
 
 import info.textgrid.middleware.oaipmh.ListSetsType;
 import info.textgrid.middleware.oaipmh.SetType;
diff --git a/oaipmh-core/src/main/xsd/oai_pmh.xsd b/oaipmh-core/src/main/xsd/oai_pmh.xsd__URGLI_MURGLI
similarity index 100%
rename from oaipmh-core/src/main/xsd/oai_pmh.xsd
rename to oaipmh-core/src/main/xsd/oai_pmh.xsd__URGLI_MURGLI