diff --git a/do b/do
index e29d4d1c..688d24ed 100755
--- a/do
+++ b/do
@@ -3,6 +3,7 @@
 # mvn clean
 ant version
 mvn clean
+mvn validate
 mvn -f pom-common.xml
 # mvn # this step is needed
 # cd ../epadd
diff --git a/do.bat b/do.bat
index 1ddda269..9e8c3a65 100755
--- a/do.bat
+++ b/do.bat
@@ -1,6 +1,7 @@
 REM call ant
 REM cd ..\muse
 call mvn clean
+call mvn validate
 call mvn -f pom-common.xml
 REM call mvn -f pom-jar.xmlm
 REM call mvn 
diff --git a/lib/common-image-3.5.2.jar b/lib/common-image-3.5.2.jar
new file mode 100644
index 00000000..a37e4389
Binary files /dev/null and b/lib/common-image-3.5.2.jar differ
diff --git a/lib/emailchemy_api-15.0 beta.jar b/lib/emailchemy_api-15.0 beta.jar
new file mode 100644
index 00000000..34352f21
Binary files /dev/null and b/lib/emailchemy_api-15.0 beta.jar differ
diff --git a/lib/fast-md5-1.0.0.jar b/lib/fast-md5-1.0.0.jar
new file mode 100644
index 00000000..d5ab1bab
Binary files /dev/null and b/lib/fast-md5-1.0.0.jar differ
diff --git a/lib/jhlabs-layouts-1.0.0.jar b/lib/jhlabs-layouts-1.0.0.jar
new file mode 100644
index 00000000..98142c17
Binary files /dev/null and b/lib/jhlabs-layouts-1.0.0.jar differ
diff --git a/lib/oshi-core-1.0.0.jar b/lib/oshi-core-1.0.0.jar
new file mode 100644
index 00000000..bc570b47
Binary files /dev/null and b/lib/oshi-core-1.0.0.jar differ
diff --git a/lib/quaqua-jfc-1.0.0.jar b/lib/quaqua-jfc-1.0.0.jar
new file mode 100644
index 00000000..450f273f
Binary files /dev/null and b/lib/quaqua-jfc-1.0.0.jar differ
diff --git a/pom-common.xml b/pom-common.xml
index a2659ad8..c4e21fd0 100755
--- a/pom-common.xml
+++ b/pom-common.xml
@@ -1,169 +1,170 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>edu.stanford.epadd</groupId>
-	<artifactId>epadd-common</artifactId>
-	<packaging>pom</packaging>
-	<version>1.0.0-SNAPSHOT</version>
-	<properties>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>edu.stanford.epadd</groupId>
+    <artifactId>epadd-common</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0.0-SNAPSHOT</version>
+    <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-	</properties>
-	<name>epadd</name>
-	<url>http://maven.apache.org</url>
-
-	<repositories>
-	  <repository>
-	    <id>project_lib</id>
-	    <name>Repository in project's lib dir</name>
-	    <layout>default</layout>
-	    <url>file:///${basedir}/lib</url>
-	  </repository>
-    <!--<repository>
-        <id>adobe-restlet</id>
-        <name>Adobe repository</name>
-        <url>https://repo.adobe.com/nexus/content/repositories/public</url>
-    </repository>-->
-	</repositories>
-	
-	<pluginRepositories>
-	  <pluginRepository>
-	    <id>apache.snapshots</id>
-	    <url>http://repository.apache.org/snapshots/</url>
-	  </pluginRepository>
-	</pluginRepositories>
-	
-	<dependencies>
-		<dependency>
-			<groupId>tw.edu.ntu.csie</groupId>
-			<artifactId>libsvm</artifactId>
-			<version>3.17</version>
-		</dependency>
-<!--		<dependency>-->
-<!--			<groupId>com.sun.xml.bind</groupId>-->
-<!--			<artifactId>jaxb-impl</artifactId>-->
-<!--			<version>2.2.5-b10</version>-->
-<!--		</dependency>-->
-		<dependency>
-			<groupId>jakarta.xml.bind</groupId>
-			<artifactId>jakarta.xml.bind-api</artifactId>
-			<version>3.0.0</version>
-		</dependency>
-
-		<!-- JAXB RI, Jakarta XML Binding -->
-		<dependency>
-			<groupId>com.sun.xml.bind</groupId>
-			<artifactId>jaxb-impl</artifactId>
-			<version>3.0.0</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<version>3.0.1</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<!--<dependency>-->
-		<!--<groupId>javax.servlet</groupId>-->
-		<!--<artifactId>servlet-api</artifactId>-->
-		<!--<version>2.4</version>-->
-		<!--<scope>provided</scope>-->
-		<!--</dependency>-->
-
-		<dependency>
-			<groupId>gov.loc</groupId>
-			<artifactId>bagit</artifactId>
-			<version>5.2.0</version>
-		</dependency>
-
-		<!-- https://mvnrepository.com/artifact/gov.loc/bagit -->
-	<!--	<dependency>
-			<groupId>gov.loc</groupId>
-			<artifactId>bagit</artifactId>
-			<version>5.1.1</version>
-		</dependency>-->
-				<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>jsp-api</artifactId>
-			<version>2.0</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-core</artifactId>
-			<version>7.2.1</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-queries</artifactId>
-			<version>7.2.1</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-analyzers-common</artifactId>
-			<version>7.2.1</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-queryparser</artifactId>
-			<version>7.2.1</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-highlighter</artifactId>
-			<version>7.2.1</version>
-		</dependency>
-
-		<dependency>
-			<groupId>commons-httpclient</groupId>
-			<artifactId>commons-httpclient</artifactId>
-			<version>3.1</version>
-		</dependency>
-
-		<dependency>
-			<groupId>commons-cli</groupId>
-			<artifactId>commons-cli</artifactId>
-			<version>1.2</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>2.4</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-codec</groupId>
-			<artifactId>commons-codec</artifactId>
-			<version>1.10</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<version>1.18.20</version>
-			<scope>provided</scope>
-		</dependency>
-
-<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-imaging -->
-<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-imaging -->
-	<!--	<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-imaging</artifactId>
-			<version>1.0-SNAPSHOT</version>
-		</dependency>-->
+    </properties>
+    <name>epadd</name>
+    <url>http://maven.apache.org</url>
 
-<dependency>
-    <groupId>org.apache.commons</groupId>
-    <artifactId>commons-imaging</artifactId>
-    <version>1.0-R1534292</version>
-</dependency>
+    <repositories>
+        <repository>
+            <id>project_lib</id>
+            <name>Repository in project's lib dir</name>
+            <layout>default</layout>
+            <url>file:///${basedir}/lib</url>
+        </repository>
+        <!--<repository>
+            <id>adobe-restlet</id>
+            <name>Adobe repository</name>
+            <url>https://repo.adobe.com/nexus/content/repositories/public</url>
+        </repository>-->
+    </repositories>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id>apache.snapshots</id>
+            <url>http://repository.apache.org/snapshots/</url>
+        </pluginRepository>
+    </pluginRepositories>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>tw.edu.ntu.csie</groupId>
+            <artifactId>libsvm</artifactId>
+            <version>3.17</version>
+        </dependency>
+        <!--		<dependency>-->
+        <!--			<groupId>com.sun.xml.bind</groupId>-->
+        <!--			<artifactId>jaxb-impl</artifactId>-->
+        <!--			<version>2.2.5-b10</version>-->
+        <!--		</dependency>-->
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>3.0.0</version>
+        </dependency>
+
+        <!-- JAXB RI, Jakarta XML Binding -->
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>3.0.0</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.0.1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!--<dependency>-->
+        <!--<groupId>javax.servlet</groupId>-->
+        <!--<artifactId>servlet-api</artifactId>-->
+        <!--<version>2.4</version>-->
+        <!--<scope>provided</scope>-->
+        <!--</dependency>-->
+
+        <dependency>
+            <groupId>gov.loc</groupId>
+            <artifactId>bagit</artifactId>
+            <version>5.2.0</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/gov.loc/bagit -->
+        <!--	<dependency>
+                <groupId>gov.loc</groupId>
+                <artifactId>bagit</artifactId>
+                <version>5.1.1</version>
+            </dependency>-->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jsp-api</artifactId>
+            <version>2.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-core</artifactId>
+            <version>7.2.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-queries</artifactId>
+            <version>7.2.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-analyzers-common</artifactId>
+            <version>7.2.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-queryparser</artifactId>
+            <version>7.2.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-highlighter</artifactId>
+            <version>7.2.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+            <version>3.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+            <version>1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.4</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.10</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.20</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-imaging -->
+        <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-imaging -->
+        <!--	<dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-imaging</artifactId>
+                <version>1.0-SNAPSHOT</version>
+            </dependency>-->
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-imaging</artifactId>
+            <version>1.0-R1534292</version>
+        </dependency>
 
-		<!--
+        <!--
                 <dependency>
                     <groupId>javax.mail</groupId>
                     <artifactId>javax.mail-api</artifactId>
@@ -177,215 +178,252 @@
                 </dependency>
         -->
 
-<!--dependency>
-	<groupId>javax.mail</groupId>
-	<artifactId>mail</artifactId>
-	<version>1.4.2</version>
-</dependency-->
+        <!--dependency>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+            <version>1.4.2</version>
+        </dependency-->
 
-<dependency>
-    <groupId>javax.mail</groupId>
-    <artifactId>javax.mail-api</artifactId>
-    <version>1.6.2</version>
-</dependency>
+        <dependency>
+            <groupId>javax.mail</groupId>
+            <artifactId>javax.mail-api</artifactId>
+            <version>1.6.2</version>
+        </dependency>
 
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>net.sf.jtidy</groupId>
+            <artifactId>jtidy</artifactId>
+            <version>r938</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20131018</version>
+        </dependency>
+        <dependency>
+            <groupId>com.googlecode.json-simple</groupId>
+            <artifactId>json-simple</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>1.5</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tika</groupId>
+            <artifactId>tika-parsers</artifactId>
+            <version>1.17</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tika</groupId>
+            <artifactId>tika-core</artifactId>
+            <version>1.17</version>
+        </dependency>
+
+        <!-- no direct dependency on pdfbox now, only through tika
 <dependency>
-    <groupId>javax.activation</groupId>
-    <artifactId>activation</artifactId>
-    <version>1.1.1</version>
+    <groupId>org.apache.pdfbox</groupId>
+    <artifactId>pdfbox</artifactId>
+    <version>2.0.5</version>
 </dependency>
+        -->
+
+        <dependency>
+            <groupId>org.apache.opennlp</groupId>
+            <artifactId>opennlp-tools</artifactId>
+            <version>1.5.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.twitter4j</groupId>
+            <artifactId>twitter4j-core</artifactId>
+            <version>3.0.5</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+            <version>1.7.3</version>
+        </dependency>
+        <!--<dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.16</version>
+        </dependency>
 
-		<dependency>
-			<groupId>net.sf.jtidy</groupId>
-			<artifactId>jtidy</artifactId>
-			<version>r938</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.json</groupId>
-			<artifactId>json</artifactId>
-			<version>20131018</version>
-		</dependency>
-		<dependency>
-			<groupId>com.googlecode.json-simple</groupId>
-			<artifactId>json-simple</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-			<version>1.5</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tika</groupId>
-			<artifactId>tika-parsers</artifactId>
-			<version>1.17</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tika</groupId>
-			<artifactId>tika-core</artifactId>
-			<version>1.17</version>
-		</dependency>
-
-                <!-- no direct dependency on pdfbox now, only through tika 
-		<dependency>
-			<groupId>org.apache.pdfbox</groupId>
-			<artifactId>pdfbox</artifactId>
-			<version>2.0.5</version>
-		</dependency> 
-                -->
-
-		<dependency>
-			<groupId>org.apache.opennlp</groupId>
-			<artifactId>opennlp-tools</artifactId>
-			<version>1.5.3</version>
-		</dependency>
-		<dependency>
-			<groupId>org.twitter4j</groupId>
-			<artifactId>twitter4j-core</artifactId>
-			<version>3.0.5</version>
-		</dependency>
-		<dependency>
-			<groupId>org.jsoup</groupId>
-			<artifactId>jsoup</artifactId>
-			<version>1.7.3</version>
-		</dependency>
-		<!--<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.16</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-			<version>1.7.5</version>
-		</dependency>-->
-		<!--dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-api</artifactId>
-			<version>2.10.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-core</artifactId>
-			<version>2.10.0</version>
-		</dependency-->
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-api</artifactId>
-			<version>2.18.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-core</artifactId>
-			<version>2.18.0</version>
-		</dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.7.5</version>
+        </dependency>-->
+        <!--dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>2.10.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.10.0</version>
+        </dependency-->
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>2.18.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.18.0</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-web</artifactId>
             <version>2.18.0</version>
         </dependency>
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-taglib</artifactId>
-			<version>2.18.0</version>
-		</dependency>				
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-taglib</artifactId>
+            <version>2.18.0</version>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
             <version>2.0.0</version>
-		</dependency>
-		<!--For CSV exporting-->
-		<dependency>
-			<groupId>net.sf.opencsv</groupId>
-			<artifactId>opencsv</artifactId>
-			<version>2.3</version>
-		</dependency>
-		
-		<!-- For stringEscapeUtils. -->
-		<dependency>
-			<groupId>commons-lang</groupId>
-			<artifactId>commons-lang</artifactId>
-			<version>2.3</version>
-		</dependency>
-
-		<!-- for searcher to receive file with correspondent names -->
-		<dependency>
-			<groupId>commons-fileupload</groupId>
-			<artifactId>commons-fileupload</artifactId>
-			<version>1.4</version>
-		</dependency>
-
-		<!--For learning tasks in segmentation of openNLPNER, this could be removed-->
-		<dependency>
-		  <groupId>org.apache.commons</groupId>
-		  <artifactId>commons-math3</artifactId>
-		  <version>3.2</version>
-		</dependency>
-
-		<!--This dependency is just for CaseInsenstiveMap used in EmailUtils. Replace it if you think it is over-kill-->
-		<dependency>
-		  <groupId>org.apache.commons</groupId>
-		  <artifactId>commons-collections4</artifactId>
-		  <version>4.0</version>
-		</dependency>
-		
-		<dependency>
-		  <groupId>com.google.guava</groupId>
-		  <artifactId>guava</artifactId>
-		  <version>18.0</version>
-		</dependency>
-		
-		<dependency>
-		  <groupId>org.mnode.mstor</groupId>
-		  <artifactId>mstor</artifactId>
-		  <version>1.0.2</version>
-		<!--<version>0.9.14</version>-->
-		</dependency>
-
-		<dependency>
-			<groupId>org.codehaus.groovy</groupId>
-			<artifactId>groovy</artifactId>
-			<version>3.0.8</version>
-		</dependency>
-<!--		<dependency>-->
-<!--			<groupId>javax.xml.bind</groupId>-->
-<!--			<artifactId>jaxb-api</artifactId>-->
-<!--			<version>2.3.1</version>-->
-<!--		</dependency>-->
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.11</version>
-		</dependency>
-		<!-- https://mvnrepository.com/artifact/org.simplejavamail/simple-java-mail -->
-		<dependency>
-			<groupId>org.simplejavamail</groupId>
-			<artifactId>simple-java-mail</artifactId>
-			<version>6.6.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.simplejavamail</groupId>
-			<artifactId>outlook-module</artifactId>
-			<version>6.6.1</version>
-		</dependency>
-
-
-		<!--<dependency>
-		    <groupId>edu.stanford.nlp</groupId>
-		    <artifactId>stanford-corenlp</artifactId>
-		    <version>3.5.2</version>
-		    </dependency>
-		    <dependency>
-		      <groupId>edu.stanford.nlp</groupId>
-		      <artifactId>stanford-corenlp</artifactId>
-		      <version>3.5.2</version>
-		      <classifier>models</classifier>
-		    </dependency>-->
-	</dependencies>
-	<build>
-	  <defaultGoal>install</defaultGoal>
-	  <sourceDirectory>src/java</sourceDirectory>
-	</build>
+        </dependency>
+        <!--For CSV exporting-->
+        <dependency>
+            <groupId>net.sf.opencsv</groupId>
+            <artifactId>opencsv</artifactId>
+            <version>2.3</version>
+        </dependency>
+
+        <!-- For stringEscapeUtils. -->
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.3</version>
+        </dependency>
+
+        <!-- for searcher to receive file with correspondent names -->
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>1.4</version>
+        </dependency>
+
+        <!--For learning tasks in segmentation of openNLPNER, this could be removed-->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-math3</artifactId>
+            <version>3.2</version>
+        </dependency>
+
+        <!--This dependency is just for CaseInsenstiveMap used in EmailUtils. Replace it if you think it is over-kill-->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <version>4.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>18.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mnode.mstor</groupId>
+            <artifactId>mstor</artifactId>
+            <version>1.0.2</version>
+            <!--<version>0.9.14</version>-->
+        </dependency>
+
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy</artifactId>
+            <version>3.0.8</version>
+        </dependency>
+        <!--		<dependency>-->
+        <!--			<groupId>javax.xml.bind</groupId>-->
+        <!--			<artifactId>jaxb-api</artifactId>-->
+        <!--			<version>2.3.1</version>-->
+        <!--		</dependency>-->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.simplejavamail/simple-java-mail -->
+        <dependency>
+            <groupId>org.simplejavamail</groupId>
+            <artifactId>simple-java-mail</artifactId>
+            <version>6.6.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.simplejavamail</groupId>
+            <artifactId>outlook-module</artifactId>
+            <version>6.6.1</version>
+        </dependency>
+
+
+        <!--<dependency>
+            <groupId>edu.stanford.nlp</groupId>
+            <artifactId>stanford-corenlp</artifactId>
+            <version>3.5.2</version>
+            </dependency>
+            <dependency>
+              <groupId>edu.stanford.nlp</groupId>
+              <artifactId>stanford-corenlp</artifactId>
+              <version>3.5.2</version>
+              <classifier>models</classifier>
+            </dependency>-->
+
+        <dependency>
+            <groupId>emailchemy_api</groupId>
+            <artifactId>emailchemy_api</artifactId>
+            <version>15.0 beta</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-text -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-configuration2</artifactId>
+            <version>2.8.0</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <defaultGoal>install</defaultGoal>
+        <sourceDirectory>src/java</sourceDirectory>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+                <version>2.5.2</version>
+                <executions>
+                    <execution>
+                        <id>install-jar-lib</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>install-file</goal>
+                        </goals>
+                        <configuration>
+                            <groupId>emailchemy_api</groupId>
+                            <artifactId>emailchemy_api</artifactId>
+                            <version>15.0 beta</version>
+                            <packaging>jar</packaging>
+                            <file>${basedir}/lib/emailchemy_api-15.0 beta.jar</file>
+                            <generatePom>true</generatePom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+
+    </build>
 </project>
diff --git a/pom-discovery.xml b/pom-discovery.xml
index 245d3852..0bfe08dd 100755
--- a/pom-discovery.xml
+++ b/pom-discovery.xml
@@ -27,13 +27,6 @@
       <version>3.0.1</version>
       <scope>provided</scope>
     </dependency>
-		<dependency>
-			<groupId>com.weirdkid.emailchemy.api</groupId>
-			<artifactId>emailchemy_api</artifactId>
-			<version>15.0</version>
-			<scope>system</scope>
-			<systemPath>${TMP}\emailchemy_api\java\emailchemy_api.jar</systemPath>
-		</dependency>
 
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -82,12 +75,6 @@
       <artifactId>slf4j-log4j12</artifactId>
       <version>1.7.5</version>
     </dependency>
-        <dependency>
-            <groupId>emailchemy</groupId>
-            <artifactId>emailchemy_api</artifactId>
-            <version>15.0 beta</version>
-            <scope>compile</scope>
-        </dependency>
 
   </dependencies>
 
diff --git a/pom.xml b/pom.xml
index 45bc06fb..39172762 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,439 +1,428 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>edu.stanford.epadd</groupId>
-		<artifactId>epadd-common</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>./pom-common.xml</relativePath>
-	</parent>
-  <artifactId>epadd</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
-  <packaging>war</packaging>
-  <name>epadd</name>
-  <description>ePADD software from Stanford University Libraries</description>
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
-    <dev.build.timestamp>${maven.build.timestamp}</dev.build.timestamp>
-    <skip.generate.git.props>true</skip.generate.git.props> <!-- default, for dev builds -->
-    <enforcer.skip>true</enforcer.skip> <!-- default, for dev builds -->
-  </properties>
-
-   <profiles>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>edu.stanford.epadd</groupId>
+        <artifactId>epadd-common</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>./pom-common.xml</relativePath>
+    </parent>
+    <artifactId>epadd</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <packaging>war</packaging>
+    <name>epadd</name>
+    <description>ePADD software from Stanford University Libraries</description>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
+        <dev.build.timestamp>${maven.build.timestamp}</dev.build.timestamp>
+        <skip.generate.git.props>true</skip.generate.git.props> <!-- default, for dev builds -->
+        <enforcer.skip>true</enforcer.skip> <!-- default, for dev builds -->
+    </properties>
+
+    <profiles>
         <profile>
             <id>prod</id>
             <properties>
                 <enforcer.skip>false</enforcer.skip>
-                <skip.generate.git.props>false</skip.generate.git.props> <!-- yes, generate git props for prod builds -->
+                <skip.generate.git.props>false
+                </skip.generate.git.props> <!-- yes, generate git props for prod builds -->
             </properties>
         </profile>
     </profiles>
-  
-  <dependencies>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>3.0.1</version>
-      <scope>provided</scope>
-    </dependency>
-      <!-- https://mvnrepository.com/artifact/jpl/jpl -->
-      <!--<dependency>
-          <groupId>jpl</groupId>
-          <artifactId>jpl</artifactId>
-          <version>7.4.0</version>
-      </dependency>-->
-
-
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jsp-api</artifactId>
-      <version>2.0</version>
-    </dependency>
-      <!-- https://mvnrepository.com/artifact/it.unibo.alice.tuprolog/tuprolog -->
-
-
-
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>1.5</version>
-    </dependency>
-
-      <!-- https://mvnrepository.com/artifact/jpl/jpl -->
-      <dependency>
-          <groupId>jpl</groupId>
-          <artifactId>jpl</artifactId>
-          <version>7.4.0</version>
-      </dependency>
-
-      <!-- https://mvnrepository.com/artifact/net.java.dev.jna/jna -->
-      <dependency>
-          <groupId>net.java.dev.jna</groupId>
-          <artifactId>jna</artifactId>
-          <version>5.12.1</version>
-      </dependency>
-
-      <!-- https://mvnrepository.com/artifact/net.java.dev.jna/jna-platform -->
-      <!-- https://mvnrepository.com/artifact/net.java.dev.jna/jna-platform -->
-      <dependency>
-          <groupId>net.java.dev.jna</groupId>
-          <artifactId>jna-platform</artifactId>
-          <version>5.12.1</version>
-      </dependency>
-
-      <dependency>
-          <groupId>jhlabs-layouts</groupId>
-          <artifactId>jhlabs-layouts</artifactId>
-          <version>1.0.0</version>
-      </dependency>
-
-      <!-- https://mvnrepository.com/artifact/net.sourceforge.jdatepicker/jdatepicker -->
-      <dependency>
-          <groupId>net.sourceforge.jdatepicker</groupId>
-          <artifactId>jdatepicker</artifactId>
-          <version>1.3.2</version>
-      </dependency>
-
-
-    <!-- could have given commons-io 2.4 but using 2.0.1 because muse also has it, so we won't import twice. -->
-    <!-- <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.0.1</version>
-    </dependency>-->
-    
-    <dependency>
-      <groupId>commons-fileupload</groupId>
-      <artifactId>commons-fileupload</artifactId>
-      <version>1.3.3</version>
-    </dependency>
-   <!-- <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.16</version>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.7.5</version>
-    </dependency>-->
-      <!--dependency>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-api</artifactId>
-          <version>2.10.0</version>
-      </dependency>
-      <dependency>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-core</artifactId>
-          <version>2.10.0</version>
-      </dependency-->
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-api</artifactId>
-			<version>2.18.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-core</artifactId>
-			<version>2.18.0</version>
-		</dependency>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.0.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/jpl/jpl -->
+        <!--<dependency>
+            <groupId>jpl</groupId>
+            <artifactId>jpl</artifactId>
+            <version>7.4.0</version>
+        </dependency>-->
+
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jsp-api</artifactId>
+            <version>2.0</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/it.unibo.alice.tuprolog/tuprolog -->
+
+
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>1.5</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/jpl/jpl -->
+        <dependency>
+            <groupId>jpl</groupId>
+            <artifactId>jpl</artifactId>
+            <version>7.4.0</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/net.java.dev.jna/jna -->
+        <dependency>
+            <groupId>net.java.dev.jna</groupId>
+            <artifactId>jna</artifactId>
+            <version>5.12.1</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/net.java.dev.jna/jna-platform -->
+        <!-- https://mvnrepository.com/artifact/net.java.dev.jna/jna-platform -->
+        <dependency>
+            <groupId>net.java.dev.jna</groupId>
+            <artifactId>jna-platform</artifactId>
+            <version>5.12.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>jhlabs-layouts</groupId>
+            <artifactId>jhlabs-layouts</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>oshi-core</groupId>
+            <artifactId>oshi-core</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
+
+        <!-- https://mvnrepository.com/artifact/net.sourceforge.jdatepicker/jdatepicker -->
+        <dependency>
+            <groupId>net.sourceforge.jdatepicker</groupId>
+            <artifactId>jdatepicker</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+
+
+        <!-- could have given commons-io 2.4 but using 2.0.1 because muse also has it, so we won't import twice. -->
+        <!-- <dependency>
+          <groupId>commons-io</groupId>
+          <artifactId>commons-io</artifactId>
+          <version>2.0.1</version>
+        </dependency>-->
+
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>1.3.3</version>
+        </dependency>
+        <!-- <dependency>
+           <groupId>log4j</groupId>
+           <artifactId>log4j</artifactId>
+           <version>1.2.16</version>
+         </dependency>
+
+         <dependency>
+           <groupId>org.slf4j</groupId>
+           <artifactId>slf4j-log4j12</artifactId>
+           <version>1.7.5</version>
+         </dependency>-->
+        <!--dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>2.10.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.10.0</version>
+        </dependency-->
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>2.18.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.18.0</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-web</artifactId>
             <version>2.18.0</version>
         </dependency>
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-taglib</artifactId>
-			<version>2.18.0</version>
-		</dependency>				
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-taglib</artifactId>
+            <version>2.18.0</version>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
             <version>2.0.0</version>
-      </dependency>
-      <dependency>
-          <groupId>jakarta.xml.bind</groupId>
-          <artifactId>jakarta.xml.bind-api</artifactId>
-          <version>3.0.0</version>
-      </dependency>
-<!--      <dependency>-->
-<!--          <groupId>com.sun.xml.bind</groupId>-->
-<!--          <artifactId>jaxb-impl</artifactId>-->
-<!--          <version>2.2.5-b10</version>-->
-<!--      </dependency>-->
-      <dependency>
-          <groupId>org.codehaus.groovy</groupId>
-          <artifactId>groovy</artifactId>
-          <version>3.0.8</version>
-      </dependency>
-
-      <dependency>
-          <groupId>emailchemy</groupId>
-          <artifactId>emailchemy_api</artifactId>
-          <version>15.0 beta</version>
-      </dependency>
-      <dependency>
-          <groupId>common-image</groupId>
-          <artifactId>common-image</artifactId>
-          <version>3.5.2</version>
-      </dependency>
-      <dependency>
-
-      <groupId>net.samuelcampos</groupId>
-      <artifactId>usbdrivedetector</artifactId>
-      <version>2.0.4</version>
-      </dependency>
-
-      <!-- https://mvnrepository.com/artifact/com.opencsv/opencsv -->
-      <dependency>
-          <groupId>com.opencsv</groupId>
-          <artifactId>opencsv</artifactId>
-          <version>5.7.1</version>
-      </dependency>
-      <!-- https://mvnrepository.com/artifact/org.subethamail/subethasmtp -->
-      <dependency>
-          <groupId>org.subethamail</groupId>
-          <artifactId>subethasmtp</artifactId>
-          <version>3.1.7</version>
-          <scope>test</scope>
-      </dependency>
-      <!-- https://mvnrepository.com/artifact/org.xerial/sqlite-jdbc -->
-      <dependency>
-          <groupId>org.xerial</groupId>
-          <artifactId>sqlite-jdbc</artifactId>
-          <version>3.40.0.0</version>
-      </dependency>
-
-      <!-- https://mvnrepository.com/artifact/relaxngDatatype/relaxngDatatype -->
-      <dependency>
-          <groupId>relaxngDatatype</groupId>
-          <artifactId>relaxngDatatype</artifactId>
-          <version>20020414</version>
-      </dependency>
-
-      <dependency>
-          <groupId>quaqua-jfc</groupId>
-          <artifactId>quaqua-jfc</artifactId>
-          <version>1.0.0</version>
-      </dependency>
-
-      <!-- https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml -->
-      <dependency>
-          <groupId>org.apache.poi</groupId>
-          <artifactId>poi-ooxml</artifactId>
-          <version>5.2.3</version>
-      </dependency>
-
-      <!-- https://mvnrepository.com/artifact/info.picocli/picocli -->
-      <dependency>
-          <groupId>info.picocli</groupId>
-          <artifactId>picocli</artifactId>
-          <version>4.7.0</version>
-      </dependency>
-
-
-
-     <!-- https://mvnrepository.com/artifact/ch.qos.logback/logback-core -->
-      <dependency>
-          <groupId>ch.qos.logback</groupId>
-          <artifactId>logback-core</artifactId>
-          <version>1.4.5</version>
-      </dependency>
-
-      <!-- https://mvnrepository.com/artifact/ch.qos.logback/logback-classic -->
-      <dependency>
-          <groupId>ch.qos.logback</groupId>
-          <artifactId>logback-classic</artifactId>
-          <version>1.4.5</version>
-          <scope>test</scope>
-      </dependency>
-
-      <!-- https://mvnrepository.com/artifact/com.beetstra.jutf7/jutf7 -->
-      <dependency>
-          <groupId>com.beetstra.jutf7</groupId>
-          <artifactId>jutf7</artifactId>
-          <version>1.0.0</version>
-
-      </dependency>
-      <!-- https://mvnrepository.com/artifact/com.twelvemonkeys.imageio/imageio-metadata -->
-      <dependency>
-          <groupId>com.twelvemonkeys.imageio</groupId>
-          <artifactId>imageio-metadata</artifactId>
-          <version>3.9.4</version>
-      </dependency>
-
-      <!-- https://mvnrepository.com/artifact/com.twelvemonkeys.imageio/imageio-icns -->
-      <dependency>
-          <groupId>com.twelvemonkeys.imageio</groupId>
-          <artifactId>imageio-icns</artifactId>
-          <version>3.9.4</version>
-      </dependency>
-
-      <!-- https://mvnrepository.com/artifact/com.twelvemonkeys.imageio/imageio-core -->
-      <dependency>
-          <groupId>com.twelvemonkeys.imageio</groupId>
-          <artifactId>imageio-core</artifactId>
-          <version>3.9.4</version>
-      </dependency>
-
-      <!-- https://mvnrepository.com/artifact/com.twmacinta/fast-md5 -->
-      <dependency>
-          <groupId>fast-md5</groupId>
-          <artifactId>fast-md5</artifactId>
-          <version>1.0.0</version>
-      </dependency>
-
-      <dependency>
-          <groupId>oshi-core</groupId>
-          <artifactId>oshi-core</artifactId>
-          <version>1.0.0</version>
-      </dependency>
-      <!-- https://mvnrepository.com/artifact/org.dom4j/dom4j -->
-      <dependency>
-          <groupId>org.dom4j</groupId>
-          <artifactId>dom4j</artifactId>
-          <version>2.1.3</version>
-      </dependency>
-
-      <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-text -->
-     <dependency>
-     	 <groupId>org.apache.commons</groupId>
-     	 <artifactId>commons-configuration2</artifactId>
-     	 <version>2.8.0</version>
-     </dependency>
-     
-      <dependency>
-          <groupId>org.apache.commons</groupId>
-          <artifactId>commons-text</artifactId>
-          <version>1.10.0</version>
-      </dependency>
-
-      <!-- https://mvnrepository.com/artifact/commons-logging/commons-logging -->
-      <dependency>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-          <version>1.2</version>
-      </dependency>
-
-      <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
-      <dependency>
-          <groupId>org.apache.commons</groupId>
-          <artifactId>commons-lang3</artifactId>
-          <version>3.12.0</version>
-      </dependency>
-
-      <!-- https://mvnrepository.com/artifact/commons-lang/commons-lang -->
-      <dependency>
-          <groupId>commons-lang</groupId>
-          <artifactId>commons-lang</artifactId>
-          <version>2.6</version>
-      </dependency>
-
-      <!-- https://mvnrepository.com/artifact/commons-dbutils/commons-dbutils -->
-      <dependency>
-          <groupId>commons-dbutils</groupId>
-          <artifactId>commons-dbutils</artifactId>
-          <version>1.7</version>
-      </dependency>
-
-      <!-- https://mvnrepository.com/artifact/commons-configuration/commons-configuration -->
-      <dependency>
-          <groupId>commons-configuration</groupId>
-          <artifactId>commons-configuration</artifactId>
-          <version>1.10</version>
-      </dependency>
-
-      <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-compress -->
-      <dependency>
-          <groupId>org.apache.commons</groupId>
-          <artifactId>commons-compress</artifactId>
-          <version>1.22</version>
-      </dependency>
-
-      <!-- https://mvnrepository.com/artifact/commons-collections/commons-collections -->
-      <dependency>
-          <groupId>commons-collections</groupId>
-          <artifactId>commons-collections</artifactId>
-          <version>3.2.2</version>
-      </dependency>
-
-      <!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
-      <dependency>
-          <groupId>commons-codec</groupId>
-          <artifactId>commons-codec</artifactId>
-          <version>1.15</version>
-      </dependency>
-
-      <!-- https://mvnrepository.com/artifact/commons-beanutils/commons-beanutils -->
-      <dependency>
-          <groupId>commons-beanutils</groupId>
-          <artifactId>commons-beanutils</artifactId>
-          <version>1.9.4</version>
-      </dependency>
-
-      <!-- https://mvnrepository.com/artifact/com.twelvemonkeys.common/common-lang -->
-      <dependency>
-          <groupId>com.twelvemonkeys.common</groupId>
-          <artifactId>common-lang</artifactId>
-          <version>3.9.4</version>
-      </dependency>
-
-      <!-- https://mvnrepository.com/artifact/com.twelvemonkeys.common/common-io -->
-      <dependency>
-          <groupId>com.twelvemonkeys.common</groupId>
-          <artifactId>common-io</artifactId>
-          <version>3.9.4</version>
-      </dependency>
-
-      <!-- https://mvnrepository.com/artifact/com.twelvemonkeys.common/common-image -->
-      <dependency>
-          <groupId>com.twelvemonkeys.common</groupId>
-          <artifactId>common-image</artifactId>
-          <version>3.9.4</version>
-      </dependency>
-
-  </dependencies>
-  <build>
-    <defaultGoal>install</defaultGoal>
-    <sourceDirectory>src/java</sourceDirectory>
-
-    <resources>
-      <resource>
-       	<directory>WebContent/WEB-INF/classes</directory>
-      </resource>
-    </resources>
-    
-    <plugins>
-        <plugin>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <version>3.1</version>
-            <configuration>
-                <source>11</source>
-                <target>11</target>
-                <excludes>
-                    <exclude>**/edu/stanford/epadd/launcher/*.java</exclude>
-                </excludes>
-                <encoding>UTF-8</encoding>
-            </configuration>
-        </plugin>
-
-        <plugin>
-	<groupId>org.codehaus.mojo</groupId>
-	<artifactId>license-maven-plugin</artifactId>
-	<version>1.8</version>
-	<executions>
-	  <execution>
-	    <id>download-licenses</id>
-	    <goals>
-	      <goal>download-licenses</goal>
-	    </goals>
-	  </execution>
-	</executions>
-      </plugin>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>3.0.0</version>
+        </dependency>
+        <!--      <dependency>-->
+        <!--          <groupId>com.sun.xml.bind</groupId>-->
+        <!--          <artifactId>jaxb-impl</artifactId>-->
+        <!--          <version>2.2.5-b10</version>-->
+        <!--      </dependency>-->
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy</artifactId>
+            <version>3.0.8</version>
+        </dependency>
+
+        <dependency>
+            <groupId>common-image</groupId>
+            <artifactId>common-image</artifactId>
+            <version>3.5.2</version>
+        </dependency>
+        <dependency>
+
+            <groupId>net.samuelcampos</groupId>
+            <artifactId>usbdrivedetector</artifactId>
+            <version>2.0.4</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/com.opencsv/opencsv -->
+        <dependency>
+            <groupId>com.opencsv</groupId>
+            <artifactId>opencsv</artifactId>
+            <version>5.7.1</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.subethamail/subethasmtp -->
+        <dependency>
+            <groupId>org.subethamail</groupId>
+            <artifactId>subethasmtp</artifactId>
+            <version>3.1.7</version>
+            <scope>test</scope>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.xerial/sqlite-jdbc -->
+        <dependency>
+            <groupId>org.xerial</groupId>
+            <artifactId>sqlite-jdbc</artifactId>
+            <version>3.40.0.0</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/relaxngDatatype/relaxngDatatype -->
+        <dependency>
+            <groupId>relaxngDatatype</groupId>
+            <artifactId>relaxngDatatype</artifactId>
+            <version>20020414</version>
+        </dependency>
+
+        <dependency>
+            <groupId>quaqua-jfc</groupId>
+            <artifactId>quaqua-jfc</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml -->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>5.2.3</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/info.picocli/picocli -->
+        <dependency>
+            <groupId>info.picocli</groupId>
+            <artifactId>picocli</artifactId>
+            <version>4.7.0</version>
+        </dependency>
+
+
+        <!-- https://mvnrepository.com/artifact/ch.qos.logback/logback-core -->
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>1.4.5</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/ch.qos.logback/logback-classic -->
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/com.beetstra.jutf7/jutf7 -->
+        <dependency>
+            <groupId>com.beetstra.jutf7</groupId>
+            <artifactId>jutf7</artifactId>
+            <version>1.0.0</version>
+
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.twelvemonkeys.imageio/imageio-metadata -->
+        <dependency>
+            <groupId>com.twelvemonkeys.imageio</groupId>
+            <artifactId>imageio-metadata</artifactId>
+            <version>3.9.4</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/com.twelvemonkeys.imageio/imageio-icns -->
+        <dependency>
+            <groupId>com.twelvemonkeys.imageio</groupId>
+            <artifactId>imageio-icns</artifactId>
+            <version>3.9.4</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/com.twelvemonkeys.imageio/imageio-core -->
+        <dependency>
+            <groupId>com.twelvemonkeys.imageio</groupId>
+            <artifactId>imageio-core</artifactId>
+            <version>3.9.4</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/com.twmacinta/fast-md5 -->
+        <dependency>
+            <groupId>fast-md5</groupId>
+            <artifactId>fast-md5</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.dom4j/dom4j -->
+        <dependency>
+            <groupId>org.dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+            <version>2.1.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>1.10.0</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/commons-logging/commons-logging -->
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.2</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.12.0</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/commons-lang/commons-lang -->
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.6</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/commons-dbutils/commons-dbutils -->
+        <dependency>
+            <groupId>commons-dbutils</groupId>
+            <artifactId>commons-dbutils</artifactId>
+            <version>1.7</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/commons-configuration/commons-configuration -->
+        <dependency>
+            <groupId>commons-configuration</groupId>
+            <artifactId>commons-configuration</artifactId>
+            <version>1.10</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-compress -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+            <version>1.22</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/commons-collections/commons-collections -->
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>3.2.2</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.15</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/commons-beanutils/commons-beanutils -->
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <version>1.9.4</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/com.twelvemonkeys.common/common-lang -->
+        <dependency>
+            <groupId>com.twelvemonkeys.common</groupId>
+            <artifactId>common-lang</artifactId>
+            <version>3.9.4</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/com.twelvemonkeys.common/common-io -->
+        <dependency>
+            <groupId>com.twelvemonkeys.common</groupId>
+            <artifactId>common-io</artifactId>
+            <version>3.9.4</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/com.twelvemonkeys.common/common-image -->
+        <dependency>
+            <groupId>com.twelvemonkeys.common</groupId>
+            <artifactId>common-image</artifactId>
+            <version>3.9.4</version>
+        </dependency>
+
+    </dependencies>
+    <build>
+        <defaultGoal>install</defaultGoal>
+        <sourceDirectory>src/java</sourceDirectory>
+
+        <resources>
+            <resource>
+                <directory>WebContent/WEB-INF/classes</directory>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>11</source>
+                    <target>11</target>
+                    <excludes>
+                        <exclude>**/edu/stanford/epadd/launcher/*.java</exclude>
+                    </excludes>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>license-maven-plugin</artifactId>
+                <version>1.8</version>
+                <executions>
+                    <execution>
+                        <id>download-licenses</id>
+                        <goals>
+                            <goal>download-licenses</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <!-- generate the git properties file, check that we're building off a non-dirty version.
              documentation on configuring this plugin is at: https://github.com/ktoso/maven-git-commit-id-plugin/blob/master/README.md
              validateRevision goal in this plugin currently doesn't work, so we use maven enforcer plugin instead
@@ -460,7 +449,8 @@
                     <dateFormatTimeZone>${user.timezone}</dateFormatTimeZone>
                     <verbose>true</verbose>
                     <generateGitPropertiesFile>true</generateGitPropertiesFile>
-                    <generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
+                    <generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties
+                    </generateGitPropertiesFilename>
                     <format>properties</format>
                     <skipPoms>true</skipPoms>
                     <injectAllReactorProjects>false</injectAllReactorProjects>
@@ -495,7 +485,8 @@
                             <goal>read-project-properties</goal>
                         </goals>
                         <configuration>
-                            <quiet>${skip.generate.git.props}</quiet> <!-- set quiet to true if we have skipped generating git props file, so this doesn't crash -->
+                            <quiet>${skip.generate.git.props}
+                            </quiet> <!-- set quiet to true if we have skipped generating git props file, so this doesn't crash -->
                             <files>
                                 <file>${project.build.outputDirectory}/git.properties</file>
                             </files>
@@ -503,7 +494,7 @@
                     </execution>
                 </executions>
             </plugin>
- <!-- all the rules to be enforced must go into this section -->
+            <!-- all the rules to be enforced must go into this section -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
@@ -519,9 +510,15 @@
                             <rules>
                                 <requireProperty>
                                     <property>git.dirty</property>
-                                    <message>${line.separator}${line.separator}!!!!!!!! --------- git.dirty property not found -- commit id plugin must not have run. --------!!!!!!!!!${line.separator}${line.separator}</message>
+                                    <message>${line.separator}${line.separator}!!!!!!!! --------- git.dirty property not
+                                        found -- commit id plugin must not have run.
+                                        --------!!!!!!!!!${line.separator}${line.separator}
+                                    </message>
                                     <regex>false</regex>
-                                    <regexMessage>${line.separator}${line.separator}!!!!!!!! --------- Git dirty must not be true -- make sure all files are committed before building. --------!!!!!!!!!${line.separator}${line.separator}</regexMessage>
+                                    <regexMessage>${line.separator}${line.separator}!!!!!!!! --------- Git dirty must
+                                        not be true -- make sure all files are committed before building.
+                                        --------!!!!!!!!!${line.separator}${line.separator}
+                                    </regexMessage>
                                 </requireProperty>
                             </rules>
                             <fail>true</fail>
@@ -529,24 +526,98 @@
                     </execution>
                 </executions>
             </plugin>
-        <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-install-plugin</artifactId>
-            <version>2.5.2</version>
-            <executions>
-
-            </executions>
-        </plugin>
-
-      <plugin>
-	<artifactId>maven-war-plugin</artifactId>
-	<version>2.3</version>
-	<configuration>
-	  <warSourceDirectory>WebContent</warSourceDirectory>
-	  <!-- <filters> <filter>p.properties</filter> </filters> <filtering>true</filtering> -->
-	  <failOnMissingWebXml>true</failOnMissingWebXml>
-	</configuration>
-      </plugin>
-    </plugins>
-  </build>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+                <version>2.5.2</version>
+                <executions>
+                    <execution>
+                        <id>install-jar-lib</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>install-file</goal>
+                        </goals>
+                        <configuration>
+                            <groupId>oshi-core</groupId>
+                            <artifactId>oshi-core</artifactId>
+                            <version>1.0.0</version>
+                            <packaging>jar</packaging>
+                            <file>${basedir}/lib/oshi-core-1.0.0.jar</file>
+                            <generatePom>true</generatePom>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>install-jar-lib2</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>install-file</goal>
+                        </goals>
+                        <configuration>
+                            <groupId>jhlabs-layouts</groupId>
+                            <artifactId>jhlabs-layouts</artifactId>
+                            <version>1.0.0</version>
+                            <packaging>jar</packaging>
+                            <file>${basedir}/lib/jhlabs-layouts-1.0.0.jar</file>
+                            <generatePom>true</generatePom>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>install-jar-lib3</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>install-file</goal>
+                        </goals>
+                        <configuration>
+                            <groupId>common-image</groupId>
+                            <artifactId>common-image</artifactId>
+                            <version>3.5.2</version>
+                            <packaging>jar</packaging>
+                            <file>${basedir}/lib/common-image-3.5.2.jar</file>
+                            <generatePom>true</generatePom>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>install-jar-lib4</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>install-file</goal>
+                        </goals>
+                        <configuration>
+                            <groupId>quaqua-jfc</groupId>
+                            <artifactId>quaqua-jfc</artifactId>
+                            <version>1.0.0</version>
+                            <packaging>jar</packaging>
+                            <file>${basedir}/lib/quaqua-jfc-1.0.0.jar</file>
+                            <generatePom>true</generatePom>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <id>install-jar-lib6</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>install-file</goal>
+                        </goals>
+                        <configuration>
+                            <groupId>fast-md5</groupId>
+                            <artifactId>fast-md5</artifactId>
+                            <version>1.0.0</version>
+                            <packaging>jar</packaging>
+                            <file>${basedir}/lib/fast-md5-1.0.0.jar</file>
+                            <generatePom>true</generatePom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>2.3</version>
+                <configuration>
+                    <warSourceDirectory>WebContent</warSourceDirectory>
+                    <!-- <filters> <filter>p.properties</filter> </filters> <filtering>true</filtering> -->
+                    <failOnMissingWebXml>true</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>