diff --git a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/build.properties b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/build.properties
index 5e583bef6e838eeef37e83280569b85987726bbf..54c09fc44f212d17a00d0b22c405bd4dd35c7564 100644
--- a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/build.properties
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/build.properties
@@ -1,2 +1,2 @@
 bin.includes = META-INF/,\
-               lib/
+               libs/
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 dd251bf68a7c49f684fef9f5d6747853e32d2bb4..006eb7b39c6833045b3fc8d8bd0502134af17704 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
@@ -26,7 +26,7 @@
 				<configuration>
 					<filesets combine.children="append">
 						<fileset>
-							<directory>${basedir}/../lib/</directory>
+							<directory>${basedir}/../libs/</directory>
 							<includes>
 								<include>**/*</include>
 							</includes>
@@ -48,7 +48,7 @@
 						</goals>
 						<configuration>
 							<outputFilterFile>true</outputFilterFile>
-							<prefix>lib</prefix>
+							<prefix>libs</prefix>
 							<regenerateFile>true</regenerateFile>
 							<pathSeparator>${classpath.placeholder}</pathSeparator>
 							<outputFile>${basedir}/classpath.properties</outputFile>
@@ -61,7 +61,7 @@
 							<goal>copy-dependencies</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${basedir}/../lib</outputDirectory>
+							<outputDirectory>${basedir}/../libs</outputDirectory>
 							<overWriteReleases>false</overWriteReleases>
 							<overWriteSnapshots>false</overWriteSnapshots>
 							<overWriteIfNewer>true</overWriteIfNewer>
@@ -165,5 +165,10 @@
 			<artifactId>yang-parser-impl</artifactId>
 			<version>13.0.1</version>
 		</dependency>
+		<dependency>
+			<groupId>org.opendaylight.yangtools</groupId>
+			<artifactId>yang-repo-api</artifactId>
+			<version>13.0.1</version>
+		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
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
index 9a72e7fece8e93260644d42a7fdfb52f1b8f048b..04acac2d274ac37a24f153264f0657b3f31f869f 100644
--- 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
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="${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 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/dependencies/resources/META-INF/MANIFEST.MF b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/resources/META-INF/MANIFEST.MF
index e28c86a0f3c3fde3ad62f249707d0d0487065864..c7788c4408c4a2a703b4056672d8437030f7fb36 100644
--- a/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/resources/META-INF/MANIFEST.MF
+++ b/plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn/dependencies/resources/META-INF/MANIFEST.MF
@@ -29,5 +29,5 @@ 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: ${classpath}
 Automatic-Module-Name: org.etsi.mts.tdl.extras.yang.tools.wrapper.mvn
+Bundle-ClassPath: ${classpath}