diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/.classpath b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/.classpath
index 956fb889bc499af1cd6065dc3d7ae0748d7db75f..e786fb78335554a0fe12883f85dedde520fe634d 100644
--- a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/.classpath
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/.classpath
@@ -12,5 +12,58 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="libs/yang-data-codec-gson-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/gson-2.10.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/guava-32.1.3-jre.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/failureaccess-1.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/checker-qual-3.37.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/error_prone_annotations-2.21.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/j2objc-annotations-2.8.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/org.eclipse.jdt.annotation-2.2.800.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/util-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/triemap-1.3.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/yang-common-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/yang-data-api-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/value-2.10.0-annotations.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/yang-data-impl-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/yang-data-spi-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/yang-data-util-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/rfc8528-model-api-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/yang-model-api-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/yang-model-util-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/rfc8040-model-api-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/rfc8819-parser-support-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/yang-model-spi-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/rfc7952-model-api-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/rfc8819-model-api-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/yang-parser-rfc7950-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/antlr4-runtime-4.13.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/concepts-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/yang-model-ri-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/yang-parser-reactor-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/yang-repo-api-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/yang-ir-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/yang-repo-spi-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/yang-xpath-api-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/yang-parser-spi-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/yang-parser-api-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/odlext-parser-support-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/odlext-model-api-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/yang-parser-impl-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/openconfig-parser-support-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/openconfig-model-api-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/rfc6241-parser-support-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/rfc6241-model-api-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/rfc6536-parser-support-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/rfc6536-model-api-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/rfc6643-parser-support-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/rfc6643-model-api-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/rfc7952-parser-support-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/rfc8040-parser-support-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/rfc8528-parser-support-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/rfc8639-parser-support-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/rfc8639-model-api-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/yang-xpath-impl-13.0.1.jar"/>	
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/pom.xml b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/pom.xml
index 1016d6cb68c403748456bbb9b6d54ec8921e043c..fd29fc116438d9bbea435626241cdf52a3e07465 100644
--- a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/pom.xml
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/pom.xml
@@ -15,6 +15,8 @@
 	-->
 	<properties>
 		<classpath.placeholder>!:!</classpath.placeholder>
+		<classpath.separator>"/>${line.separator}    &lt;classpathentry exported="true" kind="lib" path="</classpath.separator>
+		<!-- "/>${line.separator}	<classpathentry exported="true" kind="lib" path=" -->
 	</properties>
 	<build>
 		<plugins>
@@ -96,6 +98,9 @@
 								<replace file="${project.build.outputDirectory}/META-INF/MANIFEST.MF" 
 									token="${classpath.placeholder}"
 									value=",${line.separator} " />
+								<replace file="${project.build.outputDirectory}/.classpath" 
+									token="${classpath.placeholder}"
+									value="${classpath.separator}" />
 							</target>
 						</configuration>
 					</execution>
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/resources/.classpath b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/resources/.classpath
new file mode 100644
index 0000000000000000000000000000000000000000..9a1bbce3773f59ee06a67244e645ab8c748d27d2
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/resources/.classpath
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="${classpath}"/>	
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/pom.xml b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/pom.xml
index 548dbf161542f1c750cf41dec022635e566b92d6..a7183b1e817325cf7dfccc5f1659524493b4f0ff 100644
--- a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/pom.xml
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/pom.xml
@@ -26,12 +26,13 @@
 							<goal>copy-resources</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>META-INF</outputDirectory>
+							<outputDirectory>${basedir}</outputDirectory>
 							<resources>
 								<resource>
-									<directory>${basedir}/dependencies/target/classes/META-INF</directory>
+									<directory>${basedir}/dependencies/target/classes</directory>
 									<includes>
-										<include>MANIFEST.MF</include>
+										<include>META-INF/MANIFEST.MF</include>
+										<include>.classpath</include>
 									</includes>
 								</resource>
 							</resources>
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn}/.classpath b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn}/.classpath
new file mode 100644
index 0000000000000000000000000000000000000000..8bb37477220ea7c17ee5b2a54e8cdbc7bcb847d3
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn}/.classpath
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="libs/yang-data-codec-gson-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/gson-2.10.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/guava-32.1.3-jre.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/failureaccess-1.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/checker-qual-3.37.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/error_prone_annotations-2.21.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/j2objc-annotations-2.8.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/org.eclipse.jdt.annotation-2.2.800.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/util-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/triemap-1.3.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/yang-common-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/yang-data-api-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/value-2.10.0-annotations.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/yang-data-impl-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/yang-data-spi-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/yang-data-util-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/rfc8528-model-api-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/yang-model-api-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/yang-model-util-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/rfc8040-model-api-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/rfc8819-parser-support-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/yang-model-spi-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/rfc7952-model-api-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/rfc8819-model-api-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/yang-parser-rfc7950-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/antlr4-runtime-4.13.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/concepts-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/yang-model-ri-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/yang-parser-reactor-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/yang-repo-api-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/yang-ir-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/yang-repo-spi-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/yang-xpath-api-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/yang-parser-spi-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/yang-parser-api-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/odlext-parser-support-13.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/odlext-model-api-13.0.1.jar"/>	
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>