diff --git a/xta-adapter/pom.xml b/xta-adapter/pom.xml
index b08c04a215e7be06379dd12983c1f1c0e71dbac7..64e509879ba0f00ca2777d451968ddd43afcbfb1 100644
--- a/xta-adapter/pom.xml
+++ b/xta-adapter/pom.xml
@@ -28,8 +28,20 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>com.evolvedbinary.maven.jvnet</groupId>
-				<artifactId>jaxb30-maven-plugin</artifactId>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>jaxb2-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>schema files</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>xjc</goal>
+						</goals>
+						<configuration>
+							<sourceType>xmlschema</sourceType>
+						</configuration>
+					</execution>
+				</executions>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/xta-adapter/src/main/resources/XTA-synchron.wsdl b/xta-adapter/src/main/wsdl/XTA-synchron.wsdl
similarity index 100%
rename from xta-adapter/src/main/resources/XTA-synchron.wsdl
rename to xta-adapter/src/main/wsdl/XTA-synchron.wsdl
diff --git a/xta-adapter/src/main/resources/XTA.wsdl b/xta-adapter/src/main/wsdl/XTA.wsdl
similarity index 100%
rename from xta-adapter/src/main/resources/XTA.wsdl
rename to xta-adapter/src/main/wsdl/XTA.wsdl
diff --git a/xta-adapter/src/main/resources/OSCI2_02.xsd b/xta-adapter/src/main/xsd/OSCI2_02.xsd
similarity index 100%
rename from xta-adapter/src/main/resources/OSCI2_02.xsd
rename to xta-adapter/src/main/xsd/OSCI2_02.xsd
diff --git a/xta-adapter/src/main/resources/OSCI_MessageMetaData_V2.02.xsd b/xta-adapter/src/main/xsd/OSCI_MessageMetaData_V2.02.xsd
similarity index 100%
rename from xta-adapter/src/main/resources/OSCI_MessageMetaData_V2.02.xsd
rename to xta-adapter/src/main/xsd/OSCI_MessageMetaData_V2.02.xsd
diff --git a/xta-adapter/src/main/resources/XTA-Webservice-Datentypen.xsd b/xta-adapter/src/main/xsd/XTA-Webservice-Datentypen.xsd
similarity index 100%
rename from xta-adapter/src/main/resources/XTA-Webservice-Datentypen.xsd
rename to xta-adapter/src/main/xsd/XTA-Webservice-Datentypen.xsd
diff --git a/xta-adapter/src/main/resources/XTA-Webservice-Exceptions.xsd b/xta-adapter/src/main/xsd/XTA-Webservice-Exceptions.xsd
similarity index 100%
rename from xta-adapter/src/main/resources/XTA-Webservice-Exceptions.xsd
rename to xta-adapter/src/main/xsd/XTA-Webservice-Exceptions.xsd
diff --git a/xta-adapter/src/main/resources/XTA-Webservice-Globale-Elemente.xsd b/xta-adapter/src/main/xsd/XTA-Webservice-Globale-Elemente.xsd
similarity index 100%
rename from xta-adapter/src/main/resources/XTA-Webservice-Globale-Elemente.xsd
rename to xta-adapter/src/main/xsd/XTA-Webservice-Globale-Elemente.xsd
diff --git a/xta-adapter/src/main/resources/oasis-200401-wss-wssecurity-secext-1.0.xsd b/xta-adapter/src/main/xsd/oasis-200401-wss-wssecurity-secext-1.0.xsd
similarity index 100%
rename from xta-adapter/src/main/resources/oasis-200401-wss-wssecurity-secext-1.0.xsd
rename to xta-adapter/src/main/xsd/oasis-200401-wss-wssecurity-secext-1.0.xsd
diff --git a/xta-adapter/src/main/resources/oasis-200401-wss-wssecurity-utility-1.0.xsd b/xta-adapter/src/main/xsd/oasis-200401-wss-wssecurity-utility-1.0.xsd
similarity index 100%
rename from xta-adapter/src/main/resources/oasis-200401-wss-wssecurity-utility-1.0.xsd
rename to xta-adapter/src/main/xsd/oasis-200401-wss-wssecurity-utility-1.0.xsd
diff --git a/xta-adapter/src/main/resources/soap-envelope.xsd b/xta-adapter/src/main/xsd/soap-envelope.xsd
similarity index 100%
rename from xta-adapter/src/main/resources/soap-envelope.xsd
rename to xta-adapter/src/main/xsd/soap-envelope.xsd
diff --git a/xta-adapter/src/main/resources/ws-addr-wsdl.xsd b/xta-adapter/src/main/xsd/ws-addr-wsdl.xsd
similarity index 100%
rename from xta-adapter/src/main/resources/ws-addr-wsdl.xsd
rename to xta-adapter/src/main/xsd/ws-addr-wsdl.xsd
diff --git a/xta-adapter/src/main/resources/ws-addr.xsd b/xta-adapter/src/main/xsd/ws-addr.xsd
similarity index 100%
rename from xta-adapter/src/main/resources/ws-addr.xsd
rename to xta-adapter/src/main/xsd/ws-addr.xsd
diff --git a/xta-adapter/src/main/resources/ws-policy.xsd b/xta-adapter/src/main/xsd/ws-policy.xsd
similarity index 100%
rename from xta-adapter/src/main/resources/ws-policy.xsd
rename to xta-adapter/src/main/xsd/ws-policy.xsd
diff --git a/xta-adapter/src/main/resources/xenc-schema.xsd b/xta-adapter/src/main/xsd/xenc-schema.xsd
similarity index 100%
rename from xta-adapter/src/main/resources/xenc-schema.xsd
rename to xta-adapter/src/main/xsd/xenc-schema.xsd
diff --git a/xta-adapter/src/main/resources/xml.xsd b/xta-adapter/src/main/xsd/xml.xsd
similarity index 100%
rename from xta-adapter/src/main/resources/xml.xsd
rename to xta-adapter/src/main/xsd/xml.xsd
diff --git a/xta-adapter/src/main/resources/xmldsig-core-schema.xsd b/xta-adapter/src/main/xsd/xmldsig-core-schema.xsd
similarity index 100%
rename from xta-adapter/src/main/resources/xmldsig-core-schema.xsd
rename to xta-adapter/src/main/xsd/xmldsig-core-schema.xsd
diff --git a/xta-adapter/src/main/resources/xmlmime.xsd b/xta-adapter/src/main/xsd/xmlmime.xsd
similarity index 100%
rename from xta-adapter/src/main/resources/xmlmime.xsd
rename to xta-adapter/src/main/xsd/xmlmime.xsd
diff --git a/xta-adapter/src/main/resources/xoev-basisdatentypen.xsd b/xta-adapter/src/main/xsd/xoev-basisdatentypen.xsd
similarity index 100%
rename from xta-adapter/src/main/resources/xoev-basisdatentypen.xsd
rename to xta-adapter/src/main/xsd/xoev-basisdatentypen.xsd
diff --git a/xta-adapter/src/main/resources/xoev1_0-basisdatentypen.xsd b/xta-adapter/src/main/xsd/xoev1_0-basisdatentypen.xsd
similarity index 100%
rename from xta-adapter/src/main/resources/xoev1_0-basisdatentypen.xsd
rename to xta-adapter/src/main/xsd/xoev1_0-basisdatentypen.xsd