diff --git a/src/ooxml/testcases/org/apache/poi/TestDetectAsOOXML.java b/poi-ooxml/src/test/java/org/apache/poi/TestDetectAsOOXML.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/TestDetectAsOOXML.java
rename to poi-ooxml/src/test/java/org/apache/poi/TestDetectAsOOXML.java
diff --git a/src/ooxml/testcases/org/apache/poi/TestEmbeded.java b/poi-ooxml/src/test/java/org/apache/poi/TestEmbeded.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/TestEmbeded.java
rename to poi-ooxml/src/test/java/org/apache/poi/TestEmbeded.java
diff --git a/src/ooxml/testcases/org/apache/poi/TestPOIXMLDocument.java b/poi-ooxml/src/test/java/org/apache/poi/TestPOIXMLDocument.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/TestPOIXMLDocument.java
rename to poi-ooxml/src/test/java/org/apache/poi/TestPOIXMLDocument.java
diff --git a/src/ooxml/testcases/org/apache/poi/TestPOIXMLProperties.java b/poi-ooxml/src/test/java/org/apache/poi/TestPOIXMLProperties.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/TestPOIXMLProperties.java
rename to poi-ooxml/src/test/java/org/apache/poi/TestPOIXMLProperties.java
diff --git a/src/ooxml/testcases/org/apache/poi/TestXMLPropertiesTextExtractor.java b/poi-ooxml/src/test/java/org/apache/poi/TestXMLPropertiesTextExtractor.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/TestXMLPropertiesTextExtractor.java
rename to poi-ooxml/src/test/java/org/apache/poi/TestXMLPropertiesTextExtractor.java
diff --git a/src/ooxml/testcases/org/apache/poi/extractor/TestExtractorFactory.java b/poi-ooxml/src/test/java/org/apache/poi/extractor/TestExtractorFactory.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/extractor/TestExtractorFactory.java
rename to poi-ooxml/src/test/java/org/apache/poi/extractor/TestExtractorFactory.java
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/OpenXML4JTestDataSamples.java b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/OpenXML4JTestDataSamples.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/openxml4j/OpenXML4JTestDataSamples.java
rename to poi-ooxml/src/test/java/org/apache/poi/openxml4j/OpenXML4JTestDataSamples.java
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/AllOpenXML4JTests.java b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/AllOpenXML4JTests.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/AllOpenXML4JTests.java
rename to poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/AllOpenXML4JTests.java
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestContentType.java b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestContentType.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestContentType.java
rename to poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestContentType.java
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestFileHelper.java b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestFileHelper.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestFileHelper.java
rename to poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestFileHelper.java
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestListParts.java b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestListParts.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestListParts.java
rename to poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestListParts.java
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackage.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java
rename to poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackage.java
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackageCoreProperties.java b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackageCoreProperties.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackageCoreProperties.java
rename to poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackageCoreProperties.java
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackagePartName.java b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackagePartName.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackagePartName.java
rename to poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackagePartName.java
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackageThumbnail.java b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackageThumbnail.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackageThumbnail.java
rename to poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackageThumbnail.java
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackagingURIHelper.java b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackagingURIHelper.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackagingURIHelper.java
rename to poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackagingURIHelper.java
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestRelationships.java b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestRelationships.java
rename to poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/ZipFileAssert.java b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/ZipFileAssert.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/ZipFileAssert.java
rename to poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/ZipFileAssert.java
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/AllOpenXML4JComplianceTests.java b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/compliance/AllOpenXML4JComplianceTests.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/AllOpenXML4JComplianceTests.java
rename to poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/compliance/AllOpenXML4JComplianceTests.java
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCComplianceCoreProperties.java b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/compliance/TestOPCComplianceCoreProperties.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCComplianceCoreProperties.java
rename to poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/compliance/TestOPCComplianceCoreProperties.java
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePackageModel.java b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePackageModel.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePackageModel.java
rename to poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePackageModel.java
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePartName.java b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePartName.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePartName.java
rename to poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePartName.java
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/AllOpenXML4JInternalTests.java b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/internal/AllOpenXML4JInternalTests.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/AllOpenXML4JInternalTests.java
rename to poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/internal/AllOpenXML4JInternalTests.java
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/TestContentTypeManager.java b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/internal/TestContentTypeManager.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/TestContentTypeManager.java
rename to poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/internal/TestContentTypeManager.java
diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/AllPOIFSCryptoTests.java b/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/AllPOIFSCryptoTests.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/poifs/crypt/AllPOIFSCryptoTests.java
rename to poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/AllPOIFSCryptoTests.java
diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestAgileEncryptionParameters.java b/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/TestAgileEncryptionParameters.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/poifs/crypt/TestAgileEncryptionParameters.java
rename to poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/TestAgileEncryptionParameters.java
diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestCertificateEncryption.java b/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/TestCertificateEncryption.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/poifs/crypt/TestCertificateEncryption.java
rename to poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/TestCertificateEncryption.java
diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestDecryptor.java b/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/TestDecryptor.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/poifs/crypt/TestDecryptor.java
rename to poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/TestDecryptor.java
diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestEncryptionInfo.java b/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/TestEncryptionInfo.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/poifs/crypt/TestEncryptionInfo.java
rename to poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/TestEncryptionInfo.java
diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestEncryptor.java b/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/TestEncryptor.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/poifs/crypt/TestEncryptor.java
rename to poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/TestEncryptor.java
diff --git a/src/ooxml/testcases/org/apache/poi/ss/TestWorkbookFactory.java b/poi-ooxml/src/test/java/org/apache/poi/ss/TestWorkbookFactory.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/ss/TestWorkbookFactory.java
rename to poi-ooxml/src/test/java/org/apache/poi/ss/TestWorkbookFactory.java
diff --git a/src/ooxml/testcases/org/apache/poi/ss/format/TestCellFormatPart.java b/poi-ooxml/src/test/java/org/apache/poi/ss/format/TestCellFormatPart.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/ss/format/TestCellFormatPart.java
rename to poi-ooxml/src/test/java/org/apache/poi/ss/format/TestCellFormatPart.java
diff --git a/src/ooxml/testcases/org/apache/poi/util/TestIdentifierManager.java b/poi-ooxml/src/test/java/org/apache/poi/util/TestIdentifierManager.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/util/TestIdentifierManager.java
rename to poi-ooxml/src/test/java/org/apache/poi/util/TestIdentifierManager.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/TestXSLFBugs.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java
rename to poi-ooxml/src/test/java/org/apache/poi/xslf/TestXSLFBugs.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFSlideShow.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/TestXSLFSlideShow.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xslf/TestXSLFSlideShow.java
rename to poi-ooxml/src/test/java/org/apache/poi/xslf/TestXSLFSlideShow.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/XSLFTestDataSamples.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/XSLFTestDataSamples.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xslf/XSLFTestDataSamples.java
rename to poi-ooxml/src/test/java/org/apache/poi/xslf/XSLFTestDataSamples.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java
rename to poi-ooxml/src/test/java/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/geom/TestFormulaParser.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/geom/TestFormulaParser.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xslf/geom/TestFormulaParser.java
rename to poi-ooxml/src/test/java/org/apache/poi/xslf/geom/TestFormulaParser.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/geom/TestPresetGeometries.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/geom/TestPresetGeometries.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xslf/geom/TestPresetGeometries.java
rename to poi-ooxml/src/test/java/org/apache/poi/xslf/geom/TestPresetGeometries.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java
rename to poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXMLSlideShow.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXMLSlideShow.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXMLSlideShow.java
rename to poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXMLSlideShow.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java
rename to poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFChart.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFChart.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFChart.java
rename to poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFChart.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFColor.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFColor.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFColor.java
rename to poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFColor.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java
rename to poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java
rename to poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java
rename to poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFHyperlink.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFHyperlink.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFHyperlink.java
rename to poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFHyperlink.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java
rename to poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShape.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFShape.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShape.java
rename to poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFShape.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShapeContainer.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFShapeContainer.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShapeContainer.java
rename to poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFShapeContainer.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSheet.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSheet.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSheet.java
rename to poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSheet.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java
rename to poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlide.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSlide.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlide.java
rename to poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSlide.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java
rename to poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTable.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTable.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTable.java
rename to poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTable.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableStyles.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTableStyles.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableStyles.java
rename to poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTableStyles.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextBox.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextBox.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextBox.java
rename to poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextBox.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java
rename to poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextRun.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextRun.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextRun.java
rename to poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextRun.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextShape.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextShape.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextShape.java
rename to poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextShape.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTheme.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTheme.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTheme.java
rename to poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTheme.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/AllXSSFTests.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/AllXSSFTests.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/AllXSSFTests.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/AllXSSFTests.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/SXSSFITestDataProvider.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/SXSSFITestDataProvider.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/SXSSFITestDataProvider.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/SXSSFITestDataProvider.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/TestSheetProtection.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/TestSheetProtection.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/TestSheetProtection.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/TestSheetProtection.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/TestWorkbookProtection.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/TestWorkbookProtection.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/TestWorkbookProtection.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/TestWorkbookProtection.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/XSSFITestDataProvider.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/XSSFITestDataProvider.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/XSSFITestDataProvider.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/XSSFITestDataProvider.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/XSSFTestDataSamples.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/XSSFTestDataSamples.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/XSSFTestDataSamples.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/XSSFTestDataSamples.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestReadOnlySharedStringsTable.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestReadOnlySharedStringsTable.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestReadOnlySharedStringsTable.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestReadOnlySharedStringsTable.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractor.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractor.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractor.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractor.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractorUsingFactory.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractorUsingFactory.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractorUsingFactory.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractorUsingFactory.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractorUsingFactory.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExcelExtractorUsingFactory.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractorUsingFactory.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExcelExtractorUsingFactory.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFImportFromXML.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFImportFromXML.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFImportFromXML.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFImportFromXML.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/io/TestLoadSaveXSSF.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/io/TestLoadSaveXSSF.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/io/TestLoadSaveXSSF.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/io/TestLoadSaveXSSF.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/model/TestCalculationChain.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/model/TestCalculationChain.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/model/TestCalculationChain.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/model/TestCalculationChain.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/model/TestCommentsTable.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/model/TestCommentsTable.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/model/TestCommentsTable.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/model/TestCommentsTable.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/model/TestMapInfo.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/model/TestMapInfo.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/model/TestMapInfo.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/model/TestMapInfo.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/model/TestSharedStringsTable.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/model/TestSharedStringsTable.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/model/TestSharedStringsTable.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/model/TestSharedStringsTable.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/model/TestStylesTable.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/model/TestStylesTable.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/model/TestStylesTable.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/model/TestStylesTable.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestOutlining.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestOutlining.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/streaming/TestOutlining.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestOutlining.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFCell.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFCell.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFCell.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFCell.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFHyperlink.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFHyperlink.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFHyperlink.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFHyperlink.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFRow.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFRow.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFRow.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFRow.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheet.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFSheet.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheet.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFSheet.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/AllXSSFUsermodelTests.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/AllXSSFUsermodelTests.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/AllXSSFUsermodelTests.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/AllXSSFUsermodelTests.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSheetHiding.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestSheetHiding.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSheetHiding.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestSheetHiding.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCell.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFCell.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCell.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFCell.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFChart.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFChart.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFChart.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFChart.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFChartSheet.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFChartSheet.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFChartSheet.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFChartSheet.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColor.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFColor.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColor.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFColor.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFComment.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFComment.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFComment.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFComment.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataFormat.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDataFormat.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataFormat.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDataFormat.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDialogSheet.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDialogSheet.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDialogSheet.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDialogSheet.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFExternalFunctions.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFExternalFunctions.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFExternalFunctions.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFExternalFunctions.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFont.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFont.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFont.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFont.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaEvaluation.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFormulaEvaluation.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaEvaluation.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFormulaEvaluation.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHeaderFooter.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFHeaderFooter.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHeaderFooter.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFHeaderFooter.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHyperlink.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFHyperlink.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHyperlink.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFHyperlink.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFName.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFName.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFName.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFName.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPicture.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPicture.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPicture.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPicture.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPictureData.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPictureData.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPictureData.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPictureData.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPrintSetup.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPrintSetup.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPrintSetup.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPrintSetup.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFRichTextString.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFRichTextString.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFRichTextString.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFRichTextString.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFRow.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFRow.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFRow.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFRow.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheet.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheet.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetAutosizeColumn.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetAutosizeColumn.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetAutosizeColumn.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetAutosizeColumn.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetRowGrouping.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetRowGrouping.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetRowGrouping.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetRowGrouping.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRows.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRows.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRows.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRows.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetUpdateArrayFormulas.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetUpdateArrayFormulas.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetUpdateArrayFormulas.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetUpdateArrayFormulas.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFVMLDrawing.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFVMLDrawing.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFVMLDrawing.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFVMLDrawing.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFCategoryAxis.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFCategoryAxis.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFCategoryAxis.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFCategoryAxis.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFChartAxis.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFChartAxis.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFChartAxis.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFChartAxis.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFChartLegend.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFChartLegend.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFChartLegend.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFChartLegend.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFLineChartData.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFLineChartData.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFLineChartData.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFLineChartData.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFManualLayout.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFManualLayout.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFManualLayout.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFManualLayout.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFScatterChartData.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFScatterChartData.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFScatterChartData.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFScatterChartData.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFValueAxis.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFValueAxis.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFValueAxis.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFValueAxis.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFBorder.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFBorder.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFBorder.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFBorder.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFCellFill.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFCellFill.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFCellFill.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFCellFill.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFSheetComments.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFSheetComments.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFSheetComments.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFSheetComments.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestColumnHelper.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/helpers/TestColumnHelper.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestColumnHelper.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/helpers/TestColumnHelper.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestHeaderFooterHelper.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/helpers/TestHeaderFooterHelper.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestHeaderFooterHelper.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/helpers/TestHeaderFooterHelper.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/util/MemoryUsage.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/util/MemoryUsage.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/util/MemoryUsage.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/util/MemoryUsage.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/util/TestCTColComparator.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/util/TestCTColComparator.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/util/TestCTColComparator.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/util/TestCTColComparator.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/util/TestEvilUnclosedBRFixingInputStream.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/util/TestEvilUnclosedBRFixingInputStream.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/util/TestEvilUnclosedBRFixingInputStream.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/util/TestEvilUnclosedBRFixingInputStream.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/util/TestNumericRanges.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/util/TestNumericRanges.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/util/TestNumericRanges.java
rename to poi-ooxml/src/test/java/org/apache/poi/xssf/util/TestNumericRanges.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/AllXWPFTests.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/AllXWPFTests.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xwpf/AllXWPFTests.java
rename to poi-ooxml/src/test/java/org/apache/poi/xwpf/AllXWPFTests.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/TestAllExtendedProperties.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/TestAllExtendedProperties.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xwpf/TestAllExtendedProperties.java
rename to poi-ooxml/src/test/java/org/apache/poi/xwpf/TestAllExtendedProperties.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/TestDocumentProtection.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/TestDocumentProtection.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xwpf/TestDocumentProtection.java
rename to poi-ooxml/src/test/java/org/apache/poi/xwpf/TestDocumentProtection.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/TestPackageCorePropertiesGetKeywords.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/TestPackageCorePropertiesGetKeywords.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xwpf/TestPackageCorePropertiesGetKeywords.java
rename to poi-ooxml/src/test/java/org/apache/poi/xwpf/TestPackageCorePropertiesGetKeywords.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFBugs.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/TestXWPFBugs.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFBugs.java
rename to poi-ooxml/src/test/java/org/apache/poi/xwpf/TestXWPFBugs.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/XWPFTestDataSamples.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/XWPFTestDataSamples.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xwpf/XWPFTestDataSamples.java
rename to poi-ooxml/src/test/java/org/apache/poi/xwpf/XWPFTestDataSamples.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java
rename to poi-ooxml/src/test/java/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFDecorators.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/model/TestXWPFDecorators.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFDecorators.java
rename to poi-ooxml/src/test/java/org/apache/poi/xwpf/model/TestXWPFDecorators.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFHeaderFooterPolicy.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/model/TestXWPFHeaderFooterPolicy.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFHeaderFooterPolicy.java
rename to poi-ooxml/src/test/java/org/apache/poi/xwpf/model/TestXWPFHeaderFooterPolicy.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestChangeTracking.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestChangeTracking.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestChangeTracking.java
rename to poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestChangeTracking.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFBugs.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFBugs.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFBugs.java
rename to poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFBugs.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java
rename to poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFFootnotes.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFFootnotes.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFFootnotes.java
rename to poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFFootnotes.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeader.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFHeader.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeader.java
rename to poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFHeader.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeadings.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFHeadings.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeadings.java
rename to poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFHeadings.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFNumbering.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFNumbering.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFNumbering.java
rename to poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFNumbering.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java
rename to poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java
rename to poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFRun.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFRun.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFRun.java
rename to poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFRun.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFSDT.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFSDT.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFSDT.java
rename to poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFSDT.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFSmartTag.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFSmartTag.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFSmartTag.java
rename to poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFSmartTag.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java
rename to poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTable.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFTable.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTable.java
rename to poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFTable.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableCell.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFTableCell.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableCell.java
rename to poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFTableCell.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableRow.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFTableRow.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableRow.java
rename to poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFTableRow.java