diff --git a/org.etsi.mts.tdl.parent/pom.xml b/org.etsi.mts.tdl.parent/pom.xml
index eec7de07df9b75120b57aa439853053d6d8b0a91..6107ac1b8a0f9a0a4bd01986adbf2a3776223c80 100644
--- a/org.etsi.mts.tdl.parent/pom.xml
+++ b/org.etsi.mts.tdl.parent/pom.xml
@@ -50,6 +50,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 		<module>../plugins/org.etsi.mts.tdl.project</module>		
 		<module>../plugins/org.etsi.mts.tdl.wizards</module>
 		<module>../plugins/org.etsi.mts.tdl.execution.java</module>
+		<module>../plugins/org.etsi.mts.tdl.execution.java.codegen</module>
 		<!-- Constraints -->
 		<module>../plugins/org.etsi.mts.tdl.constraints</module>
 		<module>../plugins/org.etsi.mts.tdl.constraints.ui</module>
diff --git a/plugins/org.etsi.mts.tdl.execution.java.codegen/.classpath b/plugins/org.etsi.mts.tdl.execution.java.codegen/.classpath
new file mode 100644
index 0000000000000000000000000000000000000000..e801ebfb4680123285c15553dc70584276fe0057
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.execution.java.codegen/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/org.etsi.mts.tdl.execution.java.codegen/.project b/plugins/org.etsi.mts.tdl.execution.java.codegen/.project
new file mode 100644
index 0000000000000000000000000000000000000000..e47a13b7a8bd9463011f2e6417b27a3f143c63b1
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.execution.java.codegen/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.etsi.mts.tdl.execution.java.codegen</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/org.etsi.mts.tdl.execution.java.codegen/.settings/org.eclipse.core.resources.prefs b/plugins/org.etsi.mts.tdl.execution.java.codegen/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.execution.java.codegen/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.etsi.mts.tdl.execution.java.codegen/.settings/org.eclipse.jdt.core.prefs b/plugins/org.etsi.mts.tdl.execution.java.codegen/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..c9545f06a4120d5b4a1228fb19f67a1171bc0f5b
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.execution.java.codegen/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,9 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/plugins/org.etsi.mts.tdl.execution.java.codegen/META-INF/MANIFEST.MF b/plugins/org.etsi.mts.tdl.execution.java.codegen/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000000000000000000000000000000000..5f2f3bd978250d7b41aa2bb122322df1b38a4beb
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.execution.java.codegen/META-INF/MANIFEST.MF
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: org.etsi.mts.tdl.execution.java.codegen
+Bundle-SymbolicName: org.etsi.mts.tdl.execution.java.codegen
+Bundle-Version: 1.0.0.qualifier
+Export-Package: org.etsi.mts.tdl.execution.java.codegen
+Require-Bundle: org.etsi.mts.tdl.model
+Automatic-Module-Name: org.etsi.mts.tdl.execution.java.codegen
+Bundle-ClassPath: .
+Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/plugins/org.etsi.mts.tdl.execution.java.codegen/build.properties b/plugins/org.etsi.mts.tdl.execution.java.codegen/build.properties
new file mode 100644
index 0000000000000000000000000000000000000000..34d2e4d2dad529ceaeb953bfcdb63c51d69ffed2
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.execution.java.codegen/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/plugins/org.etsi.mts.tdl.execution.java/src/org/etsi/mts/tdl/execution/java/codegen/JUnitTestGenerator.java b/plugins/org.etsi.mts.tdl.execution.java.codegen/src/org/etsi/mts/tdl/execution/java/codegen/JUnitTestGenerator.java
similarity index 100%
rename from plugins/org.etsi.mts.tdl.execution.java/src/org/etsi/mts/tdl/execution/java/codegen/JUnitTestGenerator.java
rename to plugins/org.etsi.mts.tdl.execution.java.codegen/src/org/etsi/mts/tdl/execution/java/codegen/JUnitTestGenerator.java
diff --git a/plugins/org.etsi.mts.tdl.execution.java/src/org/etsi/mts/tdl/execution/java/codegen/Renderer.java b/plugins/org.etsi.mts.tdl.execution.java.codegen/src/org/etsi/mts/tdl/execution/java/codegen/Renderer.java
similarity index 100%
rename from plugins/org.etsi.mts.tdl.execution.java/src/org/etsi/mts/tdl/execution/java/codegen/Renderer.java
rename to plugins/org.etsi.mts.tdl.execution.java.codegen/src/org/etsi/mts/tdl/execution/java/codegen/Renderer.java
diff --git a/plugins/org.etsi.mts.tdl.execution.java/src/org/etsi/mts/tdl/execution/java/codegen/Settings.java b/plugins/org.etsi.mts.tdl.execution.java.codegen/src/org/etsi/mts/tdl/execution/java/codegen/Settings.java
similarity index 100%
rename from plugins/org.etsi.mts.tdl.execution.java/src/org/etsi/mts/tdl/execution/java/codegen/Settings.java
rename to plugins/org.etsi.mts.tdl.execution.java.codegen/src/org/etsi/mts/tdl/execution/java/codegen/Settings.java
diff --git a/plugins/org.etsi.mts.tdl.execution.java/META-INF/MANIFEST.MF b/plugins/org.etsi.mts.tdl.execution.java/META-INF/MANIFEST.MF
index e51cf333201bb3962dce263f4030c14a19dcf9c5..551848e0b5f7c09458cf9559bd7147610350f393 100644
--- a/plugins/org.etsi.mts.tdl.execution.java/META-INF/MANIFEST.MF
+++ b/plugins/org.etsi.mts.tdl.execution.java/META-INF/MANIFEST.MF
@@ -7,7 +7,8 @@ Bundle-ClassPath: .
 Automatic-Module-Name: org.etsi.mts.tdl.execution.java
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: .
-Require-Bundle: org.eclipse.core.runtime,
+Require-Bundle: org.etsi.mts.tdl.execution.java.codegen,
+ org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.ui,
  org.eclipse.ui.ide,