diff --git a/src/testcases/org/apache/poi/AllPOITests.java b/poi-main/src/test/java/org/apache/poi/AllPOITests.java
similarity index 100%
rename from src/testcases/org/apache/poi/AllPOITests.java
rename to poi-main/src/test/java/org/apache/poi/AllPOITests.java
diff --git a/src/testcases/org/apache/poi/POIDataSamples.java b/poi-main/src/test/java/org/apache/poi/POIDataSamples.java
similarity index 100%
rename from src/testcases/org/apache/poi/POIDataSamples.java
rename to poi-main/src/test/java/org/apache/poi/POIDataSamples.java
diff --git a/src/testcases/org/apache/poi/POITestCase.java b/poi-main/src/test/java/org/apache/poi/POITestCase.java
similarity index 100%
rename from src/testcases/org/apache/poi/POITestCase.java
rename to poi-main/src/test/java/org/apache/poi/POITestCase.java
diff --git a/src/testcases/org/apache/poi/TestPOIDocumentMain.java b/poi-main/src/test/java/org/apache/poi/TestPOIDocumentMain.java
similarity index 100%
rename from src/testcases/org/apache/poi/TestPOIDocumentMain.java
rename to poi-main/src/test/java/org/apache/poi/TestPOIDocumentMain.java
diff --git a/src/testcases/org/apache/poi/ddf/AllPOIDDFTests.java b/poi-main/src/test/java/org/apache/poi/ddf/AllPOIDDFTests.java
similarity index 100%
rename from src/testcases/org/apache/poi/ddf/AllPOIDDFTests.java
rename to poi-main/src/test/java/org/apache/poi/ddf/AllPOIDDFTests.java
diff --git a/src/testcases/org/apache/poi/ddf/TestEscherBSERecord.java b/poi-main/src/test/java/org/apache/poi/ddf/TestEscherBSERecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/ddf/TestEscherBSERecord.java
rename to poi-main/src/test/java/org/apache/poi/ddf/TestEscherBSERecord.java
diff --git a/src/testcases/org/apache/poi/ddf/TestEscherBlipRecord.java b/poi-main/src/test/java/org/apache/poi/ddf/TestEscherBlipRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/ddf/TestEscherBlipRecord.java
rename to poi-main/src/test/java/org/apache/poi/ddf/TestEscherBlipRecord.java
diff --git a/src/testcases/org/apache/poi/ddf/TestEscherBoolProperty.java b/poi-main/src/test/java/org/apache/poi/ddf/TestEscherBoolProperty.java
similarity index 100%
rename from src/testcases/org/apache/poi/ddf/TestEscherBoolProperty.java
rename to poi-main/src/test/java/org/apache/poi/ddf/TestEscherBoolProperty.java
diff --git a/src/testcases/org/apache/poi/ddf/TestEscherChildAnchorRecord.java b/poi-main/src/test/java/org/apache/poi/ddf/TestEscherChildAnchorRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/ddf/TestEscherChildAnchorRecord.java
rename to poi-main/src/test/java/org/apache/poi/ddf/TestEscherChildAnchorRecord.java
diff --git a/src/testcases/org/apache/poi/ddf/TestEscherClientAnchorRecord.java b/poi-main/src/test/java/org/apache/poi/ddf/TestEscherClientAnchorRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/ddf/TestEscherClientAnchorRecord.java
rename to poi-main/src/test/java/org/apache/poi/ddf/TestEscherClientAnchorRecord.java
diff --git a/src/testcases/org/apache/poi/ddf/TestEscherClientDataRecord.java b/poi-main/src/test/java/org/apache/poi/ddf/TestEscherClientDataRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/ddf/TestEscherClientDataRecord.java
rename to poi-main/src/test/java/org/apache/poi/ddf/TestEscherClientDataRecord.java
diff --git a/src/testcases/org/apache/poi/ddf/TestEscherContainerRecord.java b/poi-main/src/test/java/org/apache/poi/ddf/TestEscherContainerRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/ddf/TestEscherContainerRecord.java
rename to poi-main/src/test/java/org/apache/poi/ddf/TestEscherContainerRecord.java
diff --git a/src/testcases/org/apache/poi/ddf/TestEscherDgRecord.java b/poi-main/src/test/java/org/apache/poi/ddf/TestEscherDgRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/ddf/TestEscherDgRecord.java
rename to poi-main/src/test/java/org/apache/poi/ddf/TestEscherDgRecord.java
diff --git a/src/testcases/org/apache/poi/ddf/TestEscherDggRecord.java b/poi-main/src/test/java/org/apache/poi/ddf/TestEscherDggRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/ddf/TestEscherDggRecord.java
rename to poi-main/src/test/java/org/apache/poi/ddf/TestEscherDggRecord.java
diff --git a/src/testcases/org/apache/poi/ddf/TestEscherOptRecord.java b/poi-main/src/test/java/org/apache/poi/ddf/TestEscherOptRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/ddf/TestEscherOptRecord.java
rename to poi-main/src/test/java/org/apache/poi/ddf/TestEscherOptRecord.java
diff --git a/src/testcases/org/apache/poi/ddf/TestEscherProperty.java b/poi-main/src/test/java/org/apache/poi/ddf/TestEscherProperty.java
similarity index 100%
rename from src/testcases/org/apache/poi/ddf/TestEscherProperty.java
rename to poi-main/src/test/java/org/apache/poi/ddf/TestEscherProperty.java
diff --git a/src/testcases/org/apache/poi/ddf/TestEscherPropertyFactory.java b/poi-main/src/test/java/org/apache/poi/ddf/TestEscherPropertyFactory.java
similarity index 100%
rename from src/testcases/org/apache/poi/ddf/TestEscherPropertyFactory.java
rename to poi-main/src/test/java/org/apache/poi/ddf/TestEscherPropertyFactory.java
diff --git a/src/testcases/org/apache/poi/ddf/TestEscherSpRecord.java b/poi-main/src/test/java/org/apache/poi/ddf/TestEscherSpRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/ddf/TestEscherSpRecord.java
rename to poi-main/src/test/java/org/apache/poi/ddf/TestEscherSpRecord.java
diff --git a/src/testcases/org/apache/poi/ddf/TestEscherSpgrRecord.java b/poi-main/src/test/java/org/apache/poi/ddf/TestEscherSpgrRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/ddf/TestEscherSpgrRecord.java
rename to poi-main/src/test/java/org/apache/poi/ddf/TestEscherSpgrRecord.java
diff --git a/src/testcases/org/apache/poi/ddf/TestEscherSplitMenuColorsRecord.java b/poi-main/src/test/java/org/apache/poi/ddf/TestEscherSplitMenuColorsRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/ddf/TestEscherSplitMenuColorsRecord.java
rename to poi-main/src/test/java/org/apache/poi/ddf/TestEscherSplitMenuColorsRecord.java
diff --git a/src/testcases/org/apache/poi/ddf/TestUnknownEscherRecord.java b/poi-main/src/test/java/org/apache/poi/ddf/TestUnknownEscherRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/ddf/TestUnknownEscherRecord.java
rename to poi-main/src/test/java/org/apache/poi/ddf/TestUnknownEscherRecord.java
diff --git a/src/testcases/org/apache/poi/hpsf/TestVariantSupport.java b/poi-main/src/test/java/org/apache/poi/hpsf/TestVariantSupport.java
similarity index 100%
rename from src/testcases/org/apache/poi/hpsf/TestVariantSupport.java
rename to poi-main/src/test/java/org/apache/poi/hpsf/TestVariantSupport.java
diff --git a/src/testcases/org/apache/poi/hpsf/basic/AllDataFilesTester.java b/poi-main/src/test/java/org/apache/poi/hpsf/basic/AllDataFilesTester.java
similarity index 100%
rename from src/testcases/org/apache/poi/hpsf/basic/AllDataFilesTester.java
rename to poi-main/src/test/java/org/apache/poi/hpsf/basic/AllDataFilesTester.java
diff --git a/src/testcases/org/apache/poi/hpsf/basic/AllPOIHPSFBasicTests.java b/poi-main/src/test/java/org/apache/poi/hpsf/basic/AllPOIHPSFBasicTests.java
similarity index 100%
rename from src/testcases/org/apache/poi/hpsf/basic/AllPOIHPSFBasicTests.java
rename to poi-main/src/test/java/org/apache/poi/hpsf/basic/AllPOIHPSFBasicTests.java
diff --git a/src/testcases/org/apache/poi/hpsf/basic/POIFile.java b/poi-main/src/test/java/org/apache/poi/hpsf/basic/POIFile.java
similarity index 100%
rename from src/testcases/org/apache/poi/hpsf/basic/POIFile.java
rename to poi-main/src/test/java/org/apache/poi/hpsf/basic/POIFile.java
diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestBasic.java b/poi-main/src/test/java/org/apache/poi/hpsf/basic/TestBasic.java
similarity index 100%
rename from src/testcases/org/apache/poi/hpsf/basic/TestBasic.java
rename to poi-main/src/test/java/org/apache/poi/hpsf/basic/TestBasic.java
diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestClassID.java b/poi-main/src/test/java/org/apache/poi/hpsf/basic/TestClassID.java
similarity index 100%
rename from src/testcases/org/apache/poi/hpsf/basic/TestClassID.java
rename to poi-main/src/test/java/org/apache/poi/hpsf/basic/TestClassID.java
diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestEmptyProperties.java b/poi-main/src/test/java/org/apache/poi/hpsf/basic/TestEmptyProperties.java
similarity index 100%
rename from src/testcases/org/apache/poi/hpsf/basic/TestEmptyProperties.java
rename to poi-main/src/test/java/org/apache/poi/hpsf/basic/TestEmptyProperties.java
diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestHPSFBugs.java b/poi-main/src/test/java/org/apache/poi/hpsf/basic/TestHPSFBugs.java
similarity index 100%
rename from src/testcases/org/apache/poi/hpsf/basic/TestHPSFBugs.java
rename to poi-main/src/test/java/org/apache/poi/hpsf/basic/TestHPSFBugs.java
diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestMetaDataIPI.java b/poi-main/src/test/java/org/apache/poi/hpsf/basic/TestMetaDataIPI.java
similarity index 100%
rename from src/testcases/org/apache/poi/hpsf/basic/TestMetaDataIPI.java
rename to poi-main/src/test/java/org/apache/poi/hpsf/basic/TestMetaDataIPI.java
diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestReadAllFiles.java b/poi-main/src/test/java/org/apache/poi/hpsf/basic/TestReadAllFiles.java
similarity index 100%
rename from src/testcases/org/apache/poi/hpsf/basic/TestReadAllFiles.java
rename to poi-main/src/test/java/org/apache/poi/hpsf/basic/TestReadAllFiles.java
diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestUnicode.java b/poi-main/src/test/java/org/apache/poi/hpsf/basic/TestUnicode.java
similarity index 100%
rename from src/testcases/org/apache/poi/hpsf/basic/TestUnicode.java
rename to poi-main/src/test/java/org/apache/poi/hpsf/basic/TestUnicode.java
diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java b/poi-main/src/test/java/org/apache/poi/hpsf/basic/TestWrite.java
similarity index 100%
rename from src/testcases/org/apache/poi/hpsf/basic/TestWrite.java
rename to poi-main/src/test/java/org/apache/poi/hpsf/basic/TestWrite.java
diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java b/poi-main/src/test/java/org/apache/poi/hpsf/basic/TestWriteWellKnown.java
similarity index 100%
rename from src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java
rename to poi-main/src/test/java/org/apache/poi/hpsf/basic/TestWriteWellKnown.java
diff --git a/src/testcases/org/apache/poi/hpsf/basic/Util.java b/poi-main/src/test/java/org/apache/poi/hpsf/basic/Util.java
similarity index 100%
rename from src/testcases/org/apache/poi/hpsf/basic/Util.java
rename to poi-main/src/test/java/org/apache/poi/hpsf/basic/Util.java
diff --git a/src/testcases/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java b/poi-main/src/test/java/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java
similarity index 100%
rename from src/testcases/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java
rename to poi-main/src/test/java/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java
diff --git a/src/testcases/org/apache/poi/hssf/HSSFITestDataProvider.java b/poi-main/src/test/java/org/apache/poi/hssf/HSSFITestDataProvider.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/HSSFITestDataProvider.java
rename to poi-main/src/test/java/org/apache/poi/hssf/HSSFITestDataProvider.java
diff --git a/src/testcases/org/apache/poi/hssf/HSSFTestDataSamples.java b/poi-main/src/test/java/org/apache/poi/hssf/HSSFTestDataSamples.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/HSSFTestDataSamples.java
rename to poi-main/src/test/java/org/apache/poi/hssf/HSSFTestDataSamples.java
diff --git a/src/testcases/org/apache/poi/hssf/HSSFTests.java b/poi-main/src/test/java/org/apache/poi/hssf/HSSFTests.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/HSSFTests.java
rename to poi-main/src/test/java/org/apache/poi/hssf/HSSFTests.java
diff --git a/src/testcases/org/apache/poi/hssf/dev/BaseXLSIteratingTest.java b/poi-main/src/test/java/org/apache/poi/hssf/dev/BaseXLSIteratingTest.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/dev/BaseXLSIteratingTest.java
rename to poi-main/src/test/java/org/apache/poi/hssf/dev/BaseXLSIteratingTest.java
diff --git a/src/testcases/org/apache/poi/hssf/dev/TestBiffDrawingToXml.java b/poi-main/src/test/java/org/apache/poi/hssf/dev/TestBiffDrawingToXml.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/dev/TestBiffDrawingToXml.java
rename to poi-main/src/test/java/org/apache/poi/hssf/dev/TestBiffDrawingToXml.java
diff --git a/src/testcases/org/apache/poi/hssf/dev/TestBiffViewer.java b/poi-main/src/test/java/org/apache/poi/hssf/dev/TestBiffViewer.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/dev/TestBiffViewer.java
rename to poi-main/src/test/java/org/apache/poi/hssf/dev/TestBiffViewer.java
diff --git a/src/testcases/org/apache/poi/hssf/dev/TestEFBiffViewer.java b/poi-main/src/test/java/org/apache/poi/hssf/dev/TestEFBiffViewer.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/dev/TestEFBiffViewer.java
rename to poi-main/src/test/java/org/apache/poi/hssf/dev/TestEFBiffViewer.java
diff --git a/src/testcases/org/apache/poi/hssf/dev/TestFormulaViewer.java b/poi-main/src/test/java/org/apache/poi/hssf/dev/TestFormulaViewer.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/dev/TestFormulaViewer.java
rename to poi-main/src/test/java/org/apache/poi/hssf/dev/TestFormulaViewer.java
diff --git a/src/testcases/org/apache/poi/hssf/dev/TestReSave.java b/poi-main/src/test/java/org/apache/poi/hssf/dev/TestReSave.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/dev/TestReSave.java
rename to poi-main/src/test/java/org/apache/poi/hssf/dev/TestReSave.java
diff --git a/src/testcases/org/apache/poi/hssf/dev/TestRecordLister.java b/poi-main/src/test/java/org/apache/poi/hssf/dev/TestRecordLister.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/dev/TestRecordLister.java
rename to poi-main/src/test/java/org/apache/poi/hssf/dev/TestRecordLister.java
diff --git a/src/testcases/org/apache/poi/hssf/eventmodel/TestAbortableListener.java b/poi-main/src/test/java/org/apache/poi/hssf/eventmodel/TestAbortableListener.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/eventmodel/TestAbortableListener.java
rename to poi-main/src/test/java/org/apache/poi/hssf/eventmodel/TestAbortableListener.java
diff --git a/src/testcases/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java b/poi-main/src/test/java/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java
rename to poi-main/src/test/java/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java
diff --git a/src/testcases/org/apache/poi/hssf/eventusermodel/AllEventUserModelTests.java b/poi-main/src/test/java/org/apache/poi/hssf/eventusermodel/AllEventUserModelTests.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/eventusermodel/AllEventUserModelTests.java
rename to poi-main/src/test/java/org/apache/poi/hssf/eventusermodel/AllEventUserModelTests.java
diff --git a/src/testcases/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java b/poi-main/src/test/java/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java
rename to poi-main/src/test/java/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java
diff --git a/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java b/poi-main/src/test/java/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java
rename to poi-main/src/test/java/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java
diff --git a/src/testcases/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java b/poi-main/src/test/java/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java
rename to poi-main/src/test/java/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java
diff --git a/src/testcases/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java b/poi-main/src/test/java/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java
rename to poi-main/src/test/java/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java
diff --git a/src/testcases/org/apache/poi/hssf/extractor/TestExcelExtractor.java b/poi-main/src/test/java/org/apache/poi/hssf/extractor/TestExcelExtractor.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/extractor/TestExcelExtractor.java
rename to poi-main/src/test/java/org/apache/poi/hssf/extractor/TestExcelExtractor.java
diff --git a/src/testcases/org/apache/poi/hssf/model/AllModelTests.java b/poi-main/src/test/java/org/apache/poi/hssf/model/AllModelTests.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/model/AllModelTests.java
rename to poi-main/src/test/java/org/apache/poi/hssf/model/AllModelTests.java
diff --git a/src/testcases/org/apache/poi/hssf/model/HSSFTestModelHelper.java b/poi-main/src/test/java/org/apache/poi/hssf/model/HSSFTestModelHelper.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/model/HSSFTestModelHelper.java
rename to poi-main/src/test/java/org/apache/poi/hssf/model/HSSFTestModelHelper.java
diff --git a/src/testcases/org/apache/poi/hssf/model/TestDrawingAggregate.java b/poi-main/src/test/java/org/apache/poi/hssf/model/TestDrawingAggregate.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/model/TestDrawingAggregate.java
rename to poi-main/src/test/java/org/apache/poi/hssf/model/TestDrawingAggregate.java
diff --git a/src/testcases/org/apache/poi/hssf/model/TestDrawingManager.java b/poi-main/src/test/java/org/apache/poi/hssf/model/TestDrawingManager.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/model/TestDrawingManager.java
rename to poi-main/src/test/java/org/apache/poi/hssf/model/TestDrawingManager.java
diff --git a/src/testcases/org/apache/poi/hssf/model/TestDrawingManager2.java b/poi-main/src/test/java/org/apache/poi/hssf/model/TestDrawingManager2.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/model/TestDrawingManager2.java
rename to poi-main/src/test/java/org/apache/poi/hssf/model/TestDrawingManager2.java
diff --git a/src/testcases/org/apache/poi/hssf/model/TestDrawingShapes.java b/poi-main/src/test/java/org/apache/poi/hssf/model/TestDrawingShapes.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/model/TestDrawingShapes.java
rename to poi-main/src/test/java/org/apache/poi/hssf/model/TestDrawingShapes.java
diff --git a/src/testcases/org/apache/poi/hssf/model/TestEscherRecordFactory.java b/poi-main/src/test/java/org/apache/poi/hssf/model/TestEscherRecordFactory.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/model/TestEscherRecordFactory.java
rename to poi-main/src/test/java/org/apache/poi/hssf/model/TestEscherRecordFactory.java
diff --git a/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java b/poi-main/src/test/java/org/apache/poi/hssf/model/TestFormulaParser.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java
rename to poi-main/src/test/java/org/apache/poi/hssf/model/TestFormulaParser.java
diff --git a/src/testcases/org/apache/poi/hssf/model/TestFormulaParserEval.java b/poi-main/src/test/java/org/apache/poi/hssf/model/TestFormulaParserEval.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/model/TestFormulaParserEval.java
rename to poi-main/src/test/java/org/apache/poi/hssf/model/TestFormulaParserEval.java
diff --git a/src/testcases/org/apache/poi/hssf/model/TestFormulaParserIf.java b/poi-main/src/test/java/org/apache/poi/hssf/model/TestFormulaParserIf.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/model/TestFormulaParserIf.java
rename to poi-main/src/test/java/org/apache/poi/hssf/model/TestFormulaParserIf.java
diff --git a/src/testcases/org/apache/poi/hssf/model/TestHSSFAnchor.java b/poi-main/src/test/java/org/apache/poi/hssf/model/TestHSSFAnchor.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/model/TestHSSFAnchor.java
rename to poi-main/src/test/java/org/apache/poi/hssf/model/TestHSSFAnchor.java
diff --git a/src/testcases/org/apache/poi/hssf/model/TestLinkTable.java b/poi-main/src/test/java/org/apache/poi/hssf/model/TestLinkTable.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/model/TestLinkTable.java
rename to poi-main/src/test/java/org/apache/poi/hssf/model/TestLinkTable.java
diff --git a/src/testcases/org/apache/poi/hssf/model/TestOperandClassTransformer.java b/poi-main/src/test/java/org/apache/poi/hssf/model/TestOperandClassTransformer.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/model/TestOperandClassTransformer.java
rename to poi-main/src/test/java/org/apache/poi/hssf/model/TestOperandClassTransformer.java
diff --git a/src/testcases/org/apache/poi/hssf/model/TestRVA.java b/poi-main/src/test/java/org/apache/poi/hssf/model/TestRVA.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/model/TestRVA.java
rename to poi-main/src/test/java/org/apache/poi/hssf/model/TestRVA.java
diff --git a/src/testcases/org/apache/poi/hssf/model/TestRowBlocksReader.java b/poi-main/src/test/java/org/apache/poi/hssf/model/TestRowBlocksReader.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/model/TestRowBlocksReader.java
rename to poi-main/src/test/java/org/apache/poi/hssf/model/TestRowBlocksReader.java
diff --git a/src/testcases/org/apache/poi/hssf/model/TestShapes.java b/poi-main/src/test/java/org/apache/poi/hssf/model/TestShapes.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/model/TestShapes.java
rename to poi-main/src/test/java/org/apache/poi/hssf/model/TestShapes.java
diff --git a/src/testcases/org/apache/poi/hssf/model/TestSheet.java b/poi-main/src/test/java/org/apache/poi/hssf/model/TestSheet.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/model/TestSheet.java
rename to poi-main/src/test/java/org/apache/poi/hssf/model/TestSheet.java
diff --git a/src/testcases/org/apache/poi/hssf/model/TestSheetAdditional.java b/poi-main/src/test/java/org/apache/poi/hssf/model/TestSheetAdditional.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/model/TestSheetAdditional.java
rename to poi-main/src/test/java/org/apache/poi/hssf/model/TestSheetAdditional.java
diff --git a/src/testcases/org/apache/poi/hssf/model/TestWorkbook.java b/poi-main/src/test/java/org/apache/poi/hssf/model/TestWorkbook.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/model/TestWorkbook.java
rename to poi-main/src/test/java/org/apache/poi/hssf/model/TestWorkbook.java
diff --git a/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java b/poi-main/src/test/java/org/apache/poi/hssf/record/AllRecordTests.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/AllRecordTests.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/AllRecordTests.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestArrayRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestArrayRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestArrayRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestArrayRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestAutoFilterInfoRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestAutoFilterInfoRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestAutoFilterInfoRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestAutoFilterInfoRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestBOFRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestBOFRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestBOFRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestBOFRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestBoolErrRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestBoolErrRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestBoolErrRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestBoolErrRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestBoundSheetRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestBoundSheetRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestBoundSheetRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestBoundSheetRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestCFHeaderRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestCFHeaderRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestCFHeaderRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestCFHeaderRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestCFRuleRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestCFRuleRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestCFRuleRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestCFRuleRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestColumnInfoRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestColumnInfoRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestColumnInfoRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestColumnInfoRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestDConRefRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestDConRefRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestDConRefRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestDConRefRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestDVALRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestDVALRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestDVALRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestDVALRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestDrawingGroupRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestDrawingGroupRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestDrawingGroupRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestDrawingGroupRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestDrawingRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestDrawingRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestDrawingRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestDrawingRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestEmbeddedObjectRefSubRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestEmbeddedObjectRefSubRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestEmbeddedObjectRefSubRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestEmbeddedObjectRefSubRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestEndSubRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestEndSubRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestEndSubRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestEndSubRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestEscherAggregate.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestEscherAggregate.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestEscherAggregate.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestEscherAggregate.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestExtSSTRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestExtSSTRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestExtSSTRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestExtSSTRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestExtendedFormatRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestExtendedFormatRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestExtendedFormatRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestExtendedFormatRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestExternalNameRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestExternalNameRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestExternalNameRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestExternalNameRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestFeatRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestFeatRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestFeatRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestFeatRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestFontRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestFontRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestFontRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestFontRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestFormulaRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestFormulaRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestFormulaRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestFormulaRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestFtCblsSubRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestFtCblsSubRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestFtCblsSubRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestFtCblsSubRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestHyperlinkRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestHyperlinkRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestHyperlinkRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestHyperlinkRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestInterfaceEndRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestInterfaceEndRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestInterfaceEndRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestInterfaceEndRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestLabelRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestLabelRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestLabelRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestLabelRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestLbsDataSubRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestLbsDataSubRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestLbsDataSubRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestLbsDataSubRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestMergeCellsRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestMergeCellsRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestNameCommentRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestNameCommentRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestNameCommentRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestNameCommentRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestNameRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestNameRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestNameRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestNameRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestNoteRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestNoteRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestNoteRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestNoteRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestNoteStructureSubRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestNoteStructureSubRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestNoteStructureSubRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestNoteStructureSubRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestObjRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestObjRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestObjRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestObjRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestPLVRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestPLVRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestPLVRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestPLVRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestPaletteRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestPaletteRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestPaletteRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestPaletteRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestPaneRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestPaneRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestPaneRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestPaneRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestRecalcIdRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestRecalcIdRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestRecalcIdRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestRecalcIdRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestRecordFactory.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestRecordFactory.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestRecordFactory.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestRecordFactory.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestRecordFactoryInputStream.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestRecordFactoryInputStream.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestRecordFactoryInputStream.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestRecordFactoryInputStream.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestRecordInputStream.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestRecordInputStream.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestRecordInputStream.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestRecordInputStream.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSCLRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestSCLRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestSCLRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestSCLRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSSTDeserializer.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestSSTDeserializer.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestSSTDeserializer.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestSSTDeserializer.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSSTRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestSSTRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestSSTRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestSSTRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSSTRecordSizeCalculator.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestSSTRecordSizeCalculator.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestSSTRecordSizeCalculator.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestSSTRecordSizeCalculator.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSharedFormulaRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestSharedFormulaRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestSharedFormulaRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestSharedFormulaRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestStringRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestStringRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestStringRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestStringRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestStyleRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestStyleRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestStyleRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestStyleRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSubRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestSubRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestSubRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestSubRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSupBookRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestSupBookRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestSupBookRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestSupBookRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestTableRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestTableRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestTableRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestTableRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestTextObjectBaseRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestTextObjectBaseRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestTextObjectBaseRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestTextObjectBaseRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestTextObjectRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestTextObjectRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestTextObjectRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestTextObjectRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestUnicodeNameRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestUnicodeNameRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestUnicodeNameRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestUnicodeNameRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestWriteAccessRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestWriteAccessRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestWriteAccessRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestWriteAccessRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestcaseRecordInputStream.java b/poi-main/src/test/java/org/apache/poi/hssf/record/TestcaseRecordInputStream.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/TestcaseRecordInputStream.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/TestcaseRecordInputStream.java
diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/AllRecordAggregateTests.java b/poi-main/src/test/java/org/apache/poi/hssf/record/aggregates/AllRecordAggregateTests.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/aggregates/AllRecordAggregateTests.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/aggregates/AllRecordAggregateTests.java
diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java b/poi-main/src/test/java/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java
diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java b/poi-main/src/test/java/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java
diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java b/poi-main/src/test/java/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java
diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java b/poi-main/src/test/java/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java
diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java b/poi-main/src/test/java/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java
diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/TestSharedValueManager.java b/poi-main/src/test/java/org/apache/poi/hssf/record/aggregates/TestSharedValueManager.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/aggregates/TestSharedValueManager.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/aggregates/TestSharedValueManager.java
diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java b/poi-main/src/test/java/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java
diff --git a/src/testcases/org/apache/poi/hssf/record/cf/TestCellRange.java b/poi-main/src/test/java/org/apache/poi/hssf/record/cf/TestCellRange.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/cf/TestCellRange.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/cf/TestCellRange.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/AllChartRecordTests.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/AllChartRecordTests.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/AllChartRecordTests.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/AllChartRecordTests.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestAreaRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestAreaRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/TestAreaRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestAreaRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestAxisRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/TestAxisRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestBarRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestBarRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/TestBarRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestBarRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestChartRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestChartRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/TestChartRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestChartRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestDatRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestDatRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/TestDatRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestDatRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestFrameRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestFrameRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/TestFrameRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestFrameRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestLegendRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestLegendRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/TestLegendRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestLegendRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestPlotAreaRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestPlotAreaRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/TestPlotAreaRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestPlotAreaRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/TestSeriesRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesToChartGroupRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesToChartGroupRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/TestSeriesToChartGroupRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesToChartGroupRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestTextRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestTextRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/TestTextRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestTextRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestTickRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestTickRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/TestTickRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestTickRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestUnitsRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestUnitsRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/TestUnitsRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestUnitsRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/common/TestUnicodeString.java b/poi-main/src/test/java/org/apache/poi/hssf/record/common/TestUnicodeString.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/common/TestUnicodeString.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/common/TestUnicodeString.java
diff --git a/src/testcases/org/apache/poi/hssf/record/crypto/AllHSSFEncryptionTests.java b/poi-main/src/test/java/org/apache/poi/hssf/record/crypto/AllHSSFEncryptionTests.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/crypto/AllHSSFEncryptionTests.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/crypto/AllHSSFEncryptionTests.java
diff --git a/src/testcases/org/apache/poi/hssf/record/crypto/TestBiff8DecryptingStream.java b/poi-main/src/test/java/org/apache/poi/hssf/record/crypto/TestBiff8DecryptingStream.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/crypto/TestBiff8DecryptingStream.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/crypto/TestBiff8DecryptingStream.java
diff --git a/src/testcases/org/apache/poi/hssf/record/crypto/TestBiff8EncryptionKey.java b/poi-main/src/test/java/org/apache/poi/hssf/record/crypto/TestBiff8EncryptionKey.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/crypto/TestBiff8EncryptionKey.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/crypto/TestBiff8EncryptionKey.java
diff --git a/src/testcases/org/apache/poi/hssf/record/crypto/TestRC4.java b/poi-main/src/test/java/org/apache/poi/hssf/record/crypto/TestRC4.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/crypto/TestRC4.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/crypto/TestRC4.java
diff --git a/src/testcases/org/apache/poi/hssf/record/pivot/AllPivotRecordTests.java b/poi-main/src/test/java/org/apache/poi/hssf/record/pivot/AllPivotRecordTests.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/pivot/AllPivotRecordTests.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/pivot/AllPivotRecordTests.java
diff --git a/src/testcases/org/apache/poi/hssf/record/pivot/TestExtendedPivotTableViewFieldsRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/pivot/TestExtendedPivotTableViewFieldsRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/pivot/TestExtendedPivotTableViewFieldsRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/pivot/TestExtendedPivotTableViewFieldsRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/pivot/TestPageItemRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/pivot/TestPageItemRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/pivot/TestPageItemRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/pivot/TestPageItemRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/pivot/TestViewFieldsRecord.java b/poi-main/src/test/java/org/apache/poi/hssf/record/pivot/TestViewFieldsRecord.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/record/pivot/TestViewFieldsRecord.java
rename to poi-main/src/test/java/org/apache/poi/hssf/record/pivot/TestViewFieldsRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/AllUserModelTests.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/AllUserModelTests.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/AllUserModelTests.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/AllUserModelTests.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/FormulaExtractor.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/FormulaExtractor.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/FormulaExtractor.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/FormulaExtractor.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/HSSFEvaluationTestHelper.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/HSSFEvaluationTestHelper.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/HSSFEvaluationTestHelper.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/HSSFEvaluationTestHelper.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/HSSFTestHelper.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/HSSFTestHelper.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/HSSFTestHelper.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/HSSFTestHelper.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/RecordInspector.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/RecordInspector.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/RecordInspector.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/RecordInspector.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/SanityChecker.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/SanityChecker.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/SanityChecker.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/SanityChecker.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/StreamUtility.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/StreamUtility.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/StreamUtility.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/StreamUtility.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestBug42464.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestBug42464.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestBug42464.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestBug42464.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestBugs.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestBugs.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestCellStyle.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestCellStyle.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestCloneSheet.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestCloneSheet.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestCloneSheet.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestCloneSheet.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestComment.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestComment.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestComment.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestComment.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestDataValidation.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestDataValidation.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestDataValidation.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestDataValidation.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestEmbeddedObjects.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestEmbeddedObjects.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestEmbeddedObjects.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestEmbeddedObjects.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestEscherGraphics.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestEscherGraphics.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics2d.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestEscherGraphics2d.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics2d.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestEscherGraphics2d.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestExternalReferenceChange.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestExternalReferenceChange.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestExternalReferenceChange.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestExternalReferenceChange.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestFontDetails.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestFontDetails.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestFontDetails.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestFontDetails.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorDocs.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorDocs.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorDocs.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorDocs.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestFormulas.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestFormulas.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestFormulas.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestFormulas.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFCell.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFCell.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFClientAnchor.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFClientAnchor.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFClientAnchor.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFClientAnchor.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFComment.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFComment.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFComment.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFComment.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFConditionalFormatting.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFConditionalFormatting.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFConditionalFormatting.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFConditionalFormatting.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormatter.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFDataFormatter.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormatter.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFDataFormatter.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFExternalFunctions.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFExternalFunctions.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFExternalFunctions.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFExternalFunctions.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFont.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFFont.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFont.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFFont.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHeaderFooter.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFHeaderFooter.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHeaderFooter.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFHeaderFooter.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHyperlink.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFHyperlink.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHyperlink.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFHyperlink.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFName.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFName.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFName.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFName.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFOptimiser.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFOptimiser.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFOptimiser.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFOptimiser.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPalette.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPalette.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPalette.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPalette.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPatriarch.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPatriarch.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPatriarch.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPatriarch.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPicture.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPicture.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPicture.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPicture.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRichTextString.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFRichTextString.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRichTextString.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFRichTextString.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFRow.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFRow.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetAutosizeColumn.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetAutosizeColumn.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetAutosizeColumn.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetAutosizeColumn.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetShiftRows.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetShiftRows.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetShiftRows.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetShiftRows.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetUpdateArrayFormulas.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetUpdateArrayFormulas.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetUpdateArrayFormulas.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetUpdateArrayFormulas.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFTextbox.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFTextbox.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFTextbox.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFTextbox.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestNonStandardWorkbookStreamNames.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestNonStandardWorkbookStreamNames.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestNonStandardWorkbookStreamNames.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestNonStandardWorkbookStreamNames.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestOLE2Embeding.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestOLE2Embeding.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestOLE2Embeding.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestOLE2Embeding.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestPOIFSProperties.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestPOIFSProperties.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestPOIFSProperties.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestPOIFSProperties.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestPatriarch.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestPatriarch.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestPatriarch.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestPatriarch.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestPolygon.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestPolygon.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestPolygon.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestPolygon.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestReadWriteChart.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestReadWriteChart.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestReadWriteChart.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestReadWriteChart.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestRowStyle.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestRowStyle.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestRowStyle.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestRowStyle.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestSanityChecker.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestSanityChecker.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestSanityChecker.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestSanityChecker.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestShapeGroup.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestShapeGroup.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestShapeGroup.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestShapeGroup.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestSheetHiding.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestSheetHiding.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestSheetHiding.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestSheetHiding.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestText.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestText.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestText.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestText.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestUnfixedBugs.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestUnfixedBugs.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestUnfixedBugs.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestUnfixedBugs.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestUnicodeWorkbook.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestUnicodeWorkbook.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestUnicodeWorkbook.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestUnicodeWorkbook.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestWorkbook.java b/poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestWorkbook.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/usermodel/TestWorkbook.java
rename to poi-main/src/test/java/org/apache/poi/hssf/usermodel/TestWorkbook.java
diff --git a/src/testcases/org/apache/poi/hssf/util/AllHSSFUtilTests.java b/poi-main/src/test/java/org/apache/poi/hssf/util/AllHSSFUtilTests.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/util/AllHSSFUtilTests.java
rename to poi-main/src/test/java/org/apache/poi/hssf/util/AllHSSFUtilTests.java
diff --git a/src/testcases/org/apache/poi/hssf/util/TestAreaReference.java b/poi-main/src/test/java/org/apache/poi/hssf/util/TestAreaReference.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/util/TestAreaReference.java
rename to poi-main/src/test/java/org/apache/poi/hssf/util/TestAreaReference.java
diff --git a/src/testcases/org/apache/poi/hssf/util/TestCellReference.java b/poi-main/src/test/java/org/apache/poi/hssf/util/TestCellReference.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/util/TestCellReference.java
rename to poi-main/src/test/java/org/apache/poi/hssf/util/TestCellReference.java
diff --git a/src/testcases/org/apache/poi/hssf/util/TestHSSFColor.java b/poi-main/src/test/java/org/apache/poi/hssf/util/TestHSSFColor.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/util/TestHSSFColor.java
rename to poi-main/src/test/java/org/apache/poi/hssf/util/TestHSSFColor.java
diff --git a/src/testcases/org/apache/poi/hssf/util/TestRKUtil.java b/poi-main/src/test/java/org/apache/poi/hssf/util/TestRKUtil.java
similarity index 100%
rename from src/testcases/org/apache/poi/hssf/util/TestRKUtil.java
rename to poi-main/src/test/java/org/apache/poi/hssf/util/TestRKUtil.java
diff --git a/src/testcases/org/apache/poi/poifs/AllPOIFSTests.java b/poi-main/src/test/java/org/apache/poi/poifs/AllPOIFSTests.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/AllPOIFSTests.java
rename to poi-main/src/test/java/org/apache/poi/poifs/AllPOIFSTests.java
diff --git a/src/testcases/org/apache/poi/poifs/eventfilesystem/Listener.java b/poi-main/src/test/java/org/apache/poi/poifs/eventfilesystem/Listener.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/eventfilesystem/Listener.java
rename to poi-main/src/test/java/org/apache/poi/poifs/eventfilesystem/Listener.java
diff --git a/src/testcases/org/apache/poi/poifs/eventfilesystem/TestPOIFSReaderRegistry.java b/poi-main/src/test/java/org/apache/poi/poifs/eventfilesystem/TestPOIFSReaderRegistry.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/eventfilesystem/TestPOIFSReaderRegistry.java
rename to poi-main/src/test/java/org/apache/poi/poifs/eventfilesystem/TestPOIFSReaderRegistry.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/AllPOIFSFileSystemTests.java b/poi-main/src/test/java/org/apache/poi/poifs/filesystem/AllPOIFSFileSystemTests.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/filesystem/AllPOIFSFileSystemTests.java
rename to poi-main/src/test/java/org/apache/poi/poifs/filesystem/AllPOIFSFileSystemTests.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/ReaderWriter.java b/poi-main/src/test/java/org/apache/poi/poifs/filesystem/ReaderWriter.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/filesystem/ReaderWriter.java
rename to poi-main/src/test/java/org/apache/poi/poifs/filesystem/ReaderWriter.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/SlowInputStream.java b/poi-main/src/test/java/org/apache/poi/poifs/filesystem/SlowInputStream.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/filesystem/SlowInputStream.java
rename to poi-main/src/test/java/org/apache/poi/poifs/filesystem/SlowInputStream.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestDirectoryNode.java b/poi-main/src/test/java/org/apache/poi/poifs/filesystem/TestDirectoryNode.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/filesystem/TestDirectoryNode.java
rename to poi-main/src/test/java/org/apache/poi/poifs/filesystem/TestDirectoryNode.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestDocument.java b/poi-main/src/test/java/org/apache/poi/poifs/filesystem/TestDocument.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/filesystem/TestDocument.java
rename to poi-main/src/test/java/org/apache/poi/poifs/filesystem/TestDocument.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentDescriptor.java b/poi-main/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentDescriptor.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/filesystem/TestDocumentDescriptor.java
rename to poi-main/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentDescriptor.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentInputStream.java b/poi-main/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentInputStream.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/filesystem/TestDocumentInputStream.java
rename to poi-main/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentInputStream.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentNode.java b/poi-main/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentNode.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/filesystem/TestDocumentNode.java
rename to poi-main/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentNode.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentOutputStream.java b/poi-main/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentOutputStream.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/filesystem/TestDocumentOutputStream.java
rename to poi-main/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentOutputStream.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestEmptyDocument.java b/poi-main/src/test/java/org/apache/poi/poifs/filesystem/TestEmptyDocument.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/filesystem/TestEmptyDocument.java
rename to poi-main/src/test/java/org/apache/poi/poifs/filesystem/TestEmptyDocument.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestEntryUtils.java b/poi-main/src/test/java/org/apache/poi/poifs/filesystem/TestEntryUtils.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/filesystem/TestEntryUtils.java
rename to poi-main/src/test/java/org/apache/poi/poifs/filesystem/TestEntryUtils.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java b/poi-main/src/test/java/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java
rename to poi-main/src/test/java/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestNPOIFSFileSystem.java b/poi-main/src/test/java/org/apache/poi/poifs/filesystem/TestNPOIFSFileSystem.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/filesystem/TestNPOIFSFileSystem.java
rename to poi-main/src/test/java/org/apache/poi/poifs/filesystem/TestNPOIFSFileSystem.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestNPOIFSMiniStore.java b/poi-main/src/test/java/org/apache/poi/poifs/filesystem/TestNPOIFSMiniStore.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/filesystem/TestNPOIFSMiniStore.java
rename to poi-main/src/test/java/org/apache/poi/poifs/filesystem/TestNPOIFSMiniStore.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestNPOIFSStream.java b/poi-main/src/test/java/org/apache/poi/poifs/filesystem/TestNPOIFSStream.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/filesystem/TestNPOIFSStream.java
rename to poi-main/src/test/java/org/apache/poi/poifs/filesystem/TestNPOIFSStream.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestOffice2007XMLException.java b/poi-main/src/test/java/org/apache/poi/poifs/filesystem/TestOffice2007XMLException.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/filesystem/TestOffice2007XMLException.java
rename to poi-main/src/test/java/org/apache/poi/poifs/filesystem/TestOffice2007XMLException.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestOle10Native.java b/poi-main/src/test/java/org/apache/poi/poifs/filesystem/TestOle10Native.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/filesystem/TestOle10Native.java
rename to poi-main/src/test/java/org/apache/poi/poifs/filesystem/TestOle10Native.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSDocumentPath.java b/poi-main/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSDocumentPath.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSDocumentPath.java
rename to poi-main/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSDocumentPath.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java b/poi-main/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java
rename to poi-main/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestPropertySorter.java b/poi-main/src/test/java/org/apache/poi/poifs/filesystem/TestPropertySorter.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/filesystem/TestPropertySorter.java
rename to poi-main/src/test/java/org/apache/poi/poifs/filesystem/TestPropertySorter.java
diff --git a/src/testcases/org/apache/poi/poifs/nio/TestDataSource.java b/poi-main/src/test/java/org/apache/poi/poifs/nio/TestDataSource.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/nio/TestDataSource.java
rename to poi-main/src/test/java/org/apache/poi/poifs/nio/TestDataSource.java
diff --git a/src/testcases/org/apache/poi/poifs/property/AllPOIFSPropertyTests.java b/poi-main/src/test/java/org/apache/poi/poifs/property/AllPOIFSPropertyTests.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/property/AllPOIFSPropertyTests.java
rename to poi-main/src/test/java/org/apache/poi/poifs/property/AllPOIFSPropertyTests.java
diff --git a/src/testcases/org/apache/poi/poifs/property/LocalProperty.java b/poi-main/src/test/java/org/apache/poi/poifs/property/LocalProperty.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/property/LocalProperty.java
rename to poi-main/src/test/java/org/apache/poi/poifs/property/LocalProperty.java
diff --git a/src/testcases/org/apache/poi/poifs/property/TestDirectoryProperty.java b/poi-main/src/test/java/org/apache/poi/poifs/property/TestDirectoryProperty.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/property/TestDirectoryProperty.java
rename to poi-main/src/test/java/org/apache/poi/poifs/property/TestDirectoryProperty.java
diff --git a/src/testcases/org/apache/poi/poifs/property/TestDocumentProperty.java b/poi-main/src/test/java/org/apache/poi/poifs/property/TestDocumentProperty.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/property/TestDocumentProperty.java
rename to poi-main/src/test/java/org/apache/poi/poifs/property/TestDocumentProperty.java
diff --git a/src/testcases/org/apache/poi/poifs/property/TestPropertyFactory.java b/poi-main/src/test/java/org/apache/poi/poifs/property/TestPropertyFactory.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/property/TestPropertyFactory.java
rename to poi-main/src/test/java/org/apache/poi/poifs/property/TestPropertyFactory.java
diff --git a/src/testcases/org/apache/poi/poifs/property/TestPropertyTable.java b/poi-main/src/test/java/org/apache/poi/poifs/property/TestPropertyTable.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/property/TestPropertyTable.java
rename to poi-main/src/test/java/org/apache/poi/poifs/property/TestPropertyTable.java
diff --git a/src/testcases/org/apache/poi/poifs/property/TestRootProperty.java b/poi-main/src/test/java/org/apache/poi/poifs/property/TestRootProperty.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/property/TestRootProperty.java
rename to poi-main/src/test/java/org/apache/poi/poifs/property/TestRootProperty.java
diff --git a/src/testcases/org/apache/poi/poifs/storage/AllPOIFSStorageTests.java b/poi-main/src/test/java/org/apache/poi/poifs/storage/AllPOIFSStorageTests.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/storage/AllPOIFSStorageTests.java
rename to poi-main/src/test/java/org/apache/poi/poifs/storage/AllPOIFSStorageTests.java
diff --git a/src/testcases/org/apache/poi/poifs/storage/LocalProperty.java b/poi-main/src/test/java/org/apache/poi/poifs/storage/LocalProperty.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/storage/LocalProperty.java
rename to poi-main/src/test/java/org/apache/poi/poifs/storage/LocalProperty.java
diff --git a/src/testcases/org/apache/poi/poifs/storage/LocalRawDataBlockList.java b/poi-main/src/test/java/org/apache/poi/poifs/storage/LocalRawDataBlockList.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/storage/LocalRawDataBlockList.java
rename to poi-main/src/test/java/org/apache/poi/poifs/storage/LocalRawDataBlockList.java
diff --git a/src/testcases/org/apache/poi/poifs/storage/RawDataUtil.java b/poi-main/src/test/java/org/apache/poi/poifs/storage/RawDataUtil.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/storage/RawDataUtil.java
rename to poi-main/src/test/java/org/apache/poi/poifs/storage/RawDataUtil.java
diff --git a/src/testcases/org/apache/poi/poifs/storage/TestBATBlock.java b/poi-main/src/test/java/org/apache/poi/poifs/storage/TestBATBlock.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/storage/TestBATBlock.java
rename to poi-main/src/test/java/org/apache/poi/poifs/storage/TestBATBlock.java
diff --git a/src/testcases/org/apache/poi/poifs/storage/TestBlockAllocationTableReader.java b/poi-main/src/test/java/org/apache/poi/poifs/storage/TestBlockAllocationTableReader.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/storage/TestBlockAllocationTableReader.java
rename to poi-main/src/test/java/org/apache/poi/poifs/storage/TestBlockAllocationTableReader.java
diff --git a/src/testcases/org/apache/poi/poifs/storage/TestBlockAllocationTableWriter.java b/poi-main/src/test/java/org/apache/poi/poifs/storage/TestBlockAllocationTableWriter.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/storage/TestBlockAllocationTableWriter.java
rename to poi-main/src/test/java/org/apache/poi/poifs/storage/TestBlockAllocationTableWriter.java
diff --git a/src/testcases/org/apache/poi/poifs/storage/TestBlockListImpl.java b/poi-main/src/test/java/org/apache/poi/poifs/storage/TestBlockListImpl.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/storage/TestBlockListImpl.java
rename to poi-main/src/test/java/org/apache/poi/poifs/storage/TestBlockListImpl.java
diff --git a/src/testcases/org/apache/poi/poifs/storage/TestDocumentBlock.java b/poi-main/src/test/java/org/apache/poi/poifs/storage/TestDocumentBlock.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/storage/TestDocumentBlock.java
rename to poi-main/src/test/java/org/apache/poi/poifs/storage/TestDocumentBlock.java
diff --git a/src/testcases/org/apache/poi/poifs/storage/TestHeaderBlockReading.java b/poi-main/src/test/java/org/apache/poi/poifs/storage/TestHeaderBlockReading.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/storage/TestHeaderBlockReading.java
rename to poi-main/src/test/java/org/apache/poi/poifs/storage/TestHeaderBlockReading.java
diff --git a/src/testcases/org/apache/poi/poifs/storage/TestHeaderBlockWriting.java b/poi-main/src/test/java/org/apache/poi/poifs/storage/TestHeaderBlockWriting.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/storage/TestHeaderBlockWriting.java
rename to poi-main/src/test/java/org/apache/poi/poifs/storage/TestHeaderBlockWriting.java
diff --git a/src/testcases/org/apache/poi/poifs/storage/TestPropertyBlock.java b/poi-main/src/test/java/org/apache/poi/poifs/storage/TestPropertyBlock.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/storage/TestPropertyBlock.java
rename to poi-main/src/test/java/org/apache/poi/poifs/storage/TestPropertyBlock.java
diff --git a/src/testcases/org/apache/poi/poifs/storage/TestRawDataBlock.java b/poi-main/src/test/java/org/apache/poi/poifs/storage/TestRawDataBlock.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/storage/TestRawDataBlock.java
rename to poi-main/src/test/java/org/apache/poi/poifs/storage/TestRawDataBlock.java
diff --git a/src/testcases/org/apache/poi/poifs/storage/TestRawDataBlockList.java b/poi-main/src/test/java/org/apache/poi/poifs/storage/TestRawDataBlockList.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/storage/TestRawDataBlockList.java
rename to poi-main/src/test/java/org/apache/poi/poifs/storage/TestRawDataBlockList.java
diff --git a/src/testcases/org/apache/poi/poifs/storage/TestSmallBlockTableReader.java b/poi-main/src/test/java/org/apache/poi/poifs/storage/TestSmallBlockTableReader.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/storage/TestSmallBlockTableReader.java
rename to poi-main/src/test/java/org/apache/poi/poifs/storage/TestSmallBlockTableReader.java
diff --git a/src/testcases/org/apache/poi/poifs/storage/TestSmallBlockTableWriter.java b/poi-main/src/test/java/org/apache/poi/poifs/storage/TestSmallBlockTableWriter.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/storage/TestSmallBlockTableWriter.java
rename to poi-main/src/test/java/org/apache/poi/poifs/storage/TestSmallBlockTableWriter.java
diff --git a/src/testcases/org/apache/poi/poifs/storage/TestSmallDocumentBlock.java b/poi-main/src/test/java/org/apache/poi/poifs/storage/TestSmallDocumentBlock.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/storage/TestSmallDocumentBlock.java
rename to poi-main/src/test/java/org/apache/poi/poifs/storage/TestSmallDocumentBlock.java
diff --git a/src/testcases/org/apache/poi/poifs/storage/TestSmallDocumentBlockList.java b/poi-main/src/test/java/org/apache/poi/poifs/storage/TestSmallDocumentBlockList.java
similarity index 100%
rename from src/testcases/org/apache/poi/poifs/storage/TestSmallDocumentBlockList.java
rename to poi-main/src/test/java/org/apache/poi/poifs/storage/TestSmallDocumentBlockList.java
diff --git a/src/testcases/org/apache/poi/ss/ITestDataProvider.java b/poi-main/src/test/java/org/apache/poi/ss/ITestDataProvider.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/ITestDataProvider.java
rename to poi-main/src/test/java/org/apache/poi/ss/ITestDataProvider.java
diff --git a/src/testcases/org/apache/poi/ss/TestSpreadsheetVersion.java b/poi-main/src/test/java/org/apache/poi/ss/TestSpreadsheetVersion.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/TestSpreadsheetVersion.java
rename to poi-main/src/test/java/org/apache/poi/ss/TestSpreadsheetVersion.java
diff --git a/src/testcases/org/apache/poi/ss/format/CellFormatTestBase.java b/poi-main/src/test/java/org/apache/poi/ss/format/CellFormatTestBase.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/format/CellFormatTestBase.java
rename to poi-main/src/test/java/org/apache/poi/ss/format/CellFormatTestBase.java
diff --git a/src/testcases/org/apache/poi/ss/format/TestCellFormat.java b/poi-main/src/test/java/org/apache/poi/ss/format/TestCellFormat.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/format/TestCellFormat.java
rename to poi-main/src/test/java/org/apache/poi/ss/format/TestCellFormat.java
diff --git a/src/testcases/org/apache/poi/ss/format/TestCellFormatCondition.java b/poi-main/src/test/java/org/apache/poi/ss/format/TestCellFormatCondition.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/format/TestCellFormatCondition.java
rename to poi-main/src/test/java/org/apache/poi/ss/format/TestCellFormatCondition.java
diff --git a/src/testcases/org/apache/poi/ss/formula/AllSSFormulaTests.java b/poi-main/src/test/java/org/apache/poi/ss/formula/AllSSFormulaTests.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/AllSSFormulaTests.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/AllSSFormulaTests.java
diff --git a/src/testcases/org/apache/poi/ss/formula/BaseTestExternalFunctions.java b/poi-main/src/test/java/org/apache/poi/ss/formula/BaseTestExternalFunctions.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/BaseTestExternalFunctions.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/BaseTestExternalFunctions.java
diff --git a/src/testcases/org/apache/poi/ss/formula/EvaluationListener.java b/poi-main/src/test/java/org/apache/poi/ss/formula/EvaluationListener.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/EvaluationListener.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/EvaluationListener.java
diff --git a/src/testcases/org/apache/poi/ss/formula/TestCellCacheEntry.java b/poi-main/src/test/java/org/apache/poi/ss/formula/TestCellCacheEntry.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/TestCellCacheEntry.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/TestCellCacheEntry.java
diff --git a/src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java b/poi-main/src/test/java/org/apache/poi/ss/formula/TestEvaluationCache.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/TestEvaluationCache.java
diff --git a/src/testcases/org/apache/poi/ss/formula/TestFormulaShifter.java b/poi-main/src/test/java/org/apache/poi/ss/formula/TestFormulaShifter.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/TestFormulaShifter.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/TestFormulaShifter.java
diff --git a/src/testcases/org/apache/poi/ss/formula/TestFunctionRegistry.java b/poi-main/src/test/java/org/apache/poi/ss/formula/TestFunctionRegistry.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/TestFunctionRegistry.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/TestFunctionRegistry.java
diff --git a/src/testcases/org/apache/poi/ss/formula/TestMissingWorkbook.java b/poi-main/src/test/java/org/apache/poi/ss/formula/TestMissingWorkbook.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/TestMissingWorkbook.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/TestMissingWorkbook.java
diff --git a/src/testcases/org/apache/poi/ss/formula/TestPlainCellCache.java b/poi-main/src/test/java/org/apache/poi/ss/formula/TestPlainCellCache.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/TestPlainCellCache.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/TestPlainCellCache.java
diff --git a/src/testcases/org/apache/poi/ss/formula/TestSheetNameFormatter.java b/poi-main/src/test/java/org/apache/poi/ss/formula/TestSheetNameFormatter.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/TestSheetNameFormatter.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/TestSheetNameFormatter.java
diff --git a/src/testcases/org/apache/poi/ss/formula/TestWorkbookEvaluator.java b/poi-main/src/test/java/org/apache/poi/ss/formula/TestWorkbookEvaluator.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/TestWorkbookEvaluator.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/TestWorkbookEvaluator.java
diff --git a/src/testcases/org/apache/poi/ss/formula/WorkbookEvaluatorTestHelper.java b/poi-main/src/test/java/org/apache/poi/ss/formula/WorkbookEvaluatorTestHelper.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/WorkbookEvaluatorTestHelper.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/WorkbookEvaluatorTestHelper.java
diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestDateParser.java b/poi-main/src/test/java/org/apache/poi/ss/formula/atp/TestDateParser.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/atp/TestDateParser.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/atp/TestDateParser.java
diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestIfError.java b/poi-main/src/test/java/org/apache/poi/ss/formula/atp/TestIfError.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/atp/TestIfError.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/atp/TestIfError.java
diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestMRound.java b/poi-main/src/test/java/org/apache/poi/ss/formula/atp/TestMRound.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/atp/TestMRound.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/atp/TestMRound.java
diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestNetworkdaysFunction.java b/poi-main/src/test/java/org/apache/poi/ss/formula/atp/TestNetworkdaysFunction.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/atp/TestNetworkdaysFunction.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/atp/TestNetworkdaysFunction.java
diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestPercentile.java b/poi-main/src/test/java/org/apache/poi/ss/formula/atp/TestPercentile.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/atp/TestPercentile.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/atp/TestPercentile.java
diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestRandBetween.java b/poi-main/src/test/java/org/apache/poi/ss/formula/atp/TestRandBetween.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/atp/TestRandBetween.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/atp/TestRandBetween.java
diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayCalculator.java b/poi-main/src/test/java/org/apache/poi/ss/formula/atp/TestWorkdayCalculator.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayCalculator.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/atp/TestWorkdayCalculator.java
diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java b/poi-main/src/test/java/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java
diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculator.java b/poi-main/src/test/java/org/apache/poi/ss/formula/atp/TestYearFracCalculator.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculator.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/atp/TestYearFracCalculator.java
diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculatorFromSpreadsheet.java b/poi-main/src/test/java/org/apache/poi/ss/formula/atp/TestYearFracCalculatorFromSpreadsheet.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculatorFromSpreadsheet.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/atp/TestYearFracCalculatorFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/constant/TestConstantValueParser.java b/poi-main/src/test/java/org/apache/poi/ss/formula/constant/TestConstantValueParser.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/constant/TestConstantValueParser.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/constant/TestConstantValueParser.java
diff --git a/src/testcases/org/apache/poi/ss/formula/eval/AllFormulaEvalTests.java b/poi-main/src/test/java/org/apache/poi/ss/formula/eval/AllFormulaEvalTests.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/eval/AllFormulaEvalTests.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/eval/AllFormulaEvalTests.java
diff --git a/src/testcases/org/apache/poi/ss/formula/eval/EvalInstances.java b/poi-main/src/test/java/org/apache/poi/ss/formula/eval/EvalInstances.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/eval/EvalInstances.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/eval/EvalInstances.java
diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestAreaEval.java b/poi-main/src/test/java/org/apache/poi/ss/formula/eval/TestAreaEval.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/eval/TestAreaEval.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/eval/TestAreaEval.java
diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestCircularReferences.java b/poi-main/src/test/java/org/apache/poi/ss/formula/eval/TestCircularReferences.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/eval/TestCircularReferences.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/eval/TestCircularReferences.java
diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestDivideEval.java b/poi-main/src/test/java/org/apache/poi/ss/formula/eval/TestDivideEval.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/eval/TestDivideEval.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/eval/TestDivideEval.java
diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestEqualEval.java b/poi-main/src/test/java/org/apache/poi/ss/formula/eval/TestEqualEval.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/eval/TestEqualEval.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/eval/TestEqualEval.java
diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestExternalFunction.java b/poi-main/src/test/java/org/apache/poi/ss/formula/eval/TestExternalFunction.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/eval/TestExternalFunction.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/eval/TestExternalFunction.java
diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestFormulaBugs.java b/poi-main/src/test/java/org/apache/poi/ss/formula/eval/TestFormulaBugs.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/eval/TestFormulaBugs.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/eval/TestFormulaBugs.java
diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java b/poi-main/src/test/java/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestMinusZeroResult.java b/poi-main/src/test/java/org/apache/poi/ss/formula/eval/TestMinusZeroResult.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/eval/TestMinusZeroResult.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/eval/TestMinusZeroResult.java
diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestMissingArgEval.java b/poi-main/src/test/java/org/apache/poi/ss/formula/eval/TestMissingArgEval.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/eval/TestMissingArgEval.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/eval/TestMissingArgEval.java
diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestOperandResolver.java b/poi-main/src/test/java/org/apache/poi/ss/formula/eval/TestOperandResolver.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/eval/TestOperandResolver.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/eval/TestOperandResolver.java
diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestPercentEval.java b/poi-main/src/test/java/org/apache/poi/ss/formula/eval/TestPercentEval.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/eval/TestPercentEval.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/eval/TestPercentEval.java
diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestRangeEval.java b/poi-main/src/test/java/org/apache/poi/ss/formula/eval/TestRangeEval.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/eval/TestRangeEval.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/eval/TestRangeEval.java
diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestUnaryPlusEval.java b/poi-main/src/test/java/org/apache/poi/ss/formula/eval/TestUnaryPlusEval.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/eval/TestUnaryPlusEval.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/eval/TestUnaryPlusEval.java
diff --git a/src/testcases/org/apache/poi/ss/formula/eval/forked/TestForkedEvaluator.java b/poi-main/src/test/java/org/apache/poi/ss/formula/eval/forked/TestForkedEvaluator.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/eval/forked/TestForkedEvaluator.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/eval/forked/TestForkedEvaluator.java
diff --git a/src/testcases/org/apache/poi/ss/formula/function/AllFormulaFunctionTests.java b/poi-main/src/test/java/org/apache/poi/ss/formula/function/AllFormulaFunctionTests.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/function/AllFormulaFunctionTests.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/function/AllFormulaFunctionTests.java
diff --git a/src/testcases/org/apache/poi/ss/formula/function/ExcelFileFormatDocFunctionExtractor.java b/poi-main/src/test/java/org/apache/poi/ss/formula/function/ExcelFileFormatDocFunctionExtractor.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/function/ExcelFileFormatDocFunctionExtractor.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/function/ExcelFileFormatDocFunctionExtractor.java
diff --git a/src/testcases/org/apache/poi/ss/formula/function/TestFunctionMetadataRegistry.java b/poi-main/src/test/java/org/apache/poi/ss/formula/function/TestFunctionMetadataRegistry.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/function/TestFunctionMetadataRegistry.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/function/TestFunctionMetadataRegistry.java
diff --git a/src/testcases/org/apache/poi/ss/formula/function/TestParseMissingBuiltInFuncs.java b/poi-main/src/test/java/org/apache/poi/ss/formula/function/TestParseMissingBuiltInFuncs.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/function/TestParseMissingBuiltInFuncs.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/function/TestParseMissingBuiltInFuncs.java
diff --git a/src/testcases/org/apache/poi/ss/formula/function/TestReadMissingBuiltInFuncs.java b/poi-main/src/test/java/org/apache/poi/ss/formula/function/TestReadMissingBuiltInFuncs.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/function/TestReadMissingBuiltInFuncs.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/function/TestReadMissingBuiltInFuncs.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/AbstractNumericTestCase.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/AbstractNumericTestCase.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/AbstractNumericTestCase.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/AbstractNumericTestCase.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/AllIndividualFunctionEvaluationTests.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/AllIndividualFunctionEvaluationTests.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/AllIndividualFunctionEvaluationTests.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/AllIndividualFunctionEvaluationTests.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/CountifsTests.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/CountifsTests.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/CountifsTests.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/CountifsTests.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/EvalFactory.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/EvalFactory.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/EvalFactory.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/EvalFactory.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/NumericFunctionInvoker.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/NumericFunctionInvoker.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/NumericFunctionInvoker.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/NumericFunctionInvoker.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestAddress.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestAddress.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestAddress.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestAddress.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestAverage.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestAverage.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestAverage.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestAverage.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestCalendarFieldFunction.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestCalendarFieldFunction.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestCalendarFieldFunction.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestCalendarFieldFunction.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestClean.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestClean.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestClean.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestClean.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestCode.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestCode.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestCode.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestCode.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestCodeFunctionsFromSpreadsheet.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestCodeFunctionsFromSpreadsheet.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestCodeFunctionsFromSpreadsheet.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestCodeFunctionsFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestComplex.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestComplex.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestComplex.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestComplex.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestComplexFunctionsFromSpreadsheet.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestComplexFunctionsFromSpreadsheet.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestComplexFunctionsFromSpreadsheet.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestComplexFunctionsFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestCountFuncs.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestCountFuncs.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestCountFuncs.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestCountFuncs.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestDate.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestDate.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestDate.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestDate.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestDays360.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestDays360.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestDays360.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestDays360.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Hex.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestDec2Hex.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestDec2Hex.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestDec2Hex.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestDelta.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestDelta.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestDelta.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestDelta.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestDeltaFunctionsFromSpreadsheet.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestDeltaFunctionsFromSpreadsheet.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestDeltaFunctionsFromSpreadsheet.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestDeltaFunctionsFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestEDate.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestEDate.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestEDate.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestEDate.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestFactDoubleFunctionsFromSpreadsheet.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestFactDoubleFunctionsFromSpreadsheet.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestFactDoubleFunctionsFromSpreadsheet.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestFactDoubleFunctionsFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestFinanceLib.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestFinanceLib.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestFinanceLib.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestFinanceLib.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestFind.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestFind.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestFind.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestFind.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestHex2Dec.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestHex2Dec.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestHex2Dec.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestHex2Dec.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestIPMT.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestIPMT.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestIPMT.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestIPMT.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestImRealFunctionsFromSpreadsheet.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestImRealFunctionsFromSpreadsheet.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestImRealFunctionsFromSpreadsheet.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestImRealFunctionsFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestImaginaryFunctionsFromSpreadsheet.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestImaginaryFunctionsFromSpreadsheet.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestImaginaryFunctionsFromSpreadsheet.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestImaginaryFunctionsFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestIndex.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestIndex.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestIndex.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestIndex.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestIndexFunctionFromSpreadsheet.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestIndexFunctionFromSpreadsheet.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestIndexFunctionFromSpreadsheet.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestIndexFunctionFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestIndirect.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestIndirect.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestIndirect.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestIndirect.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestIndirectFunctionFromSpreadsheet.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestIndirectFunctionFromSpreadsheet.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestIndirectFunctionFromSpreadsheet.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestIndirectFunctionFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestIntercept.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestIntercept.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestIntercept.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestIntercept.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestIrr.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestIrr.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestIrr.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestIrr.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestIsBlank.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestIsBlank.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestIsBlank.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestIsBlank.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestLeftRight.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestLeftRight.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestLeftRight.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestLeftRight.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestLen.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestLen.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestLen.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestLen.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestLookupFunctionsFromSpreadsheet.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestLookupFunctionsFromSpreadsheet.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestLookupFunctionsFromSpreadsheet.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestLookupFunctionsFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestMatch.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestMatch.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestMatch.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestMatch.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestMatchFunctionsFromSpreadsheet.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestMatchFunctionsFromSpreadsheet.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestMatchFunctionsFromSpreadsheet.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestMatchFunctionsFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestMathX.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestMathX.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestMathX.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestMathX.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestMid.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestMid.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestMid.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestMid.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestMirr.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestMirr.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestMirr.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestMirr.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestNper.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestNper.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestNper.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestNper.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestNpv.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestNpv.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestNpv.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestNpv.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestOct2Dec.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestOct2Dec.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestOct2Dec.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestOct2Dec.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestOffset.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestOffset.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestOffset.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestOffset.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestPPMT.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestPPMT.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestPPMT.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestPPMT.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestPmt.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestPmt.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestPmt.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestPmt.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestPoisson.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestPoisson.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestPoisson.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestPoisson.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestQuotient.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestQuotient.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestQuotient.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestQuotient.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestQuotientFunctionsFromSpreadsheet.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestQuotientFunctionsFromSpreadsheet.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestQuotientFunctionsFromSpreadsheet.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestQuotientFunctionsFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestRank.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestRank.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestRank.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestRank.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestReptFunctionsFromSpreadsheet.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestReptFunctionsFromSpreadsheet.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestReptFunctionsFromSpreadsheet.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestReptFunctionsFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestRomanFunctionsFromSpreadsheet.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestRomanFunctionsFromSpreadsheet.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestRomanFunctionsFromSpreadsheet.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestRomanFunctionsFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestRoundFuncs.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestRoundFuncs.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestRoundFuncs.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestRoundFuncs.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestRowCol.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestRowCol.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestRowCol.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestRowCol.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestSlope.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestSlope.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestSlope.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestSlope.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestStatsLib.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestStatsLib.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestStatsLib.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestStatsLib.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestSubtotal.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestSubtotal.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestSubtotal.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestSubtotal.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestSumif.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestSumif.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestSumif.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestSumif.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestSumifs.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestSumifs.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestSumifs.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestSumifs.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestSumproduct.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestSumproduct.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestSumproduct.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestSumproduct.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestTFunc.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestTFunc.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestTFunc.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestTFunc.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestText.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestText.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestText.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestText.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestTime.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestTime.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestTime.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestTime.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestTrim.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestTrim.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestTrim.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestTrim.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestTrunc.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestTrunc.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestTrunc.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestTrunc.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestValue.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestValue.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestValue.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestValue.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet2013.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet2013.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet2013.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet2013.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestXYNumericFunction.java b/poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestXYNumericFunction.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/functions/TestXYNumericFunction.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/functions/TestXYNumericFunction.java
diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/AbstractPtgTestCase.java b/poi-main/src/test/java/org/apache/poi/ss/formula/ptg/AbstractPtgTestCase.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/ptg/AbstractPtgTestCase.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/ptg/AbstractPtgTestCase.java
diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/AllFormulaTests.java b/poi-main/src/test/java/org/apache/poi/ss/formula/ptg/AllFormulaTests.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/ptg/AllFormulaTests.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/ptg/AllFormulaTests.java
diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestArea3DPtg.java b/poi-main/src/test/java/org/apache/poi/ss/formula/ptg/TestArea3DPtg.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/ptg/TestArea3DPtg.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/ptg/TestArea3DPtg.java
diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaErrPtg.java b/poi-main/src/test/java/org/apache/poi/ss/formula/ptg/TestAreaErrPtg.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/ptg/TestAreaErrPtg.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/ptg/TestAreaErrPtg.java
diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaPtg.java b/poi-main/src/test/java/org/apache/poi/ss/formula/ptg/TestAreaPtg.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/ptg/TestAreaPtg.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/ptg/TestAreaPtg.java
diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestArrayPtg.java b/poi-main/src/test/java/org/apache/poi/ss/formula/ptg/TestArrayPtg.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/ptg/TestArrayPtg.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/ptg/TestArrayPtg.java
diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestAttrPtg.java b/poi-main/src/test/java/org/apache/poi/ss/formula/ptg/TestAttrPtg.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/ptg/TestAttrPtg.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/ptg/TestAttrPtg.java
diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestErrPtg.java b/poi-main/src/test/java/org/apache/poi/ss/formula/ptg/TestErrPtg.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/ptg/TestErrPtg.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/ptg/TestErrPtg.java
diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestExternalFunctionFormulas.java b/poi-main/src/test/java/org/apache/poi/ss/formula/ptg/TestExternalFunctionFormulas.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/ptg/TestExternalFunctionFormulas.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/ptg/TestExternalFunctionFormulas.java
diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestExternalNameReference.java b/poi-main/src/test/java/org/apache/poi/ss/formula/ptg/TestExternalNameReference.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/ptg/TestExternalNameReference.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/ptg/TestExternalNameReference.java
diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestFuncPtg.java b/poi-main/src/test/java/org/apache/poi/ss/formula/ptg/TestFuncPtg.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/ptg/TestFuncPtg.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/ptg/TestFuncPtg.java
diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestFuncVarPtg.java b/poi-main/src/test/java/org/apache/poi/ss/formula/ptg/TestFuncVarPtg.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/ptg/TestFuncVarPtg.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/ptg/TestFuncVarPtg.java
diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestIntersectionPtg.java b/poi-main/src/test/java/org/apache/poi/ss/formula/ptg/TestIntersectionPtg.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/ptg/TestIntersectionPtg.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/ptg/TestIntersectionPtg.java
diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestPercentPtg.java b/poi-main/src/test/java/org/apache/poi/ss/formula/ptg/TestPercentPtg.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/ptg/TestPercentPtg.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/ptg/TestPercentPtg.java
diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestRangePtg.java b/poi-main/src/test/java/org/apache/poi/ss/formula/ptg/TestRangePtg.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/ptg/TestRangePtg.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/ptg/TestRangePtg.java
diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestRef3DPtg.java b/poi-main/src/test/java/org/apache/poi/ss/formula/ptg/TestRef3DPtg.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/ptg/TestRef3DPtg.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/ptg/TestRef3DPtg.java
diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestReferencePtg.java b/poi-main/src/test/java/org/apache/poi/ss/formula/ptg/TestReferencePtg.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/ptg/TestReferencePtg.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/ptg/TestReferencePtg.java
diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestUnionPtg.java b/poi-main/src/test/java/org/apache/poi/ss/formula/ptg/TestUnionPtg.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/formula/ptg/TestUnionPtg.java
rename to poi-main/src/test/java/org/apache/poi/ss/formula/ptg/TestUnionPtg.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java b/poi-main/src/test/java/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java
rename to poi-main/src/test/java/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java b/poi-main/src/test/java/org/apache/poi/ss/usermodel/BaseTestCell.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java
rename to poi-main/src/test/java/org/apache/poi/ss/usermodel/BaseTestCell.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestCellComment.java b/poi-main/src/test/java/org/apache/poi/ss/usermodel/BaseTestCellComment.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestCellComment.java
rename to poi-main/src/test/java/org/apache/poi/ss/usermodel/BaseTestCellComment.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java b/poi-main/src/test/java/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java
rename to poi-main/src/test/java/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestDataFormat.java b/poi-main/src/test/java/org/apache/poi/ss/usermodel/BaseTestDataFormat.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestDataFormat.java
rename to poi-main/src/test/java/org/apache/poi/ss/usermodel/BaseTestDataFormat.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestDataValidation.java b/poi-main/src/test/java/org/apache/poi/ss/usermodel/BaseTestDataValidation.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestDataValidation.java
rename to poi-main/src/test/java/org/apache/poi/ss/usermodel/BaseTestDataValidation.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java b/poi-main/src/test/java/org/apache/poi/ss/usermodel/BaseTestFont.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java
rename to poi-main/src/test/java/org/apache/poi/ss/usermodel/BaseTestFont.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestFormulaEvaluator.java b/poi-main/src/test/java/org/apache/poi/ss/usermodel/BaseTestFormulaEvaluator.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestFormulaEvaluator.java
rename to poi-main/src/test/java/org/apache/poi/ss/usermodel/BaseTestFormulaEvaluator.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestHyperlink.java b/poi-main/src/test/java/org/apache/poi/ss/usermodel/BaseTestHyperlink.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestHyperlink.java
rename to poi-main/src/test/java/org/apache/poi/ss/usermodel/BaseTestHyperlink.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestNamedRange.java b/poi-main/src/test/java/org/apache/poi/ss/usermodel/BaseTestNamedRange.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestNamedRange.java
rename to poi-main/src/test/java/org/apache/poi/ss/usermodel/BaseTestNamedRange.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestPicture.java b/poi-main/src/test/java/org/apache/poi/ss/usermodel/BaseTestPicture.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestPicture.java
rename to poi-main/src/test/java/org/apache/poi/ss/usermodel/BaseTestPicture.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestRow.java b/poi-main/src/test/java/org/apache/poi/ss/usermodel/BaseTestRow.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestRow.java
rename to poi-main/src/test/java/org/apache/poi/ss/usermodel/BaseTestRow.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java b/poi-main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheet.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java
rename to poi-main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheet.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetAutosizeColumn.java b/poi-main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetAutosizeColumn.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetAutosizeColumn.java
rename to poi-main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetAutosizeColumn.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetHiding.java b/poi-main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetHiding.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetHiding.java
rename to poi-main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetHiding.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java b/poi-main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java
rename to poi-main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetUpdateArrayFormulas.java b/poi-main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetUpdateArrayFormulas.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetUpdateArrayFormulas.java
rename to poi-main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetUpdateArrayFormulas.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestWorkbook.java b/poi-main/src/test/java/org/apache/poi/ss/usermodel/BaseTestWorkbook.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestWorkbook.java
rename to poi-main/src/test/java/org/apache/poi/ss/usermodel/BaseTestWorkbook.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/TestDataFormatter.java b/poi-main/src/test/java/org/apache/poi/ss/usermodel/TestDataFormatter.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/usermodel/TestDataFormatter.java
rename to poi-main/src/test/java/org/apache/poi/ss/usermodel/TestDataFormatter.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/TestFractionFormat.java b/poi-main/src/test/java/org/apache/poi/ss/usermodel/TestFractionFormat.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/usermodel/TestFractionFormat.java
rename to poi-main/src/test/java/org/apache/poi/ss/usermodel/TestFractionFormat.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/charts/TestDataSources.java b/poi-main/src/test/java/org/apache/poi/ss/usermodel/charts/TestDataSources.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/usermodel/charts/TestDataSources.java
rename to poi-main/src/test/java/org/apache/poi/ss/usermodel/charts/TestDataSources.java
diff --git a/src/testcases/org/apache/poi/ss/util/AllSSUtilTests.java b/poi-main/src/test/java/org/apache/poi/ss/util/AllSSUtilTests.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/util/AllSSUtilTests.java
rename to poi-main/src/test/java/org/apache/poi/ss/util/AllSSUtilTests.java
diff --git a/src/testcases/org/apache/poi/ss/util/NumberComparingSpreadsheetGenerator.java b/poi-main/src/test/java/org/apache/poi/ss/util/NumberComparingSpreadsheetGenerator.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/util/NumberComparingSpreadsheetGenerator.java
rename to poi-main/src/test/java/org/apache/poi/ss/util/NumberComparingSpreadsheetGenerator.java
diff --git a/src/testcases/org/apache/poi/ss/util/NumberComparisonExamples.java b/poi-main/src/test/java/org/apache/poi/ss/util/NumberComparisonExamples.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/util/NumberComparisonExamples.java
rename to poi-main/src/test/java/org/apache/poi/ss/util/NumberComparisonExamples.java
diff --git a/src/testcases/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java b/poi-main/src/test/java/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java
rename to poi-main/src/test/java/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java
diff --git a/src/testcases/org/apache/poi/ss/util/NumberToTextConversionExamples.java b/poi-main/src/test/java/org/apache/poi/ss/util/NumberToTextConversionExamples.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/util/NumberToTextConversionExamples.java
rename to poi-main/src/test/java/org/apache/poi/ss/util/NumberToTextConversionExamples.java
diff --git a/src/testcases/org/apache/poi/ss/util/TestCellRangeAddress.java b/poi-main/src/test/java/org/apache/poi/ss/util/TestCellRangeAddress.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/util/TestCellRangeAddress.java
rename to poi-main/src/test/java/org/apache/poi/ss/util/TestCellRangeAddress.java
diff --git a/src/testcases/org/apache/poi/ss/util/TestCellReference.java b/poi-main/src/test/java/org/apache/poi/ss/util/TestCellReference.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/util/TestCellReference.java
rename to poi-main/src/test/java/org/apache/poi/ss/util/TestCellReference.java
diff --git a/src/testcases/org/apache/poi/ss/util/TestDateFormatConverter.java b/poi-main/src/test/java/org/apache/poi/ss/util/TestDateFormatConverter.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/util/TestDateFormatConverter.java
rename to poi-main/src/test/java/org/apache/poi/ss/util/TestDateFormatConverter.java
diff --git a/src/testcases/org/apache/poi/ss/util/TestExpandedDouble.java b/poi-main/src/test/java/org/apache/poi/ss/util/TestExpandedDouble.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/util/TestExpandedDouble.java
rename to poi-main/src/test/java/org/apache/poi/ss/util/TestExpandedDouble.java
diff --git a/src/testcases/org/apache/poi/ss/util/TestNumberComparer.java b/poi-main/src/test/java/org/apache/poi/ss/util/TestNumberComparer.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/util/TestNumberComparer.java
rename to poi-main/src/test/java/org/apache/poi/ss/util/TestNumberComparer.java
diff --git a/src/testcases/org/apache/poi/ss/util/TestNumberToTextConverter.java b/poi-main/src/test/java/org/apache/poi/ss/util/TestNumberToTextConverter.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/util/TestNumberToTextConverter.java
rename to poi-main/src/test/java/org/apache/poi/ss/util/TestNumberToTextConverter.java
diff --git a/src/testcases/org/apache/poi/ss/util/TestRegion.java b/poi-main/src/test/java/org/apache/poi/ss/util/TestRegion.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/util/TestRegion.java
rename to poi-main/src/test/java/org/apache/poi/ss/util/TestRegion.java
diff --git a/src/testcases/org/apache/poi/ss/util/TestSheetBuilder.java b/poi-main/src/test/java/org/apache/poi/ss/util/TestSheetBuilder.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/util/TestSheetBuilder.java
rename to poi-main/src/test/java/org/apache/poi/ss/util/TestSheetBuilder.java
diff --git a/src/testcases/org/apache/poi/ss/util/TestWorkbookUtil.java b/poi-main/src/test/java/org/apache/poi/ss/util/TestWorkbookUtil.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/util/TestWorkbookUtil.java
rename to poi-main/src/test/java/org/apache/poi/ss/util/TestWorkbookUtil.java
diff --git a/src/testcases/org/apache/poi/ss/util/cellwalk/TestCellWalk.java b/poi-main/src/test/java/org/apache/poi/ss/util/cellwalk/TestCellWalk.java
similarity index 100%
rename from src/testcases/org/apache/poi/ss/util/cellwalk/TestCellWalk.java
rename to poi-main/src/test/java/org/apache/poi/ss/util/cellwalk/TestCellWalk.java
diff --git a/src/testcases/org/apache/poi/util/AllPOIUtilTests.java b/poi-main/src/test/java/org/apache/poi/util/AllPOIUtilTests.java
similarity index 100%
rename from src/testcases/org/apache/poi/util/AllPOIUtilTests.java
rename to poi-main/src/test/java/org/apache/poi/util/AllPOIUtilTests.java
diff --git a/src/testcases/org/apache/poi/util/DummyPOILogger.java b/poi-main/src/test/java/org/apache/poi/util/DummyPOILogger.java
similarity index 100%
rename from src/testcases/org/apache/poi/util/DummyPOILogger.java
rename to poi-main/src/test/java/org/apache/poi/util/DummyPOILogger.java
diff --git a/src/testcases/org/apache/poi/util/LocalTestNode.java b/poi-main/src/test/java/org/apache/poi/util/LocalTestNode.java
similarity index 100%
rename from src/testcases/org/apache/poi/util/LocalTestNode.java
rename to poi-main/src/test/java/org/apache/poi/util/LocalTestNode.java
diff --git a/src/testcases/org/apache/poi/util/TestArrayUtil.java b/poi-main/src/test/java/org/apache/poi/util/TestArrayUtil.java
similarity index 100%
rename from src/testcases/org/apache/poi/util/TestArrayUtil.java
rename to poi-main/src/test/java/org/apache/poi/util/TestArrayUtil.java
diff --git a/src/testcases/org/apache/poi/util/TestBinaryTree.java b/poi-main/src/test/java/org/apache/poi/util/TestBinaryTree.java
similarity index 100%
rename from src/testcases/org/apache/poi/util/TestBinaryTree.java
rename to poi-main/src/test/java/org/apache/poi/util/TestBinaryTree.java
diff --git a/src/testcases/org/apache/poi/util/TestBitField.java b/poi-main/src/test/java/org/apache/poi/util/TestBitField.java
similarity index 100%
rename from src/testcases/org/apache/poi/util/TestBitField.java
rename to poi-main/src/test/java/org/apache/poi/util/TestBitField.java
diff --git a/src/testcases/org/apache/poi/util/TestByteField.java b/poi-main/src/test/java/org/apache/poi/util/TestByteField.java
similarity index 100%
rename from src/testcases/org/apache/poi/util/TestByteField.java
rename to poi-main/src/test/java/org/apache/poi/util/TestByteField.java
diff --git a/src/testcases/org/apache/poi/util/TestHexDump.java b/poi-main/src/test/java/org/apache/poi/util/TestHexDump.java
similarity index 100%
rename from src/testcases/org/apache/poi/util/TestHexDump.java
rename to poi-main/src/test/java/org/apache/poi/util/TestHexDump.java
diff --git a/src/testcases/org/apache/poi/util/TestIntList.java b/poi-main/src/test/java/org/apache/poi/util/TestIntList.java
similarity index 100%
rename from src/testcases/org/apache/poi/util/TestIntList.java
rename to poi-main/src/test/java/org/apache/poi/util/TestIntList.java
diff --git a/src/testcases/org/apache/poi/util/TestIntegerField.java b/poi-main/src/test/java/org/apache/poi/util/TestIntegerField.java
similarity index 100%
rename from src/testcases/org/apache/poi/util/TestIntegerField.java
rename to poi-main/src/test/java/org/apache/poi/util/TestIntegerField.java
diff --git a/src/testcases/org/apache/poi/util/TestLittleEndian.java b/poi-main/src/test/java/org/apache/poi/util/TestLittleEndian.java
similarity index 100%
rename from src/testcases/org/apache/poi/util/TestLittleEndian.java
rename to poi-main/src/test/java/org/apache/poi/util/TestLittleEndian.java
diff --git a/src/testcases/org/apache/poi/util/TestLittleEndianStreams.java b/poi-main/src/test/java/org/apache/poi/util/TestLittleEndianStreams.java
similarity index 100%
rename from src/testcases/org/apache/poi/util/TestLittleEndianStreams.java
rename to poi-main/src/test/java/org/apache/poi/util/TestLittleEndianStreams.java
diff --git a/src/testcases/org/apache/poi/util/TestLongField.java b/poi-main/src/test/java/org/apache/poi/util/TestLongField.java
similarity index 100%
rename from src/testcases/org/apache/poi/util/TestLongField.java
rename to poi-main/src/test/java/org/apache/poi/util/TestLongField.java
diff --git a/src/testcases/org/apache/poi/util/TestPOILogFactory.java b/poi-main/src/test/java/org/apache/poi/util/TestPOILogFactory.java
similarity index 100%
rename from src/testcases/org/apache/poi/util/TestPOILogFactory.java
rename to poi-main/src/test/java/org/apache/poi/util/TestPOILogFactory.java
diff --git a/src/testcases/org/apache/poi/util/TestPOILogger.java b/poi-main/src/test/java/org/apache/poi/util/TestPOILogger.java
similarity index 100%
rename from src/testcases/org/apache/poi/util/TestPOILogger.java
rename to poi-main/src/test/java/org/apache/poi/util/TestPOILogger.java
diff --git a/src/testcases/org/apache/poi/util/TestShortField.java b/poi-main/src/test/java/org/apache/poi/util/TestShortField.java
similarity index 100%
rename from src/testcases/org/apache/poi/util/TestShortField.java
rename to poi-main/src/test/java/org/apache/poi/util/TestShortField.java
diff --git a/src/testcases/org/apache/poi/util/TestShortList.java b/poi-main/src/test/java/org/apache/poi/util/TestShortList.java
similarity index 100%
rename from src/testcases/org/apache/poi/util/TestShortList.java
rename to poi-main/src/test/java/org/apache/poi/util/TestShortList.java
diff --git a/src/testcases/org/apache/poi/util/TestStringUtil.java b/poi-main/src/test/java/org/apache/poi/util/TestStringUtil.java
similarity index 100%
rename from src/testcases/org/apache/poi/util/TestStringUtil.java
rename to poi-main/src/test/java/org/apache/poi/util/TestStringUtil.java
diff --git a/src/testcases/org/apache/poi/util/TestTempFile.java b/poi-main/src/test/java/org/apache/poi/util/TestTempFile.java
similarity index 100%
rename from src/testcases/org/apache/poi/util/TestTempFile.java
rename to poi-main/src/test/java/org/apache/poi/util/TestTempFile.java
diff --git a/src/testcases/org/apache/poi/util/data/test_properties1 b/poi-main/src/test/java/org/apache/poi/util/data/test_properties1
similarity index 100%
rename from src/testcases/org/apache/poi/util/data/test_properties1
rename to poi-main/src/test/java/org/apache/poi/util/data/test_properties1
diff --git a/src/testcases/org/apache/poi/util/data/test_properties2 b/poi-main/src/test/java/org/apache/poi/util/data/test_properties2
similarity index 100%
rename from src/testcases/org/apache/poi/util/data/test_properties2
rename to poi-main/src/test/java/org/apache/poi/util/data/test_properties2
diff --git a/src/testcases/org/apache/poi/util/data/test_properties3 b/poi-main/src/test/java/org/apache/poi/util/data/test_properties3
similarity index 100%
rename from src/testcases/org/apache/poi/util/data/test_properties3
rename to poi-main/src/test/java/org/apache/poi/util/data/test_properties3