diff --git a/opennlp-distr/pom.xml b/opennlp-distr/pom.xml
index 1a9574d1a..48a2c0523 100644
--- a/opennlp-distr/pom.xml
+++ b/opennlp-distr/pom.xml
@@ -20,126 +20,130 @@
 -->
 
 <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>
-	<parent>
-		<groupId>org.apache.opennlp</groupId>
-		<artifactId>opennlp</artifactId>
-		<version>2.5.1-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.opennlp</groupId>
+    <artifactId>opennlp</artifactId>
+    <version>2.5.1-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
 
-	<artifactId>opennlp-distr</artifactId>
-	<packaging>pom</packaging>
-	<name>Apache OpenNLP Distribution</name>
+  <artifactId>opennlp-distr</artifactId>
+  <packaging>pom</packaging>
+  <name>Apache OpenNLP Distribution</name>
 
-	<properties>
-		<opennlp.version>${project.version}</opennlp.version>
-	</properties>
+  <properties>
+    <opennlp.version>${project.version}</opennlp.version>
+  </properties>
 
-	<!--  Versions will automatically be updated by the release plugin -->
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.opennlp</groupId>
-			<artifactId>opennlp-tools</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.opennlp</groupId>
-			<artifactId>opennlp-uima</artifactId>
-		</dependency>
-		<dependency>
-            <groupId>org.apache.opennlp</groupId>
-            <artifactId>opennlp-morfologik-addon</artifactId>
-        </dependency>
- 		<!-- ship the dist with a logging impl for cli users -->
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-slf4j2-impl</artifactId>
-			<version>${log4j2.version}</version>
-			<scope>runtime</scope>
-		</dependency>
-	</dependencies>
+  <!--  Versions will automatically be updated by the release plugin -->
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.opennlp</groupId>
+      <artifactId>opennlp-tools</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.opennlp</groupId>
+      <artifactId>opennlp-tools-models</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.opennlp</groupId>
+      <artifactId>opennlp-morfologik-addon</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.opennlp</groupId>
+      <artifactId>opennlp-uima</artifactId>
+    </dependency>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>com.ruleoftech</groupId>
-				<artifactId>markdown-page-generator-plugin</artifactId>
-				<version>2.4.2</version>
-				<executions>
-					<execution>
-						<phase>process-sources</phase>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<inputDirectory>${basedir}/../</inputDirectory>
-					<outputDirectory>${basedir}/target</outputDirectory>
-					<headerHtmlFile>${basedir}/README_HEADER.html</headerHtmlFile>
-					<footerHtmlFile>${basedir}/README_FOOTER.html</footerHtmlFile>
-					<pegdownExtensions>TABLES,FENCED_CODE_BLOCKS,AUTOLINKS</pegdownExtensions>
-					<!-- needed for the opennlp.version property -->
-					<applyFiltering>true</applyFiltering>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>bundle-project-sources</id>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-						<configuration>
-							<descriptors>
-								<descriptor>src/main/assembly/bin.xml</descriptor>
-								<descriptor>src/main/assembly/src.xml</descriptor>
-							</descriptors>
-							<!-- Tar package is only compatible with gnu tar,
-							     many file have more than 100 chars.
-							     Right now only javadoc files are too long.
-							 -->
-							 <tarLongFileMode>posix</tarLongFileMode>
-							 
-							 <finalName>apache-opennlp-${project.version}</finalName>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin> 
-	        <artifactId>maven-antrun-plugin</artifactId> 
-	        <version>1.8</version>
-	        <executions> 
-	          <execution> 
-	            <id>generate checksums for binary artifacts</id> 
-	            <goals><goal>run</goal></goals> 
-	            <phase>verify</phase> 
-	            <configuration> 
-	              <target> 
-	                <checksum algorithm="sha-512" format="MD5SUM" fileext=".sha512">
-	                  <fileset dir="${project.build.directory}"> 
-	                    <include name="*.zip" /> 
-	                    <include name="*.gz" /> 
-	                  </fileset> 
-	                </checksum>
-	              </target> 
-	            </configuration> 
-	          </execution> 
-	        </executions> 
-	      </plugin>
-		</plugins>
-	</build>
-	
-	<profiles>
+    <!-- ship the dist with a logging impl for cli users -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-slf4j2-impl</artifactId>
+      <version>${log4j2.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.ruleoftech</groupId>
+        <artifactId>markdown-page-generator-plugin</artifactId>
+        <version>2.4.2</version>
+        <executions>
+          <execution>
+            <phase>process-sources</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <inputDirectory>${basedir}/../</inputDirectory>
+          <outputDirectory>${basedir}/target</outputDirectory>
+          <headerHtmlFile>${basedir}/README_HEADER.html</headerHtmlFile>
+          <footerHtmlFile>${basedir}/README_FOOTER.html</footerHtmlFile>
+          <pegdownExtensions>TABLES,FENCED_CODE_BLOCKS,AUTOLINKS</pegdownExtensions>
+          <!-- needed for the opennlp.version property -->
+          <applyFiltering>true</applyFiltering>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>bundle-project-sources</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <descriptors>
+                <descriptor>src/main/assembly/bin.xml</descriptor>
+                <descriptor>src/main/assembly/src.xml</descriptor>
+              </descriptors>
+              <!-- Tar package is only compatible with gnu tar,
+                   many file have more than 100 chars.
+                   Right now only javadoc files are too long.
+               -->
+              <tarLongFileMode>posix</tarLongFileMode>
+
+              <finalName>apache-opennlp-${project.version}</finalName>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>generate checksums for binary artifacts</id>
+            <goals><goal>run</goal></goals>
+            <phase>verify</phase>
+            <configuration>
+              <target>
+                <checksum algorithm="sha-512" format="MD5SUM" fileext=".sha512">
+                  <fileset dir="${project.build.directory}">
+                    <include name="*.zip" />
+                    <include name="*.gz" />
+                  </fileset>
+                </checksum>
+              </target>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <profiles>
     <profile>
       <id>apache-release</id>
-      
+
       <build>
         <!-- Run jira report -->
         <!-- depends on having -DjiraVersion set -->
@@ -147,12 +151,12 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-changes-plugin</artifactId>
-			  <version>2.12.1</version>
+            <version>2.12.1</version>
             <executions>
               <execution>
-              <id>default-cli</id>
-              <phase>generate-resources</phase> 
-              <goals><goal>jira-report</goal></goals>
+                <id>default-cli</id>
+                <phase>generate-resources</phase>
+                <goals><goal>jira-report</goal></goals>
                 <configuration>
                   <useJql>true</useJql>
                   <onlyCurrentVersion>true</onlyCurrentVersion>
@@ -160,48 +164,48 @@
                   <maxEntries>1000</maxEntries> <!-- hopefully, bigger than ever needed -->
                 </configuration>
               </execution>
-            </executions>  
+            </executions>
           </plugin>
-        </plugins>     
+        </plugins>
       </build>
     </profile>
     <profile>
       <id>docker</id>
       <build>
-      <plugins>
-        <plugin>
-        <groupId>com.spotify</groupId>
-        <artifactId>docker-maven-plugin</artifactId>
-        <version>1.2.2</version>
-        <executions>
-          <execution>
-          <phase>package</phase>
-          <goals>
-            <goal>build</goal>
-          </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <imageName>apacheopennlp</imageName>
-          <dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
-          <imageTags>
-          <imageTag>${project.version}</imageTag>
-          </imageTags>
-          <buildArgs>
-            <OPENNLP_BINARY>apache-opennlp-${project.version}-bin.tar.gz</OPENNLP_BINARY>
-          </buildArgs>
-          <resources>
-          <resource>
-            <targetPath>/</targetPath>
-            <directory>${project.build.directory}</directory>
-            <include>apache-opennlp-${project.version}-bin.tar.gz</include>
-          </resource>
-          </resources>
-        </configuration>
-        </plugin>
-      </plugins>
+        <plugins>
+          <plugin>
+            <groupId>com.spotify</groupId>
+            <artifactId>docker-maven-plugin</artifactId>
+            <version>1.2.2</version>
+            <executions>
+              <execution>
+                <phase>package</phase>
+                <goals>
+                  <goal>build</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <imageName>apacheopennlp</imageName>
+              <dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
+              <imageTags>
+                <imageTag>${project.version}</imageTag>
+              </imageTags>
+              <buildArgs>
+                <OPENNLP_BINARY>apache-opennlp-${project.version}-bin.tar.gz</OPENNLP_BINARY>
+              </buildArgs>
+              <resources>
+                <resource>
+                  <targetPath>/</targetPath>
+                  <directory>${project.build.directory}</directory>
+                  <include>apache-opennlp-${project.version}-bin.tar.gz</include>
+                </resource>
+              </resources>
+            </configuration>
+          </plugin>
+        </plugins>
       </build>
     </profile>
-  </profiles> 
-  
+  </profiles>
+
 </project>
diff --git a/opennlp-distr/src/main/assembly/bin.xml b/opennlp-distr/src/main/assembly/bin.xml
index 1c8d7d8bc..176914acb 100644
--- a/opennlp-distr/src/main/assembly/bin.xml
+++ b/opennlp-distr/src/main/assembly/bin.xml
@@ -20,128 +20,142 @@
 -->
 
 <assembly>
-    <id>bin</id>
-    <formats>
-        <format>tar.gz</format>
-        <format>zip</format>
-    </formats>
-
-    <includeBaseDirectory>true</includeBaseDirectory>
-    <baseDirectory>/apache-opennlp-${project.version}</baseDirectory>
-
-    <dependencySets>
-        <dependencySet>
-            <scope>runtime</scope>
-            <unpack>false</unpack>
-            <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>644</fileMode>
-            <directoryMode>755</directoryMode>
-            <outputDirectory>lib</outputDirectory>
-            <useTransitiveDependencies>true</useTransitiveDependencies>
-        </dependencySet>
-    </dependencySets>
-
-    <fileSets>
-        <fileSet>
-            <directory>src/main/readme</directory>
-            <fileMode>644</fileMode>
-            <directoryMode>755</directoryMode>
-            <outputDirectory>.</outputDirectory>
-        </fileSet>
-
-        <fileSet>
-            <directory>src/main/resources</directory>
-            <fileMode>644</fileMode>
-            <directoryMode>755</directoryMode>
-            <outputDirectory>conf</outputDirectory>
-            <includes>
-                <include>log4j2.xml</include>
-            </includes>
-        </fileSet>
-
-        <fileSet>
-            <directory>.</directory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-            <directoryMode>755</directoryMode>
-            <includes>
-                <include>RELEASE_NOTES.html</include>
-            </includes>
-        </fileSet>
-
-        <fileSet>
-            <directory>target</directory>
-            <fileMode>644</fileMode>
-            <directoryMode>755</directoryMode>
-            <outputDirectory>.</outputDirectory>
-            <includes>
-                <include>README.html</include>
-            </includes>
-        </fileSet>
-
-        <fileSet>
-            <directory>target/issuesFixed</directory>
-            <fileMode>644</fileMode>
-            <directoryMode>755</directoryMode>
-            <outputDirectory>issuesFixed</outputDirectory>
-        </fileSet>
-
-        <fileSet>
-            <directory>src/main/bin</directory>
-            <fileMode>755</fileMode>
-            <directoryMode>755</directoryMode>
-            <outputDirectory>bin</outputDirectory>
-        </fileSet>
-
-        <fileSet>
-            <directory>../opennlp-morfologik-addon/src/main/bin</directory>
-            <fileMode>755</fileMode>
-            <directoryMode>755</directoryMode>
-            <outputDirectory>bin</outputDirectory>
-        </fileSet>
-
-        <fileSet>
-            <directory>../opennlp-tools/lang</directory>
-            <fileMode>644</fileMode>
-            <directoryMode>755</directoryMode>
-            <outputDirectory>lang</outputDirectory>
-        </fileSet>
-
-        <fileSet>
-            <directory>../opennlp-docs/target/docbkx/html</directory>
-            <fileMode>644</fileMode>
-            <directoryMode>755</directoryMode>
-            <outputDirectory>docs/manual</outputDirectory>
-        </fileSet>
-
-        <fileSet>
-            <directory>../opennlp-tools/target/apidocs</directory>
-            <fileMode>644</fileMode>
-            <directoryMode>755</directoryMode>
-            <outputDirectory>docs/apidocs/opennlp-tools</outputDirectory>
-        </fileSet>
-
-        <fileSet>
-            <directory>../opennlp-morfologik-addon/target/apidocs</directory>
-            <fileMode>644</fileMode>
-            <directoryMode>755</directoryMode>
-            <outputDirectory>docs/apidocs/opennlp-morfologik-addon</outputDirectory>
-        </fileSet>
-
-        <fileSet>
-            <directory>../opennlp-uima/target/apidocs</directory>
-            <fileMode>644</fileMode>
-            <directoryMode>755</directoryMode>
-            <outputDirectory>docs/apidocs/opennlp-uima</outputDirectory>
-        </fileSet>
-
-        <fileSet>
-            <directory>../opennlp-uima/descriptors</directory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-            <directoryMode>755</directoryMode>
-            <outputDirectory>docs/opennlp-uima-descriptors</outputDirectory>
-        </fileSet>
-
-    </fileSets>
+  <id>bin</id>
+  <formats>
+    <format>tar.gz</format>
+    <format>zip</format>
+  </formats>
+
+  <includeBaseDirectory>true</includeBaseDirectory>
+  <baseDirectory>/apache-opennlp-${project.version}</baseDirectory>
+
+  <dependencySets>
+    <dependencySet>
+      <scope>runtime</scope>
+      <unpack>false</unpack>
+      <useProjectArtifact>false</useProjectArtifact>
+      <fileMode>644</fileMode>
+      <directoryMode>755</directoryMode>
+      <outputDirectory>lib</outputDirectory>
+      <useTransitiveDependencies>true</useTransitiveDependencies>
+    </dependencySet>
+  </dependencySets>
+
+  <fileSets>
+    <fileSet>
+      <directory>src/main/readme</directory>
+      <fileMode>644</fileMode>
+      <directoryMode>755</directoryMode>
+      <outputDirectory>.</outputDirectory>
+    </fileSet>
+
+    <fileSet>
+      <directory>src/main/resources</directory>
+      <fileMode>644</fileMode>
+      <directoryMode>755</directoryMode>
+      <outputDirectory>conf</outputDirectory>
+      <includes>
+        <include>log4j2.xml</include>
+      </includes>
+    </fileSet>
+
+    <fileSet>
+      <directory>.</directory>
+      <filtered>true</filtered>
+      <fileMode>644</fileMode>
+      <directoryMode>755</directoryMode>
+      <includes>
+        <include>RELEASE_NOTES.html</include>
+      </includes>
+    </fileSet>
+
+    <fileSet>
+      <directory>target</directory>
+      <fileMode>644</fileMode>
+      <directoryMode>755</directoryMode>
+      <outputDirectory>.</outputDirectory>
+      <includes>
+        <include>README.html</include>
+      </includes>
+    </fileSet>
+
+    <fileSet>
+      <directory>target/issuesFixed</directory>
+      <fileMode>644</fileMode>
+      <directoryMode>755</directoryMode>
+      <outputDirectory>issuesFixed</outputDirectory>
+    </fileSet>
+
+    <fileSet>
+      <directory>src/main/bin</directory>
+      <fileMode>755</fileMode>
+      <directoryMode>755</directoryMode>
+      <outputDirectory>bin</outputDirectory>
+    </fileSet>
+
+    <fileSet>
+      <directory>../opennlp-morfologik-addon/src/main/bin</directory>
+      <fileMode>755</fileMode>
+      <directoryMode>755</directoryMode>
+      <outputDirectory>bin</outputDirectory>
+    </fileSet>
+
+    <fileSet>
+      <directory>../opennlp-tools/lang</directory>
+      <fileMode>644</fileMode>
+      <directoryMode>755</directoryMode>
+      <outputDirectory>lang</outputDirectory>
+    </fileSet>
+
+    <fileSet>
+      <directory>../opennlp-docs/target/docbkx/html</directory>
+      <fileMode>644</fileMode>
+      <directoryMode>755</directoryMode>
+      <outputDirectory>docs/manual</outputDirectory>
+    </fileSet>
+
+    <fileSet>
+      <directory>../opennlp-tools/target/apidocs</directory>
+      <fileMode>644</fileMode>
+      <directoryMode>755</directoryMode>
+      <outputDirectory>docs/apidocs/opennlp-tools</outputDirectory>
+    </fileSet>
+
+    <fileSet>
+      <directory>../opennlp-tools-models/target/apidocs</directory>
+      <fileMode>644</fileMode>
+      <directoryMode>755</directoryMode>
+      <outputDirectory>docs/apidocs/opennlp-tools-models</outputDirectory>
+    </fileSet>
+
+    <fileSet>
+      <directory>../opennlp-dl/target/apidocs</directory>
+      <fileMode>644</fileMode>
+      <directoryMode>755</directoryMode>
+      <outputDirectory>docs/apidocs/opennlp-dl</outputDirectory>
+    </fileSet>
+
+    <fileSet>
+      <directory>../opennlp-morfologik-addon/target/apidocs</directory>
+      <fileMode>644</fileMode>
+      <directoryMode>755</directoryMode>
+      <outputDirectory>docs/apidocs/opennlp-morfologik-addon</outputDirectory>
+    </fileSet>
+
+    <fileSet>
+      <directory>../opennlp-uima/target/apidocs</directory>
+      <fileMode>644</fileMode>
+      <directoryMode>755</directoryMode>
+      <outputDirectory>docs/apidocs/opennlp-uima</outputDirectory>
+    </fileSet>
+
+    <fileSet>
+      <directory>../opennlp-uima/descriptors</directory>
+      <filtered>true</filtered>
+      <fileMode>644</fileMode>
+      <directoryMode>755</directoryMode>
+      <outputDirectory>docs/opennlp-uima-descriptors</outputDirectory>
+    </fileSet>
+
+  </fileSets>
 </assembly>
diff --git a/pom.xml b/pom.xml
index 100819f26..efd42429f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,17 +142,23 @@
 			</dependency>
 
 			<dependency>
-				<artifactId>opennlp-uima</artifactId>
+				<artifactId>opennlp-tools-models</artifactId>
 				<groupId>${project.groupId}</groupId>
 				<version>${project.version}</version>
 			</dependency>
 
-				<dependency>
+			<dependency>
 				<artifactId>opennlp-morfologik-addon</artifactId>
 				<groupId>${project.groupId}</groupId>
 				<version>${project.version}</version>
 			</dependency>
 
+			<dependency>
+				<artifactId>opennlp-uima</artifactId>
+				<groupId>${project.groupId}</groupId>
+				<version>${project.version}</version>
+			</dependency>
+
 		</dependencies>
 	</dependencyManagement>