diff --git a/pom.xml b/pom.xml
index f0ff326..99ea91b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,10 +62,20 @@
             <artifactId>gson</artifactId>
             <version>2.8.2</version>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>eu.dnetlib</groupId>-->
+<!--            <artifactId>uoa-help-texts-library</artifactId>-->
+<!--            <version>2.0.0-SNAPSHOT</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>eu.dnetlib</groupId>
-            <artifactId>uoa-help-texts-library</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <artifactId>uoa-admin-tools-library</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 
diff --git a/src/main/java/eu/dnetlib/uoamonitorservice/UoaMonitorServiceApplication.java b/src/main/java/eu/dnetlib/uoamonitorservice/UoaMonitorServiceApplication.java
index 1b0b5ce..56ac5b7 100644
--- a/src/main/java/eu/dnetlib/uoamonitorservice/UoaMonitorServiceApplication.java
+++ b/src/main/java/eu/dnetlib/uoamonitorservice/UoaMonitorServiceApplication.java
@@ -7,14 +7,14 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.annotation.PropertySources;
-
-@SpringBootApplication(scanBasePackages = {"eu.dnetlib.uoamonitorservice", "eu.dnetlib.uoahelptexts"})
+//uoahelptexts
+@SpringBootApplication(scanBasePackages = {"eu.dnetlib.uoamonitorservice", "eu.dnetlib.uoaadmintoolslibrary"})
 @PropertySources({
         @PropertySource("classpath:monitorservice.properties"),
-        @PropertySource(value = "file:/usr/share/tomcat7/lib/dnet-override.properties", ignoreResourceNotFound = true),
-        @PropertySource(value = "file:/var/lib/tomcat_dnet/8380/lib/dnet-override.properties", ignoreResourceNotFound = true),
-        @PropertySource(value = "file:/var/lib/tomcat8/lib/dnet-override.properties", ignoreResourceNotFound = true)
-
+//        @PropertySource(value = "file:/usr/share/tomcat7/lib/dnet-override.properties", ignoreResourceNotFound = true),
+//        @PropertySource(value = "file:/var/lib/tomcat_dnet/8380/lib/dnet-override.properties", ignoreResourceNotFound = true),
+//        @PropertySource(value = "file:/var/lib/tomcat8/lib/dnet-override.properties", ignoreResourceNotFound = true)
+        @PropertySource("classpath:dnet-override.properties")
 })
 
 @EnableConfigurationProperties({SecurityConfig.class, MongoConfig.class})
diff --git a/src/main/java/eu/dnetlib/uoamonitorservice/configuration/mongo/MongoConnection.java b/src/main/java/eu/dnetlib/uoamonitorservice/configuration/mongo/MongoConnection.java
index f208afd..42c31fd 100644
--- a/src/main/java/eu/dnetlib/uoamonitorservice/configuration/mongo/MongoConnection.java
+++ b/src/main/java/eu/dnetlib/uoamonitorservice/configuration/mongo/MongoConnection.java
@@ -14,9 +14,9 @@ import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
 import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
 
 import java.util.Collections;
-
+//"uoahelptexts"
 @Configuration
-@EnableMongoRepositories(basePackages = {"eu.dnetlib.uoamonitorservice.dao", "eu.dnetlib.uoahelptexts.dao"})
+@EnableMongoRepositories(basePackages = {"eu.dnetlib.uoamonitorservice.dao", "eu.dnetlib.uoaadmintoolslibrary.dao"})
 public class MongoConnection {
 
     @Autowired
diff --git a/src/main/java/eu/dnetlib/uoamonitorservice/controllers/EmailController.java b/src/main/java/eu/dnetlib/uoamonitorservice/controllers/EmailController.java
index 53c54ce..23e0534 100644
--- a/src/main/java/eu/dnetlib/uoamonitorservice/controllers/EmailController.java
+++ b/src/main/java/eu/dnetlib/uoamonitorservice/controllers/EmailController.java
@@ -1,10 +1,15 @@
 package eu.dnetlib.uoamonitorservice.controllers;
 
-import eu.dnetlib.uoahelptexts.emailSender.EmailSender;
-import eu.dnetlib.uoahelptexts.entities.EmailRecaptcha;
-import eu.dnetlib.uoahelptexts.entities.Email;
-import eu.dnetlib.uoahelptexts.handlers.InvalidReCaptchaException;
-import eu.dnetlib.uoahelptexts.recaptcha.VerifyRecaptcha;
+//import eu.dnetlib.uoahelptexts.emailSender.EmailSender;
+//import eu.dnetlib.uoahelptexts.entities.EmailRecaptcha;
+//import eu.dnetlib.uoahelptexts.entities.Email;
+//import eu.dnetlib.uoahelptexts.handlers.InvalidReCaptchaException;
+//import eu.dnetlib.uoahelptexts.recaptcha.VerifyRecaptcha;
+import eu.dnetlib.uoaadmintoolslibrary.emailSender.EmailSender;
+import eu.dnetlib.uoaadmintoolslibrary.entities.email.Email;
+import eu.dnetlib.uoaadmintoolslibrary.entities.email.EmailRecaptcha;
+import eu.dnetlib.uoaadmintoolslibrary.handlers.InvalidReCaptchaException;
+import eu.dnetlib.uoaadmintoolslibrary.recaptcha.VerifyRecaptcha;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;