diff --git a/src/core/de.evoal.surrogate.simple/src/main/resources/META-INF/beans.xml b/src/core/de.evoal.surrogate.simple/src/main/resources/META-INF/beans.xml
new file mode 100644
index 0000000000000000000000000000000000000000..848dca3b29cc3f1f9879d2c86d586612e5d8b3e7
--- /dev/null
+++ b/src/core/de.evoal.surrogate.simple/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,6 @@
+<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
+       bean-discovery-mode="annotated"
+       version="2.0">
+</beans>
\ No newline at end of file
diff --git a/src/core/de.evoal.surrogate.simple/src/main/resources/META-INF/definitions/surrogate/simple.dl b/src/core/de.evoal.surrogate.simple/src/main/resources/META-INF/definitions/surrogate/simple.dl
deleted file mode 100644
index 0954270587de5fe61d210154c73f11caaeba41f8..0000000000000000000000000000000000000000
--- a/src/core/de.evoal.surrogate.simple/src/main/resources/META-INF/definitions/surrogate/simple.dl
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * An exemplary identity function.
- */
-type identity extends surrogate {
-}
-
-type 'linear-regression' extends surrogate {
-    intercept : float;
-    slope : float;
-}
-
-type 'simple-quadratic-regression' extends surrogate {
-    intercept : float;
-    slope : float;
-}
\ No newline at end of file
diff --git a/src/core/de.evoal.surrogate.simple/src/main/resources/de/evoal/surrogate/simple/ml.dl b/src/core/de.evoal.surrogate.simple/src/main/resources/de/evoal/surrogate/simple/ml.dl
new file mode 100644
index 0000000000000000000000000000000000000000..08d465ab5c44a37fd6c71b9c6e51587062b17334
--- /dev/null
+++ b/src/core/de.evoal.surrogate.simple/src/main/resources/de/evoal/surrogate/simple/ml.dl
@@ -0,0 +1,23 @@
+import "definitions" from de.evoal.surrogate.ml;
+
+/**
+ * Simple surrogate functions.
+ */
+module de.evoal.surrogate.simple.ml {
+
+	/**
+	 * An exemplary identity function.
+	 */
+	type identity extends surrogate {
+	}
+	
+	type 'linear-regression' extends surrogate {
+	    intercept : float;
+	    slope : float;
+	}
+	
+	type 'simple-quadratic-regression' extends surrogate {
+	    intercept : float;
+	    slope : float;
+	}
+}
\ No newline at end of file