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
deleted file mode 100644
index 8fdbbc7d6a4b024377e4c5eeef6a3c0f13532743..0000000000000000000000000000000000000000
--- a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/.classpath
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry exported="true" kind="lib" path="lib/yang-data-codec-gson-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/gson-2.10.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/guava-32.1.3-jre.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/failureaccess-1.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/checker-qual-3.37.0.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/error_prone_annotations-2.21.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/j2objc-annotations-2.8.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/org.eclipse.jdt.annotation-2.2.800.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/util-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/triemap-1.3.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/yang-common-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/yang-data-api-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/value-2.10.0-annotations.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/yang-data-impl-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/yang-data-spi-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/yang-data-util-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/rfc8528-model-api-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/yang-model-api-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/yang-model-util-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/rfc8040-model-api-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/rfc8819-parser-support-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/yang-model-spi-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/rfc7952-model-api-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/rfc8819-model-api-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/yang-parser-rfc7950-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/antlr4-runtime-4.13.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/concepts-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/yang-model-ri-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/yang-parser-reactor-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/yang-repo-api-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/yang-ir-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/yang-repo-spi-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/yang-xpath-api-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/yang-parser-spi-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/yang-parser-api-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/odlext-parser-support-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/odlext-model-api-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/yang-parser-impl-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/openconfig-parser-support-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/openconfig-model-api-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/rfc6241-parser-support-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/rfc6241-model-api-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/rfc6536-parser-support-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/rfc6536-model-api-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/rfc6643-parser-support-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/rfc6643-model-api-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/rfc7952-parser-support-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/rfc8040-parser-support-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/rfc8528-parser-support-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/rfc8639-parser-support-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/rfc8639-model-api-13.0.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="lib/yang-xpath-impl-13.0.1.jar"/>	
-	<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="output" path="target/classes"/>
-</classpath>
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/.gitignore b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..262ccf3dc32c21f9e6ff8afced619538dff55df4
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/.gitignore
@@ -0,0 +1,3 @@
+.classpath
+dependencies/classpath.properties
+META-INF/MANIFEST.MF
\ No newline at end of file
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/META-INF/.gitignore b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/META-INF/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..78d910160c4b6a2be02b1060dfbc5a0ec2526bb1
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/META-INF/.gitignore
@@ -0,0 +1,2 @@
+/*
+!.gitignore
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/META-INF/MANIFEST.MF b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/META-INF/MANIFEST.MF
index bf87d1bd560cbf27bb0e936decd278bac2c5be95..a0b44cd704a56dd1a171d08cf70265d6d0b3cd1a 100644
--- a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/META-INF/MANIFEST.MF
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/META-INF/MANIFEST.MF
@@ -29,57 +29,57 @@ Export-Package: org.opendaylight.yangtools.concepts,
  org.opendaylight.yangtools.yang.parser.spi.source,
  org.opendaylight.yangtools.yang.parser.stmt.reactor
 Bundle-Vendor: ETSI
-Bundle-Classpath: lib/yang-data-codec-gson-13.0.1.jar,
- lib/gson-2.10.1.jar,
- lib/guava-32.1.3-jre.jar,
- lib/failureaccess-1.0.1.jar,
- lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar,
- lib/checker-qual-3.37.0.jar,
- lib/error_prone_annotations-2.21.1.jar,
- lib/j2objc-annotations-2.8.jar,
- lib/org.eclipse.jdt.annotation-2.2.800.jar,
- lib/util-13.0.1.jar,
- lib/triemap-1.3.1.jar,
- lib/yang-common-13.0.1.jar,
- lib/yang-data-api-13.0.1.jar,
- lib/value-2.10.0-annotations.jar,
- lib/yang-data-impl-13.0.1.jar,
- lib/yang-data-spi-13.0.1.jar,
- lib/yang-data-util-13.0.1.jar,
- lib/rfc8528-model-api-13.0.1.jar,
- lib/yang-model-api-13.0.1.jar,
- lib/yang-model-util-13.0.1.jar,
- lib/rfc8040-model-api-13.0.1.jar,
- lib/rfc8819-parser-support-13.0.1.jar,
- lib/yang-model-spi-13.0.1.jar,
- lib/rfc7952-model-api-13.0.1.jar,
- lib/rfc8819-model-api-13.0.1.jar,
- lib/yang-parser-rfc7950-13.0.1.jar,
- lib/antlr4-runtime-4.13.1.jar,
- lib/concepts-13.0.1.jar,
- lib/yang-model-ri-13.0.1.jar,
- lib/yang-parser-reactor-13.0.1.jar,
- lib/yang-repo-api-13.0.1.jar,
- lib/yang-ir-13.0.1.jar,
- lib/yang-repo-spi-13.0.1.jar,
- lib/yang-xpath-api-13.0.1.jar,
- lib/yang-parser-spi-13.0.1.jar,
- lib/yang-parser-api-13.0.1.jar,
- lib/odlext-parser-support-13.0.1.jar,
- lib/odlext-model-api-13.0.1.jar,
- lib/yang-parser-impl-13.0.1.jar,
- lib/openconfig-parser-support-13.0.1.jar,
- lib/openconfig-model-api-13.0.1.jar,
- lib/rfc6241-parser-support-13.0.1.jar,
- lib/rfc6241-model-api-13.0.1.jar,
- lib/rfc6536-parser-support-13.0.1.jar,
- lib/rfc6536-model-api-13.0.1.jar,
- lib/rfc6643-parser-support-13.0.1.jar,
- lib/rfc6643-model-api-13.0.1.jar,
- lib/rfc7952-parser-support-13.0.1.jar,
- lib/rfc8040-parser-support-13.0.1.jar,
- lib/rfc8528-parser-support-13.0.1.jar,
- lib/rfc8639-parser-support-13.0.1.jar,
- lib/rfc8639-model-api-13.0.1.jar,
- lib/yang-xpath-impl-13.0.1.jar
 Automatic-Module-Name: org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn
+Bundle-ClassPath: libs/yang-data-codec-gson-13.0.1.jar,
+ libs/gson-2.10.1.jar,
+ libs/guava-32.1.3-jre.jar,
+ libs/failureaccess-1.0.1.jar,
+ libs/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar,
+ libs/checker-qual-3.37.0.jar,
+ libs/error_prone_annotations-2.21.1.jar,
+ libs/j2objc-annotations-2.8.jar,
+ libs/org.eclipse.jdt.annotation-2.2.800.jar,
+ libs/util-13.0.1.jar,
+ libs/triemap-1.3.1.jar,
+ libs/yang-common-13.0.1.jar,
+ libs/yang-data-api-13.0.1.jar,
+ libs/value-2.10.0-annotations.jar,
+ libs/yang-data-impl-13.0.1.jar,
+ libs/yang-data-spi-13.0.1.jar,
+ libs/yang-data-util-13.0.1.jar,
+ libs/rfc8528-model-api-13.0.1.jar,
+ libs/yang-model-api-13.0.1.jar,
+ libs/yang-model-util-13.0.1.jar,
+ libs/rfc8040-model-api-13.0.1.jar,
+ libs/rfc8819-parser-support-13.0.1.jar,
+ libs/yang-model-spi-13.0.1.jar,
+ libs/rfc7952-model-api-13.0.1.jar,
+ libs/rfc8819-model-api-13.0.1.jar,
+ libs/yang-parser-rfc7950-13.0.1.jar,
+ libs/antlr4-runtime-4.13.1.jar,
+ libs/concepts-13.0.1.jar,
+ libs/yang-model-ri-13.0.1.jar,
+ libs/yang-parser-reactor-13.0.1.jar,
+ libs/yang-ir-13.0.1.jar,
+ libs/yang-repo-spi-13.0.1.jar,
+ libs/yang-xpath-api-13.0.1.jar,
+ libs/yang-parser-spi-13.0.1.jar,
+ libs/yang-parser-api-13.0.1.jar,
+ libs/odlext-parser-support-13.0.1.jar,
+ libs/odlext-model-api-13.0.1.jar,
+ libs/yang-parser-impl-13.0.1.jar,
+ libs/openconfig-parser-support-13.0.1.jar,
+ libs/openconfig-model-api-13.0.1.jar,
+ libs/rfc6241-parser-support-13.0.1.jar,
+ libs/rfc6241-model-api-13.0.1.jar,
+ libs/rfc6536-parser-support-13.0.1.jar,
+ libs/rfc6536-model-api-13.0.1.jar,
+ libs/rfc6643-parser-support-13.0.1.jar,
+ libs/rfc6643-model-api-13.0.1.jar,
+ libs/rfc7952-parser-support-13.0.1.jar,
+ libs/rfc8040-parser-support-13.0.1.jar,
+ libs/rfc8528-parser-support-13.0.1.jar,
+ libs/rfc8639-parser-support-13.0.1.jar,
+ libs/rfc8639-model-api-13.0.1.jar,
+ libs/yang-xpath-impl-13.0.1.jar,
+ libs/yang-repo-api-13.0.1.jar
diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/classpath.properties b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/classpath.properties
deleted file mode 100644
index da23c3f3b88e4920f0fa73b4e33c1ce4e4f2ab76..0000000000000000000000000000000000000000
--- a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/classpath.properties
+++ /dev/null
@@ -1 +0,0 @@
-classpath=lib/yang-data-codec-gson-13.0.1.jar!:!lib/gson-2.10.1.jar!:!lib/guava-32.1.3-jre.jar!:!lib/failureaccess-1.0.1.jar!:!lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar!:!lib/checker-qual-3.37.0.jar!:!lib/error_prone_annotations-2.21.1.jar!:!lib/j2objc-annotations-2.8.jar!:!lib/org.eclipse.jdt.annotation-2.2.800.jar!:!lib/util-13.0.1.jar!:!lib/triemap-1.3.1.jar!:!lib/yang-common-13.0.1.jar!:!lib/yang-data-api-13.0.1.jar!:!lib/value-2.10.0-annotations.jar!:!lib/yang-data-impl-13.0.1.jar!:!lib/yang-data-spi-13.0.1.jar!:!lib/yang-data-util-13.0.1.jar!:!lib/rfc8528-model-api-13.0.1.jar!:!lib/yang-model-api-13.0.1.jar!:!lib/yang-model-util-13.0.1.jar!:!lib/rfc8040-model-api-13.0.1.jar!:!lib/rfc8819-parser-support-13.0.1.jar!:!lib/yang-model-spi-13.0.1.jar!:!lib/rfc7952-model-api-13.0.1.jar!:!lib/rfc8819-model-api-13.0.1.jar!:!lib/yang-parser-rfc7950-13.0.1.jar!:!lib/antlr4-runtime-4.13.1.jar!:!lib/concepts-13.0.1.jar!:!lib/yang-model-ri-13.0.1.jar!:!lib/yang-parser-reactor-13.0.1.jar!:!lib/yang-repo-api-13.0.1.jar!:!lib/yang-ir-13.0.1.jar!:!lib/yang-repo-spi-13.0.1.jar!:!lib/yang-xpath-api-13.0.1.jar!:!lib/yang-parser-spi-13.0.1.jar!:!lib/yang-parser-api-13.0.1.jar!:!lib/odlext-parser-support-13.0.1.jar!:!lib/odlext-model-api-13.0.1.jar!:!lib/yang-parser-impl-13.0.1.jar!:!lib/openconfig-parser-support-13.0.1.jar!:!lib/openconfig-model-api-13.0.1.jar!:!lib/rfc6241-parser-support-13.0.1.jar!:!lib/rfc6241-model-api-13.0.1.jar!:!lib/rfc6536-parser-support-13.0.1.jar!:!lib/rfc6536-model-api-13.0.1.jar!:!lib/rfc6643-parser-support-13.0.1.jar!:!lib/rfc6643-model-api-13.0.1.jar!:!lib/rfc7952-parser-support-13.0.1.jar!:!lib/rfc8040-parser-support-13.0.1.jar!:!lib/rfc8528-parser-support-13.0.1.jar!:!lib/rfc8639-parser-support-13.0.1.jar!:!lib/rfc8639-model-api-13.0.1.jar!:!lib/yang-xpath-impl-13.0.1.jar
\ No newline at end of file