diff --git a/README.rst b/README.rst
index 1c1b5027ee..00dd10fc99 100644
--- a/README.rst
+++ b/README.rst
@@ -70,17 +70,17 @@ Contributing
 
 * Write a unit test:
 
-  * Binary formats and Common APIs: src/testcases/org/apache/poi/
-  * OOXML APIs only: src/ooxml/testcases/org/apache/poi/
-  * Scratchpad (Binary formats): src/scratchpad/testcases/org/apache/poi/
+  * Binary formats and Common APIs: poi/src/test/java/org/apache/poi/
+  * OOXML APIs only: poi-ooxml/src/test/java/org/apache/poi/
+  * Scratchpad (Binary formats): poi-scratchpad/src/test/java/org/apache/poi/
   * Test files: test-data/
 
 * Navigate the source, make changes, and run unit tests to verify
 
-  * Binary formats and Common APIs: src/java/org/apache/poi/
-  * OOXML APIs only: src/ooxml/java/org/apache/poi/
-  * Scratchpad (Binary formats): src/scratchpad/src/org/apache/poi/
-  * Examples: src/examples/src/org/apache/poi/
+  * Binary formats and Common APIs: poi/src/main/java/org/apache/poi/
+  * OOXML APIs only: poi-ooxml/src/main/java/org/apache/poi/
+  * Scratchpad (Binary formats): poi-scratchpad/src/main/java/org/apache/poi/
+  * Examples: poi-examples/src/main/java/org/apache/poi/
 
 * More info: `How To Build page`_  at apache.org
 
diff --git a/build.gradle b/build.gradle
index 3756158663..a85f346ee2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -331,33 +331,36 @@ rat {
     inputDir.set(file("."))
 
     // include all directories which contain files that are included in releases
-    includes.add("examples/**")
-    includes.add("excelant/**")
+    includes.add("poi-examples/**")
+    includes.add("poi-excelant/**")
     includes.add("poi-integration/**")
     includes.add("legal/**")
-    includes.add("main/**")
+    includes.add("poi/**")
     includes.add("maven/**")
-    includes.add("ooxml/**")
-    includes.add("ooxml-schema/**")
+    includes.add("poi-ooxml/**")
+    includes.add("poi-ooxml-full/**")
+    includes.add("poi-ooxml-lite/**")
+    includes.add("poi-ooxml-lite-agent/**")
     //includes.add("osgi/**")
-    includes.add("scratchpad/**")
+    includes.add("poi-scratchpad/**")
     includes.add("src/**")
     //includes.add("sonar/**")
     includes.add("build.*")
 
     // List of Gradle exclude directives, defaults to ['**/.gradle/**']
     //excludes.add("main/java/org/apache/poi/**/*-chart-data.txt")
+    includes.add("build.javacheck.xml")
     excludes.add("**/build/**")
     excludes.add("**/out/**")
     excludes.add("**/*.iml")
     excludes.add("**/*.log")
     excludes.add("**/main/java/org/apache/poi/**/*-chart-data.txt")
-    excludes.add("main/src/main/resources/org/apache/poi/sl/draw/geom/presetShapeDefinitions.xml")
-    excludes.add("ooxml/src/main/resources/org/apache/poi/xslf/usermodel/notesMaster.xml")
-    excludes.add("ooxml/src/main/resources/org/apache/poi/xssf/usermodel/presetTableStyles.xml")
-    excludes.add("ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/XAdES*.xsd")
-    excludes.add("ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/xmldsig-core-schema.xsd")
-    excludes.add("ooxml-schema/src/main/xmlschema/org/apache/poi/xdgf/visio.xsd")
+    excludes.add("poi/src/main/resources/org/apache/poi/sl/draw/geom/presetShapeDefinitions.xml")
+    excludes.add("poi-ooxml/src/main/resources/org/apache/poi/xslf/usermodel/notesMaster.xml")
+    excludes.add("poi-ooxml/src/main/resources/org/apache/poi/xssf/usermodel/presetTableStyles.xml")
+    excludes.add("poi-ooxml-full/src/main/xmlschema/org/apache/poi/schemas/XAdES*.xsd")
+    excludes.add("poi-ooxml-full/src/main/xmlschema/org/apache/poi/schemas/xmldsig-core-schema.xsd")
+    excludes.add("poi-ooxml-full/src/main/xmlschema/org/apache/poi/xdgf/visio.xsd")
     /*
     <exclude name="documentation/*.txt" />
     <exclude name="documentation/content/xdocs/dtd/" />
diff --git a/jenkins/create_jobs.groovy b/jenkins/create_jobs.groovy
index f841b78790..85f09a0da0 100644
--- a/jenkins/create_jobs.groovy
+++ b/jenkins/create_jobs.groovy
@@ -156,10 +156,10 @@ def apicheckDesc = '''
 <p>
 <b><a href="https://sonarcloud.io/dashboard?id=poi-parent" target="_blank">Sonar reports</a></b> -
 <p>
-<b><a href="lastSuccessfulBuild/artifact/build/main/build/reports/japi.html">API Check POI</a></b>
-<b><a href="lastSuccessfulBuild/artifact/build/ooxml/build/reports/japi.html">API Check POI-OOXML</a></b>
-<b><a href="lastSuccessfulBuild/artifact/build/excelant/build/reports/japi.html">API Check POI-Excelant</a></b>
-<b><a href="lastSuccessfulBuild/artifact/build/scratchpad/build/reports/japi.html">API Check POI-Scratchpad</a></b>
+<b><a href="lastSuccessfulBuild/artifact/build/poi/build/reports/japi.html">API Check POI</a></b>
+<b><a href="lastSuccessfulBuild/artifact/build/poi-ooxml/build/reports/japi.html">API Check POI-OOXML</a></b>
+<b><a href="lastSuccessfulBuild/artifact/build/poi-excelant/build/reports/japi.html">API Check POI-Excelant</a></b>
+<b><a href="lastSuccessfulBuild/artifact/build/poi-scratchpad/build/reports/japi.html">API Check POI-Scratchpad</a></b>
 
 </p>
 '''
diff --git a/sonar/examples/pom.xml b/sonar/examples/pom.xml
index a6851591e9..cbeb37f092 100644
--- a/sonar/examples/pom.xml
+++ b/sonar/examples/pom.xml
@@ -36,7 +36,7 @@
                             <outputDirectory>${basedir}/src/main/java</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>../../examples/src/main/java</directory>
+                                    <directory>../../poi-examples/src/main/java</directory>
                                 </resource>
                             </resources>
                         </configuration>
diff --git a/sonar/excelant/pom.xml b/sonar/excelant/pom.xml
index 7dceeabfa2..20bfcf4c62 100644
--- a/sonar/excelant/pom.xml
+++ b/sonar/excelant/pom.xml
@@ -31,7 +31,7 @@
                             <outputDirectory>${basedir}/src/main/java</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>../../excelant/src/main/java</directory>
+                                    <directory>../../poi-excelant/src/main/java</directory>
                                 </resource>
                             </resources>
                         </configuration>
@@ -47,10 +47,10 @@
                             <outputDirectory>${basedir}/src/main/resources</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>../../excelant/src/main/resources</directory>
+                                    <directory>../../poi-excelant/src/main/resources</directory>
                                 </resource>
                                 <resource>
-                                    <directory>../../excelant/src/test/resources</directory>
+                                    <directory>../../poi-excelant/src/test/resources</directory>
                                 </resource>
                             </resources>
                         </configuration>
@@ -66,7 +66,7 @@
                             <outputDirectory>${basedir}/src/test/java</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>../../excelant/src/test/java</directory>
+                                    <directory>../../poi-excelant/src/test/java</directory>
                                 </resource>
                             </resources>
                         </configuration>
diff --git a/sonar/integration-test/pom.xml b/sonar/integration-test/pom.xml
index 583d28ec6b..7fe0e86e2c 100644
--- a/sonar/integration-test/pom.xml
+++ b/sonar/integration-test/pom.xml
@@ -34,7 +34,7 @@
                                     <directory>../../poi-integration/src/test/java</directory>
                                 </resource>
                                 <resource>
-                                    <directory>../../main/src/test/java</directory>
+                                    <directory>../../poi/src/test/java</directory>
                                     <includes>
                                         <include>org/apache/poi/POIDataSamples.java</include>
                                         <include>org/apache/poi/util/NullPrintStream.java</include>
diff --git a/sonar/main/pom.xml b/sonar/main/pom.xml
index 3383554035..d5c2aeefa7 100644
--- a/sonar/main/pom.xml
+++ b/sonar/main/pom.xml
@@ -30,7 +30,7 @@
                             <outputDirectory>${basedir}/src/main/java</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>../../main/src/main/java</directory>
+                                    <directory>../../poi/src/main/java</directory>
                                 </resource>
                             </resources>
                         </configuration>
@@ -45,7 +45,7 @@
                             <outputDirectory>${basedir}/src/main/resources</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>../../main/src/main/resources</directory>
+                                    <directory>../../poi/src/main/resources</directory>
                                 </resource>
                             </resources>
                         </configuration>
@@ -61,10 +61,10 @@
                             <outputDirectory>${basedir}/src/test/java</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>../../main/src/test/java</directory>
+                                    <directory>../../poi/src/test/java</directory>
                                 </resource>
                                 <resource>
-                                    <directory>../../main/src/test/resources</directory>
+                                    <directory>../../poi/src/test/resources</directory>
                                 </resource>
                             </resources>
                         </configuration>
@@ -128,5 +128,11 @@
             <artifactId>SparseBitSet</artifactId>
             <version>1.2</version>
         </dependency>
-    </dependencies>
+		<dependency>
+			<groupId>org.apache.ant</groupId>
+			<artifactId>ant</artifactId>
+			<version>1.10.9</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
 </project>
diff --git a/sonar/ooxml-full/pom.xml b/sonar/ooxml-full/pom.xml
index 263136d962..3b10eff008 100644
--- a/sonar/ooxml-full/pom.xml
+++ b/sonar/ooxml-full/pom.xml
@@ -34,7 +34,7 @@
                         </goals>
                         <configuration>
                             <target>
-                                <property name="xsdir" value="${basedir}/../../ooxml-schema/src/main/xmlschema/org/apache/poi"/>
+                                <property name="xsdir" value="${basedir}/../../poi-ooxml-full/src/main/xmlschema/org/apache/poi"/>
                                 <copy todir="${basedir}/target/schemas">
                                     <zipfileset src="${xsdir}/schemas/OfficeOpenXML-XMLSchema-Transitional.zip"/>
                                     <zipfileset src="${xsdir}/schemas/OpenPackagingConventions-XMLSchema.zip" includes="opc-digSig.xsd,opc-relationships.xsd"/>
@@ -100,7 +100,7 @@
                                     <directory>${basedir}/target/generated-resources</directory>
                                 </resource>
                                 <resource>
-                                    <directory>${basedir}/../../ooxml-schema/src/ooxml-full/java9</directory>
+                                    <directory>${basedir}/../../poi-ooxml-full/src/main/java9</directory>
                                     <targetPath>META-INF/versions/9</targetPath>
                                     <includes>
                                         <include>*.class</include>
diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml
index e181ca3171..83845c591e 100644
--- a/sonar/ooxml/pom.xml
+++ b/sonar/ooxml/pom.xml
@@ -28,7 +28,7 @@
                             <outputDirectory>${basedir}/src/main/java</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>../../ooxml/src/main/java</directory>
+                                    <directory>../../poi-ooxml/src/main/java</directory>
                                 </resource>
                             </resources>
                         </configuration>
@@ -43,7 +43,7 @@
                             <outputDirectory>${basedir}/src/main/resources</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>../../ooxml/src/main/resources</directory>
+                                    <directory>../../poi-ooxml/src/main/resources</directory>
                                 </resource>
                             </resources>
                         </configuration>
@@ -58,10 +58,10 @@
                             <outputDirectory>${basedir}/src/test/java</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>../../ooxml/src/test/java</directory>
+                                    <directory>../../poi-ooxml/src/test/java</directory>
                                 </resource>
                                 <resource>
-                                    <directory>../../ooxml/src/test/resources</directory>
+                                    <directory>../../poi-ooxml/src/test/resources</directory>
                                 </resource>
                             </resources>
                         </configuration>
diff --git a/sonar/scratchpad/pom.xml b/sonar/scratchpad/pom.xml
index 639d930358..b5d1e80ef7 100644
--- a/sonar/scratchpad/pom.xml
+++ b/sonar/scratchpad/pom.xml
@@ -37,7 +37,7 @@
                             <outputDirectory>${basedir}/src/main/java</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>../../scratchpad/src/main/java</directory>
+                                    <directory>../../poi-scratchpad/src/main/java</directory>
                                 </resource>
                             </resources>
                         </configuration>
@@ -53,7 +53,7 @@
                             <outputDirectory>${basedir}/src/main/resources</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>../../scratchpad/src/main/resources</directory>
+                                    <directory>../../poi-scratchpad/src/main/resources</directory>
                                 </resource>
                             </resources>
                         </configuration>
@@ -69,10 +69,10 @@
                             <outputDirectory>${basedir}/src/test/java</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>../../scratchpad/src/test/java</directory>
+                                    <directory>../../poi-scratchpad/src/test/java</directory>
                                 </resource>
                                 <resource>
-                                    <directory>../../scratchpad/src/test/resources</directory>
+                                    <directory>../../poi-scratchpad/src/test/resources</directory>
                                 </resource>
                             </resources>
                         </configuration>