diff --git a/src/core/de.evoal.core.main/src/main/resources/META-INF/definitions/ddl/si-units.ddl b/src/core/de.evoal.core.main/src/main/resources/META-INF/definitions/data/si-units.ddl
similarity index 100%
rename from src/core/de.evoal.core.main/src/main/resources/META-INF/definitions/ddl/si-units.ddl
rename to src/core/de.evoal.core.main/src/main/resources/META-INF/definitions/data/si-units.ddl
diff --git a/src/core/de.evoal.core.main/src/main/resources/META-INF/definitions/ea/core.dl b/src/core/de.evoal.core.main/src/main/resources/META-INF/definitions/optimisation/core.dl
similarity index 100%
rename from src/core/de.evoal.core.main/src/main/resources/META-INF/definitions/ea/core.dl
rename to src/core/de.evoal.core.main/src/main/resources/META-INF/definitions/optimisation/core.dl
diff --git a/src/core/de.evoal.core.plugin/pom.xml b/src/core/de.evoal.core.plugin/pom.xml
index f4b0fc43e31b6be241a34c6e0764d0e30411324e..1f0849e392d1ed94eb9e5b0cbff9d6ef2e0158e4 100644
--- a/src/core/de.evoal.core.plugin/pom.xml
+++ b/src/core/de.evoal.core.plugin/pom.xml
@@ -228,6 +228,20 @@
 				<artifactId>maven-failsafe-plugin</artifactId>
 				<version>2.22.2</version>
 			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<version>3.2.1</version>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 
 		<pluginManagement>
diff --git a/src/core/de.evoal.releng.parent/pom.xml b/src/core/de.evoal.releng.parent/pom.xml
index c801ed457da5b00e8b18f47f6a7cccabc135e8d2..ccedc18fbeb757e830cf13136a549e507dd7a5cc 100644
--- a/src/core/de.evoal.releng.parent/pom.xml
+++ b/src/core/de.evoal.releng.parent/pom.xml
@@ -263,6 +263,19 @@
                 </configuration>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>