diff --git a/test-data/ddf/47143.dat b/poi-main/src/test/resources/ddf/47143.dat
similarity index 100%
rename from test-data/ddf/47143.dat
rename to poi-main/src/test/resources/ddf/47143.dat
diff --git a/test-data/ddf/Container.dat b/poi-main/src/test/resources/ddf/Container.dat
similarity index 100%
rename from test-data/ddf/Container.dat
rename to poi-main/src/test/resources/ddf/Container.dat
diff --git a/test-data/diagram/44501.vsd b/poi-main/src/test/resources/diagram/44501.vsd
similarity index 100%
rename from test-data/diagram/44501.vsd
rename to poi-main/src/test/resources/diagram/44501.vsd
diff --git a/test-data/diagram/44594-2.vsd b/poi-main/src/test/resources/diagram/44594-2.vsd
similarity index 100%
rename from test-data/diagram/44594-2.vsd
rename to poi-main/src/test/resources/diagram/44594-2.vsd
diff --git a/test-data/diagram/44594.vsd b/poi-main/src/test/resources/diagram/44594.vsd
similarity index 100%
rename from test-data/diagram/44594.vsd
rename to poi-main/src/test/resources/diagram/44594.vsd
diff --git a/test-data/diagram/NegativeChunkLength.vsd b/poi-main/src/test/resources/diagram/NegativeChunkLength.vsd
similarity index 100%
rename from test-data/diagram/NegativeChunkLength.vsd
rename to poi-main/src/test/resources/diagram/NegativeChunkLength.vsd
diff --git a/test-data/diagram/NegativeChunkLength2.vsd b/poi-main/src/test/resources/diagram/NegativeChunkLength2.vsd
similarity index 100%
rename from test-data/diagram/NegativeChunkLength2.vsd
rename to poi-main/src/test/resources/diagram/NegativeChunkLength2.vsd
diff --git a/test-data/diagram/ShortChunk1.vsd b/poi-main/src/test/resources/diagram/ShortChunk1.vsd
similarity index 100%
rename from test-data/diagram/ShortChunk1.vsd
rename to poi-main/src/test/resources/diagram/ShortChunk1.vsd
diff --git a/test-data/diagram/ShortChunk2.vsd b/poi-main/src/test/resources/diagram/ShortChunk2.vsd
similarity index 100%
rename from test-data/diagram/ShortChunk2.vsd
rename to poi-main/src/test/resources/diagram/ShortChunk2.vsd
diff --git a/test-data/diagram/ShortChunk3.vsd b/poi-main/src/test/resources/diagram/ShortChunk3.vsd
similarity index 100%
rename from test-data/diagram/ShortChunk3.vsd
rename to poi-main/src/test/resources/diagram/ShortChunk3.vsd
diff --git a/test-data/diagram/Test_Visio-Some_Random_Text.vsd b/poi-main/src/test/resources/diagram/Test_Visio-Some_Random_Text.vsd
similarity index 100%
rename from test-data/diagram/Test_Visio-Some_Random_Text.vsd
rename to poi-main/src/test/resources/diagram/Test_Visio-Some_Random_Text.vsd
diff --git a/test-data/diagram/v6-non-utf16le.vsd b/poi-main/src/test/resources/diagram/v6-non-utf16le.vsd
similarity index 100%
rename from test-data/diagram/v6-non-utf16le.vsd
rename to poi-main/src/test/resources/diagram/v6-non-utf16le.vsd
diff --git a/test-data/diagram/visio_with_embeded.vsd b/poi-main/src/test/resources/diagram/visio_with_embeded.vsd
similarity index 100%
rename from test-data/diagram/visio_with_embeded.vsd
rename to poi-main/src/test/resources/diagram/visio_with_embeded.vsd
diff --git a/test-data/document/45690.docm b/poi-main/src/test/resources/document/45690.docm
similarity index 100%
rename from test-data/document/45690.docm
rename to poi-main/src/test/resources/document/45690.docm
diff --git a/test-data/document/52288.docx b/poi-main/src/test/resources/document/52288.docx
similarity index 100%
rename from test-data/document/52288.docx
rename to poi-main/src/test/resources/document/52288.docx
diff --git a/test-data/document/52449.docx b/poi-main/src/test/resources/document/52449.docx
similarity index 100%
rename from test-data/document/52449.docx
rename to poi-main/src/test/resources/document/52449.docx
diff --git a/test-data/document/53446.doc b/poi-main/src/test/resources/document/53446.doc
similarity index 100%
rename from test-data/document/53446.doc
rename to poi-main/src/test/resources/document/53446.doc
diff --git a/test-data/document/55733.docx b/poi-main/src/test/resources/document/55733.docx
similarity index 100%
rename from test-data/document/55733.docx
rename to poi-main/src/test/resources/document/55733.docx
diff --git a/test-data/document/AIOOB-Tap.doc b/poi-main/src/test/resources/document/AIOOB-Tap.doc
similarity index 100%
rename from test-data/document/AIOOB-Tap.doc
rename to poi-main/src/test/resources/document/AIOOB-Tap.doc
diff --git a/test-data/document/Bug28627.doc b/poi-main/src/test/resources/document/Bug28627.doc
similarity index 100%
rename from test-data/document/Bug28627.doc
rename to poi-main/src/test/resources/document/Bug28627.doc
diff --git a/test-data/document/Bug33519.doc b/poi-main/src/test/resources/document/Bug33519.doc
similarity index 100%
rename from test-data/document/Bug33519.doc
rename to poi-main/src/test/resources/document/Bug33519.doc
diff --git a/test-data/document/Bug34898.doc b/poi-main/src/test/resources/document/Bug34898.doc
similarity index 100%
rename from test-data/document/Bug34898.doc
rename to poi-main/src/test/resources/document/Bug34898.doc
diff --git a/test-data/document/Bug41898.doc b/poi-main/src/test/resources/document/Bug41898.doc
similarity index 100%
rename from test-data/document/Bug41898.doc
rename to poi-main/src/test/resources/document/Bug41898.doc
diff --git a/test-data/document/Bug44292.doc b/poi-main/src/test/resources/document/Bug44292.doc
similarity index 100%
rename from test-data/document/Bug44292.doc
rename to poi-main/src/test/resources/document/Bug44292.doc
diff --git a/test-data/document/Bug44431.doc b/poi-main/src/test/resources/document/Bug44431.doc
similarity index 100%
rename from test-data/document/Bug44431.doc
rename to poi-main/src/test/resources/document/Bug44431.doc
diff --git a/test-data/document/Bug44603.doc b/poi-main/src/test/resources/document/Bug44603.doc
similarity index 100%
rename from test-data/document/Bug44603.doc
rename to poi-main/src/test/resources/document/Bug44603.doc
diff --git a/test-data/document/Bug45269.doc b/poi-main/src/test/resources/document/Bug45269.doc
similarity index 100%
rename from test-data/document/Bug45269.doc
rename to poi-main/src/test/resources/document/Bug45269.doc
diff --git a/test-data/document/Bug45473.doc b/poi-main/src/test/resources/document/Bug45473.doc
similarity index 100%
rename from test-data/document/Bug45473.doc
rename to poi-main/src/test/resources/document/Bug45473.doc
diff --git a/test-data/document/Bug45877.doc b/poi-main/src/test/resources/document/Bug45877.doc
similarity index 100%
rename from test-data/document/Bug45877.doc
rename to poi-main/src/test/resources/document/Bug45877.doc
diff --git a/test-data/document/Bug46220.doc b/poi-main/src/test/resources/document/Bug46220.doc
similarity index 100%
rename from test-data/document/Bug46220.doc
rename to poi-main/src/test/resources/document/Bug46220.doc
diff --git a/test-data/document/Bug46610_1.doc b/poi-main/src/test/resources/document/Bug46610_1.doc
similarity index 100%
rename from test-data/document/Bug46610_1.doc
rename to poi-main/src/test/resources/document/Bug46610_1.doc
diff --git a/test-data/document/Bug46610_2.doc b/poi-main/src/test/resources/document/Bug46610_2.doc
similarity index 100%
rename from test-data/document/Bug46610_2.doc
rename to poi-main/src/test/resources/document/Bug46610_2.doc
diff --git a/test-data/document/Bug46610_3.doc b/poi-main/src/test/resources/document/Bug46610_3.doc
similarity index 100%
rename from test-data/document/Bug46610_3.doc
rename to poi-main/src/test/resources/document/Bug46610_3.doc
diff --git a/test-data/document/Bug46817.doc b/poi-main/src/test/resources/document/Bug46817.doc
similarity index 100%
rename from test-data/document/Bug46817.doc
rename to poi-main/src/test/resources/document/Bug46817.doc
diff --git a/test-data/document/Bug47286.doc b/poi-main/src/test/resources/document/Bug47286.doc
similarity index 100%
rename from test-data/document/Bug47286.doc
rename to poi-main/src/test/resources/document/Bug47286.doc
diff --git a/test-data/document/Bug47287.doc b/poi-main/src/test/resources/document/Bug47287.doc
similarity index 100%
rename from test-data/document/Bug47287.doc
rename to poi-main/src/test/resources/document/Bug47287.doc
diff --git a/test-data/document/Bug47731.doc b/poi-main/src/test/resources/document/Bug47731.doc
similarity index 100%
rename from test-data/document/Bug47731.doc
rename to poi-main/src/test/resources/document/Bug47731.doc
diff --git a/test-data/document/Bug47742-text.txt b/poi-main/src/test/resources/document/Bug47742-text.txt
similarity index 100%
rename from test-data/document/Bug47742-text.txt
rename to poi-main/src/test/resources/document/Bug47742-text.txt
diff --git a/test-data/document/Bug47742.doc b/poi-main/src/test/resources/document/Bug47742.doc
similarity index 100%
rename from test-data/document/Bug47742.doc
rename to poi-main/src/test/resources/document/Bug47742.doc
diff --git a/test-data/document/Bug47958.doc b/poi-main/src/test/resources/document/Bug47958.doc
similarity index 100%
rename from test-data/document/Bug47958.doc
rename to poi-main/src/test/resources/document/Bug47958.doc
diff --git a/test-data/document/Bug48065.doc b/poi-main/src/test/resources/document/Bug48065.doc
similarity index 100%
rename from test-data/document/Bug48065.doc
rename to poi-main/src/test/resources/document/Bug48065.doc
diff --git a/test-data/document/Bug48075.doc b/poi-main/src/test/resources/document/Bug48075.doc
similarity index 100%
rename from test-data/document/Bug48075.doc
rename to poi-main/src/test/resources/document/Bug48075.doc
diff --git a/test-data/document/Bug49820.doc b/poi-main/src/test/resources/document/Bug49820.doc
similarity index 100%
rename from test-data/document/Bug49820.doc
rename to poi-main/src/test/resources/document/Bug49820.doc
diff --git a/test-data/document/Bug49908.doc b/poi-main/src/test/resources/document/Bug49908.doc
similarity index 100%
rename from test-data/document/Bug49908.doc
rename to poi-main/src/test/resources/document/Bug49908.doc
diff --git a/test-data/document/Bug49919.doc b/poi-main/src/test/resources/document/Bug49919.doc
similarity index 100%
rename from test-data/document/Bug49919.doc
rename to poi-main/src/test/resources/document/Bug49919.doc
diff --git a/test-data/document/Bug49933.doc b/poi-main/src/test/resources/document/Bug49933.doc
similarity index 100%
rename from test-data/document/Bug49933.doc
rename to poi-main/src/test/resources/document/Bug49933.doc
diff --git a/test-data/document/Bug50075.doc b/poi-main/src/test/resources/document/Bug50075.doc
similarity index 100%
rename from test-data/document/Bug50075.doc
rename to poi-main/src/test/resources/document/Bug50075.doc
diff --git a/test-data/document/Bug50936_1.doc b/poi-main/src/test/resources/document/Bug50936_1.doc
similarity index 100%
rename from test-data/document/Bug50936_1.doc
rename to poi-main/src/test/resources/document/Bug50936_1.doc
diff --git a/test-data/document/Bug50936_2.doc b/poi-main/src/test/resources/document/Bug50936_2.doc
similarity index 100%
rename from test-data/document/Bug50936_2.doc
rename to poi-main/src/test/resources/document/Bug50936_2.doc
diff --git a/test-data/document/Bug50936_3.doc b/poi-main/src/test/resources/document/Bug50936_3.doc
similarity index 100%
rename from test-data/document/Bug50936_3.doc
rename to poi-main/src/test/resources/document/Bug50936_3.doc
diff --git a/test-data/document/Bug50955.doc b/poi-main/src/test/resources/document/Bug50955.doc
similarity index 100%
rename from test-data/document/Bug50955.doc
rename to poi-main/src/test/resources/document/Bug50955.doc
diff --git a/test-data/document/Bug51170.docx b/poi-main/src/test/resources/document/Bug51170.docx
similarity index 100%
rename from test-data/document/Bug51170.docx
rename to poi-main/src/test/resources/document/Bug51170.docx
diff --git a/test-data/document/Bug51604.doc b/poi-main/src/test/resources/document/Bug51604.doc
similarity index 100%
rename from test-data/document/Bug51604.doc
rename to poi-main/src/test/resources/document/Bug51604.doc
diff --git a/test-data/document/Bug51686.doc b/poi-main/src/test/resources/document/Bug51686.doc
similarity index 100%
rename from test-data/document/Bug51686.doc
rename to poi-main/src/test/resources/document/Bug51686.doc
diff --git a/test-data/document/Bug51834.doc b/poi-main/src/test/resources/document/Bug51834.doc
similarity index 100%
rename from test-data/document/Bug51834.doc
rename to poi-main/src/test/resources/document/Bug51834.doc
diff --git a/test-data/document/Bug51890.doc b/poi-main/src/test/resources/document/Bug51890.doc
similarity index 100%
rename from test-data/document/Bug51890.doc
rename to poi-main/src/test/resources/document/Bug51890.doc
diff --git a/test-data/document/Bug51944.doc b/poi-main/src/test/resources/document/Bug51944.doc
similarity index 100%
rename from test-data/document/Bug51944.doc
rename to poi-main/src/test/resources/document/Bug51944.doc
diff --git a/test-data/document/Bug52032_1.doc b/poi-main/src/test/resources/document/Bug52032_1.doc
similarity index 100%
rename from test-data/document/Bug52032_1.doc
rename to poi-main/src/test/resources/document/Bug52032_1.doc
diff --git a/test-data/document/Bug52032_2.doc b/poi-main/src/test/resources/document/Bug52032_2.doc
similarity index 100%
rename from test-data/document/Bug52032_2.doc
rename to poi-main/src/test/resources/document/Bug52032_2.doc
diff --git a/test-data/document/Bug52032_3.doc b/poi-main/src/test/resources/document/Bug52032_3.doc
similarity index 100%
rename from test-data/document/Bug52032_3.doc
rename to poi-main/src/test/resources/document/Bug52032_3.doc
diff --git a/test-data/document/Bug52311.doc b/poi-main/src/test/resources/document/Bug52311.doc
similarity index 100%
rename from test-data/document/Bug52311.doc
rename to poi-main/src/test/resources/document/Bug52311.doc
diff --git a/test-data/document/Bug52583.doc b/poi-main/src/test/resources/document/Bug52583.doc
similarity index 100%
rename from test-data/document/Bug52583.doc
rename to poi-main/src/test/resources/document/Bug52583.doc
diff --git a/test-data/document/Bug53182.doc b/poi-main/src/test/resources/document/Bug53182.doc
similarity index 100%
rename from test-data/document/Bug53182.doc
rename to poi-main/src/test/resources/document/Bug53182.doc
diff --git a/test-data/document/Bug53380_1.doc b/poi-main/src/test/resources/document/Bug53380_1.doc
similarity index 100%
rename from test-data/document/Bug53380_1.doc
rename to poi-main/src/test/resources/document/Bug53380_1.doc
diff --git a/test-data/document/Bug53380_2.doc b/poi-main/src/test/resources/document/Bug53380_2.doc
similarity index 100%
rename from test-data/document/Bug53380_2.doc
rename to poi-main/src/test/resources/document/Bug53380_2.doc
diff --git a/test-data/document/Bug53380_3.doc b/poi-main/src/test/resources/document/Bug53380_3.doc
similarity index 100%
rename from test-data/document/Bug53380_3.doc
rename to poi-main/src/test/resources/document/Bug53380_3.doc
diff --git a/test-data/document/Bug53380_4.doc b/poi-main/src/test/resources/document/Bug53380_4.doc
similarity index 100%
rename from test-data/document/Bug53380_4.doc
rename to poi-main/src/test/resources/document/Bug53380_4.doc
diff --git a/test-data/document/Bug54849.docx b/poi-main/src/test/resources/document/Bug54849.docx
similarity index 100%
rename from test-data/document/Bug54849.docx
rename to poi-main/src/test/resources/document/Bug54849.docx
diff --git a/test-data/document/Bug55142.docx b/poi-main/src/test/resources/document/Bug55142.docx
similarity index 100%
rename from test-data/document/Bug55142.docx
rename to poi-main/src/test/resources/document/Bug55142.docx
diff --git a/test-data/document/DiffFirstPageHeadFoot.doc b/poi-main/src/test/resources/document/DiffFirstPageHeadFoot.doc
similarity index 100%
rename from test-data/document/DiffFirstPageHeadFoot.doc
rename to poi-main/src/test/resources/document/DiffFirstPageHeadFoot.doc
diff --git a/test-data/document/DiffFirstPageHeadFoot.docx b/poi-main/src/test/resources/document/DiffFirstPageHeadFoot.docx
similarity index 100%
rename from test-data/document/DiffFirstPageHeadFoot.docx
rename to poi-main/src/test/resources/document/DiffFirstPageHeadFoot.docx
diff --git a/test-data/document/EmbeddedDocument.docx b/poi-main/src/test/resources/document/EmbeddedDocument.docx
similarity index 100%
rename from test-data/document/EmbeddedDocument.docx
rename to poi-main/src/test/resources/document/EmbeddedDocument.docx
diff --git a/test-data/document/EmptyDocumentWithHeaderFooter.docx b/poi-main/src/test/resources/document/EmptyDocumentWithHeaderFooter.docx
similarity index 100%
rename from test-data/document/EmptyDocumentWithHeaderFooter.docx
rename to poi-main/src/test/resources/document/EmptyDocumentWithHeaderFooter.docx
diff --git a/test-data/document/FancyFoot.doc b/poi-main/src/test/resources/document/FancyFoot.doc
similarity index 100%
rename from test-data/document/FancyFoot.doc
rename to poi-main/src/test/resources/document/FancyFoot.doc
diff --git a/test-data/document/FancyFoot.docx b/poi-main/src/test/resources/document/FancyFoot.docx
similarity index 100%
rename from test-data/document/FancyFoot.docx
rename to poi-main/src/test/resources/document/FancyFoot.docx
diff --git a/test-data/document/FieldCodes.docx b/poi-main/src/test/resources/document/FieldCodes.docx
similarity index 100%
rename from test-data/document/FieldCodes.docx
rename to poi-main/src/test/resources/document/FieldCodes.docx
diff --git a/test-data/document/FldSimple.docx b/poi-main/src/test/resources/document/FldSimple.docx
similarity index 100%
rename from test-data/document/FldSimple.docx
rename to poi-main/src/test/resources/document/FldSimple.docx
diff --git a/test-data/document/FloatingPictures.doc b/poi-main/src/test/resources/document/FloatingPictures.doc
similarity index 100%
rename from test-data/document/FloatingPictures.doc
rename to poi-main/src/test/resources/document/FloatingPictures.doc
diff --git a/test-data/document/HeaderFooterProblematic.doc b/poi-main/src/test/resources/document/HeaderFooterProblematic.doc
similarity index 100%
rename from test-data/document/HeaderFooterProblematic.doc
rename to poi-main/src/test/resources/document/HeaderFooterProblematic.doc
diff --git a/test-data/document/HeaderFooterUnicode.doc b/poi-main/src/test/resources/document/HeaderFooterUnicode.doc
similarity index 100%
rename from test-data/document/HeaderFooterUnicode.doc
rename to poi-main/src/test/resources/document/HeaderFooterUnicode.doc
diff --git a/test-data/document/HeaderFooterUnicode.docx b/poi-main/src/test/resources/document/HeaderFooterUnicode.docx
similarity index 100%
rename from test-data/document/HeaderFooterUnicode.docx
rename to poi-main/src/test/resources/document/HeaderFooterUnicode.docx
diff --git a/test-data/document/HeaderWithMacros.doc b/poi-main/src/test/resources/document/HeaderWithMacros.doc
similarity index 100%
rename from test-data/document/HeaderWithMacros.doc
rename to poi-main/src/test/resources/document/HeaderWithMacros.doc
diff --git a/test-data/document/Headers.docx b/poi-main/src/test/resources/document/Headers.docx
similarity index 100%
rename from test-data/document/Headers.docx
rename to poi-main/src/test/resources/document/Headers.docx
diff --git a/test-data/document/IllustrativeCases.docx b/poi-main/src/test/resources/document/IllustrativeCases.docx
similarity index 100%
rename from test-data/document/IllustrativeCases.docx
rename to poi-main/src/test/resources/document/IllustrativeCases.docx
diff --git a/test-data/document/ListEntryNoListTable.doc b/poi-main/src/test/resources/document/ListEntryNoListTable.doc
similarity index 100%
rename from test-data/document/ListEntryNoListTable.doc
rename to poi-main/src/test/resources/document/ListEntryNoListTable.doc
diff --git a/test-data/document/Lists.doc b/poi-main/src/test/resources/document/Lists.doc
similarity index 100%
rename from test-data/document/Lists.doc
rename to poi-main/src/test/resources/document/Lists.doc
diff --git a/test-data/document/MarkAuthorsTable.doc b/poi-main/src/test/resources/document/MarkAuthorsTable.doc
similarity index 100%
rename from test-data/document/MarkAuthorsTable.doc
rename to poi-main/src/test/resources/document/MarkAuthorsTable.doc
diff --git a/test-data/document/NoHeadFoot.doc b/poi-main/src/test/resources/document/NoHeadFoot.doc
similarity index 100%
rename from test-data/document/NoHeadFoot.doc
rename to poi-main/src/test/resources/document/NoHeadFoot.doc
diff --git a/test-data/document/NoHeadFoot.docx b/poi-main/src/test/resources/document/NoHeadFoot.docx
similarity index 100%
rename from test-data/document/NoHeadFoot.docx
rename to poi-main/src/test/resources/document/NoHeadFoot.docx
diff --git a/test-data/document/Numbering.docx b/poi-main/src/test/resources/document/Numbering.docx
similarity index 100%
rename from test-data/document/Numbering.docx
rename to poi-main/src/test/resources/document/Numbering.docx
diff --git a/test-data/document/PageSpecificHeadFoot.doc b/poi-main/src/test/resources/document/PageSpecificHeadFoot.doc
similarity index 100%
rename from test-data/document/PageSpecificHeadFoot.doc
rename to poi-main/src/test/resources/document/PageSpecificHeadFoot.doc
diff --git a/test-data/document/PageSpecificHeadFoot.docx b/poi-main/src/test/resources/document/PageSpecificHeadFoot.docx
similarity index 100%
rename from test-data/document/PageSpecificHeadFoot.docx
rename to poi-main/src/test/resources/document/PageSpecificHeadFoot.docx
diff --git a/test-data/document/PasswordProtected.doc b/poi-main/src/test/resources/document/PasswordProtected.doc
similarity index 100%
rename from test-data/document/PasswordProtected.doc
rename to poi-main/src/test/resources/document/PasswordProtected.doc
diff --git a/test-data/document/Picture_Alternative_Text.doc b/poi-main/src/test/resources/document/Picture_Alternative_Text.doc
similarity index 100%
rename from test-data/document/Picture_Alternative_Text.doc
rename to poi-main/src/test/resources/document/Picture_Alternative_Text.doc
diff --git a/test-data/document/PngPicture.doc b/poi-main/src/test/resources/document/PngPicture.doc
similarity index 100%
rename from test-data/document/PngPicture.doc
rename to poi-main/src/test/resources/document/PngPicture.doc
diff --git a/test-data/document/ProblemExtracting.doc b/poi-main/src/test/resources/document/ProblemExtracting.doc
similarity index 100%
rename from test-data/document/ProblemExtracting.doc
rename to poi-main/src/test/resources/document/ProblemExtracting.doc
diff --git a/test-data/document/SampleDoc.doc b/poi-main/src/test/resources/document/SampleDoc.doc
similarity index 100%
rename from test-data/document/SampleDoc.doc
rename to poi-main/src/test/resources/document/SampleDoc.doc
diff --git a/test-data/document/SampleDoc.docx b/poi-main/src/test/resources/document/SampleDoc.docx
similarity index 100%
rename from test-data/document/SampleDoc.docx
rename to poi-main/src/test/resources/document/SampleDoc.docx
diff --git a/test-data/document/SampleDoc.txt b/poi-main/src/test/resources/document/SampleDoc.txt
similarity index 100%
rename from test-data/document/SampleDoc.txt
rename to poi-main/src/test/resources/document/SampleDoc.txt
diff --git a/test-data/document/SimpleHeadThreeColFoot.doc b/poi-main/src/test/resources/document/SimpleHeadThreeColFoot.doc
similarity index 100%
rename from test-data/document/SimpleHeadThreeColFoot.doc
rename to poi-main/src/test/resources/document/SimpleHeadThreeColFoot.doc
diff --git a/test-data/document/SimpleHeadThreeColFoot.docx b/poi-main/src/test/resources/document/SimpleHeadThreeColFoot.docx
similarity index 100%
rename from test-data/document/SimpleHeadThreeColFoot.docx
rename to poi-main/src/test/resources/document/SimpleHeadThreeColFoot.docx
diff --git a/test-data/document/Styles.docx b/poi-main/src/test/resources/document/Styles.docx
similarity index 100%
rename from test-data/document/Styles.docx
rename to poi-main/src/test/resources/document/Styles.docx
diff --git a/test-data/document/TestDocument.docx b/poi-main/src/test/resources/document/TestDocument.docx
similarity index 100%
rename from test-data/document/TestDocument.docx
rename to poi-main/src/test/resources/document/TestDocument.docx
diff --git a/test-data/document/TestPoiXMLDocumentCorePropertiesGetKeywords.docx b/poi-main/src/test/resources/document/TestPoiXMLDocumentCorePropertiesGetKeywords.docx
similarity index 100%
rename from test-data/document/TestPoiXMLDocumentCorePropertiesGetKeywords.docx
rename to poi-main/src/test/resources/document/TestPoiXMLDocumentCorePropertiesGetKeywords.docx
diff --git a/test-data/document/ThreeColFoot.doc b/poi-main/src/test/resources/document/ThreeColFoot.doc
similarity index 100%
rename from test-data/document/ThreeColFoot.doc
rename to poi-main/src/test/resources/document/ThreeColFoot.doc
diff --git a/test-data/document/ThreeColFoot.docx b/poi-main/src/test/resources/document/ThreeColFoot.docx
similarity index 100%
rename from test-data/document/ThreeColFoot.docx
rename to poi-main/src/test/resources/document/ThreeColFoot.docx
diff --git a/test-data/document/ThreeColHead.doc b/poi-main/src/test/resources/document/ThreeColHead.doc
similarity index 100%
rename from test-data/document/ThreeColHead.doc
rename to poi-main/src/test/resources/document/ThreeColHead.doc
diff --git a/test-data/document/ThreeColHead.docx b/poi-main/src/test/resources/document/ThreeColHead.docx
similarity index 100%
rename from test-data/document/ThreeColHead.docx
rename to poi-main/src/test/resources/document/ThreeColHead.docx
diff --git a/test-data/document/ThreeColHeadFoot.doc b/poi-main/src/test/resources/document/ThreeColHeadFoot.doc
similarity index 100%
rename from test-data/document/ThreeColHeadFoot.doc
rename to poi-main/src/test/resources/document/ThreeColHeadFoot.doc
diff --git a/test-data/document/ThreeColHeadFoot.docx b/poi-main/src/test/resources/document/ThreeColHeadFoot.docx
similarity index 100%
rename from test-data/document/ThreeColHeadFoot.docx
rename to poi-main/src/test/resources/document/ThreeColHeadFoot.docx
diff --git a/test-data/document/Tika-792.docx b/poi-main/src/test/resources/document/Tika-792.docx
similarity index 100%
rename from test-data/document/Tika-792.docx
rename to poi-main/src/test/resources/document/Tika-792.docx
diff --git a/test-data/document/VariousPictures.docx b/poi-main/src/test/resources/document/VariousPictures.docx
similarity index 100%
rename from test-data/document/VariousPictures.docx
rename to poi-main/src/test/resources/document/VariousPictures.docx
diff --git a/test-data/document/WithArtShapes.doc b/poi-main/src/test/resources/document/WithArtShapes.doc
similarity index 100%
rename from test-data/document/WithArtShapes.doc
rename to poi-main/src/test/resources/document/WithArtShapes.doc
diff --git a/test-data/document/WithGIF.docx b/poi-main/src/test/resources/document/WithGIF.docx
similarity index 100%
rename from test-data/document/WithGIF.docx
rename to poi-main/src/test/resources/document/WithGIF.docx
diff --git a/test-data/document/WithTabs.docx b/poi-main/src/test/resources/document/WithTabs.docx
similarity index 100%
rename from test-data/document/WithTabs.docx
rename to poi-main/src/test/resources/document/WithTabs.docx
diff --git a/test-data/document/Word6.doc b/poi-main/src/test/resources/document/Word6.doc
similarity index 100%
rename from test-data/document/Word6.doc
rename to poi-main/src/test/resources/document/Word6.doc
diff --git a/test-data/document/Word6_sections.doc b/poi-main/src/test/resources/document/Word6_sections.doc
similarity index 100%
rename from test-data/document/Word6_sections.doc
rename to poi-main/src/test/resources/document/Word6_sections.doc
diff --git a/test-data/document/Word6_sections2.doc b/poi-main/src/test/resources/document/Word6_sections2.doc
similarity index 100%
rename from test-data/document/Word6_sections2.doc
rename to poi-main/src/test/resources/document/Word6_sections2.doc
diff --git a/test-data/document/Word95.doc b/poi-main/src/test/resources/document/Word95.doc
similarity index 100%
rename from test-data/document/Word95.doc
rename to poi-main/src/test/resources/document/Word95.doc
diff --git a/test-data/document/WordWithAttachments.docx b/poi-main/src/test/resources/document/WordWithAttachments.docx
similarity index 100%
rename from test-data/document/WordWithAttachments.docx
rename to poi-main/src/test/resources/document/WordWithAttachments.docx
diff --git a/test-data/document/abstract1.jpg b/poi-main/src/test/resources/document/abstract1.jpg
similarity index 100%
rename from test-data/document/abstract1.jpg
rename to poi-main/src/test/resources/document/abstract1.jpg
diff --git a/test-data/document/abstract2.jpg b/poi-main/src/test/resources/document/abstract2.jpg
similarity index 100%
rename from test-data/document/abstract2.jpg
rename to poi-main/src/test/resources/document/abstract2.jpg
diff --git a/test-data/document/abstract3.jpg b/poi-main/src/test/resources/document/abstract3.jpg
similarity index 100%
rename from test-data/document/abstract3.jpg
rename to poi-main/src/test/resources/document/abstract3.jpg
diff --git a/test-data/document/abstract4.jpg b/poi-main/src/test/resources/document/abstract4.jpg
similarity index 100%
rename from test-data/document/abstract4.jpg
rename to poi-main/src/test/resources/document/abstract4.jpg
diff --git a/test-data/document/bookmarks.docx b/poi-main/src/test/resources/document/bookmarks.docx
similarity index 100%
rename from test-data/document/bookmarks.docx
rename to poi-main/src/test/resources/document/bookmarks.docx
diff --git a/test-data/document/bug53475-password-is-pass.docx b/poi-main/src/test/resources/document/bug53475-password-is-pass.docx
similarity index 100%
rename from test-data/document/bug53475-password-is-pass.docx
rename to poi-main/src/test/resources/document/bug53475-password-is-pass.docx
diff --git a/test-data/document/bug53475-password-is-solrcell.docx b/poi-main/src/test/resources/document/bug53475-password-is-solrcell.docx
similarity index 100%
rename from test-data/document/bug53475-password-is-solrcell.docx
rename to poi-main/src/test/resources/document/bug53475-password-is-solrcell.docx
diff --git a/test-data/document/bug56075-changeTracking_off.docx b/poi-main/src/test/resources/document/bug56075-changeTracking_off.docx
similarity index 100%
rename from test-data/document/bug56075-changeTracking_off.docx
rename to poi-main/src/test/resources/document/bug56075-changeTracking_off.docx
diff --git a/test-data/document/bug56075-changeTracking_on.docx b/poi-main/src/test/resources/document/bug56075-changeTracking_on.docx
similarity index 100%
rename from test-data/document/bug56075-changeTracking_on.docx
rename to poi-main/src/test/resources/document/bug56075-changeTracking_on.docx
diff --git a/test-data/document/bug56076.docx b/poi-main/src/test/resources/document/bug56076.docx
similarity index 100%
rename from test-data/document/bug56076.docx
rename to poi-main/src/test/resources/document/bug56076.docx
diff --git a/test-data/document/delins.docx b/poi-main/src/test/resources/document/delins.docx
similarity index 100%
rename from test-data/document/delins.docx
rename to poi-main/src/test/resources/document/delins.docx
diff --git a/test-data/document/documentProperties.doc b/poi-main/src/test/resources/document/documentProperties.doc
similarity index 100%
rename from test-data/document/documentProperties.doc
rename to poi-main/src/test/resources/document/documentProperties.doc
diff --git a/test-data/document/documentProperties.docx b/poi-main/src/test/resources/document/documentProperties.docx
similarity index 100%
rename from test-data/document/documentProperties.docx
rename to poi-main/src/test/resources/document/documentProperties.docx
diff --git a/test-data/document/documentProtection_comments_no_password.docx b/poi-main/src/test/resources/document/documentProtection_comments_no_password.docx
similarity index 100%
rename from test-data/document/documentProtection_comments_no_password.docx
rename to poi-main/src/test/resources/document/documentProtection_comments_no_password.docx
diff --git a/test-data/document/documentProtection_forms_no_password.docx b/poi-main/src/test/resources/document/documentProtection_forms_no_password.docx
similarity index 100%
rename from test-data/document/documentProtection_forms_no_password.docx
rename to poi-main/src/test/resources/document/documentProtection_forms_no_password.docx
diff --git a/test-data/document/documentProtection_no_protection.docx b/poi-main/src/test/resources/document/documentProtection_no_protection.docx
similarity index 100%
rename from test-data/document/documentProtection_no_protection.docx
rename to poi-main/src/test/resources/document/documentProtection_no_protection.docx
diff --git a/test-data/document/documentProtection_no_protection_tag_existing.docx b/poi-main/src/test/resources/document/documentProtection_no_protection_tag_existing.docx
similarity index 100%
rename from test-data/document/documentProtection_no_protection_tag_existing.docx
rename to poi-main/src/test/resources/document/documentProtection_no_protection_tag_existing.docx
diff --git a/test-data/document/documentProtection_readonly_no_password.docx b/poi-main/src/test/resources/document/documentProtection_readonly_no_password.docx
similarity index 100%
rename from test-data/document/documentProtection_readonly_no_password.docx
rename to poi-main/src/test/resources/document/documentProtection_readonly_no_password.docx
diff --git a/test-data/document/documentProtection_trackedChanges_no_password.docx b/poi-main/src/test/resources/document/documentProtection_trackedChanges_no_password.docx
similarity index 100%
rename from test-data/document/documentProtection_trackedChanges_no_password.docx
rename to poi-main/src/test/resources/document/documentProtection_trackedChanges_no_password.docx
diff --git a/test-data/document/drawing.docx b/poi-main/src/test/resources/document/drawing.docx
similarity index 100%
rename from test-data/document/drawing.docx
rename to poi-main/src/test/resources/document/drawing.docx
diff --git a/test-data/document/empty.doc b/poi-main/src/test/resources/document/empty.doc
similarity index 100%
rename from test-data/document/empty.doc
rename to poi-main/src/test/resources/document/empty.doc
diff --git a/test-data/document/endingnote.doc b/poi-main/src/test/resources/document/endingnote.doc
similarity index 100%
rename from test-data/document/endingnote.doc
rename to poi-main/src/test/resources/document/endingnote.doc
diff --git a/test-data/document/endnotes.docx b/poi-main/src/test/resources/document/endnotes.docx
similarity index 100%
rename from test-data/document/endnotes.docx
rename to poi-main/src/test/resources/document/endnotes.docx
diff --git a/test-data/document/equation.doc b/poi-main/src/test/resources/document/equation.doc
similarity index 100%
rename from test-data/document/equation.doc
rename to poi-main/src/test/resources/document/equation.doc
diff --git a/test-data/document/footnote.doc b/poi-main/src/test/resources/document/footnote.doc
similarity index 100%
rename from test-data/document/footnote.doc
rename to poi-main/src/test/resources/document/footnote.doc
diff --git a/test-data/document/footnotes.docx b/poi-main/src/test/resources/document/footnotes.docx
similarity index 100%
rename from test-data/document/footnotes.docx
rename to poi-main/src/test/resources/document/footnotes.docx
diff --git a/test-data/document/form_footnotes.docx b/poi-main/src/test/resources/document/form_footnotes.docx
similarity index 100%
rename from test-data/document/form_footnotes.docx
rename to poi-main/src/test/resources/document/form_footnotes.docx
diff --git a/test-data/document/headerFooter.docx b/poi-main/src/test/resources/document/headerFooter.docx
similarity index 100%
rename from test-data/document/headerFooter.docx
rename to poi-main/src/test/resources/document/headerFooter.docx
diff --git a/test-data/document/headerPic.docx b/poi-main/src/test/resources/document/headerPic.docx
similarity index 100%
rename from test-data/document/headerPic.docx
rename to poi-main/src/test/resources/document/headerPic.docx
diff --git a/test-data/document/header_image.doc b/poi-main/src/test/resources/document/header_image.doc
similarity index 100%
rename from test-data/document/header_image.doc
rename to poi-main/src/test/resources/document/header_image.doc
diff --git a/test-data/document/heading123.docx b/poi-main/src/test/resources/document/heading123.docx
similarity index 100%
rename from test-data/document/heading123.docx
rename to poi-main/src/test/resources/document/heading123.docx
diff --git a/test-data/document/hyperlink.doc b/poi-main/src/test/resources/document/hyperlink.doc
similarity index 100%
rename from test-data/document/hyperlink.doc
rename to poi-main/src/test/resources/document/hyperlink.doc
diff --git a/test-data/document/innertable.doc b/poi-main/src/test/resources/document/innertable.doc
similarity index 100%
rename from test-data/document/innertable.doc
rename to poi-main/src/test/resources/document/innertable.doc
diff --git a/test-data/document/issue_51265_1.docx b/poi-main/src/test/resources/document/issue_51265_1.docx
similarity index 100%
rename from test-data/document/issue_51265_1.docx
rename to poi-main/src/test/resources/document/issue_51265_1.docx
diff --git a/test-data/document/issue_51265_2.docx b/poi-main/src/test/resources/document/issue_51265_2.docx
similarity index 100%
rename from test-data/document/issue_51265_2.docx
rename to poi-main/src/test/resources/document/issue_51265_2.docx
diff --git a/test-data/document/issue_51265_3.docx b/poi-main/src/test/resources/document/issue_51265_3.docx
similarity index 100%
rename from test-data/document/issue_51265_3.docx
rename to poi-main/src/test/resources/document/issue_51265_3.docx
diff --git a/test-data/document/lists-margins.doc b/poi-main/src/test/resources/document/lists-margins.doc
similarity index 100%
rename from test-data/document/lists-margins.doc
rename to poi-main/src/test/resources/document/lists-margins.doc
diff --git a/test-data/document/nature1.gif b/poi-main/src/test/resources/document/nature1.gif
similarity index 100%
rename from test-data/document/nature1.gif
rename to poi-main/src/test/resources/document/nature1.gif
diff --git a/test-data/document/nature1.jpg b/poi-main/src/test/resources/document/nature1.jpg
similarity index 100%
rename from test-data/document/nature1.jpg
rename to poi-main/src/test/resources/document/nature1.jpg
diff --git a/test-data/document/nature1.png b/poi-main/src/test/resources/document/nature1.png
similarity index 100%
rename from test-data/document/nature1.png
rename to poi-main/src/test/resources/document/nature1.png
diff --git a/test-data/document/nature2.jpg b/poi-main/src/test/resources/document/nature2.jpg
similarity index 100%
rename from test-data/document/nature2.jpg
rename to poi-main/src/test/resources/document/nature2.jpg
diff --git a/test-data/document/nature3.jpg b/poi-main/src/test/resources/document/nature3.jpg
similarity index 100%
rename from test-data/document/nature3.jpg
rename to poi-main/src/test/resources/document/nature3.jpg
diff --git a/test-data/document/nature4.jpg b/poi-main/src/test/resources/document/nature4.jpg
similarity index 100%
rename from test-data/document/nature4.jpg
rename to poi-main/src/test/resources/document/nature4.jpg
diff --git a/test-data/document/o_kurs.doc b/poi-main/src/test/resources/document/o_kurs.doc
similarity index 100%
rename from test-data/document/o_kurs.doc
rename to poi-main/src/test/resources/document/o_kurs.doc
diff --git a/test-data/document/ob_is.doc b/poi-main/src/test/resources/document/ob_is.doc
similarity index 100%
rename from test-data/document/ob_is.doc
rename to poi-main/src/test/resources/document/ob_is.doc
diff --git a/test-data/document/page-break-before.doc b/poi-main/src/test/resources/document/page-break-before.doc
similarity index 100%
rename from test-data/document/page-break-before.doc
rename to poi-main/src/test/resources/document/page-break-before.doc
diff --git a/test-data/document/page-break.doc b/poi-main/src/test/resources/document/page-break.doc
similarity index 100%
rename from test-data/document/page-break.doc
rename to poi-main/src/test/resources/document/page-break.doc
diff --git a/test-data/document/pageref.doc b/poi-main/src/test/resources/document/pageref.doc
similarity index 100%
rename from test-data/document/pageref.doc
rename to poi-main/src/test/resources/document/pageref.doc
diff --git a/test-data/document/parentinvguid.doc b/poi-main/src/test/resources/document/parentinvguid.doc
similarity index 100%
rename from test-data/document/parentinvguid.doc
rename to poi-main/src/test/resources/document/parentinvguid.doc
diff --git a/test-data/document/picture.doc b/poi-main/src/test/resources/document/picture.doc
similarity index 100%
rename from test-data/document/picture.doc
rename to poi-main/src/test/resources/document/picture.doc
diff --git a/test-data/document/pictures_escher.doc b/poi-main/src/test/resources/document/pictures_escher.doc
similarity index 100%
rename from test-data/document/pictures_escher.doc
rename to poi-main/src/test/resources/document/pictures_escher.doc
diff --git a/test-data/document/protected_sample.docx b/poi-main/src/test/resources/document/protected_sample.docx
similarity index 100%
rename from test-data/document/protected_sample.docx
rename to poi-main/src/test/resources/document/protected_sample.docx
diff --git a/test-data/document/rasp.doc b/poi-main/src/test/resources/document/rasp.doc
similarity index 100%
rename from test-data/document/rasp.doc
rename to poi-main/src/test/resources/document/rasp.doc
diff --git a/test-data/document/sample.docx b/poi-main/src/test/resources/document/sample.docx
similarity index 100%
rename from test-data/document/sample.docx
rename to poi-main/src/test/resources/document/sample.docx
diff --git a/test-data/document/saved-by-table.doc b/poi-main/src/test/resources/document/saved-by-table.doc
similarity index 100%
rename from test-data/document/saved-by-table.doc
rename to poi-main/src/test/resources/document/saved-by-table.doc
diff --git a/test-data/document/simple-list.doc b/poi-main/src/test/resources/document/simple-list.doc
similarity index 100%
rename from test-data/document/simple-list.doc
rename to poi-main/src/test/resources/document/simple-list.doc
diff --git a/test-data/document/simple-table.doc b/poi-main/src/test/resources/document/simple-table.doc
similarity index 100%
rename from test-data/document/simple-table.doc
rename to poi-main/src/test/resources/document/simple-table.doc
diff --git a/test-data/document/simple-table2.doc b/poi-main/src/test/resources/document/simple-table2.doc
similarity index 100%
rename from test-data/document/simple-table2.doc
rename to poi-main/src/test/resources/document/simple-table2.doc
diff --git a/test-data/document/simple.doc b/poi-main/src/test/resources/document/simple.doc
similarity index 100%
rename from test-data/document/simple.doc
rename to poi-main/src/test/resources/document/simple.doc
diff --git a/test-data/document/simple_image.jpg b/poi-main/src/test/resources/document/simple_image.jpg
similarity index 100%
rename from test-data/document/simple_image.jpg
rename to poi-main/src/test/resources/document/simple_image.jpg
diff --git a/test-data/document/simple_image.png b/poi-main/src/test/resources/document/simple_image.png
similarity index 100%
rename from test-data/document/simple_image.png
rename to poi-main/src/test/resources/document/simple_image.png
diff --git a/test-data/document/smarttag-snippet.docx b/poi-main/src/test/resources/document/smarttag-snippet.docx
similarity index 100%
rename from test-data/document/smarttag-snippet.docx
rename to poi-main/src/test/resources/document/smarttag-snippet.docx
diff --git a/test-data/document/table-merges.doc b/poi-main/src/test/resources/document/table-merges.doc
similarity index 100%
rename from test-data/document/table-merges.doc
rename to poi-main/src/test/resources/document/table-merges.doc
diff --git a/test-data/document/table_footnotes.docx b/poi-main/src/test/resources/document/table_footnotes.docx
similarity index 100%
rename from test-data/document/table_footnotes.docx
rename to poi-main/src/test/resources/document/table_footnotes.docx
diff --git a/test-data/document/test-fields.doc b/poi-main/src/test/resources/document/test-fields.doc
similarity index 100%
rename from test-data/document/test-fields.doc
rename to poi-main/src/test/resources/document/test-fields.doc
diff --git a/test-data/document/test.doc b/poi-main/src/test/resources/document/test.doc
similarity index 100%
rename from test-data/document/test.doc
rename to poi-main/src/test/resources/document/test.doc
diff --git a/test-data/document/test.dotx b/poi-main/src/test/resources/document/test.dotx
similarity index 100%
rename from test-data/document/test.dotx
rename to poi-main/src/test/resources/document/test.dotx
diff --git a/test-data/document/test2.doc b/poi-main/src/test/resources/document/test2.doc
similarity index 100%
rename from test-data/document/test2.doc
rename to poi-main/src/test/resources/document/test2.doc
diff --git a/test-data/document/testCroppedPictures.doc b/poi-main/src/test/resources/document/testCroppedPictures.doc
similarity index 100%
rename from test-data/document/testCroppedPictures.doc
rename to poi-main/src/test/resources/document/testCroppedPictures.doc
diff --git a/test-data/document/testPictures.doc b/poi-main/src/test/resources/document/testPictures.doc
similarity index 100%
rename from test-data/document/testPictures.doc
rename to poi-main/src/test/resources/document/testPictures.doc
diff --git a/test-data/document/testRangeDelete.doc b/poi-main/src/test/resources/document/testRangeDelete.doc
similarity index 100%
rename from test-data/document/testRangeDelete.doc
rename to poi-main/src/test/resources/document/testRangeDelete.doc
diff --git a/test-data/document/testRangeInsertion.doc b/poi-main/src/test/resources/document/testRangeInsertion.doc
similarity index 100%
rename from test-data/document/testRangeInsertion.doc
rename to poi-main/src/test/resources/document/testRangeInsertion.doc
diff --git a/test-data/document/testRangeReplacement.doc b/poi-main/src/test/resources/document/testRangeReplacement.doc
similarity index 100%
rename from test-data/document/testRangeReplacement.doc
rename to poi-main/src/test/resources/document/testRangeReplacement.doc
diff --git a/test-data/document/two_images.doc b/poi-main/src/test/resources/document/two_images.doc
similarity index 100%
rename from test-data/document/two_images.doc
rename to poi-main/src/test/resources/document/two_images.doc
diff --git a/test-data/document/vector_image.doc b/poi-main/src/test/resources/document/vector_image.doc
similarity index 100%
rename from test-data/document/vector_image.doc
rename to poi-main/src/test/resources/document/vector_image.doc
diff --git a/test-data/document/vector_image.emf b/poi-main/src/test/resources/document/vector_image.emf
similarity index 100%
rename from test-data/document/vector_image.emf
rename to poi-main/src/test/resources/document/vector_image.emf
diff --git a/test-data/document/watermark.doc b/poi-main/src/test/resources/document/watermark.doc
similarity index 100%
rename from test-data/document/watermark.doc
rename to poi-main/src/test/resources/document/watermark.doc
diff --git a/test-data/document/word95err.doc b/poi-main/src/test/resources/document/word95err.doc
similarity index 100%
rename from test-data/document/word95err.doc
rename to poi-main/src/test/resources/document/word95err.doc
diff --git a/test-data/document/word_with_embeded.doc b/poi-main/src/test/resources/document/word_with_embeded.doc
similarity index 100%
rename from test-data/document/word_with_embeded.doc
rename to poi-main/src/test/resources/document/word_with_embeded.doc
diff --git a/test-data/document/word_with_embeded_ooxml.doc b/poi-main/src/test/resources/document/word_with_embeded_ooxml.doc
similarity index 100%
rename from test-data/document/word_with_embeded_ooxml.doc
rename to poi-main/src/test/resources/document/word_with_embeded_ooxml.doc
diff --git a/test-data/hmef/bug52400-winmail-simple.dat b/poi-main/src/test/resources/hmef/bug52400-winmail-simple.dat
similarity index 100%
rename from test-data/hmef/bug52400-winmail-simple.dat
rename to poi-main/src/test/resources/hmef/bug52400-winmail-simple.dat
diff --git a/test-data/hmef/bug52400-winmail-with-attachments.dat b/poi-main/src/test/resources/hmef/bug52400-winmail-with-attachments.dat
similarity index 100%
rename from test-data/hmef/bug52400-winmail-with-attachments.dat
rename to poi-main/src/test/resources/hmef/bug52400-winmail-with-attachments.dat
diff --git a/test-data/hmef/quick-contents/message.rtf b/poi-main/src/test/resources/hmef/quick-contents/message.rtf
similarity index 100%
rename from test-data/hmef/quick-contents/message.rtf
rename to poi-main/src/test/resources/hmef/quick-contents/message.rtf
diff --git a/test-data/hmef/quick-contents/quick.doc b/poi-main/src/test/resources/hmef/quick-contents/quick.doc
similarity index 100%
rename from test-data/hmef/quick-contents/quick.doc
rename to poi-main/src/test/resources/hmef/quick-contents/quick.doc
diff --git a/test-data/hmef/quick-contents/quick.html b/poi-main/src/test/resources/hmef/quick-contents/quick.html
similarity index 100%
rename from test-data/hmef/quick-contents/quick.html
rename to poi-main/src/test/resources/hmef/quick-contents/quick.html
diff --git a/test-data/hmef/quick-contents/quick.pdf b/poi-main/src/test/resources/hmef/quick-contents/quick.pdf
similarity index 100%
rename from test-data/hmef/quick-contents/quick.pdf
rename to poi-main/src/test/resources/hmef/quick-contents/quick.pdf
diff --git a/test-data/hmef/quick-contents/quick.txt b/poi-main/src/test/resources/hmef/quick-contents/quick.txt
similarity index 100%
rename from test-data/hmef/quick-contents/quick.txt
rename to poi-main/src/test/resources/hmef/quick-contents/quick.txt
diff --git a/test-data/hmef/quick-contents/quick.xml b/poi-main/src/test/resources/hmef/quick-contents/quick.xml
similarity index 100%
rename from test-data/hmef/quick-contents/quick.xml
rename to poi-main/src/test/resources/hmef/quick-contents/quick.xml
diff --git a/test-data/hmef/quick-winmail.dat b/poi-main/src/test/resources/hmef/quick-winmail.dat
similarity index 100%
rename from test-data/hmef/quick-winmail.dat
rename to poi-main/src/test/resources/hmef/quick-winmail.dat
diff --git a/test-data/hmef/winmail-sample1.dat b/poi-main/src/test/resources/hmef/winmail-sample1.dat
similarity index 100%
rename from test-data/hmef/winmail-sample1.dat
rename to poi-main/src/test/resources/hmef/winmail-sample1.dat
diff --git a/test-data/hpsf/Test0313rur.adm b/poi-main/src/test/resources/hpsf/Test0313rur.adm
similarity index 100%
rename from test-data/hpsf/Test0313rur.adm
rename to poi-main/src/test/resources/hpsf/Test0313rur.adm
diff --git a/test-data/hpsf/TestBug44375.xls b/poi-main/src/test/resources/hpsf/TestBug44375.xls
similarity index 100%
rename from test-data/hpsf/TestBug44375.xls
rename to poi-main/src/test/resources/hpsf/TestBug44375.xls
diff --git a/test-data/hpsf/TestChineseProperties.doc b/poi-main/src/test/resources/hpsf/TestChineseProperties.doc
similarity index 100%
rename from test-data/hpsf/TestChineseProperties.doc
rename to poi-main/src/test/resources/hpsf/TestChineseProperties.doc
diff --git a/test-data/hpsf/TestCorel.shw b/poi-main/src/test/resources/hpsf/TestCorel.shw
similarity index 100%
rename from test-data/hpsf/TestCorel.shw
rename to poi-main/src/test/resources/hpsf/TestCorel.shw
diff --git a/test-data/hpsf/TestEditTime.doc b/poi-main/src/test/resources/hpsf/TestEditTime.doc
similarity index 100%
rename from test-data/hpsf/TestEditTime.doc
rename to poi-main/src/test/resources/hpsf/TestEditTime.doc
diff --git a/test-data/hpsf/TestGermanWord90.doc b/poi-main/src/test/resources/hpsf/TestGermanWord90.doc
similarity index 100%
rename from test-data/hpsf/TestGermanWord90.doc
rename to poi-main/src/test/resources/hpsf/TestGermanWord90.doc
diff --git a/test-data/hpsf/TestMickey.doc b/poi-main/src/test/resources/hpsf/TestMickey.doc
similarity index 100%
rename from test-data/hpsf/TestMickey.doc
rename to poi-main/src/test/resources/hpsf/TestMickey.doc
diff --git a/test-data/hpsf/TestNon4ByteBoundary.doc b/poi-main/src/test/resources/hpsf/TestNon4ByteBoundary.doc
similarity index 100%
rename from test-data/hpsf/TestNon4ByteBoundary.doc
rename to poi-main/src/test/resources/hpsf/TestNon4ByteBoundary.doc
diff --git a/test-data/hpsf/TestRobert_Flaherty.doc b/poi-main/src/test/resources/hpsf/TestRobert_Flaherty.doc
similarity index 100%
rename from test-data/hpsf/TestRobert_Flaherty.doc
rename to poi-main/src/test/resources/hpsf/TestRobert_Flaherty.doc
diff --git a/test-data/hpsf/TestSectionDictionary.doc b/poi-main/src/test/resources/hpsf/TestSectionDictionary.doc
similarity index 100%
rename from test-data/hpsf/TestSectionDictionary.doc
rename to poi-main/src/test/resources/hpsf/TestSectionDictionary.doc
diff --git a/test-data/hpsf/TestShiftJIS.doc b/poi-main/src/test/resources/hpsf/TestShiftJIS.doc
similarity index 100%
rename from test-data/hpsf/TestShiftJIS.doc
rename to poi-main/src/test/resources/hpsf/TestShiftJIS.doc
diff --git a/test-data/hpsf/TestSolidWorks.sldprt b/poi-main/src/test/resources/hpsf/TestSolidWorks.sldprt
similarity index 100%
rename from test-data/hpsf/TestSolidWorks.sldprt
rename to poi-main/src/test/resources/hpsf/TestSolidWorks.sldprt
diff --git a/test-data/hpsf/TestUnicode.xls b/poi-main/src/test/resources/hpsf/TestUnicode.xls
similarity index 100%
rename from test-data/hpsf/TestUnicode.xls
rename to poi-main/src/test/resources/hpsf/TestUnicode.xls
diff --git a/test-data/hpsf/TestVisioWithCodepage.vsd b/poi-main/src/test/resources/hpsf/TestVisioWithCodepage.vsd
similarity index 100%
rename from test-data/hpsf/TestVisioWithCodepage.vsd
rename to poi-main/src/test/resources/hpsf/TestVisioWithCodepage.vsd
diff --git a/test-data/hpsf/TestWriteWellKnown.doc b/poi-main/src/test/resources/hpsf/TestWriteWellKnown.doc
similarity index 100%
rename from test-data/hpsf/TestWriteWellKnown.doc
rename to poi-main/src/test/resources/hpsf/TestWriteWellKnown.doc
diff --git a/test-data/hpsf/TestZeroLengthCodePage.mpp b/poi-main/src/test/resources/hpsf/TestZeroLengthCodePage.mpp
similarity index 100%
rename from test-data/hpsf/TestZeroLengthCodePage.mpp
rename to poi-main/src/test/resources/hpsf/TestZeroLengthCodePage.mpp
diff --git a/test-data/hpsf/Test_Humor-Generation.ppt b/poi-main/src/test/resources/hpsf/Test_Humor-Generation.ppt
similarity index 100%
rename from test-data/hpsf/Test_Humor-Generation.ppt
rename to poi-main/src/test/resources/hpsf/Test_Humor-Generation.ppt
diff --git a/test-data/hsmf/51873.msg b/poi-main/src/test/resources/hsmf/51873.msg
similarity index 100%
rename from test-data/hsmf/51873.msg
rename to poi-main/src/test/resources/hsmf/51873.msg
diff --git a/test-data/hsmf/53784_fails.msg b/poi-main/src/test/resources/hsmf/53784_fails.msg
similarity index 100%
rename from test-data/hsmf/53784_fails.msg
rename to poi-main/src/test/resources/hsmf/53784_fails.msg
diff --git a/test-data/hsmf/53784_succeeds.msg b/poi-main/src/test/resources/hsmf/53784_succeeds.msg
similarity index 100%
rename from test-data/hsmf/53784_succeeds.msg
rename to poi-main/src/test/resources/hsmf/53784_succeeds.msg
diff --git a/test-data/hsmf/attachment_msg_pdf.msg b/poi-main/src/test/resources/hsmf/attachment_msg_pdf.msg
similarity index 100%
rename from test-data/hsmf/attachment_msg_pdf.msg
rename to poi-main/src/test/resources/hsmf/attachment_msg_pdf.msg
diff --git a/test-data/hsmf/attachment_test_msg.msg b/poi-main/src/test/resources/hsmf/attachment_test_msg.msg
similarity index 100%
rename from test-data/hsmf/attachment_test_msg.msg
rename to poi-main/src/test/resources/hsmf/attachment_test_msg.msg
diff --git a/test-data/hsmf/blank.msg b/poi-main/src/test/resources/hsmf/blank.msg
similarity index 100%
rename from test-data/hsmf/blank.msg
rename to poi-main/src/test/resources/hsmf/blank.msg
diff --git a/test-data/hsmf/chinese-traditional.msg b/poi-main/src/test/resources/hsmf/chinese-traditional.msg
similarity index 100%
rename from test-data/hsmf/chinese-traditional.msg
rename to poi-main/src/test/resources/hsmf/chinese-traditional.msg
diff --git a/test-data/hsmf/cyrillic_message.msg b/poi-main/src/test/resources/hsmf/cyrillic_message.msg
similarity index 100%
rename from test-data/hsmf/cyrillic_message.msg
rename to poi-main/src/test/resources/hsmf/cyrillic_message.msg
diff --git a/test-data/hsmf/example_received_regular.msg b/poi-main/src/test/resources/hsmf/example_received_regular.msg
similarity index 100%
rename from test-data/hsmf/example_received_regular.msg
rename to poi-main/src/test/resources/hsmf/example_received_regular.msg
diff --git a/test-data/hsmf/example_received_unicode.msg b/poi-main/src/test/resources/hsmf/example_received_unicode.msg
similarity index 100%
rename from test-data/hsmf/example_received_unicode.msg
rename to poi-main/src/test/resources/hsmf/example_received_unicode.msg
diff --git a/test-data/hsmf/example_sent_regular.msg b/poi-main/src/test/resources/hsmf/example_sent_regular.msg
similarity index 100%
rename from test-data/hsmf/example_sent_regular.msg
rename to poi-main/src/test/resources/hsmf/example_sent_regular.msg
diff --git a/test-data/hsmf/example_sent_unicode.msg b/poi-main/src/test/resources/hsmf/example_sent_unicode.msg
similarity index 100%
rename from test-data/hsmf/example_sent_unicode.msg
rename to poi-main/src/test/resources/hsmf/example_sent_unicode.msg
diff --git a/test-data/hsmf/no_recipient_address.msg b/poi-main/src/test/resources/hsmf/no_recipient_address.msg
similarity index 100%
rename from test-data/hsmf/no_recipient_address.msg
rename to poi-main/src/test/resources/hsmf/no_recipient_address.msg
diff --git a/test-data/hsmf/outlook_30_msg.msg b/poi-main/src/test/resources/hsmf/outlook_30_msg.msg
similarity index 100%
rename from test-data/hsmf/outlook_30_msg.msg
rename to poi-main/src/test/resources/hsmf/outlook_30_msg.msg
diff --git a/test-data/hsmf/quick.msg b/poi-main/src/test/resources/hsmf/quick.msg
similarity index 100%
rename from test-data/hsmf/quick.msg
rename to poi-main/src/test/resources/hsmf/quick.msg
diff --git a/test-data/hsmf/simple_test_msg.msg b/poi-main/src/test/resources/hsmf/simple_test_msg.msg
similarity index 100%
rename from test-data/hsmf/simple_test_msg.msg
rename to poi-main/src/test/resources/hsmf/simple_test_msg.msg
diff --git a/test-data/openxml4j/50154.xlsx b/poi-main/src/test/resources/openxml4j/50154.xlsx
similarity index 100%
rename from test-data/openxml4j/50154.xlsx
rename to poi-main/src/test/resources/openxml4j/50154.xlsx
diff --git a/test-data/openxml4j/51444.xlsx b/poi-main/src/test/resources/openxml4j/51444.xlsx
similarity index 100%
rename from test-data/openxml4j/51444.xlsx
rename to poi-main/src/test/resources/openxml4j/51444.xlsx
diff --git a/test-data/openxml4j/53282.xlsx b/poi-main/src/test/resources/openxml4j/53282.xlsx
similarity index 100%
rename from test-data/openxml4j/53282.xlsx
rename to poi-main/src/test/resources/openxml4j/53282.xlsx
diff --git a/test-data/openxml4j/ContentTypeHasEntities.ooxml b/poi-main/src/test/resources/openxml4j/ContentTypeHasEntities.ooxml
similarity index 100%
rename from test-data/openxml4j/ContentTypeHasEntities.ooxml
rename to poi-main/src/test/resources/openxml4j/ContentTypeHasEntities.ooxml
diff --git a/test-data/openxml4j/ContentTypeHasParameters.ooxml b/poi-main/src/test/resources/openxml4j/ContentTypeHasParameters.ooxml
similarity index 100%
rename from test-data/openxml4j/ContentTypeHasParameters.ooxml
rename to poi-main/src/test/resources/openxml4j/ContentTypeHasParameters.ooxml
diff --git a/test-data/openxml4j/ExcelWithHyperlinks.xlsx b/poi-main/src/test/resources/openxml4j/ExcelWithHyperlinks.xlsx
similarity index 100%
rename from test-data/openxml4j/ExcelWithHyperlinks.xlsx
rename to poi-main/src/test/resources/openxml4j/ExcelWithHyperlinks.xlsx
diff --git a/test-data/openxml4j/MultipleCoreProperties.docx b/poi-main/src/test/resources/openxml4j/MultipleCoreProperties.docx
similarity index 100%
rename from test-data/openxml4j/MultipleCoreProperties.docx
rename to poi-main/src/test/resources/openxml4j/MultipleCoreProperties.docx
diff --git a/test-data/openxml4j/OPCCompliance_CoreProperties_DCTermsNamespaceLimitedUseFAIL.docx b/poi-main/src/test/resources/openxml4j/OPCCompliance_CoreProperties_DCTermsNamespaceLimitedUseFAIL.docx
similarity index 100%
rename from test-data/openxml4j/OPCCompliance_CoreProperties_DCTermsNamespaceLimitedUseFAIL.docx
rename to poi-main/src/test/resources/openxml4j/OPCCompliance_CoreProperties_DCTermsNamespaceLimitedUseFAIL.docx
diff --git a/test-data/openxml4j/OPCCompliance_CoreProperties_DoNotUseCompatibilityMarkupFAIL.docx b/poi-main/src/test/resources/openxml4j/OPCCompliance_CoreProperties_DoNotUseCompatibilityMarkupFAIL.docx
similarity index 100%
rename from test-data/openxml4j/OPCCompliance_CoreProperties_DoNotUseCompatibilityMarkupFAIL.docx
rename to poi-main/src/test/resources/openxml4j/OPCCompliance_CoreProperties_DoNotUseCompatibilityMarkupFAIL.docx
diff --git a/test-data/openxml4j/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_NotPresentFAIL.docx b/poi-main/src/test/resources/openxml4j/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_NotPresentFAIL.docx
similarity index 100%
rename from test-data/openxml4j/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_NotPresentFAIL.docx
rename to poi-main/src/test/resources/openxml4j/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_NotPresentFAIL.docx
diff --git a/test-data/openxml4j/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_PresentWithUnauthorizedValueFAIL.docx b/poi-main/src/test/resources/openxml4j/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_PresentWithUnauthorizedValueFAIL.docx
similarity index 100%
rename from test-data/openxml4j/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_PresentWithUnauthorizedValueFAIL.docx
rename to poi-main/src/test/resources/openxml4j/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_PresentWithUnauthorizedValueFAIL.docx
diff --git a/test-data/openxml4j/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPart.docx b/poi-main/src/test/resources/openxml4j/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPart.docx
similarity index 100%
rename from test-data/openxml4j/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPart.docx
rename to poi-main/src/test/resources/openxml4j/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPart.docx
diff --git a/test-data/openxml4j/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPartFAIL.docx b/poi-main/src/test/resources/openxml4j/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPartFAIL.docx
similarity index 100%
rename from test-data/openxml4j/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPartFAIL.docx
rename to poi-main/src/test/resources/openxml4j/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPartFAIL.docx
diff --git a/test-data/openxml4j/OPCCompliance_CoreProperties_SUCCESS.docx b/poi-main/src/test/resources/openxml4j/OPCCompliance_CoreProperties_SUCCESS.docx
similarity index 100%
rename from test-data/openxml4j/OPCCompliance_CoreProperties_SUCCESS.docx
rename to poi-main/src/test/resources/openxml4j/OPCCompliance_CoreProperties_SUCCESS.docx
diff --git a/test-data/openxml4j/OPCCompliance_CoreProperties_UnauthorizedXMLLangAttributeFAIL.docx b/poi-main/src/test/resources/openxml4j/OPCCompliance_CoreProperties_UnauthorizedXMLLangAttributeFAIL.docx
similarity index 100%
rename from test-data/openxml4j/OPCCompliance_CoreProperties_UnauthorizedXMLLangAttributeFAIL.docx
rename to poi-main/src/test/resources/openxml4j/OPCCompliance_CoreProperties_UnauthorizedXMLLangAttributeFAIL.docx
diff --git a/test-data/openxml4j/OPCCompliance_DerivedPartNameFAIL.docx b/poi-main/src/test/resources/openxml4j/OPCCompliance_DerivedPartNameFAIL.docx
similarity index 100%
rename from test-data/openxml4j/OPCCompliance_DerivedPartNameFAIL.docx
rename to poi-main/src/test/resources/openxml4j/OPCCompliance_DerivedPartNameFAIL.docx
diff --git a/test-data/openxml4j/TestCreatePackageOUTPUT.docx b/poi-main/src/test/resources/openxml4j/TestCreatePackageOUTPUT.docx
similarity index 100%
rename from test-data/openxml4j/TestCreatePackageOUTPUT.docx
rename to poi-main/src/test/resources/openxml4j/TestCreatePackageOUTPUT.docx
diff --git a/test-data/openxml4j/TestOpenPackageINPUT.docx b/poi-main/src/test/resources/openxml4j/TestOpenPackageINPUT.docx
similarity index 100%
rename from test-data/openxml4j/TestOpenPackageINPUT.docx
rename to poi-main/src/test/resources/openxml4j/TestOpenPackageINPUT.docx
diff --git a/test-data/openxml4j/TestOpenPackageOUTPUT.docx b/poi-main/src/test/resources/openxml4j/TestOpenPackageOUTPUT.docx
similarity index 100%
rename from test-data/openxml4j/TestOpenPackageOUTPUT.docx
rename to poi-main/src/test/resources/openxml4j/TestOpenPackageOUTPUT.docx
diff --git a/test-data/openxml4j/TestPackageCommon.docx b/poi-main/src/test/resources/openxml4j/TestPackageCommon.docx
similarity index 100%
rename from test-data/openxml4j/TestPackageCommon.docx
rename to poi-main/src/test/resources/openxml4j/TestPackageCommon.docx
diff --git a/test-data/openxml4j/TestPackageCoreProperiesGetters.docx b/poi-main/src/test/resources/openxml4j/TestPackageCoreProperiesGetters.docx
similarity index 100%
rename from test-data/openxml4j/TestPackageCoreProperiesGetters.docx
rename to poi-main/src/test/resources/openxml4j/TestPackageCoreProperiesGetters.docx
diff --git a/test-data/openxml4j/TestPackageCoreProperiesSetters.docx b/poi-main/src/test/resources/openxml4j/TestPackageCoreProperiesSetters.docx
similarity index 100%
rename from test-data/openxml4j/TestPackageCoreProperiesSetters.docx
rename to poi-main/src/test/resources/openxml4j/TestPackageCoreProperiesSetters.docx
diff --git a/test-data/openxml4j/TestPackageThumbnail.docx b/poi-main/src/test/resources/openxml4j/TestPackageThumbnail.docx
similarity index 100%
rename from test-data/openxml4j/TestPackageThumbnail.docx
rename to poi-main/src/test/resources/openxml4j/TestPackageThumbnail.docx
diff --git a/test-data/openxml4j/sample.docx b/poi-main/src/test/resources/openxml4j/sample.docx
similarity index 100%
rename from test-data/openxml4j/sample.docx
rename to poi-main/src/test/resources/openxml4j/sample.docx
diff --git a/test-data/openxml4j/sample.xlsx b/poi-main/src/test/resources/openxml4j/sample.xlsx
similarity index 100%
rename from test-data/openxml4j/sample.xlsx
rename to poi-main/src/test/resources/openxml4j/sample.xlsx
diff --git a/test-data/openxml4j/thumbnail.jpg b/poi-main/src/test/resources/openxml4j/thumbnail.jpg
similarity index 100%
rename from test-data/openxml4j/thumbnail.jpg
rename to poi-main/src/test/resources/openxml4j/thumbnail.jpg
diff --git a/test-data/poifs/20-Force-on-a-current-S00.doc b/poi-main/src/test/resources/poifs/20-Force-on-a-current-S00.doc
similarity index 100%
rename from test-data/poifs/20-Force-on-a-current-S00.doc
rename to poi-main/src/test/resources/poifs/20-Force-on-a-current-S00.doc
diff --git a/test-data/poifs/BlockSize4096.zvi b/poi-main/src/test/resources/poifs/BlockSize4096.zvi
similarity index 100%
rename from test-data/poifs/BlockSize4096.zvi
rename to poi-main/src/test/resources/poifs/BlockSize4096.zvi
diff --git a/test-data/poifs/BlockSize512.zvi b/poi-main/src/test/resources/poifs/BlockSize512.zvi
similarity index 100%
rename from test-data/poifs/BlockSize512.zvi
rename to poi-main/src/test/resources/poifs/BlockSize512.zvi
diff --git a/test-data/poifs/Notes.ole2 b/poi-main/src/test/resources/poifs/Notes.ole2
similarity index 100%
rename from test-data/poifs/Notes.ole2
rename to poi-main/src/test/resources/poifs/Notes.ole2
diff --git a/test-data/poifs/ReferencesInvalidSectors.mpp b/poi-main/src/test/resources/poifs/ReferencesInvalidSectors.mpp
similarity index 100%
rename from test-data/poifs/ReferencesInvalidSectors.mpp
rename to poi-main/src/test/resources/poifs/ReferencesInvalidSectors.mpp
diff --git a/test-data/poifs/ShortLastBlock.qwp b/poi-main/src/test/resources/poifs/ShortLastBlock.qwp
similarity index 100%
rename from test-data/poifs/ShortLastBlock.qwp
rename to poi-main/src/test/resources/poifs/ShortLastBlock.qwp
diff --git a/test-data/poifs/ShortLastBlock.wps b/poi-main/src/test/resources/poifs/ShortLastBlock.wps
similarity index 100%
rename from test-data/poifs/ShortLastBlock.wps
rename to poi-main/src/test/resources/poifs/ShortLastBlock.wps
diff --git a/test-data/poifs/multimedia.doc b/poi-main/src/test/resources/poifs/multimedia.doc
similarity index 100%
rename from test-data/poifs/multimedia.doc
rename to poi-main/src/test/resources/poifs/multimedia.doc
diff --git a/test-data/poifs/oleObject1.bin b/poi-main/src/test/resources/poifs/oleObject1.bin
similarity index 100%
rename from test-data/poifs/oleObject1.bin
rename to poi-main/src/test/resources/poifs/oleObject1.bin
diff --git a/test-data/poifs/poitest.pfx b/poi-main/src/test/resources/poifs/poitest.pfx
similarity index 100%
rename from test-data/poifs/poitest.pfx
rename to poi-main/src/test/resources/poifs/poitest.pfx
diff --git a/test-data/poifs/protect.xlsx b/poi-main/src/test/resources/poifs/protect.xlsx
similarity index 100%
rename from test-data/poifs/protect.xlsx
rename to poi-main/src/test/resources/poifs/protect.xlsx
diff --git a/test-data/poifs/protected_agile.docx b/poi-main/src/test/resources/poifs/protected_agile.docx
similarity index 100%
rename from test-data/poifs/protected_agile.docx
rename to poi-main/src/test/resources/poifs/protected_agile.docx
diff --git a/test-data/poifs/protected_sha512.xlsx b/poi-main/src/test/resources/poifs/protected_sha512.xlsx
similarity index 100%
rename from test-data/poifs/protected_sha512.xlsx
rename to poi-main/src/test/resources/poifs/protected_sha512.xlsx
diff --git a/test-data/publisher/51318.pub b/poi-main/src/test/resources/publisher/51318.pub
similarity index 100%
rename from test-data/publisher/51318.pub
rename to poi-main/src/test/resources/publisher/51318.pub
diff --git a/test-data/publisher/LinkAt0And10.pub b/poi-main/src/test/resources/publisher/LinkAt0And10.pub
similarity index 100%
rename from test-data/publisher/LinkAt0And10.pub
rename to poi-main/src/test/resources/publisher/LinkAt0And10.pub
diff --git a/test-data/publisher/LinkAt10.pub b/poi-main/src/test/resources/publisher/LinkAt10.pub
similarity index 100%
rename from test-data/publisher/LinkAt10.pub
rename to poi-main/src/test/resources/publisher/LinkAt10.pub
diff --git a/test-data/publisher/LinkAt10And20And30.pub b/poi-main/src/test/resources/publisher/LinkAt10And20And30.pub
similarity index 100%
rename from test-data/publisher/LinkAt10And20And30.pub
rename to poi-main/src/test/resources/publisher/LinkAt10And20And30.pub
diff --git a/test-data/publisher/LinkAt10And20And30And40.pub b/poi-main/src/test/resources/publisher/LinkAt10And20And30And40.pub
similarity index 100%
rename from test-data/publisher/LinkAt10And20And30And40.pub
rename to poi-main/src/test/resources/publisher/LinkAt10And20And30And40.pub
diff --git a/test-data/publisher/LinkAt10Longer.pub b/poi-main/src/test/resources/publisher/LinkAt10Longer.pub
similarity index 100%
rename from test-data/publisher/LinkAt10Longer.pub
rename to poi-main/src/test/resources/publisher/LinkAt10Longer.pub
diff --git a/test-data/publisher/LinkAt20.pub b/poi-main/src/test/resources/publisher/LinkAt20.pub
similarity index 100%
rename from test-data/publisher/LinkAt20.pub
rename to poi-main/src/test/resources/publisher/LinkAt20.pub
diff --git a/test-data/publisher/Sample.pub b/poi-main/src/test/resources/publisher/Sample.pub
similarity index 100%
rename from test-data/publisher/Sample.pub
rename to poi-main/src/test/resources/publisher/Sample.pub
diff --git a/test-data/publisher/Sample.txt b/poi-main/src/test/resources/publisher/Sample.txt
similarity index 100%
rename from test-data/publisher/Sample.txt
rename to poi-main/src/test/resources/publisher/Sample.txt
diff --git a/test-data/publisher/Sample2.pub b/poi-main/src/test/resources/publisher/Sample2.pub
similarity index 100%
rename from test-data/publisher/Sample2.pub
rename to poi-main/src/test/resources/publisher/Sample2.pub
diff --git a/test-data/publisher/Sample2.txt b/poi-main/src/test/resources/publisher/Sample2.txt
similarity index 100%
rename from test-data/publisher/Sample2.txt
rename to poi-main/src/test/resources/publisher/Sample2.txt
diff --git a/test-data/publisher/Sample2000.pub b/poi-main/src/test/resources/publisher/Sample2000.pub
similarity index 100%
rename from test-data/publisher/Sample2000.pub
rename to poi-main/src/test/resources/publisher/Sample2000.pub
diff --git a/test-data/publisher/Sample2_2010.pub b/poi-main/src/test/resources/publisher/Sample2_2010.pub
similarity index 100%
rename from test-data/publisher/Sample2_2010.pub
rename to poi-main/src/test/resources/publisher/Sample2_2010.pub
diff --git a/test-data/publisher/Sample3.pub b/poi-main/src/test/resources/publisher/Sample3.pub
similarity index 100%
rename from test-data/publisher/Sample3.pub
rename to poi-main/src/test/resources/publisher/Sample3.pub
diff --git a/test-data/publisher/Sample3.txt b/poi-main/src/test/resources/publisher/Sample3.txt
similarity index 100%
rename from test-data/publisher/Sample3.txt
rename to poi-main/src/test/resources/publisher/Sample3.txt
diff --git a/test-data/publisher/Sample3_2010.pub b/poi-main/src/test/resources/publisher/Sample3_2010.pub
similarity index 100%
rename from test-data/publisher/Sample3_2010.pub
rename to poi-main/src/test/resources/publisher/Sample3_2010.pub
diff --git a/test-data/publisher/Sample4.pub b/poi-main/src/test/resources/publisher/Sample4.pub
similarity index 100%
rename from test-data/publisher/Sample4.pub
rename to poi-main/src/test/resources/publisher/Sample4.pub
diff --git a/test-data/publisher/Sample4.txt b/poi-main/src/test/resources/publisher/Sample4.txt
similarity index 100%
rename from test-data/publisher/Sample4.txt
rename to poi-main/src/test/resources/publisher/Sample4.txt
diff --git a/test-data/publisher/Sample4_2010.pub b/poi-main/src/test/resources/publisher/Sample4_2010.pub
similarity index 100%
rename from test-data/publisher/Sample4_2010.pub
rename to poi-main/src/test/resources/publisher/Sample4_2010.pub
diff --git a/test-data/publisher/Sample98.pub b/poi-main/src/test/resources/publisher/Sample98.pub
similarity index 100%
rename from test-data/publisher/Sample98.pub
rename to poi-main/src/test/resources/publisher/Sample98.pub
diff --git a/test-data/publisher/SampleBrochure.pub b/poi-main/src/test/resources/publisher/SampleBrochure.pub
similarity index 100%
rename from test-data/publisher/SampleBrochure.pub
rename to poi-main/src/test/resources/publisher/SampleBrochure.pub
diff --git a/test-data/publisher/SampleNewsletter.pub b/poi-main/src/test/resources/publisher/SampleNewsletter.pub
similarity index 100%
rename from test-data/publisher/SampleNewsletter.pub
rename to poi-main/src/test/resources/publisher/SampleNewsletter.pub
diff --git a/test-data/publisher/Sample_2010.pub b/poi-main/src/test/resources/publisher/Sample_2010.pub
similarity index 100%
rename from test-data/publisher/Sample_2010.pub
rename to poi-main/src/test/resources/publisher/Sample_2010.pub
diff --git a/test-data/publisher/Simple.pub b/poi-main/src/test/resources/publisher/Simple.pub
similarity index 100%
rename from test-data/publisher/Simple.pub
rename to poi-main/src/test/resources/publisher/Simple.pub
diff --git a/test-data/slideshow/38256.ppt b/poi-main/src/test/resources/slideshow/38256.ppt
similarity index 100%
rename from test-data/slideshow/38256.ppt
rename to poi-main/src/test/resources/slideshow/38256.ppt
diff --git a/test-data/slideshow/41071.ppt b/poi-main/src/test/resources/slideshow/41071.ppt
similarity index 100%
rename from test-data/slideshow/41071.ppt
rename to poi-main/src/test/resources/slideshow/41071.ppt
diff --git a/test-data/slideshow/41246-1.ppt b/poi-main/src/test/resources/slideshow/41246-1.ppt
similarity index 100%
rename from test-data/slideshow/41246-1.ppt
rename to poi-main/src/test/resources/slideshow/41246-1.ppt
diff --git a/test-data/slideshow/41246-2.ppt b/poi-main/src/test/resources/slideshow/41246-2.ppt
similarity index 100%
rename from test-data/slideshow/41246-2.ppt
rename to poi-main/src/test/resources/slideshow/41246-2.ppt
diff --git a/test-data/slideshow/41384.ppt b/poi-main/src/test/resources/slideshow/41384.ppt
similarity index 100%
rename from test-data/slideshow/41384.ppt
rename to poi-main/src/test/resources/slideshow/41384.ppt
diff --git a/test-data/slideshow/42474-1.ppt b/poi-main/src/test/resources/slideshow/42474-1.ppt
similarity index 100%
rename from test-data/slideshow/42474-1.ppt
rename to poi-main/src/test/resources/slideshow/42474-1.ppt
diff --git a/test-data/slideshow/42474-2.ppt b/poi-main/src/test/resources/slideshow/42474-2.ppt
similarity index 100%
rename from test-data/slideshow/42474-2.ppt
rename to poi-main/src/test/resources/slideshow/42474-2.ppt
diff --git a/test-data/slideshow/42485.ppt b/poi-main/src/test/resources/slideshow/42485.ppt
similarity index 100%
rename from test-data/slideshow/42485.ppt
rename to poi-main/src/test/resources/slideshow/42485.ppt
diff --git a/test-data/slideshow/42486.ppt b/poi-main/src/test/resources/slideshow/42486.ppt
similarity index 100%
rename from test-data/slideshow/42486.ppt
rename to poi-main/src/test/resources/slideshow/42486.ppt
diff --git a/test-data/slideshow/42520.ppt b/poi-main/src/test/resources/slideshow/42520.ppt
similarity index 100%
rename from test-data/slideshow/42520.ppt
rename to poi-main/src/test/resources/slideshow/42520.ppt
diff --git a/test-data/slideshow/43781.ppt b/poi-main/src/test/resources/slideshow/43781.ppt
similarity index 100%
rename from test-data/slideshow/43781.ppt
rename to poi-main/src/test/resources/slideshow/43781.ppt
diff --git a/test-data/slideshow/44296.ppt b/poi-main/src/test/resources/slideshow/44296.ppt
similarity index 100%
rename from test-data/slideshow/44296.ppt
rename to poi-main/src/test/resources/slideshow/44296.ppt
diff --git a/test-data/slideshow/44770.ppt b/poi-main/src/test/resources/slideshow/44770.ppt
similarity index 100%
rename from test-data/slideshow/44770.ppt
rename to poi-main/src/test/resources/slideshow/44770.ppt
diff --git a/test-data/slideshow/45537_Footer.ppt b/poi-main/src/test/resources/slideshow/45537_Footer.ppt
similarity index 100%
rename from test-data/slideshow/45537_Footer.ppt
rename to poi-main/src/test/resources/slideshow/45537_Footer.ppt
diff --git a/test-data/slideshow/45537_Header.ppt b/poi-main/src/test/resources/slideshow/45537_Header.ppt
similarity index 100%
rename from test-data/slideshow/45537_Header.ppt
rename to poi-main/src/test/resources/slideshow/45537_Header.ppt
diff --git a/test-data/slideshow/45541_Footer.pptx b/poi-main/src/test/resources/slideshow/45541_Footer.pptx
similarity index 100%
rename from test-data/slideshow/45541_Footer.pptx
rename to poi-main/src/test/resources/slideshow/45541_Footer.pptx
diff --git a/test-data/slideshow/45541_Header.pptx b/poi-main/src/test/resources/slideshow/45541_Header.pptx
similarity index 100%
rename from test-data/slideshow/45541_Header.pptx
rename to poi-main/src/test/resources/slideshow/45541_Header.pptx
diff --git a/test-data/slideshow/45543.ppt b/poi-main/src/test/resources/slideshow/45543.ppt
similarity index 100%
rename from test-data/slideshow/45543.ppt
rename to poi-main/src/test/resources/slideshow/45543.ppt
diff --git a/test-data/slideshow/45545_Comment.pptx b/poi-main/src/test/resources/slideshow/45545_Comment.pptx
similarity index 100%
rename from test-data/slideshow/45545_Comment.pptx
rename to poi-main/src/test/resources/slideshow/45545_Comment.pptx
diff --git a/test-data/slideshow/45776.ppt b/poi-main/src/test/resources/slideshow/45776.ppt
similarity index 100%
rename from test-data/slideshow/45776.ppt
rename to poi-main/src/test/resources/slideshow/45776.ppt
diff --git a/test-data/slideshow/47261.ppt b/poi-main/src/test/resources/slideshow/47261.ppt
similarity index 100%
rename from test-data/slideshow/47261.ppt
rename to poi-main/src/test/resources/slideshow/47261.ppt
diff --git a/test-data/slideshow/49386-null_dates.pptx b/poi-main/src/test/resources/slideshow/49386-null_dates.pptx
similarity index 100%
rename from test-data/slideshow/49386-null_dates.pptx
rename to poi-main/src/test/resources/slideshow/49386-null_dates.pptx
diff --git a/test-data/slideshow/49648.ppt b/poi-main/src/test/resources/slideshow/49648.ppt
similarity index 100%
rename from test-data/slideshow/49648.ppt
rename to poi-main/src/test/resources/slideshow/49648.ppt
diff --git a/test-data/slideshow/51187.pptx b/poi-main/src/test/resources/slideshow/51187.pptx
similarity index 100%
rename from test-data/slideshow/51187.pptx
rename to poi-main/src/test/resources/slideshow/51187.pptx
diff --git a/test-data/slideshow/51731.ppt b/poi-main/src/test/resources/slideshow/51731.ppt
similarity index 100%
rename from test-data/slideshow/51731.ppt
rename to poi-main/src/test/resources/slideshow/51731.ppt
diff --git a/test-data/slideshow/52244.ppt b/poi-main/src/test/resources/slideshow/52244.ppt
similarity index 100%
rename from test-data/slideshow/52244.ppt
rename to poi-main/src/test/resources/slideshow/52244.ppt
diff --git a/test-data/slideshow/52599.ppt b/poi-main/src/test/resources/slideshow/52599.ppt
similarity index 100%
rename from test-data/slideshow/52599.ppt
rename to poi-main/src/test/resources/slideshow/52599.ppt
diff --git a/test-data/slideshow/53446.ppt b/poi-main/src/test/resources/slideshow/53446.ppt
similarity index 100%
rename from test-data/slideshow/53446.ppt
rename to poi-main/src/test/resources/slideshow/53446.ppt
diff --git a/test-data/slideshow/54111.ppt b/poi-main/src/test/resources/slideshow/54111.ppt
similarity index 100%
rename from test-data/slideshow/54111.ppt
rename to poi-main/src/test/resources/slideshow/54111.ppt
diff --git a/test-data/slideshow/54722.ppt b/poi-main/src/test/resources/slideshow/54722.ppt
similarity index 100%
rename from test-data/slideshow/54722.ppt
rename to poi-main/src/test/resources/slideshow/54722.ppt
diff --git a/test-data/slideshow/54880_chinese.ppt b/poi-main/src/test/resources/slideshow/54880_chinese.ppt
similarity index 100%
rename from test-data/slideshow/54880_chinese.ppt
rename to poi-main/src/test/resources/slideshow/54880_chinese.ppt
diff --git a/test-data/slideshow/56260.ppt b/poi-main/src/test/resources/slideshow/56260.ppt
similarity index 100%
rename from test-data/slideshow/56260.ppt
rename to poi-main/src/test/resources/slideshow/56260.ppt
diff --git a/test-data/slideshow/OverlappingRelations.pptx b/poi-main/src/test/resources/slideshow/OverlappingRelations.pptx
similarity index 100%
rename from test-data/slideshow/OverlappingRelations.pptx
rename to poi-main/src/test/resources/slideshow/OverlappingRelations.pptx
diff --git a/test-data/slideshow/PPT95.ppt b/poi-main/src/test/resources/slideshow/PPT95.ppt
similarity index 100%
rename from test-data/slideshow/PPT95.ppt
rename to poi-main/src/test/resources/slideshow/PPT95.ppt
diff --git a/test-data/slideshow/PPTWithAttachments.pptm b/poi-main/src/test/resources/slideshow/PPTWithAttachments.pptm
similarity index 100%
rename from test-data/slideshow/PPTWithAttachments.pptm
rename to poi-main/src/test/resources/slideshow/PPTWithAttachments.pptm
diff --git a/test-data/slideshow/ParagraphStylesShorterThanCharStyles.ppt b/poi-main/src/test/resources/slideshow/ParagraphStylesShorterThanCharStyles.ppt
similarity index 100%
rename from test-data/slideshow/ParagraphStylesShorterThanCharStyles.ppt
rename to poi-main/src/test/resources/slideshow/ParagraphStylesShorterThanCharStyles.ppt
diff --git a/test-data/slideshow/Password_Protected-56-hello.ppt b/poi-main/src/test/resources/slideshow/Password_Protected-56-hello.ppt
similarity index 100%
rename from test-data/slideshow/Password_Protected-56-hello.ppt
rename to poi-main/src/test/resources/slideshow/Password_Protected-56-hello.ppt
diff --git a/test-data/slideshow/Password_Protected-hello.ppt b/poi-main/src/test/resources/slideshow/Password_Protected-hello.ppt
similarity index 100%
rename from test-data/slideshow/Password_Protected-hello.ppt
rename to poi-main/src/test/resources/slideshow/Password_Protected-hello.ppt
diff --git a/test-data/slideshow/Password_Protected-np-hello.ppt b/poi-main/src/test/resources/slideshow/Password_Protected-np-hello.ppt
similarity index 100%
rename from test-data/slideshow/Password_Protected-np-hello.ppt
rename to poi-main/src/test/resources/slideshow/Password_Protected-np-hello.ppt
diff --git a/test-data/slideshow/PictureTypeZero.ppt b/poi-main/src/test/resources/slideshow/PictureTypeZero.ppt
similarity index 100%
rename from test-data/slideshow/PictureTypeZero.ppt
rename to poi-main/src/test/resources/slideshow/PictureTypeZero.ppt
diff --git a/test-data/slideshow/SampleShow.ppt b/poi-main/src/test/resources/slideshow/SampleShow.ppt
similarity index 100%
rename from test-data/slideshow/SampleShow.ppt
rename to poi-main/src/test/resources/slideshow/SampleShow.ppt
diff --git a/test-data/slideshow/SampleShow.pptx b/poi-main/src/test/resources/slideshow/SampleShow.pptx
similarity index 100%
rename from test-data/slideshow/SampleShow.pptx
rename to poi-main/src/test/resources/slideshow/SampleShow.pptx
diff --git a/test-data/slideshow/SampleShow.txt b/poi-main/src/test/resources/slideshow/SampleShow.txt
similarity index 100%
rename from test-data/slideshow/SampleShow.txt
rename to poi-main/src/test/resources/slideshow/SampleShow.txt
diff --git a/test-data/slideshow/Single_Coloured_Page.ppt b/poi-main/src/test/resources/slideshow/Single_Coloured_Page.ppt
similarity index 100%
rename from test-data/slideshow/Single_Coloured_Page.ppt
rename to poi-main/src/test/resources/slideshow/Single_Coloured_Page.ppt
diff --git a/test-data/slideshow/Single_Coloured_Page_With_Fonts_and_Alignments.ppt b/poi-main/src/test/resources/slideshow/Single_Coloured_Page_With_Fonts_and_Alignments.ppt
similarity index 100%
rename from test-data/slideshow/Single_Coloured_Page_With_Fonts_and_Alignments.ppt
rename to poi-main/src/test/resources/slideshow/Single_Coloured_Page_With_Fonts_and_Alignments.ppt
diff --git a/test-data/slideshow/WithComments.ppt b/poi-main/src/test/resources/slideshow/WithComments.ppt
similarity index 100%
rename from test-data/slideshow/WithComments.ppt
rename to poi-main/src/test/resources/slideshow/WithComments.ppt
diff --git a/test-data/slideshow/WithLinks.ppt b/poi-main/src/test/resources/slideshow/WithLinks.ppt
similarity index 100%
rename from test-data/slideshow/WithLinks.ppt
rename to poi-main/src/test/resources/slideshow/WithLinks.ppt
diff --git a/test-data/slideshow/WithMacros.ppt b/poi-main/src/test/resources/slideshow/WithMacros.ppt
similarity index 100%
rename from test-data/slideshow/WithMacros.ppt
rename to poi-main/src/test/resources/slideshow/WithMacros.ppt
diff --git a/test-data/slideshow/WithMaster.ppt b/poi-main/src/test/resources/slideshow/WithMaster.ppt
similarity index 100%
rename from test-data/slideshow/WithMaster.ppt
rename to poi-main/src/test/resources/slideshow/WithMaster.ppt
diff --git a/test-data/slideshow/WithMaster.pptx b/poi-main/src/test/resources/slideshow/WithMaster.pptx
similarity index 100%
rename from test-data/slideshow/WithMaster.pptx
rename to poi-main/src/test/resources/slideshow/WithMaster.pptx
diff --git a/test-data/slideshow/alterman_security.ppt b/poi-main/src/test/resources/slideshow/alterman_security.ppt
similarity index 100%
rename from test-data/slideshow/alterman_security.ppt
rename to poi-main/src/test/resources/slideshow/alterman_security.ppt
diff --git a/test-data/slideshow/backgrounds.ppt b/poi-main/src/test/resources/slideshow/backgrounds.ppt
similarity index 100%
rename from test-data/slideshow/backgrounds.ppt
rename to poi-main/src/test/resources/slideshow/backgrounds.ppt
diff --git a/test-data/slideshow/backgrounds.pptx b/poi-main/src/test/resources/slideshow/backgrounds.pptx
similarity index 100%
rename from test-data/slideshow/backgrounds.pptx
rename to poi-main/src/test/resources/slideshow/backgrounds.pptx
diff --git a/test-data/slideshow/badzip.ppt b/poi-main/src/test/resources/slideshow/badzip.ppt
similarity index 100%
rename from test-data/slideshow/badzip.ppt
rename to poi-main/src/test/resources/slideshow/badzip.ppt
diff --git a/test-data/slideshow/basic_test_ppt_file.ppt b/poi-main/src/test/resources/slideshow/basic_test_ppt_file.ppt
similarity index 100%
rename from test-data/slideshow/basic_test_ppt_file.ppt
rename to poi-main/src/test/resources/slideshow/basic_test_ppt_file.ppt
diff --git a/test-data/slideshow/bug-41015.ppt b/poi-main/src/test/resources/slideshow/bug-41015.ppt
similarity index 100%
rename from test-data/slideshow/bug-41015.ppt
rename to poi-main/src/test/resources/slideshow/bug-41015.ppt
diff --git a/test-data/slideshow/bug55732.ppt b/poi-main/src/test/resources/slideshow/bug55732.ppt
similarity index 100%
rename from test-data/slideshow/bug55732.ppt
rename to poi-main/src/test/resources/slideshow/bug55732.ppt
diff --git a/test-data/slideshow/bug55902-mixedChars.png b/poi-main/src/test/resources/slideshow/bug55902-mixedChars.png
similarity index 100%
rename from test-data/slideshow/bug55902-mixedChars.png
rename to poi-main/src/test/resources/slideshow/bug55902-mixedChars.png
diff --git a/test-data/slideshow/bug55902-mixedFontChineseCharacters.ppt b/poi-main/src/test/resources/slideshow/bug55902-mixedFontChineseCharacters.ppt
similarity index 100%
rename from test-data/slideshow/bug55902-mixedFontChineseCharacters.ppt
rename to poi-main/src/test/resources/slideshow/bug55902-mixedFontChineseCharacters.ppt
diff --git a/test-data/slideshow/bullets.ppt b/poi-main/src/test/resources/slideshow/bullets.ppt
similarity index 100%
rename from test-data/slideshow/bullets.ppt
rename to poi-main/src/test/resources/slideshow/bullets.ppt
diff --git a/test-data/slideshow/clock.dib b/poi-main/src/test/resources/slideshow/clock.dib
similarity index 100%
rename from test-data/slideshow/clock.dib
rename to poi-main/src/test/resources/slideshow/clock.dib
diff --git a/test-data/slideshow/clock.jpg b/poi-main/src/test/resources/slideshow/clock.jpg
similarity index 100%
rename from test-data/slideshow/clock.jpg
rename to poi-main/src/test/resources/slideshow/clock.jpg
diff --git a/test-data/slideshow/cow.pict b/poi-main/src/test/resources/slideshow/cow.pict
similarity index 100%
rename from test-data/slideshow/cow.pict
rename to poi-main/src/test/resources/slideshow/cow.pict
diff --git a/test-data/slideshow/empty.ppt b/poi-main/src/test/resources/slideshow/empty.ppt
similarity index 100%
rename from test-data/slideshow/empty.ppt
rename to poi-main/src/test/resources/slideshow/empty.ppt
diff --git a/test-data/slideshow/empty_textbox.ppt b/poi-main/src/test/resources/slideshow/empty_textbox.ppt
similarity index 100%
rename from test-data/slideshow/empty_textbox.ppt
rename to poi-main/src/test/resources/slideshow/empty_textbox.ppt
diff --git a/test-data/slideshow/headers_footers.ppt b/poi-main/src/test/resources/slideshow/headers_footers.ppt
similarity index 100%
rename from test-data/slideshow/headers_footers.ppt
rename to poi-main/src/test/resources/slideshow/headers_footers.ppt
diff --git a/test-data/slideshow/headers_footers_2007.ppt b/poi-main/src/test/resources/slideshow/headers_footers_2007.ppt
similarity index 100%
rename from test-data/slideshow/headers_footers_2007.ppt
rename to poi-main/src/test/resources/slideshow/headers_footers_2007.ppt
diff --git a/test-data/slideshow/iisd_report.ppt b/poi-main/src/test/resources/slideshow/iisd_report.ppt
similarity index 100%
rename from test-data/slideshow/iisd_report.ppt
rename to poi-main/src/test/resources/slideshow/iisd_report.ppt
diff --git a/test-data/slideshow/incorrect_slide_order.ppt b/poi-main/src/test/resources/slideshow/incorrect_slide_order.ppt
similarity index 100%
rename from test-data/slideshow/incorrect_slide_order.ppt
rename to poi-main/src/test/resources/slideshow/incorrect_slide_order.ppt
diff --git a/test-data/slideshow/layouts.pptx b/poi-main/src/test/resources/slideshow/layouts.pptx
similarity index 100%
rename from test-data/slideshow/layouts.pptx
rename to poi-main/src/test/resources/slideshow/layouts.pptx
diff --git a/test-data/slideshow/master_text.ppt b/poi-main/src/test/resources/slideshow/master_text.ppt
similarity index 100%
rename from test-data/slideshow/master_text.ppt
rename to poi-main/src/test/resources/slideshow/master_text.ppt
diff --git a/test-data/slideshow/missing_core_records.ppt b/poi-main/src/test/resources/slideshow/missing_core_records.ppt
similarity index 100%
rename from test-data/slideshow/missing_core_records.ppt
rename to poi-main/src/test/resources/slideshow/missing_core_records.ppt
diff --git a/test-data/slideshow/next_test_ppt_file.ppt b/poi-main/src/test/resources/slideshow/next_test_ppt_file.ppt
similarity index 100%
rename from test-data/slideshow/next_test_ppt_file.ppt
rename to poi-main/src/test/resources/slideshow/next_test_ppt_file.ppt
diff --git a/test-data/slideshow/numbers.ppt b/poi-main/src/test/resources/slideshow/numbers.ppt
similarity index 100%
rename from test-data/slideshow/numbers.ppt
rename to poi-main/src/test/resources/slideshow/numbers.ppt
diff --git a/test-data/slideshow/numbers2.ppt b/poi-main/src/test/resources/slideshow/numbers2.ppt
similarity index 100%
rename from test-data/slideshow/numbers2.ppt
rename to poi-main/src/test/resources/slideshow/numbers2.ppt
diff --git a/test-data/slideshow/numbers3.ppt b/poi-main/src/test/resources/slideshow/numbers3.ppt
similarity index 100%
rename from test-data/slideshow/numbers3.ppt
rename to poi-main/src/test/resources/slideshow/numbers3.ppt
diff --git a/test-data/slideshow/ole2-embedding-2003.ppt b/poi-main/src/test/resources/slideshow/ole2-embedding-2003.ppt
similarity index 100%
rename from test-data/slideshow/ole2-embedding-2003.ppt
rename to poi-main/src/test/resources/slideshow/ole2-embedding-2003.ppt
diff --git a/test-data/slideshow/painting.png b/poi-main/src/test/resources/slideshow/painting.png
similarity index 100%
rename from test-data/slideshow/painting.png
rename to poi-main/src/test/resources/slideshow/painting.png
diff --git a/test-data/slideshow/pictures.ppt b/poi-main/src/test/resources/slideshow/pictures.ppt
similarity index 100%
rename from test-data/slideshow/pictures.ppt
rename to poi-main/src/test/resources/slideshow/pictures.ppt
diff --git a/test-data/slideshow/pie-chart.pptx b/poi-main/src/test/resources/slideshow/pie-chart.pptx
similarity index 100%
rename from test-data/slideshow/pie-chart.pptx
rename to poi-main/src/test/resources/slideshow/pie-chart.pptx
diff --git a/test-data/slideshow/ppt_with_embeded.ppt b/poi-main/src/test/resources/slideshow/ppt_with_embeded.ppt
similarity index 100%
rename from test-data/slideshow/ppt_with_embeded.ppt
rename to poi-main/src/test/resources/slideshow/ppt_with_embeded.ppt
diff --git a/test-data/slideshow/ppt_with_png.ppt b/poi-main/src/test/resources/slideshow/ppt_with_png.ppt
similarity index 100%
rename from test-data/slideshow/ppt_with_png.ppt
rename to poi-main/src/test/resources/slideshow/ppt_with_png.ppt
diff --git a/test-data/slideshow/pptx2svg.pptx b/poi-main/src/test/resources/slideshow/pptx2svg.pptx
similarity index 100%
rename from test-data/slideshow/pptx2svg.pptx
rename to poi-main/src/test/resources/slideshow/pptx2svg.pptx
diff --git a/test-data/slideshow/pptx2svg.svg b/poi-main/src/test/resources/slideshow/pptx2svg.svg
similarity index 100%
rename from test-data/slideshow/pptx2svg.svg
rename to poi-main/src/test/resources/slideshow/pptx2svg.svg
diff --git a/test-data/slideshow/prProps.pptx b/poi-main/src/test/resources/slideshow/prProps.pptx
similarity index 100%
rename from test-data/slideshow/prProps.pptx
rename to poi-main/src/test/resources/slideshow/prProps.pptx
diff --git a/test-data/slideshow/present1.pptx b/poi-main/src/test/resources/slideshow/present1.pptx
similarity index 100%
rename from test-data/slideshow/present1.pptx
rename to poi-main/src/test/resources/slideshow/present1.pptx
diff --git a/test-data/slideshow/ringin.wav b/poi-main/src/test/resources/slideshow/ringin.wav
similarity index 100%
rename from test-data/slideshow/ringin.wav
rename to poi-main/src/test/resources/slideshow/ringin.wav
diff --git a/test-data/slideshow/sample.pptx b/poi-main/src/test/resources/slideshow/sample.pptx
similarity index 100%
rename from test-data/slideshow/sample.pptx
rename to poi-main/src/test/resources/slideshow/sample.pptx
diff --git a/test-data/slideshow/santa.wmf b/poi-main/src/test/resources/slideshow/santa.wmf
similarity index 100%
rename from test-data/slideshow/santa.wmf
rename to poi-main/src/test/resources/slideshow/santa.wmf
diff --git a/test-data/slideshow/sci_cec.dib b/poi-main/src/test/resources/slideshow/sci_cec.dib
similarity index 100%
rename from test-data/slideshow/sci_cec.dib
rename to poi-main/src/test/resources/slideshow/sci_cec.dib
diff --git a/test-data/slideshow/shapes.pptx b/poi-main/src/test/resources/slideshow/shapes.pptx
similarity index 100%
rename from test-data/slideshow/shapes.pptx
rename to poi-main/src/test/resources/slideshow/shapes.pptx
diff --git a/test-data/slideshow/slide_master.ppt b/poi-main/src/test/resources/slideshow/slide_master.ppt
similarity index 100%
rename from test-data/slideshow/slide_master.ppt
rename to poi-main/src/test/resources/slideshow/slide_master.ppt
diff --git a/test-data/slideshow/sound.ppt b/poi-main/src/test/resources/slideshow/sound.ppt
similarity index 100%
rename from test-data/slideshow/sound.ppt
rename to poi-main/src/test/resources/slideshow/sound.ppt
diff --git a/test-data/slideshow/testPPT.ppsm b/poi-main/src/test/resources/slideshow/testPPT.ppsm
similarity index 100%
rename from test-data/slideshow/testPPT.ppsm
rename to poi-main/src/test/resources/slideshow/testPPT.ppsm
diff --git a/test-data/slideshow/testPPT.ppsx b/poi-main/src/test/resources/slideshow/testPPT.ppsx
similarity index 100%
rename from test-data/slideshow/testPPT.ppsx
rename to poi-main/src/test/resources/slideshow/testPPT.ppsx
diff --git a/test-data/slideshow/testPPT.pptm b/poi-main/src/test/resources/slideshow/testPPT.pptm
similarity index 100%
rename from test-data/slideshow/testPPT.pptm
rename to poi-main/src/test/resources/slideshow/testPPT.pptm
diff --git a/test-data/slideshow/testPPT.pptx b/poi-main/src/test/resources/slideshow/testPPT.pptx
similarity index 100%
rename from test-data/slideshow/testPPT.pptx
rename to poi-main/src/test/resources/slideshow/testPPT.pptx
diff --git a/test-data/slideshow/testPPT.thmx b/poi-main/src/test/resources/slideshow/testPPT.thmx
similarity index 100%
rename from test-data/slideshow/testPPT.thmx
rename to poi-main/src/test/resources/slideshow/testPPT.thmx
diff --git a/test-data/slideshow/testPPT.xps b/poi-main/src/test/resources/slideshow/testPPT.xps
similarity index 100%
rename from test-data/slideshow/testPPT.xps
rename to poi-main/src/test/resources/slideshow/testPPT.xps
diff --git a/test-data/slideshow/text-margins.ppt b/poi-main/src/test/resources/slideshow/text-margins.ppt
similarity index 100%
rename from test-data/slideshow/text-margins.ppt
rename to poi-main/src/test/resources/slideshow/text-margins.ppt
diff --git a/test-data/slideshow/text_shapes.ppt b/poi-main/src/test/resources/slideshow/text_shapes.ppt
similarity index 100%
rename from test-data/slideshow/text_shapes.ppt
rename to poi-main/src/test/resources/slideshow/text_shapes.ppt
diff --git a/test-data/slideshow/themes.pptx b/poi-main/src/test/resources/slideshow/themes.pptx
similarity index 100%
rename from test-data/slideshow/themes.pptx
rename to poi-main/src/test/resources/slideshow/themes.pptx
diff --git a/test-data/slideshow/tomcat.png b/poi-main/src/test/resources/slideshow/tomcat.png
similarity index 100%
rename from test-data/slideshow/tomcat.png
rename to poi-main/src/test/resources/slideshow/tomcat.png
diff --git a/test-data/slideshow/with_japanese.pptx b/poi-main/src/test/resources/slideshow/with_japanese.pptx
similarity index 100%
rename from test-data/slideshow/with_japanese.pptx
rename to poi-main/src/test/resources/slideshow/with_japanese.pptx
diff --git a/test-data/slideshow/with_textbox.ppt b/poi-main/src/test/resources/slideshow/with_textbox.ppt
similarity index 100%
rename from test-data/slideshow/with_textbox.ppt
rename to poi-main/src/test/resources/slideshow/with_textbox.ppt
diff --git a/test-data/slideshow/wrench.emf b/poi-main/src/test/resources/slideshow/wrench.emf
similarity index 100%
rename from test-data/slideshow/wrench.emf
rename to poi-main/src/test/resources/slideshow/wrench.emf
diff --git a/test-data/spreadsheet/12561-1.xls b/poi-main/src/test/resources/spreadsheet/12561-1.xls
similarity index 100%
rename from test-data/spreadsheet/12561-1.xls
rename to poi-main/src/test/resources/spreadsheet/12561-1.xls
diff --git a/test-data/spreadsheet/12561-2.xls b/poi-main/src/test/resources/spreadsheet/12561-2.xls
similarity index 100%
rename from test-data/spreadsheet/12561-2.xls
rename to poi-main/src/test/resources/spreadsheet/12561-2.xls
diff --git a/test-data/spreadsheet/12843-1.xls b/poi-main/src/test/resources/spreadsheet/12843-1.xls
similarity index 100%
rename from test-data/spreadsheet/12843-1.xls
rename to poi-main/src/test/resources/spreadsheet/12843-1.xls
diff --git a/test-data/spreadsheet/12843-2.xls b/poi-main/src/test/resources/spreadsheet/12843-2.xls
similarity index 100%
rename from test-data/spreadsheet/12843-2.xls
rename to poi-main/src/test/resources/spreadsheet/12843-2.xls
diff --git a/test-data/spreadsheet/13224.xls b/poi-main/src/test/resources/spreadsheet/13224.xls
similarity index 100%
rename from test-data/spreadsheet/13224.xls
rename to poi-main/src/test/resources/spreadsheet/13224.xls
diff --git a/test-data/spreadsheet/13796.xls b/poi-main/src/test/resources/spreadsheet/13796.xls
similarity index 100%
rename from test-data/spreadsheet/13796.xls
rename to poi-main/src/test/resources/spreadsheet/13796.xls
diff --git a/test-data/spreadsheet/14330-1.xls b/poi-main/src/test/resources/spreadsheet/14330-1.xls
similarity index 100%
rename from test-data/spreadsheet/14330-1.xls
rename to poi-main/src/test/resources/spreadsheet/14330-1.xls
diff --git a/test-data/spreadsheet/14330-2.xls b/poi-main/src/test/resources/spreadsheet/14330-2.xls
similarity index 100%
rename from test-data/spreadsheet/14330-2.xls
rename to poi-main/src/test/resources/spreadsheet/14330-2.xls
diff --git a/test-data/spreadsheet/14460.xls b/poi-main/src/test/resources/spreadsheet/14460.xls
similarity index 100%
rename from test-data/spreadsheet/14460.xls
rename to poi-main/src/test/resources/spreadsheet/14460.xls
diff --git a/test-data/spreadsheet/15228.xls b/poi-main/src/test/resources/spreadsheet/15228.xls
similarity index 100%
rename from test-data/spreadsheet/15228.xls
rename to poi-main/src/test/resources/spreadsheet/15228.xls
diff --git a/test-data/spreadsheet/15375.xls b/poi-main/src/test/resources/spreadsheet/15375.xls
similarity index 100%
rename from test-data/spreadsheet/15375.xls
rename to poi-main/src/test/resources/spreadsheet/15375.xls
diff --git a/test-data/spreadsheet/15556.xls b/poi-main/src/test/resources/spreadsheet/15556.xls
similarity index 100%
rename from test-data/spreadsheet/15556.xls
rename to poi-main/src/test/resources/spreadsheet/15556.xls
diff --git a/test-data/spreadsheet/15573.xls b/poi-main/src/test/resources/spreadsheet/15573.xls
similarity index 100%
rename from test-data/spreadsheet/15573.xls
rename to poi-main/src/test/resources/spreadsheet/15573.xls
diff --git a/test-data/spreadsheet/1900DateWindowing.xls b/poi-main/src/test/resources/spreadsheet/1900DateWindowing.xls
similarity index 100%
rename from test-data/spreadsheet/1900DateWindowing.xls
rename to poi-main/src/test/resources/spreadsheet/1900DateWindowing.xls
diff --git a/test-data/spreadsheet/1904DateWindowing.xls b/poi-main/src/test/resources/spreadsheet/1904DateWindowing.xls
similarity index 100%
rename from test-data/spreadsheet/1904DateWindowing.xls
rename to poi-main/src/test/resources/spreadsheet/1904DateWindowing.xls
diff --git a/test-data/spreadsheet/19599-1.xls b/poi-main/src/test/resources/spreadsheet/19599-1.xls
similarity index 100%
rename from test-data/spreadsheet/19599-1.xls
rename to poi-main/src/test/resources/spreadsheet/19599-1.xls
diff --git a/test-data/spreadsheet/19599-2.xls b/poi-main/src/test/resources/spreadsheet/19599-2.xls
similarity index 100%
rename from test-data/spreadsheet/19599-2.xls
rename to poi-main/src/test/resources/spreadsheet/19599-2.xls
diff --git a/test-data/spreadsheet/22742.xls b/poi-main/src/test/resources/spreadsheet/22742.xls
similarity index 100%
rename from test-data/spreadsheet/22742.xls
rename to poi-main/src/test/resources/spreadsheet/22742.xls
diff --git a/test-data/spreadsheet/24207.xls b/poi-main/src/test/resources/spreadsheet/24207.xls
similarity index 100%
rename from test-data/spreadsheet/24207.xls
rename to poi-main/src/test/resources/spreadsheet/24207.xls
diff --git a/test-data/spreadsheet/24215.xls b/poi-main/src/test/resources/spreadsheet/24215.xls
similarity index 100%
rename from test-data/spreadsheet/24215.xls
rename to poi-main/src/test/resources/spreadsheet/24215.xls
diff --git a/test-data/spreadsheet/25183.xls b/poi-main/src/test/resources/spreadsheet/25183.xls
similarity index 100%
rename from test-data/spreadsheet/25183.xls
rename to poi-main/src/test/resources/spreadsheet/25183.xls
diff --git a/test-data/spreadsheet/25695.xls b/poi-main/src/test/resources/spreadsheet/25695.xls
similarity index 100%
rename from test-data/spreadsheet/25695.xls
rename to poi-main/src/test/resources/spreadsheet/25695.xls
diff --git a/test-data/spreadsheet/26100.xls b/poi-main/src/test/resources/spreadsheet/26100.xls
similarity index 100%
rename from test-data/spreadsheet/26100.xls
rename to poi-main/src/test/resources/spreadsheet/26100.xls
diff --git a/test-data/spreadsheet/27272_1.xls b/poi-main/src/test/resources/spreadsheet/27272_1.xls
similarity index 100%
rename from test-data/spreadsheet/27272_1.xls
rename to poi-main/src/test/resources/spreadsheet/27272_1.xls
diff --git a/test-data/spreadsheet/27272_2.xls b/poi-main/src/test/resources/spreadsheet/27272_2.xls
similarity index 100%
rename from test-data/spreadsheet/27272_2.xls
rename to poi-main/src/test/resources/spreadsheet/27272_2.xls
diff --git a/test-data/spreadsheet/27349-vlookupAcrossSheets.xls b/poi-main/src/test/resources/spreadsheet/27349-vlookupAcrossSheets.xls
similarity index 100%
rename from test-data/spreadsheet/27349-vlookupAcrossSheets.xls
rename to poi-main/src/test/resources/spreadsheet/27349-vlookupAcrossSheets.xls
diff --git a/test-data/spreadsheet/27364.xls b/poi-main/src/test/resources/spreadsheet/27364.xls
similarity index 100%
rename from test-data/spreadsheet/27364.xls
rename to poi-main/src/test/resources/spreadsheet/27364.xls
diff --git a/test-data/spreadsheet/27394.xls b/poi-main/src/test/resources/spreadsheet/27394.xls
similarity index 100%
rename from test-data/spreadsheet/27394.xls
rename to poi-main/src/test/resources/spreadsheet/27394.xls
diff --git a/test-data/spreadsheet/27852.xls b/poi-main/src/test/resources/spreadsheet/27852.xls
similarity index 100%
rename from test-data/spreadsheet/27852.xls
rename to poi-main/src/test/resources/spreadsheet/27852.xls
diff --git a/test-data/spreadsheet/27933.xls b/poi-main/src/test/resources/spreadsheet/27933.xls
similarity index 100%
rename from test-data/spreadsheet/27933.xls
rename to poi-main/src/test/resources/spreadsheet/27933.xls
diff --git a/test-data/spreadsheet/28772.xls b/poi-main/src/test/resources/spreadsheet/28772.xls
similarity index 100%
rename from test-data/spreadsheet/28772.xls
rename to poi-main/src/test/resources/spreadsheet/28772.xls
diff --git a/test-data/spreadsheet/28774.xls b/poi-main/src/test/resources/spreadsheet/28774.xls
similarity index 100%
rename from test-data/spreadsheet/28774.xls
rename to poi-main/src/test/resources/spreadsheet/28774.xls
diff --git a/test-data/spreadsheet/29675.xls b/poi-main/src/test/resources/spreadsheet/29675.xls
similarity index 100%
rename from test-data/spreadsheet/29675.xls
rename to poi-main/src/test/resources/spreadsheet/29675.xls
diff --git a/test-data/spreadsheet/29942.xls b/poi-main/src/test/resources/spreadsheet/29942.xls
similarity index 100%
rename from test-data/spreadsheet/29942.xls
rename to poi-main/src/test/resources/spreadsheet/29942.xls
diff --git a/test-data/spreadsheet/29982.xls b/poi-main/src/test/resources/spreadsheet/29982.xls
similarity index 100%
rename from test-data/spreadsheet/29982.xls
rename to poi-main/src/test/resources/spreadsheet/29982.xls
diff --git a/test-data/spreadsheet/30070.xls b/poi-main/src/test/resources/spreadsheet/30070.xls
similarity index 100%
rename from test-data/spreadsheet/30070.xls
rename to poi-main/src/test/resources/spreadsheet/30070.xls
diff --git a/test-data/spreadsheet/30540.xls b/poi-main/src/test/resources/spreadsheet/30540.xls
similarity index 100%
rename from test-data/spreadsheet/30540.xls
rename to poi-main/src/test/resources/spreadsheet/30540.xls
diff --git a/test-data/spreadsheet/30978-alt.xls b/poi-main/src/test/resources/spreadsheet/30978-alt.xls
similarity index 100%
rename from test-data/spreadsheet/30978-alt.xls
rename to poi-main/src/test/resources/spreadsheet/30978-alt.xls
diff --git a/test-data/spreadsheet/30978-deleted.xls b/poi-main/src/test/resources/spreadsheet/30978-deleted.xls
similarity index 100%
rename from test-data/spreadsheet/30978-deleted.xls
rename to poi-main/src/test/resources/spreadsheet/30978-deleted.xls
diff --git a/test-data/spreadsheet/31661.xls b/poi-main/src/test/resources/spreadsheet/31661.xls
similarity index 100%
rename from test-data/spreadsheet/31661.xls
rename to poi-main/src/test/resources/spreadsheet/31661.xls
diff --git a/test-data/spreadsheet/31749.xls b/poi-main/src/test/resources/spreadsheet/31749.xls
similarity index 100%
rename from test-data/spreadsheet/31749.xls
rename to poi-main/src/test/resources/spreadsheet/31749.xls
diff --git a/test-data/spreadsheet/31979.xls b/poi-main/src/test/resources/spreadsheet/31979.xls
similarity index 100%
rename from test-data/spreadsheet/31979.xls
rename to poi-main/src/test/resources/spreadsheet/31979.xls
diff --git a/test-data/spreadsheet/32822.xls b/poi-main/src/test/resources/spreadsheet/32822.xls
similarity index 100%
rename from test-data/spreadsheet/32822.xls
rename to poi-main/src/test/resources/spreadsheet/32822.xls
diff --git a/test-data/spreadsheet/33082.xls b/poi-main/src/test/resources/spreadsheet/33082.xls
similarity index 100%
rename from test-data/spreadsheet/33082.xls
rename to poi-main/src/test/resources/spreadsheet/33082.xls
diff --git a/test-data/spreadsheet/34775.xls b/poi-main/src/test/resources/spreadsheet/34775.xls
similarity index 100%
rename from test-data/spreadsheet/34775.xls
rename to poi-main/src/test/resources/spreadsheet/34775.xls
diff --git a/test-data/spreadsheet/35564.xls b/poi-main/src/test/resources/spreadsheet/35564.xls
similarity index 100%
rename from test-data/spreadsheet/35564.xls
rename to poi-main/src/test/resources/spreadsheet/35564.xls
diff --git a/test-data/spreadsheet/35565.xls b/poi-main/src/test/resources/spreadsheet/35565.xls
similarity index 100%
rename from test-data/spreadsheet/35565.xls
rename to poi-main/src/test/resources/spreadsheet/35565.xls
diff --git a/test-data/spreadsheet/36947.xls b/poi-main/src/test/resources/spreadsheet/36947.xls
similarity index 100%
rename from test-data/spreadsheet/36947.xls
rename to poi-main/src/test/resources/spreadsheet/36947.xls
diff --git a/test-data/spreadsheet/37376.xls b/poi-main/src/test/resources/spreadsheet/37376.xls
similarity index 100%
rename from test-data/spreadsheet/37376.xls
rename to poi-main/src/test/resources/spreadsheet/37376.xls
diff --git a/test-data/spreadsheet/37630.xls b/poi-main/src/test/resources/spreadsheet/37630.xls
similarity index 100%
rename from test-data/spreadsheet/37630.xls
rename to poi-main/src/test/resources/spreadsheet/37630.xls
diff --git a/test-data/spreadsheet/37684-1.xls b/poi-main/src/test/resources/spreadsheet/37684-1.xls
similarity index 100%
rename from test-data/spreadsheet/37684-1.xls
rename to poi-main/src/test/resources/spreadsheet/37684-1.xls
diff --git a/test-data/spreadsheet/37684-2.xls b/poi-main/src/test/resources/spreadsheet/37684-2.xls
similarity index 100%
rename from test-data/spreadsheet/37684-2.xls
rename to poi-main/src/test/resources/spreadsheet/37684-2.xls
diff --git a/test-data/spreadsheet/37684.xls b/poi-main/src/test/resources/spreadsheet/37684.xls
similarity index 100%
rename from test-data/spreadsheet/37684.xls
rename to poi-main/src/test/resources/spreadsheet/37684.xls
diff --git a/test-data/spreadsheet/39234.xls b/poi-main/src/test/resources/spreadsheet/39234.xls
similarity index 100%
rename from test-data/spreadsheet/39234.xls
rename to poi-main/src/test/resources/spreadsheet/39234.xls
diff --git a/test-data/spreadsheet/39512.xls b/poi-main/src/test/resources/spreadsheet/39512.xls
similarity index 100%
rename from test-data/spreadsheet/39512.xls
rename to poi-main/src/test/resources/spreadsheet/39512.xls
diff --git a/test-data/spreadsheet/39634.xls b/poi-main/src/test/resources/spreadsheet/39634.xls
similarity index 100%
rename from test-data/spreadsheet/39634.xls
rename to poi-main/src/test/resources/spreadsheet/39634.xls
diff --git a/test-data/spreadsheet/3dFormulas.xls b/poi-main/src/test/resources/spreadsheet/3dFormulas.xls
similarity index 100%
rename from test-data/spreadsheet/3dFormulas.xls
rename to poi-main/src/test/resources/spreadsheet/3dFormulas.xls
diff --git a/test-data/spreadsheet/40285.xls b/poi-main/src/test/resources/spreadsheet/40285.xls
similarity index 100%
rename from test-data/spreadsheet/40285.xls
rename to poi-main/src/test/resources/spreadsheet/40285.xls
diff --git a/test-data/spreadsheet/41139.xls b/poi-main/src/test/resources/spreadsheet/41139.xls
similarity index 100%
rename from test-data/spreadsheet/41139.xls
rename to poi-main/src/test/resources/spreadsheet/41139.xls
diff --git a/test-data/spreadsheet/41546.xls b/poi-main/src/test/resources/spreadsheet/41546.xls
similarity index 100%
rename from test-data/spreadsheet/41546.xls
rename to poi-main/src/test/resources/spreadsheet/41546.xls
diff --git a/test-data/spreadsheet/42464-ExpPtg-bad.xls b/poi-main/src/test/resources/spreadsheet/42464-ExpPtg-bad.xls
similarity index 100%
rename from test-data/spreadsheet/42464-ExpPtg-bad.xls
rename to poi-main/src/test/resources/spreadsheet/42464-ExpPtg-bad.xls
diff --git a/test-data/spreadsheet/42464-ExpPtg-ok.xls b/poi-main/src/test/resources/spreadsheet/42464-ExpPtg-ok.xls
similarity index 100%
rename from test-data/spreadsheet/42464-ExpPtg-ok.xls
rename to poi-main/src/test/resources/spreadsheet/42464-ExpPtg-ok.xls
diff --git a/test-data/spreadsheet/42726.xls b/poi-main/src/test/resources/spreadsheet/42726.xls
similarity index 100%
rename from test-data/spreadsheet/42726.xls
rename to poi-main/src/test/resources/spreadsheet/42726.xls
diff --git a/test-data/spreadsheet/42844.xls b/poi-main/src/test/resources/spreadsheet/42844.xls
similarity index 100%
rename from test-data/spreadsheet/42844.xls
rename to poi-main/src/test/resources/spreadsheet/42844.xls
diff --git a/test-data/spreadsheet/43251.xls b/poi-main/src/test/resources/spreadsheet/43251.xls
similarity index 100%
rename from test-data/spreadsheet/43251.xls
rename to poi-main/src/test/resources/spreadsheet/43251.xls
diff --git a/test-data/spreadsheet/43493.xls b/poi-main/src/test/resources/spreadsheet/43493.xls
similarity index 100%
rename from test-data/spreadsheet/43493.xls
rename to poi-main/src/test/resources/spreadsheet/43493.xls
diff --git a/test-data/spreadsheet/43623.xls b/poi-main/src/test/resources/spreadsheet/43623.xls
similarity index 100%
rename from test-data/spreadsheet/43623.xls
rename to poi-main/src/test/resources/spreadsheet/43623.xls
diff --git a/test-data/spreadsheet/43902.xls b/poi-main/src/test/resources/spreadsheet/43902.xls
similarity index 100%
rename from test-data/spreadsheet/43902.xls
rename to poi-main/src/test/resources/spreadsheet/43902.xls
diff --git a/test-data/spreadsheet/44010-SingleChart.xls b/poi-main/src/test/resources/spreadsheet/44010-SingleChart.xls
similarity index 100%
rename from test-data/spreadsheet/44010-SingleChart.xls
rename to poi-main/src/test/resources/spreadsheet/44010-SingleChart.xls
diff --git a/test-data/spreadsheet/44010-TwoCharts.xls b/poi-main/src/test/resources/spreadsheet/44010-TwoCharts.xls
similarity index 100%
rename from test-data/spreadsheet/44010-TwoCharts.xls
rename to poi-main/src/test/resources/spreadsheet/44010-TwoCharts.xls
diff --git a/test-data/spreadsheet/44167.xls b/poi-main/src/test/resources/spreadsheet/44167.xls
similarity index 100%
rename from test-data/spreadsheet/44167.xls
rename to poi-main/src/test/resources/spreadsheet/44167.xls
diff --git a/test-data/spreadsheet/44200.xls b/poi-main/src/test/resources/spreadsheet/44200.xls
similarity index 100%
rename from test-data/spreadsheet/44200.xls
rename to poi-main/src/test/resources/spreadsheet/44200.xls
diff --git a/test-data/spreadsheet/44201.xls b/poi-main/src/test/resources/spreadsheet/44201.xls
similarity index 100%
rename from test-data/spreadsheet/44201.xls
rename to poi-main/src/test/resources/spreadsheet/44201.xls
diff --git a/test-data/spreadsheet/44235.xls b/poi-main/src/test/resources/spreadsheet/44235.xls
similarity index 100%
rename from test-data/spreadsheet/44235.xls
rename to poi-main/src/test/resources/spreadsheet/44235.xls
diff --git a/test-data/spreadsheet/44297.xls b/poi-main/src/test/resources/spreadsheet/44297.xls
similarity index 100%
rename from test-data/spreadsheet/44297.xls
rename to poi-main/src/test/resources/spreadsheet/44297.xls
diff --git a/test-data/spreadsheet/44593.xls b/poi-main/src/test/resources/spreadsheet/44593.xls
similarity index 100%
rename from test-data/spreadsheet/44593.xls
rename to poi-main/src/test/resources/spreadsheet/44593.xls
diff --git a/test-data/spreadsheet/44636.xls b/poi-main/src/test/resources/spreadsheet/44636.xls
similarity index 100%
rename from test-data/spreadsheet/44636.xls
rename to poi-main/src/test/resources/spreadsheet/44636.xls
diff --git a/test-data/spreadsheet/44643.xls b/poi-main/src/test/resources/spreadsheet/44643.xls
similarity index 100%
rename from test-data/spreadsheet/44643.xls
rename to poi-main/src/test/resources/spreadsheet/44643.xls
diff --git a/test-data/spreadsheet/44693.xls b/poi-main/src/test/resources/spreadsheet/44693.xls
similarity index 100%
rename from test-data/spreadsheet/44693.xls
rename to poi-main/src/test/resources/spreadsheet/44693.xls
diff --git a/test-data/spreadsheet/44840.xls b/poi-main/src/test/resources/spreadsheet/44840.xls
similarity index 100%
rename from test-data/spreadsheet/44840.xls
rename to poi-main/src/test/resources/spreadsheet/44840.xls
diff --git a/test-data/spreadsheet/44861.xls b/poi-main/src/test/resources/spreadsheet/44861.xls
similarity index 100%
rename from test-data/spreadsheet/44861.xls
rename to poi-main/src/test/resources/spreadsheet/44861.xls
diff --git a/test-data/spreadsheet/44891.xls b/poi-main/src/test/resources/spreadsheet/44891.xls
similarity index 100%
rename from test-data/spreadsheet/44891.xls
rename to poi-main/src/test/resources/spreadsheet/44891.xls
diff --git a/test-data/spreadsheet/44958.xls b/poi-main/src/test/resources/spreadsheet/44958.xls
similarity index 100%
rename from test-data/spreadsheet/44958.xls
rename to poi-main/src/test/resources/spreadsheet/44958.xls
diff --git a/test-data/spreadsheet/45129.xls b/poi-main/src/test/resources/spreadsheet/45129.xls
similarity index 100%
rename from test-data/spreadsheet/45129.xls
rename to poi-main/src/test/resources/spreadsheet/45129.xls
diff --git a/test-data/spreadsheet/45290.xls b/poi-main/src/test/resources/spreadsheet/45290.xls
similarity index 100%
rename from test-data/spreadsheet/45290.xls
rename to poi-main/src/test/resources/spreadsheet/45290.xls
diff --git a/test-data/spreadsheet/45322.xls b/poi-main/src/test/resources/spreadsheet/45322.xls
similarity index 100%
rename from test-data/spreadsheet/45322.xls
rename to poi-main/src/test/resources/spreadsheet/45322.xls
diff --git a/test-data/spreadsheet/45365-2.xls b/poi-main/src/test/resources/spreadsheet/45365-2.xls
similarity index 100%
rename from test-data/spreadsheet/45365-2.xls
rename to poi-main/src/test/resources/spreadsheet/45365-2.xls
diff --git a/test-data/spreadsheet/45365.xls b/poi-main/src/test/resources/spreadsheet/45365.xls
similarity index 100%
rename from test-data/spreadsheet/45365.xls
rename to poi-main/src/test/resources/spreadsheet/45365.xls
diff --git a/test-data/spreadsheet/45430.xlsx b/poi-main/src/test/resources/spreadsheet/45430.xlsx
similarity index 100%
rename from test-data/spreadsheet/45430.xlsx
rename to poi-main/src/test/resources/spreadsheet/45430.xlsx
diff --git a/test-data/spreadsheet/45431.xlsm b/poi-main/src/test/resources/spreadsheet/45431.xlsm
similarity index 100%
rename from test-data/spreadsheet/45431.xlsm
rename to poi-main/src/test/resources/spreadsheet/45431.xlsm
diff --git a/test-data/spreadsheet/45492.xls b/poi-main/src/test/resources/spreadsheet/45492.xls
similarity index 100%
rename from test-data/spreadsheet/45492.xls
rename to poi-main/src/test/resources/spreadsheet/45492.xls
diff --git a/test-data/spreadsheet/45538_classic_Footer.xls b/poi-main/src/test/resources/spreadsheet/45538_classic_Footer.xls
similarity index 100%
rename from test-data/spreadsheet/45538_classic_Footer.xls
rename to poi-main/src/test/resources/spreadsheet/45538_classic_Footer.xls
diff --git a/test-data/spreadsheet/45538_classic_Header.xls b/poi-main/src/test/resources/spreadsheet/45538_classic_Header.xls
similarity index 100%
rename from test-data/spreadsheet/45538_classic_Header.xls
rename to poi-main/src/test/resources/spreadsheet/45538_classic_Header.xls
diff --git a/test-data/spreadsheet/45538_form_Footer.xls b/poi-main/src/test/resources/spreadsheet/45538_form_Footer.xls
similarity index 100%
rename from test-data/spreadsheet/45538_form_Footer.xls
rename to poi-main/src/test/resources/spreadsheet/45538_form_Footer.xls
diff --git a/test-data/spreadsheet/45538_form_Header.xls b/poi-main/src/test/resources/spreadsheet/45538_form_Header.xls
similarity index 100%
rename from test-data/spreadsheet/45538_form_Header.xls
rename to poi-main/src/test/resources/spreadsheet/45538_form_Header.xls
diff --git a/test-data/spreadsheet/45540_classic_Footer.xlsx b/poi-main/src/test/resources/spreadsheet/45540_classic_Footer.xlsx
similarity index 100%
rename from test-data/spreadsheet/45540_classic_Footer.xlsx
rename to poi-main/src/test/resources/spreadsheet/45540_classic_Footer.xlsx
diff --git a/test-data/spreadsheet/45540_classic_Header.xlsx b/poi-main/src/test/resources/spreadsheet/45540_classic_Header.xlsx
similarity index 100%
rename from test-data/spreadsheet/45540_classic_Header.xlsx
rename to poi-main/src/test/resources/spreadsheet/45540_classic_Header.xlsx
diff --git a/test-data/spreadsheet/45540_form_Footer.xlsx b/poi-main/src/test/resources/spreadsheet/45540_form_Footer.xlsx
similarity index 100%
rename from test-data/spreadsheet/45540_form_Footer.xlsx
rename to poi-main/src/test/resources/spreadsheet/45540_form_Footer.xlsx
diff --git a/test-data/spreadsheet/45540_form_Header.xlsx b/poi-main/src/test/resources/spreadsheet/45540_form_Header.xlsx
similarity index 100%
rename from test-data/spreadsheet/45540_form_Header.xlsx
rename to poi-main/src/test/resources/spreadsheet/45540_form_Header.xlsx
diff --git a/test-data/spreadsheet/45544.xlsx b/poi-main/src/test/resources/spreadsheet/45544.xlsx
similarity index 100%
rename from test-data/spreadsheet/45544.xlsx
rename to poi-main/src/test/resources/spreadsheet/45544.xlsx
diff --git a/test-data/spreadsheet/45672.xls b/poi-main/src/test/resources/spreadsheet/45672.xls
similarity index 100%
rename from test-data/spreadsheet/45672.xls
rename to poi-main/src/test/resources/spreadsheet/45672.xls
diff --git a/test-data/spreadsheet/45720.xls b/poi-main/src/test/resources/spreadsheet/45720.xls
similarity index 100%
rename from test-data/spreadsheet/45720.xls
rename to poi-main/src/test/resources/spreadsheet/45720.xls
diff --git a/test-data/spreadsheet/45761.xls b/poi-main/src/test/resources/spreadsheet/45761.xls
similarity index 100%
rename from test-data/spreadsheet/45761.xls
rename to poi-main/src/test/resources/spreadsheet/45761.xls
diff --git a/test-data/spreadsheet/45784.xls b/poi-main/src/test/resources/spreadsheet/45784.xls
similarity index 100%
rename from test-data/spreadsheet/45784.xls
rename to poi-main/src/test/resources/spreadsheet/45784.xls
diff --git a/test-data/spreadsheet/45829.png b/poi-main/src/test/resources/spreadsheet/45829.png
similarity index 100%
rename from test-data/spreadsheet/45829.png
rename to poi-main/src/test/resources/spreadsheet/45829.png
diff --git a/test-data/spreadsheet/46136-NoWarnings.xls b/poi-main/src/test/resources/spreadsheet/46136-NoWarnings.xls
similarity index 100%
rename from test-data/spreadsheet/46136-NoWarnings.xls
rename to poi-main/src/test/resources/spreadsheet/46136-NoWarnings.xls
diff --git a/test-data/spreadsheet/46136-WithWarnings.xls b/poi-main/src/test/resources/spreadsheet/46136-WithWarnings.xls
similarity index 100%
rename from test-data/spreadsheet/46136-WithWarnings.xls
rename to poi-main/src/test/resources/spreadsheet/46136-WithWarnings.xls
diff --git a/test-data/spreadsheet/46137.xls b/poi-main/src/test/resources/spreadsheet/46137.xls
similarity index 100%
rename from test-data/spreadsheet/46137.xls
rename to poi-main/src/test/resources/spreadsheet/46137.xls
diff --git a/test-data/spreadsheet/46250.xls b/poi-main/src/test/resources/spreadsheet/46250.xls
similarity index 100%
rename from test-data/spreadsheet/46250.xls
rename to poi-main/src/test/resources/spreadsheet/46250.xls
diff --git a/test-data/spreadsheet/46368.xls b/poi-main/src/test/resources/spreadsheet/46368.xls
similarity index 100%
rename from test-data/spreadsheet/46368.xls
rename to poi-main/src/test/resources/spreadsheet/46368.xls
diff --git a/test-data/spreadsheet/46445.xls b/poi-main/src/test/resources/spreadsheet/46445.xls
similarity index 100%
rename from test-data/spreadsheet/46445.xls
rename to poi-main/src/test/resources/spreadsheet/46445.xls
diff --git a/test-data/spreadsheet/46535.xlsx b/poi-main/src/test/resources/spreadsheet/46535.xlsx
similarity index 100%
rename from test-data/spreadsheet/46535.xlsx
rename to poi-main/src/test/resources/spreadsheet/46535.xlsx
diff --git a/test-data/spreadsheet/46536.xlsx b/poi-main/src/test/resources/spreadsheet/46536.xlsx
similarity index 100%
rename from test-data/spreadsheet/46536.xlsx
rename to poi-main/src/test/resources/spreadsheet/46536.xlsx
diff --git a/test-data/spreadsheet/46904.xls b/poi-main/src/test/resources/spreadsheet/46904.xls
similarity index 100%
rename from test-data/spreadsheet/46904.xls
rename to poi-main/src/test/resources/spreadsheet/46904.xls
diff --git a/test-data/spreadsheet/47026.xlsm b/poi-main/src/test/resources/spreadsheet/47026.xlsm
similarity index 100%
rename from test-data/spreadsheet/47026.xlsm
rename to poi-main/src/test/resources/spreadsheet/47026.xlsm
diff --git a/test-data/spreadsheet/47034.xls b/poi-main/src/test/resources/spreadsheet/47034.xls
similarity index 100%
rename from test-data/spreadsheet/47034.xls
rename to poi-main/src/test/resources/spreadsheet/47034.xls
diff --git a/test-data/spreadsheet/47089.xlsm b/poi-main/src/test/resources/spreadsheet/47089.xlsm
similarity index 100%
rename from test-data/spreadsheet/47089.xlsm
rename to poi-main/src/test/resources/spreadsheet/47089.xlsm
diff --git a/test-data/spreadsheet/47090.xlsx b/poi-main/src/test/resources/spreadsheet/47090.xlsx
similarity index 100%
rename from test-data/spreadsheet/47090.xlsx
rename to poi-main/src/test/resources/spreadsheet/47090.xlsx
diff --git a/test-data/spreadsheet/47154.xls b/poi-main/src/test/resources/spreadsheet/47154.xls
similarity index 100%
rename from test-data/spreadsheet/47154.xls
rename to poi-main/src/test/resources/spreadsheet/47154.xls
diff --git a/test-data/spreadsheet/47251.xls b/poi-main/src/test/resources/spreadsheet/47251.xls
similarity index 100%
rename from test-data/spreadsheet/47251.xls
rename to poi-main/src/test/resources/spreadsheet/47251.xls
diff --git a/test-data/spreadsheet/47504.xlsx b/poi-main/src/test/resources/spreadsheet/47504.xlsx
similarity index 100%
rename from test-data/spreadsheet/47504.xlsx
rename to poi-main/src/test/resources/spreadsheet/47504.xlsx
diff --git a/test-data/spreadsheet/47668.xlsx b/poi-main/src/test/resources/spreadsheet/47668.xlsx
similarity index 100%
rename from test-data/spreadsheet/47668.xlsx
rename to poi-main/src/test/resources/spreadsheet/47668.xlsx
diff --git a/test-data/spreadsheet/47701.xls b/poi-main/src/test/resources/spreadsheet/47701.xls
similarity index 100%
rename from test-data/spreadsheet/47701.xls
rename to poi-main/src/test/resources/spreadsheet/47701.xls
diff --git a/test-data/spreadsheet/47737.xlsx b/poi-main/src/test/resources/spreadsheet/47737.xlsx
similarity index 100%
rename from test-data/spreadsheet/47737.xlsx
rename to poi-main/src/test/resources/spreadsheet/47737.xlsx
diff --git a/test-data/spreadsheet/47804.xlsx b/poi-main/src/test/resources/spreadsheet/47804.xlsx
similarity index 100%
rename from test-data/spreadsheet/47804.xlsx
rename to poi-main/src/test/resources/spreadsheet/47804.xlsx
diff --git a/test-data/spreadsheet/47813.xlsx b/poi-main/src/test/resources/spreadsheet/47813.xlsx
similarity index 100%
rename from test-data/spreadsheet/47813.xlsx
rename to poi-main/src/test/resources/spreadsheet/47813.xlsx
diff --git a/test-data/spreadsheet/47847.xls b/poi-main/src/test/resources/spreadsheet/47847.xls
similarity index 100%
rename from test-data/spreadsheet/47847.xls
rename to poi-main/src/test/resources/spreadsheet/47847.xls
diff --git a/test-data/spreadsheet/47862.xlsx b/poi-main/src/test/resources/spreadsheet/47862.xlsx
similarity index 100%
rename from test-data/spreadsheet/47862.xlsx
rename to poi-main/src/test/resources/spreadsheet/47862.xlsx
diff --git a/test-data/spreadsheet/47889.xlsx b/poi-main/src/test/resources/spreadsheet/47889.xlsx
similarity index 100%
rename from test-data/spreadsheet/47889.xlsx
rename to poi-main/src/test/resources/spreadsheet/47889.xlsx
diff --git a/test-data/spreadsheet/47920.xls b/poi-main/src/test/resources/spreadsheet/47920.xls
similarity index 100%
rename from test-data/spreadsheet/47920.xls
rename to poi-main/src/test/resources/spreadsheet/47920.xls
diff --git a/test-data/spreadsheet/47924.xls b/poi-main/src/test/resources/spreadsheet/47924.xls
similarity index 100%
rename from test-data/spreadsheet/47924.xls
rename to poi-main/src/test/resources/spreadsheet/47924.xls
diff --git a/test-data/spreadsheet/48026.xls b/poi-main/src/test/resources/spreadsheet/48026.xls
similarity index 100%
rename from test-data/spreadsheet/48026.xls
rename to poi-main/src/test/resources/spreadsheet/48026.xls
diff --git a/test-data/spreadsheet/48180.xls b/poi-main/src/test/resources/spreadsheet/48180.xls
similarity index 100%
rename from test-data/spreadsheet/48180.xls
rename to poi-main/src/test/resources/spreadsheet/48180.xls
diff --git a/test-data/spreadsheet/48325.xls b/poi-main/src/test/resources/spreadsheet/48325.xls
similarity index 100%
rename from test-data/spreadsheet/48325.xls
rename to poi-main/src/test/resources/spreadsheet/48325.xls
diff --git a/test-data/spreadsheet/48495.xlsx b/poi-main/src/test/resources/spreadsheet/48495.xlsx
similarity index 100%
rename from test-data/spreadsheet/48495.xlsx
rename to poi-main/src/test/resources/spreadsheet/48495.xlsx
diff --git a/test-data/spreadsheet/48539.xlsx b/poi-main/src/test/resources/spreadsheet/48539.xlsx
similarity index 100%
rename from test-data/spreadsheet/48539.xlsx
rename to poi-main/src/test/resources/spreadsheet/48539.xlsx
diff --git a/test-data/spreadsheet/48703.xls b/poi-main/src/test/resources/spreadsheet/48703.xls
similarity index 100%
rename from test-data/spreadsheet/48703.xls
rename to poi-main/src/test/resources/spreadsheet/48703.xls
diff --git a/test-data/spreadsheet/48703.xlsx b/poi-main/src/test/resources/spreadsheet/48703.xlsx
similarity index 100%
rename from test-data/spreadsheet/48703.xlsx
rename to poi-main/src/test/resources/spreadsheet/48703.xlsx
diff --git a/test-data/spreadsheet/48779.xlsx b/poi-main/src/test/resources/spreadsheet/48779.xlsx
similarity index 100%
rename from test-data/spreadsheet/48779.xlsx
rename to poi-main/src/test/resources/spreadsheet/48779.xlsx
diff --git a/test-data/spreadsheet/48923.xlsx b/poi-main/src/test/resources/spreadsheet/48923.xlsx
similarity index 100%
rename from test-data/spreadsheet/48923.xlsx
rename to poi-main/src/test/resources/spreadsheet/48923.xlsx
diff --git a/test-data/spreadsheet/48936-strings.txt b/poi-main/src/test/resources/spreadsheet/48936-strings.txt
similarity index 100%
rename from test-data/spreadsheet/48936-strings.txt
rename to poi-main/src/test/resources/spreadsheet/48936-strings.txt
diff --git a/test-data/spreadsheet/48968.xls b/poi-main/src/test/resources/spreadsheet/48968.xls
similarity index 100%
rename from test-data/spreadsheet/48968.xls
rename to poi-main/src/test/resources/spreadsheet/48968.xls
diff --git a/test-data/spreadsheet/49096.xls b/poi-main/src/test/resources/spreadsheet/49096.xls
similarity index 100%
rename from test-data/spreadsheet/49096.xls
rename to poi-main/src/test/resources/spreadsheet/49096.xls
diff --git a/test-data/spreadsheet/49156.xlsx b/poi-main/src/test/resources/spreadsheet/49156.xlsx
similarity index 100%
rename from test-data/spreadsheet/49156.xlsx
rename to poi-main/src/test/resources/spreadsheet/49156.xlsx
diff --git a/test-data/spreadsheet/49185.xls b/poi-main/src/test/resources/spreadsheet/49185.xls
similarity index 100%
rename from test-data/spreadsheet/49185.xls
rename to poi-main/src/test/resources/spreadsheet/49185.xls
diff --git a/test-data/spreadsheet/49219.xls b/poi-main/src/test/resources/spreadsheet/49219.xls
similarity index 100%
rename from test-data/spreadsheet/49219.xls
rename to poi-main/src/test/resources/spreadsheet/49219.xls
diff --git a/test-data/spreadsheet/49237.xls b/poi-main/src/test/resources/spreadsheet/49237.xls
similarity index 100%
rename from test-data/spreadsheet/49237.xls
rename to poi-main/src/test/resources/spreadsheet/49237.xls
diff --git a/test-data/spreadsheet/49273.xlsx b/poi-main/src/test/resources/spreadsheet/49273.xlsx
similarity index 100%
rename from test-data/spreadsheet/49273.xlsx
rename to poi-main/src/test/resources/spreadsheet/49273.xlsx
diff --git a/test-data/spreadsheet/49325.xlsx b/poi-main/src/test/resources/spreadsheet/49325.xlsx
similarity index 100%
rename from test-data/spreadsheet/49325.xlsx
rename to poi-main/src/test/resources/spreadsheet/49325.xlsx
diff --git a/test-data/spreadsheet/49524.xls b/poi-main/src/test/resources/spreadsheet/49524.xls
similarity index 100%
rename from test-data/spreadsheet/49524.xls
rename to poi-main/src/test/resources/spreadsheet/49524.xls
diff --git a/test-data/spreadsheet/49529.xls b/poi-main/src/test/resources/spreadsheet/49529.xls
similarity index 100%
rename from test-data/spreadsheet/49529.xls
rename to poi-main/src/test/resources/spreadsheet/49529.xls
diff --git a/test-data/spreadsheet/49581.xls b/poi-main/src/test/resources/spreadsheet/49581.xls
similarity index 100%
rename from test-data/spreadsheet/49581.xls
rename to poi-main/src/test/resources/spreadsheet/49581.xls
diff --git a/test-data/spreadsheet/49609.xlsx b/poi-main/src/test/resources/spreadsheet/49609.xlsx
similarity index 100%
rename from test-data/spreadsheet/49609.xlsx
rename to poi-main/src/test/resources/spreadsheet/49609.xlsx
diff --git a/test-data/spreadsheet/49612.xls b/poi-main/src/test/resources/spreadsheet/49612.xls
similarity index 100%
rename from test-data/spreadsheet/49612.xls
rename to poi-main/src/test/resources/spreadsheet/49612.xls
diff --git a/test-data/spreadsheet/49751.xls b/poi-main/src/test/resources/spreadsheet/49751.xls
similarity index 100%
rename from test-data/spreadsheet/49751.xls
rename to poi-main/src/test/resources/spreadsheet/49751.xls
diff --git a/test-data/spreadsheet/49761.xls b/poi-main/src/test/resources/spreadsheet/49761.xls
similarity index 100%
rename from test-data/spreadsheet/49761.xls
rename to poi-main/src/test/resources/spreadsheet/49761.xls
diff --git a/test-data/spreadsheet/49783.xlsx b/poi-main/src/test/resources/spreadsheet/49783.xlsx
similarity index 100%
rename from test-data/spreadsheet/49783.xlsx
rename to poi-main/src/test/resources/spreadsheet/49783.xlsx
diff --git a/test-data/spreadsheet/49872.xlsx b/poi-main/src/test/resources/spreadsheet/49872.xlsx
similarity index 100%
rename from test-data/spreadsheet/49872.xlsx
rename to poi-main/src/test/resources/spreadsheet/49872.xlsx
diff --git a/test-data/spreadsheet/49896.xls b/poi-main/src/test/resources/spreadsheet/49896.xls
similarity index 100%
rename from test-data/spreadsheet/49896.xls
rename to poi-main/src/test/resources/spreadsheet/49896.xls
diff --git a/test-data/spreadsheet/49928.xls b/poi-main/src/test/resources/spreadsheet/49928.xls
similarity index 100%
rename from test-data/spreadsheet/49928.xls
rename to poi-main/src/test/resources/spreadsheet/49928.xls
diff --git a/test-data/spreadsheet/49928.xlsx b/poi-main/src/test/resources/spreadsheet/49928.xlsx
similarity index 100%
rename from test-data/spreadsheet/49928.xlsx
rename to poi-main/src/test/resources/spreadsheet/49928.xlsx
diff --git a/test-data/spreadsheet/49931.xls b/poi-main/src/test/resources/spreadsheet/49931.xls
similarity index 100%
rename from test-data/spreadsheet/49931.xls
rename to poi-main/src/test/resources/spreadsheet/49931.xls
diff --git a/test-data/spreadsheet/49966.xlsx b/poi-main/src/test/resources/spreadsheet/49966.xlsx
similarity index 100%
rename from test-data/spreadsheet/49966.xlsx
rename to poi-main/src/test/resources/spreadsheet/49966.xlsx
diff --git a/test-data/spreadsheet/50020.xls b/poi-main/src/test/resources/spreadsheet/50020.xls
similarity index 100%
rename from test-data/spreadsheet/50020.xls
rename to poi-main/src/test/resources/spreadsheet/50020.xls
diff --git a/test-data/spreadsheet/50096.xlsx b/poi-main/src/test/resources/spreadsheet/50096.xlsx
similarity index 100%
rename from test-data/spreadsheet/50096.xlsx
rename to poi-main/src/test/resources/spreadsheet/50096.xlsx
diff --git a/test-data/spreadsheet/50298.xls b/poi-main/src/test/resources/spreadsheet/50298.xls
similarity index 100%
rename from test-data/spreadsheet/50298.xls
rename to poi-main/src/test/resources/spreadsheet/50298.xls
diff --git a/test-data/spreadsheet/50299.xlsx b/poi-main/src/test/resources/spreadsheet/50299.xlsx
similarity index 100%
rename from test-data/spreadsheet/50299.xlsx
rename to poi-main/src/test/resources/spreadsheet/50299.xlsx
diff --git a/test-data/spreadsheet/50426.xls b/poi-main/src/test/resources/spreadsheet/50426.xls
similarity index 100%
rename from test-data/spreadsheet/50426.xls
rename to poi-main/src/test/resources/spreadsheet/50426.xls
diff --git a/test-data/spreadsheet/50756.xls b/poi-main/src/test/resources/spreadsheet/50756.xls
similarity index 100%
rename from test-data/spreadsheet/50756.xls
rename to poi-main/src/test/resources/spreadsheet/50756.xls
diff --git a/test-data/spreadsheet/50779_1.xls b/poi-main/src/test/resources/spreadsheet/50779_1.xls
similarity index 100%
rename from test-data/spreadsheet/50779_1.xls
rename to poi-main/src/test/resources/spreadsheet/50779_1.xls
diff --git a/test-data/spreadsheet/50779_2.xls b/poi-main/src/test/resources/spreadsheet/50779_2.xls
similarity index 100%
rename from test-data/spreadsheet/50779_2.xls
rename to poi-main/src/test/resources/spreadsheet/50779_2.xls
diff --git a/test-data/spreadsheet/50784-font_theme_colours.xlsx b/poi-main/src/test/resources/spreadsheet/50784-font_theme_colours.xlsx
similarity index 100%
rename from test-data/spreadsheet/50784-font_theme_colours.xlsx
rename to poi-main/src/test/resources/spreadsheet/50784-font_theme_colours.xlsx
diff --git a/test-data/spreadsheet/50786-indexed_colours.xlsx b/poi-main/src/test/resources/spreadsheet/50786-indexed_colours.xlsx
similarity index 100%
rename from test-data/spreadsheet/50786-indexed_colours.xlsx
rename to poi-main/src/test/resources/spreadsheet/50786-indexed_colours.xlsx
diff --git a/test-data/spreadsheet/50795.xlsx b/poi-main/src/test/resources/spreadsheet/50795.xlsx
similarity index 100%
rename from test-data/spreadsheet/50795.xlsx
rename to poi-main/src/test/resources/spreadsheet/50795.xlsx
diff --git a/test-data/spreadsheet/50833.xls b/poi-main/src/test/resources/spreadsheet/50833.xls
similarity index 100%
rename from test-data/spreadsheet/50833.xls
rename to poi-main/src/test/resources/spreadsheet/50833.xls
diff --git a/test-data/spreadsheet/50846-border_colours.xlsx b/poi-main/src/test/resources/spreadsheet/50846-border_colours.xlsx
similarity index 100%
rename from test-data/spreadsheet/50846-border_colours.xlsx
rename to poi-main/src/test/resources/spreadsheet/50846-border_colours.xlsx
diff --git a/test-data/spreadsheet/50867_with_table.xlsx b/poi-main/src/test/resources/spreadsheet/50867_with_table.xlsx
similarity index 100%
rename from test-data/spreadsheet/50867_with_table.xlsx
rename to poi-main/src/test/resources/spreadsheet/50867_with_table.xlsx
diff --git a/test-data/spreadsheet/50939.xls b/poi-main/src/test/resources/spreadsheet/50939.xls
similarity index 100%
rename from test-data/spreadsheet/50939.xls
rename to poi-main/src/test/resources/spreadsheet/50939.xls
diff --git a/test-data/spreadsheet/51143.xls b/poi-main/src/test/resources/spreadsheet/51143.xls
similarity index 100%
rename from test-data/spreadsheet/51143.xls
rename to poi-main/src/test/resources/spreadsheet/51143.xls
diff --git a/test-data/spreadsheet/51222.xlsx b/poi-main/src/test/resources/spreadsheet/51222.xlsx
similarity index 100%
rename from test-data/spreadsheet/51222.xlsx
rename to poi-main/src/test/resources/spreadsheet/51222.xlsx
diff --git a/test-data/spreadsheet/51461.xls b/poi-main/src/test/resources/spreadsheet/51461.xls
similarity index 100%
rename from test-data/spreadsheet/51461.xls
rename to poi-main/src/test/resources/spreadsheet/51461.xls
diff --git a/test-data/spreadsheet/51470.xlsx b/poi-main/src/test/resources/spreadsheet/51470.xlsx
similarity index 100%
rename from test-data/spreadsheet/51470.xlsx
rename to poi-main/src/test/resources/spreadsheet/51470.xlsx
diff --git a/test-data/spreadsheet/51498.xls b/poi-main/src/test/resources/spreadsheet/51498.xls
similarity index 100%
rename from test-data/spreadsheet/51498.xls
rename to poi-main/src/test/resources/spreadsheet/51498.xls
diff --git a/test-data/spreadsheet/51535.xls b/poi-main/src/test/resources/spreadsheet/51535.xls
similarity index 100%
rename from test-data/spreadsheet/51535.xls
rename to poi-main/src/test/resources/spreadsheet/51535.xls
diff --git a/test-data/spreadsheet/51585.xlsx b/poi-main/src/test/resources/spreadsheet/51585.xlsx
similarity index 100%
rename from test-data/spreadsheet/51585.xlsx
rename to poi-main/src/test/resources/spreadsheet/51585.xlsx
diff --git a/test-data/spreadsheet/51670.xls b/poi-main/src/test/resources/spreadsheet/51670.xls
similarity index 100%
rename from test-data/spreadsheet/51670.xls
rename to poi-main/src/test/resources/spreadsheet/51670.xls
diff --git a/test-data/spreadsheet/51675.xls b/poi-main/src/test/resources/spreadsheet/51675.xls
similarity index 100%
rename from test-data/spreadsheet/51675.xls
rename to poi-main/src/test/resources/spreadsheet/51675.xls
diff --git a/test-data/spreadsheet/51710.xlsx b/poi-main/src/test/resources/spreadsheet/51710.xlsx
similarity index 100%
rename from test-data/spreadsheet/51710.xlsx
rename to poi-main/src/test/resources/spreadsheet/51710.xlsx
diff --git a/test-data/spreadsheet/51832.xls b/poi-main/src/test/resources/spreadsheet/51832.xls
similarity index 100%
rename from test-data/spreadsheet/51832.xls
rename to poi-main/src/test/resources/spreadsheet/51832.xls
diff --git a/test-data/spreadsheet/51850.xlsx b/poi-main/src/test/resources/spreadsheet/51850.xlsx
similarity index 100%
rename from test-data/spreadsheet/51850.xlsx
rename to poi-main/src/test/resources/spreadsheet/51850.xlsx
diff --git a/test-data/spreadsheet/51963.xlsx b/poi-main/src/test/resources/spreadsheet/51963.xlsx
similarity index 100%
rename from test-data/spreadsheet/51963.xlsx
rename to poi-main/src/test/resources/spreadsheet/51963.xlsx
diff --git a/test-data/spreadsheet/52348.xlsx b/poi-main/src/test/resources/spreadsheet/52348.xlsx
similarity index 100%
rename from test-data/spreadsheet/52348.xlsx
rename to poi-main/src/test/resources/spreadsheet/52348.xlsx
diff --git a/test-data/spreadsheet/52527.xls b/poi-main/src/test/resources/spreadsheet/52527.xls
similarity index 100%
rename from test-data/spreadsheet/52527.xls
rename to poi-main/src/test/resources/spreadsheet/52527.xls
diff --git a/test-data/spreadsheet/52575_main.xls b/poi-main/src/test/resources/spreadsheet/52575_main.xls
similarity index 100%
rename from test-data/spreadsheet/52575_main.xls
rename to poi-main/src/test/resources/spreadsheet/52575_main.xls
diff --git a/test-data/spreadsheet/52575_source.xls b/poi-main/src/test/resources/spreadsheet/52575_source.xls
similarity index 100%
rename from test-data/spreadsheet/52575_source.xls
rename to poi-main/src/test/resources/spreadsheet/52575_source.xls
diff --git a/test-data/spreadsheet/52716.xlsx b/poi-main/src/test/resources/spreadsheet/52716.xlsx
similarity index 100%
rename from test-data/spreadsheet/52716.xlsx
rename to poi-main/src/test/resources/spreadsheet/52716.xlsx
diff --git a/test-data/spreadsheet/53101.xlsx b/poi-main/src/test/resources/spreadsheet/53101.xlsx
similarity index 100%
rename from test-data/spreadsheet/53101.xlsx
rename to poi-main/src/test/resources/spreadsheet/53101.xlsx
diff --git a/test-data/spreadsheet/53282.xlsx b/poi-main/src/test/resources/spreadsheet/53282.xlsx
similarity index 100%
rename from test-data/spreadsheet/53282.xlsx
rename to poi-main/src/test/resources/spreadsheet/53282.xlsx
diff --git a/test-data/spreadsheet/53282b.xlsx b/poi-main/src/test/resources/spreadsheet/53282b.xlsx
similarity index 100%
rename from test-data/spreadsheet/53282b.xlsx
rename to poi-main/src/test/resources/spreadsheet/53282b.xlsx
diff --git a/test-data/spreadsheet/53404.xls b/poi-main/src/test/resources/spreadsheet/53404.xls
similarity index 100%
rename from test-data/spreadsheet/53404.xls
rename to poi-main/src/test/resources/spreadsheet/53404.xls
diff --git a/test-data/spreadsheet/53446.xls b/poi-main/src/test/resources/spreadsheet/53446.xls
similarity index 100%
rename from test-data/spreadsheet/53446.xls
rename to poi-main/src/test/resources/spreadsheet/53446.xls
diff --git a/test-data/spreadsheet/53568.xlsx b/poi-main/src/test/resources/spreadsheet/53568.xlsx
similarity index 100%
rename from test-data/spreadsheet/53568.xlsx
rename to poi-main/src/test/resources/spreadsheet/53568.xlsx
diff --git a/test-data/spreadsheet/53588.xls b/poi-main/src/test/resources/spreadsheet/53588.xls
similarity index 100%
rename from test-data/spreadsheet/53588.xls
rename to poi-main/src/test/resources/spreadsheet/53588.xls
diff --git a/test-data/spreadsheet/53734.xlsx b/poi-main/src/test/resources/spreadsheet/53734.xlsx
similarity index 100%
rename from test-data/spreadsheet/53734.xlsx
rename to poi-main/src/test/resources/spreadsheet/53734.xlsx
diff --git a/test-data/spreadsheet/53798.xlsx b/poi-main/src/test/resources/spreadsheet/53798.xlsx
similarity index 100%
rename from test-data/spreadsheet/53798.xlsx
rename to poi-main/src/test/resources/spreadsheet/53798.xlsx
diff --git a/test-data/spreadsheet/53798_shiftNegative_TMPL.xls b/poi-main/src/test/resources/spreadsheet/53798_shiftNegative_TMPL.xls
similarity index 100%
rename from test-data/spreadsheet/53798_shiftNegative_TMPL.xls
rename to poi-main/src/test/resources/spreadsheet/53798_shiftNegative_TMPL.xls
diff --git a/test-data/spreadsheet/53798_shiftNegative_TMPL.xlsx b/poi-main/src/test/resources/spreadsheet/53798_shiftNegative_TMPL.xlsx
similarity index 100%
rename from test-data/spreadsheet/53798_shiftNegative_TMPL.xlsx
rename to poi-main/src/test/resources/spreadsheet/53798_shiftNegative_TMPL.xlsx
diff --git a/test-data/spreadsheet/53972.xls b/poi-main/src/test/resources/spreadsheet/53972.xls
similarity index 100%
rename from test-data/spreadsheet/53972.xls
rename to poi-main/src/test/resources/spreadsheet/53972.xls
diff --git a/test-data/spreadsheet/54016.xls b/poi-main/src/test/resources/spreadsheet/54016.xls
similarity index 100%
rename from test-data/spreadsheet/54016.xls
rename to poi-main/src/test/resources/spreadsheet/54016.xls
diff --git a/test-data/spreadsheet/54071.xlsx b/poi-main/src/test/resources/spreadsheet/54071.xlsx
similarity index 100%
rename from test-data/spreadsheet/54071.xlsx
rename to poi-main/src/test/resources/spreadsheet/54071.xlsx
diff --git a/test-data/spreadsheet/54084 - Greek - beyond BMP.txt b/poi-main/src/test/resources/spreadsheet/54084 - Greek - beyond BMP.txt
similarity index 100%
rename from test-data/spreadsheet/54084 - Greek - beyond BMP.txt
rename to poi-main/src/test/resources/spreadsheet/54084 - Greek - beyond BMP.txt
diff --git a/test-data/spreadsheet/54084 - Greek - beyond BMP.xlsx b/poi-main/src/test/resources/spreadsheet/54084 - Greek - beyond BMP.xlsx
similarity index 100%
rename from test-data/spreadsheet/54084 - Greek - beyond BMP.xlsx
rename to poi-main/src/test/resources/spreadsheet/54084 - Greek - beyond BMP.xlsx
diff --git a/test-data/spreadsheet/54206.xls b/poi-main/src/test/resources/spreadsheet/54206.xls
similarity index 100%
rename from test-data/spreadsheet/54206.xls
rename to poi-main/src/test/resources/spreadsheet/54206.xls
diff --git a/test-data/spreadsheet/54206.xlsx b/poi-main/src/test/resources/spreadsheet/54206.xlsx
similarity index 100%
rename from test-data/spreadsheet/54206.xlsx
rename to poi-main/src/test/resources/spreadsheet/54206.xlsx
diff --git a/test-data/spreadsheet/54288-ref.xlsx b/poi-main/src/test/resources/spreadsheet/54288-ref.xlsx
similarity index 100%
rename from test-data/spreadsheet/54288-ref.xlsx
rename to poi-main/src/test/resources/spreadsheet/54288-ref.xlsx
diff --git a/test-data/spreadsheet/54288.xlsx b/poi-main/src/test/resources/spreadsheet/54288.xlsx
similarity index 100%
rename from test-data/spreadsheet/54288.xlsx
rename to poi-main/src/test/resources/spreadsheet/54288.xlsx
diff --git a/test-data/spreadsheet/54436.xlsx b/poi-main/src/test/resources/spreadsheet/54436.xlsx
similarity index 100%
rename from test-data/spreadsheet/54436.xlsx
rename to poi-main/src/test/resources/spreadsheet/54436.xlsx
diff --git a/test-data/spreadsheet/54500.xls b/poi-main/src/test/resources/spreadsheet/54500.xls
similarity index 100%
rename from test-data/spreadsheet/54500.xls
rename to poi-main/src/test/resources/spreadsheet/54500.xls
diff --git a/test-data/spreadsheet/54524.xlsx b/poi-main/src/test/resources/spreadsheet/54524.xlsx
similarity index 100%
rename from test-data/spreadsheet/54524.xlsx
rename to poi-main/src/test/resources/spreadsheet/54524.xlsx
diff --git a/test-data/spreadsheet/54607.xlsx b/poi-main/src/test/resources/spreadsheet/54607.xlsx
similarity index 100%
rename from test-data/spreadsheet/54607.xlsx
rename to poi-main/src/test/resources/spreadsheet/54607.xlsx
diff --git a/test-data/spreadsheet/54686_fraction_formats.txt b/poi-main/src/test/resources/spreadsheet/54686_fraction_formats.txt
similarity index 100%
rename from test-data/spreadsheet/54686_fraction_formats.txt
rename to poi-main/src/test/resources/spreadsheet/54686_fraction_formats.txt
diff --git a/test-data/spreadsheet/54686_fraction_formats.xls b/poi-main/src/test/resources/spreadsheet/54686_fraction_formats.xls
similarity index 100%
rename from test-data/spreadsheet/54686_fraction_formats.xls
rename to poi-main/src/test/resources/spreadsheet/54686_fraction_formats.xls
diff --git a/test-data/spreadsheet/55341_CellStyleBorder.xls b/poi-main/src/test/resources/spreadsheet/55341_CellStyleBorder.xls
similarity index 100%
rename from test-data/spreadsheet/55341_CellStyleBorder.xls
rename to poi-main/src/test/resources/spreadsheet/55341_CellStyleBorder.xls
diff --git a/test-data/spreadsheet/55640.xlsx b/poi-main/src/test/resources/spreadsheet/55640.xlsx
similarity index 100%
rename from test-data/spreadsheet/55640.xlsx
rename to poi-main/src/test/resources/spreadsheet/55640.xlsx
diff --git a/test-data/spreadsheet/55745.xlsx b/poi-main/src/test/resources/spreadsheet/55745.xlsx
similarity index 100%
rename from test-data/spreadsheet/55745.xlsx
rename to poi-main/src/test/resources/spreadsheet/55745.xlsx
diff --git a/test-data/spreadsheet/55850.xlsx b/poi-main/src/test/resources/spreadsheet/55850.xlsx
similarity index 100%
rename from test-data/spreadsheet/55850.xlsx
rename to poi-main/src/test/resources/spreadsheet/55850.xlsx
diff --git a/test-data/spreadsheet/55923.xlsx b/poi-main/src/test/resources/spreadsheet/55923.xlsx
similarity index 100%
rename from test-data/spreadsheet/55923.xlsx
rename to poi-main/src/test/resources/spreadsheet/55923.xlsx
diff --git a/test-data/spreadsheet/55924.xlsx b/poi-main/src/test/resources/spreadsheet/55924.xlsx
similarity index 100%
rename from test-data/spreadsheet/55924.xlsx
rename to poi-main/src/test/resources/spreadsheet/55924.xlsx
diff --git a/test-data/spreadsheet/55926.xlsx b/poi-main/src/test/resources/spreadsheet/55926.xlsx
similarity index 100%
rename from test-data/spreadsheet/55926.xlsx
rename to poi-main/src/test/resources/spreadsheet/55926.xlsx
diff --git a/test-data/spreadsheet/55927.xlsx b/poi-main/src/test/resources/spreadsheet/55927.xlsx
similarity index 100%
rename from test-data/spreadsheet/55927.xlsx
rename to poi-main/src/test/resources/spreadsheet/55927.xlsx
diff --git a/test-data/spreadsheet/56011.xlsx b/poi-main/src/test/resources/spreadsheet/56011.xlsx
similarity index 100%
rename from test-data/spreadsheet/56011.xlsx
rename to poi-main/src/test/resources/spreadsheet/56011.xlsx
diff --git a/test-data/spreadsheet/56017.xlsx b/poi-main/src/test/resources/spreadsheet/56017.xlsx
similarity index 100%
rename from test-data/spreadsheet/56017.xlsx
rename to poi-main/src/test/resources/spreadsheet/56017.xlsx
diff --git a/test-data/spreadsheet/56169.xlsx b/poi-main/src/test/resources/spreadsheet/56169.xlsx
similarity index 100%
rename from test-data/spreadsheet/56169.xlsx
rename to poi-main/src/test/resources/spreadsheet/56169.xlsx
diff --git a/test-data/spreadsheet/56278.xlsx b/poi-main/src/test/resources/spreadsheet/56278.xlsx
similarity index 100%
rename from test-data/spreadsheet/56278.xlsx
rename to poi-main/src/test/resources/spreadsheet/56278.xlsx
diff --git a/test-data/spreadsheet/AbnormalSharedFormulaFlag.xls b/poi-main/src/test/resources/spreadsheet/AbnormalSharedFormulaFlag.xls
similarity index 100%
rename from test-data/spreadsheet/AbnormalSharedFormulaFlag.xls
rename to poi-main/src/test/resources/spreadsheet/AbnormalSharedFormulaFlag.xls
diff --git a/test-data/spreadsheet/AreaErrPtg.xls b/poi-main/src/test/resources/spreadsheet/AreaErrPtg.xls
similarity index 100%
rename from test-data/spreadsheet/AreaErrPtg.xls
rename to poi-main/src/test/resources/spreadsheet/AreaErrPtg.xls
diff --git a/test-data/spreadsheet/AverageTaxRates.xlsx b/poi-main/src/test/resources/spreadsheet/AverageTaxRates.xlsx
similarity index 100%
rename from test-data/spreadsheet/AverageTaxRates.xlsx
rename to poi-main/src/test/resources/spreadsheet/AverageTaxRates.xlsx
diff --git a/test-data/spreadsheet/BOOK_in_capitals.xls b/poi-main/src/test/resources/spreadsheet/BOOK_in_capitals.xls
similarity index 100%
rename from test-data/spreadsheet/BOOK_in_capitals.xls
rename to poi-main/src/test/resources/spreadsheet/BOOK_in_capitals.xls
diff --git a/test-data/spreadsheet/BigSSTRecord b/poi-main/src/test/resources/spreadsheet/BigSSTRecord
similarity index 100%
rename from test-data/spreadsheet/BigSSTRecord
rename to poi-main/src/test/resources/spreadsheet/BigSSTRecord
diff --git a/test-data/spreadsheet/BigSSTRecord2 b/poi-main/src/test/resources/spreadsheet/BigSSTRecord2
similarity index 100%
rename from test-data/spreadsheet/BigSSTRecord2
rename to poi-main/src/test/resources/spreadsheet/BigSSTRecord2
diff --git a/test-data/spreadsheet/BigSSTRecord2CR1 b/poi-main/src/test/resources/spreadsheet/BigSSTRecord2CR1
similarity index 100%
rename from test-data/spreadsheet/BigSSTRecord2CR1
rename to poi-main/src/test/resources/spreadsheet/BigSSTRecord2CR1
diff --git a/test-data/spreadsheet/BigSSTRecord2CR2 b/poi-main/src/test/resources/spreadsheet/BigSSTRecord2CR2
similarity index 100%
rename from test-data/spreadsheet/BigSSTRecord2CR2
rename to poi-main/src/test/resources/spreadsheet/BigSSTRecord2CR2
diff --git a/test-data/spreadsheet/BigSSTRecord2CR3 b/poi-main/src/test/resources/spreadsheet/BigSSTRecord2CR3
similarity index 100%
rename from test-data/spreadsheet/BigSSTRecord2CR3
rename to poi-main/src/test/resources/spreadsheet/BigSSTRecord2CR3
diff --git a/test-data/spreadsheet/BigSSTRecord2CR4 b/poi-main/src/test/resources/spreadsheet/BigSSTRecord2CR4
similarity index 100%
rename from test-data/spreadsheet/BigSSTRecord2CR4
rename to poi-main/src/test/resources/spreadsheet/BigSSTRecord2CR4
diff --git a/test-data/spreadsheet/BigSSTRecord2CR5 b/poi-main/src/test/resources/spreadsheet/BigSSTRecord2CR5
similarity index 100%
rename from test-data/spreadsheet/BigSSTRecord2CR5
rename to poi-main/src/test/resources/spreadsheet/BigSSTRecord2CR5
diff --git a/test-data/spreadsheet/BigSSTRecord2CR6 b/poi-main/src/test/resources/spreadsheet/BigSSTRecord2CR6
similarity index 100%
rename from test-data/spreadsheet/BigSSTRecord2CR6
rename to poi-main/src/test/resources/spreadsheet/BigSSTRecord2CR6
diff --git a/test-data/spreadsheet/BigSSTRecord2CR7 b/poi-main/src/test/resources/spreadsheet/BigSSTRecord2CR7
similarity index 100%
rename from test-data/spreadsheet/BigSSTRecord2CR7
rename to poi-main/src/test/resources/spreadsheet/BigSSTRecord2CR7
diff --git a/test-data/spreadsheet/BigSSTRecordCR b/poi-main/src/test/resources/spreadsheet/BigSSTRecordCR
similarity index 100%
rename from test-data/spreadsheet/BigSSTRecordCR
rename to poi-main/src/test/resources/spreadsheet/BigSSTRecordCR
diff --git a/test-data/spreadsheet/Booleans.xlsx b/poi-main/src/test/resources/spreadsheet/Booleans.xlsx
similarity index 100%
rename from test-data/spreadsheet/Booleans.xlsx
rename to poi-main/src/test/resources/spreadsheet/Booleans.xlsx
diff --git a/test-data/spreadsheet/BrNotClosed.xlsx b/poi-main/src/test/resources/spreadsheet/BrNotClosed.xlsx
similarity index 100%
rename from test-data/spreadsheet/BrNotClosed.xlsx
rename to poi-main/src/test/resources/spreadsheet/BrNotClosed.xlsx
diff --git a/test-data/spreadsheet/CodeFunctionTestCaseData.xls b/poi-main/src/test/resources/spreadsheet/CodeFunctionTestCaseData.xls
similarity index 100%
rename from test-data/spreadsheet/CodeFunctionTestCaseData.xls
rename to poi-main/src/test/resources/spreadsheet/CodeFunctionTestCaseData.xls
diff --git a/test-data/spreadsheet/ColumnStyle1dp.xls b/poi-main/src/test/resources/spreadsheet/ColumnStyle1dp.xls
similarity index 100%
rename from test-data/spreadsheet/ColumnStyle1dp.xls
rename to poi-main/src/test/resources/spreadsheet/ColumnStyle1dp.xls
diff --git a/test-data/spreadsheet/ColumnStyle1dpColoured.xls b/poi-main/src/test/resources/spreadsheet/ColumnStyle1dpColoured.xls
similarity index 100%
rename from test-data/spreadsheet/ColumnStyle1dpColoured.xls
rename to poi-main/src/test/resources/spreadsheet/ColumnStyle1dpColoured.xls
diff --git a/test-data/spreadsheet/ColumnStyleNone.xls b/poi-main/src/test/resources/spreadsheet/ColumnStyleNone.xls
similarity index 100%
rename from test-data/spreadsheet/ColumnStyleNone.xls
rename to poi-main/src/test/resources/spreadsheet/ColumnStyleNone.xls
diff --git a/test-data/spreadsheet/ComplexFunctionTestCaseData.xls b/poi-main/src/test/resources/spreadsheet/ComplexFunctionTestCaseData.xls
similarity index 100%
rename from test-data/spreadsheet/ComplexFunctionTestCaseData.xls
rename to poi-main/src/test/resources/spreadsheet/ComplexFunctionTestCaseData.xls
diff --git a/test-data/spreadsheet/ContinueRecordProblem.xls b/poi-main/src/test/resources/spreadsheet/ContinueRecordProblem.xls
similarity index 100%
rename from test-data/spreadsheet/ContinueRecordProblem.xls
rename to poi-main/src/test/resources/spreadsheet/ContinueRecordProblem.xls
diff --git a/test-data/spreadsheet/CustomXMLMapping-singleattributenamespace.xlsx b/poi-main/src/test/resources/spreadsheet/CustomXMLMapping-singleattributenamespace.xlsx
similarity index 100%
rename from test-data/spreadsheet/CustomXMLMapping-singleattributenamespace.xlsx
rename to poi-main/src/test/resources/spreadsheet/CustomXMLMapping-singleattributenamespace.xlsx
diff --git a/test-data/spreadsheet/CustomXMLMappings-complex-type.xlsx b/poi-main/src/test/resources/spreadsheet/CustomXMLMappings-complex-type.xlsx
similarity index 100%
rename from test-data/spreadsheet/CustomXMLMappings-complex-type.xlsx
rename to poi-main/src/test/resources/spreadsheet/CustomXMLMappings-complex-type.xlsx
diff --git a/test-data/spreadsheet/CustomXMLMappings.xlsx b/poi-main/src/test/resources/spreadsheet/CustomXMLMappings.xlsx
similarity index 100%
rename from test-data/spreadsheet/CustomXMLMappings.xlsx
rename to poi-main/src/test/resources/spreadsheet/CustomXMLMappings.xlsx
diff --git a/test-data/spreadsheet/CustomXmlMappings-inverse-order.xlsx b/poi-main/src/test/resources/spreadsheet/CustomXmlMappings-inverse-order.xlsx
similarity index 100%
rename from test-data/spreadsheet/CustomXmlMappings-inverse-order.xlsx
rename to poi-main/src/test/resources/spreadsheet/CustomXmlMappings-inverse-order.xlsx
diff --git a/test-data/spreadsheet/DBCSHeader.xls b/poi-main/src/test/resources/spreadsheet/DBCSHeader.xls
similarity index 100%
rename from test-data/spreadsheet/DBCSHeader.xls
rename to poi-main/src/test/resources/spreadsheet/DBCSHeader.xls
diff --git a/test-data/spreadsheet/DBCSSheetName.xls b/poi-main/src/test/resources/spreadsheet/DBCSSheetName.xls
similarity index 100%
rename from test-data/spreadsheet/DBCSSheetName.xls
rename to poi-main/src/test/resources/spreadsheet/DBCSSheetName.xls
diff --git a/test-data/spreadsheet/DataValidations-49244.xlsx b/poi-main/src/test/resources/spreadsheet/DataValidations-49244.xlsx
similarity index 100%
rename from test-data/spreadsheet/DataValidations-49244.xlsx
rename to poi-main/src/test/resources/spreadsheet/DataValidations-49244.xlsx
diff --git a/test-data/spreadsheet/DateFormatTests.xlsx b/poi-main/src/test/resources/spreadsheet/DateFormatTests.xlsx
similarity index 100%
rename from test-data/spreadsheet/DateFormatTests.xlsx
rename to poi-main/src/test/resources/spreadsheet/DateFormatTests.xlsx
diff --git a/test-data/spreadsheet/DateFormats.xls b/poi-main/src/test/resources/spreadsheet/DateFormats.xls
similarity index 100%
rename from test-data/spreadsheet/DateFormats.xls
rename to poi-main/src/test/resources/spreadsheet/DateFormats.xls
diff --git a/test-data/spreadsheet/DeltaFunctionTestCaseData.xls b/poi-main/src/test/resources/spreadsheet/DeltaFunctionTestCaseData.xls
similarity index 100%
rename from test-data/spreadsheet/DeltaFunctionTestCaseData.xls
rename to poi-main/src/test/resources/spreadsheet/DeltaFunctionTestCaseData.xls
diff --git a/test-data/spreadsheet/DrawingAndComments.xls b/poi-main/src/test/resources/spreadsheet/DrawingAndComments.xls
similarity index 100%
rename from test-data/spreadsheet/DrawingAndComments.xls
rename to poi-main/src/test/resources/spreadsheet/DrawingAndComments.xls
diff --git a/test-data/spreadsheet/DrawingContinue.xls b/poi-main/src/test/resources/spreadsheet/DrawingContinue.xls
similarity index 100%
rename from test-data/spreadsheet/DrawingContinue.xls
rename to poi-main/src/test/resources/spreadsheet/DrawingContinue.xls
diff --git a/test-data/spreadsheet/ElapsedFormatTests.xlsx b/poi-main/src/test/resources/spreadsheet/ElapsedFormatTests.xlsx
similarity index 100%
rename from test-data/spreadsheet/ElapsedFormatTests.xlsx
rename to poi-main/src/test/resources/spreadsheet/ElapsedFormatTests.xlsx
diff --git a/test-data/spreadsheet/EmbeddedChartHeaderTest.xls b/poi-main/src/test/resources/spreadsheet/EmbeddedChartHeaderTest.xls
similarity index 100%
rename from test-data/spreadsheet/EmbeddedChartHeaderTest.xls
rename to poi-main/src/test/resources/spreadsheet/EmbeddedChartHeaderTest.xls
diff --git a/test-data/spreadsheet/Employee.xls b/poi-main/src/test/resources/spreadsheet/Employee.xls
similarity index 100%
rename from test-data/spreadsheet/Employee.xls
rename to poi-main/src/test/resources/spreadsheet/Employee.xls
diff --git a/test-data/spreadsheet/ErrPtg.xls b/poi-main/src/test/resources/spreadsheet/ErrPtg.xls
similarity index 100%
rename from test-data/spreadsheet/ErrPtg.xls
rename to poi-main/src/test/resources/spreadsheet/ErrPtg.xls
diff --git a/test-data/spreadsheet/ExcelWithAttachments.xlsm b/poi-main/src/test/resources/spreadsheet/ExcelWithAttachments.xlsm
similarity index 100%
rename from test-data/spreadsheet/ExcelWithAttachments.xlsm
rename to poi-main/src/test/resources/spreadsheet/ExcelWithAttachments.xlsm
diff --git a/test-data/spreadsheet/FactDoubleFunctionTestCaseData.xls b/poi-main/src/test/resources/spreadsheet/FactDoubleFunctionTestCaseData.xls
similarity index 100%
rename from test-data/spreadsheet/FactDoubleFunctionTestCaseData.xls
rename to poi-main/src/test/resources/spreadsheet/FactDoubleFunctionTestCaseData.xls
diff --git a/test-data/spreadsheet/ForShifting.xls b/poi-main/src/test/resources/spreadsheet/ForShifting.xls
similarity index 100%
rename from test-data/spreadsheet/ForShifting.xls
rename to poi-main/src/test/resources/spreadsheet/ForShifting.xls
diff --git a/test-data/spreadsheet/ForShifting.xlsx b/poi-main/src/test/resources/spreadsheet/ForShifting.xlsx
similarity index 100%
rename from test-data/spreadsheet/ForShifting.xlsx
rename to poi-main/src/test/resources/spreadsheet/ForShifting.xlsx
diff --git a/test-data/spreadsheet/FormatChoiceTests.xls b/poi-main/src/test/resources/spreadsheet/FormatChoiceTests.xls
similarity index 100%
rename from test-data/spreadsheet/FormatChoiceTests.xls
rename to poi-main/src/test/resources/spreadsheet/FormatChoiceTests.xls
diff --git a/test-data/spreadsheet/FormatChoiceTests.xlsx b/poi-main/src/test/resources/spreadsheet/FormatChoiceTests.xlsx
similarity index 100%
rename from test-data/spreadsheet/FormatChoiceTests.xlsx
rename to poi-main/src/test/resources/spreadsheet/FormatChoiceTests.xlsx
diff --git a/test-data/spreadsheet/FormatConditionTests.xlsx b/poi-main/src/test/resources/spreadsheet/FormatConditionTests.xlsx
similarity index 100%
rename from test-data/spreadsheet/FormatConditionTests.xlsx
rename to poi-main/src/test/resources/spreadsheet/FormatConditionTests.xlsx
diff --git a/test-data/spreadsheet/Formatting.xls b/poi-main/src/test/resources/spreadsheet/Formatting.xls
similarity index 100%
rename from test-data/spreadsheet/Formatting.xls
rename to poi-main/src/test/resources/spreadsheet/Formatting.xls
diff --git a/test-data/spreadsheet/Formatting.xlsx b/poi-main/src/test/resources/spreadsheet/Formatting.xlsx
similarity index 100%
rename from test-data/spreadsheet/Formatting.xlsx
rename to poi-main/src/test/resources/spreadsheet/Formatting.xlsx
diff --git a/test-data/spreadsheet/FormulaEvalTestData.xls b/poi-main/src/test/resources/spreadsheet/FormulaEvalTestData.xls
similarity index 100%
rename from test-data/spreadsheet/FormulaEvalTestData.xls
rename to poi-main/src/test/resources/spreadsheet/FormulaEvalTestData.xls
diff --git a/test-data/spreadsheet/FormulaEvalTestData_Copy.xlsx b/poi-main/src/test/resources/spreadsheet/FormulaEvalTestData_Copy.xlsx
similarity index 100%
rename from test-data/spreadsheet/FormulaEvalTestData_Copy.xlsx
rename to poi-main/src/test/resources/spreadsheet/FormulaEvalTestData_Copy.xlsx
diff --git a/test-data/spreadsheet/FormulaRefs.xls b/poi-main/src/test/resources/spreadsheet/FormulaRefs.xls
similarity index 100%
rename from test-data/spreadsheet/FormulaRefs.xls
rename to poi-main/src/test/resources/spreadsheet/FormulaRefs.xls
diff --git a/test-data/spreadsheet/GeneralFormatTests.xlsx b/poi-main/src/test/resources/spreadsheet/GeneralFormatTests.xlsx
similarity index 100%
rename from test-data/spreadsheet/GeneralFormatTests.xlsx
rename to poi-main/src/test/resources/spreadsheet/GeneralFormatTests.xlsx
diff --git a/test-data/spreadsheet/GroupTest.xlsx b/poi-main/src/test/resources/spreadsheet/GroupTest.xlsx
similarity index 100%
rename from test-data/spreadsheet/GroupTest.xlsx
rename to poi-main/src/test/resources/spreadsheet/GroupTest.xlsx
diff --git a/test-data/spreadsheet/HyperlinksOnManySheets.xls b/poi-main/src/test/resources/spreadsheet/HyperlinksOnManySheets.xls
similarity index 100%
rename from test-data/spreadsheet/HyperlinksOnManySheets.xls
rename to poi-main/src/test/resources/spreadsheet/HyperlinksOnManySheets.xls
diff --git a/test-data/spreadsheet/IfFormulaTest.xls b/poi-main/src/test/resources/spreadsheet/IfFormulaTest.xls
similarity index 100%
rename from test-data/spreadsheet/IfFormulaTest.xls
rename to poi-main/src/test/resources/spreadsheet/IfFormulaTest.xls
diff --git a/test-data/spreadsheet/ImRealFunctionTestCaseData.xls b/poi-main/src/test/resources/spreadsheet/ImRealFunctionTestCaseData.xls
similarity index 100%
rename from test-data/spreadsheet/ImRealFunctionTestCaseData.xls
rename to poi-main/src/test/resources/spreadsheet/ImRealFunctionTestCaseData.xls
diff --git a/test-data/spreadsheet/ImaginaryFunctionTestCaseData.xls b/poi-main/src/test/resources/spreadsheet/ImaginaryFunctionTestCaseData.xls
similarity index 100%
rename from test-data/spreadsheet/ImaginaryFunctionTestCaseData.xls
rename to poi-main/src/test/resources/spreadsheet/ImaginaryFunctionTestCaseData.xls
diff --git a/test-data/spreadsheet/IndexFunctionTestCaseData.xls b/poi-main/src/test/resources/spreadsheet/IndexFunctionTestCaseData.xls
similarity index 100%
rename from test-data/spreadsheet/IndexFunctionTestCaseData.xls
rename to poi-main/src/test/resources/spreadsheet/IndexFunctionTestCaseData.xls
diff --git a/test-data/spreadsheet/IndirectFunctionTestCaseData.xls b/poi-main/src/test/resources/spreadsheet/IndirectFunctionTestCaseData.xls
similarity index 100%
rename from test-data/spreadsheet/IndirectFunctionTestCaseData.xls
rename to poi-main/src/test/resources/spreadsheet/IndirectFunctionTestCaseData.xls
diff --git a/test-data/spreadsheet/InlineStrings.xlsx b/poi-main/src/test/resources/spreadsheet/InlineStrings.xlsx
similarity index 100%
rename from test-data/spreadsheet/InlineStrings.xlsx
rename to poi-main/src/test/resources/spreadsheet/InlineStrings.xlsx
diff --git a/test-data/spreadsheet/IntersectionPtg.xls b/poi-main/src/test/resources/spreadsheet/IntersectionPtg.xls
similarity index 100%
rename from test-data/spreadsheet/IntersectionPtg.xls
rename to poi-main/src/test/resources/spreadsheet/IntersectionPtg.xls
diff --git a/test-data/spreadsheet/IrrNpvTestCaseData.xls b/poi-main/src/test/resources/spreadsheet/IrrNpvTestCaseData.xls
similarity index 100%
rename from test-data/spreadsheet/IrrNpvTestCaseData.xls
rename to poi-main/src/test/resources/spreadsheet/IrrNpvTestCaseData.xls
diff --git a/test-data/spreadsheet/LookupFunctionsTestCaseData.xls b/poi-main/src/test/resources/spreadsheet/LookupFunctionsTestCaseData.xls
similarity index 100%
rename from test-data/spreadsheet/LookupFunctionsTestCaseData.xls
rename to poi-main/src/test/resources/spreadsheet/LookupFunctionsTestCaseData.xls
diff --git a/test-data/spreadsheet/MRExtraLines.xls b/poi-main/src/test/resources/spreadsheet/MRExtraLines.xls
similarity index 100%
rename from test-data/spreadsheet/MRExtraLines.xls
rename to poi-main/src/test/resources/spreadsheet/MRExtraLines.xls
diff --git a/test-data/spreadsheet/MatchFunctionTestCaseData.xls b/poi-main/src/test/resources/spreadsheet/MatchFunctionTestCaseData.xls
similarity index 100%
rename from test-data/spreadsheet/MatchFunctionTestCaseData.xls
rename to poi-main/src/test/resources/spreadsheet/MatchFunctionTestCaseData.xls
diff --git a/test-data/spreadsheet/MissingBits.xls b/poi-main/src/test/resources/spreadsheet/MissingBits.xls
similarity index 100%
rename from test-data/spreadsheet/MissingBits.xls
rename to poi-main/src/test/resources/spreadsheet/MissingBits.xls
diff --git a/test-data/spreadsheet/NewlineInFormulas.xlsx b/poi-main/src/test/resources/spreadsheet/NewlineInFormulas.xlsx
similarity index 100%
rename from test-data/spreadsheet/NewlineInFormulas.xlsx
rename to poi-main/src/test/resources/spreadsheet/NewlineInFormulas.xlsx
diff --git a/test-data/spreadsheet/NoGutsRecords.xls b/poi-main/src/test/resources/spreadsheet/NoGutsRecords.xls
similarity index 100%
rename from test-data/spreadsheet/NoGutsRecords.xls
rename to poi-main/src/test/resources/spreadsheet/NoGutsRecords.xls
diff --git a/test-data/spreadsheet/NumberFormatApproxTests.xlsx b/poi-main/src/test/resources/spreadsheet/NumberFormatApproxTests.xlsx
similarity index 100%
rename from test-data/spreadsheet/NumberFormatApproxTests.xlsx
rename to poi-main/src/test/resources/spreadsheet/NumberFormatApproxTests.xlsx
diff --git a/test-data/spreadsheet/NumberFormatTests.xlsx b/poi-main/src/test/resources/spreadsheet/NumberFormatTests.xlsx
similarity index 100%
rename from test-data/spreadsheet/NumberFormatTests.xlsx
rename to poi-main/src/test/resources/spreadsheet/NumberFormatTests.xlsx
diff --git a/test-data/spreadsheet/OddStyleRecord.xls b/poi-main/src/test/resources/spreadsheet/OddStyleRecord.xls
similarity index 100%
rename from test-data/spreadsheet/OddStyleRecord.xls
rename to poi-main/src/test/resources/spreadsheet/OddStyleRecord.xls
diff --git a/test-data/spreadsheet/PercentPtg.xls b/poi-main/src/test/resources/spreadsheet/PercentPtg.xls
similarity index 100%
rename from test-data/spreadsheet/PercentPtg.xls
rename to poi-main/src/test/resources/spreadsheet/PercentPtg.xls
diff --git a/test-data/spreadsheet/QuotientFunctionTestCaseData.xls b/poi-main/src/test/resources/spreadsheet/QuotientFunctionTestCaseData.xls
similarity index 100%
rename from test-data/spreadsheet/QuotientFunctionTestCaseData.xls
rename to poi-main/src/test/resources/spreadsheet/QuotientFunctionTestCaseData.xls
diff --git a/test-data/spreadsheet/RangePtg.xls b/poi-main/src/test/resources/spreadsheet/RangePtg.xls
similarity index 100%
rename from test-data/spreadsheet/RangePtg.xls
rename to poi-main/src/test/resources/spreadsheet/RangePtg.xls
diff --git a/test-data/spreadsheet/ReadOnlyRecommended.xls b/poi-main/src/test/resources/spreadsheet/ReadOnlyRecommended.xls
similarity index 100%
rename from test-data/spreadsheet/ReadOnlyRecommended.xls
rename to poi-main/src/test/resources/spreadsheet/ReadOnlyRecommended.xls
diff --git a/test-data/spreadsheet/ReferencePtg.xls b/poi-main/src/test/resources/spreadsheet/ReferencePtg.xls
similarity index 100%
rename from test-data/spreadsheet/ReferencePtg.xls
rename to poi-main/src/test/resources/spreadsheet/ReferencePtg.xls
diff --git a/test-data/spreadsheet/RepeatingRowsCols.xls b/poi-main/src/test/resources/spreadsheet/RepeatingRowsCols.xls
similarity index 100%
rename from test-data/spreadsheet/RepeatingRowsCols.xls
rename to poi-main/src/test/resources/spreadsheet/RepeatingRowsCols.xls
diff --git a/test-data/spreadsheet/RepeatingRowsCols.xlsx b/poi-main/src/test/resources/spreadsheet/RepeatingRowsCols.xlsx
similarity index 100%
rename from test-data/spreadsheet/RepeatingRowsCols.xlsx
rename to poi-main/src/test/resources/spreadsheet/RepeatingRowsCols.xlsx
diff --git a/test-data/spreadsheet/ReptFunctionTestCaseData.xls b/poi-main/src/test/resources/spreadsheet/ReptFunctionTestCaseData.xls
similarity index 100%
rename from test-data/spreadsheet/ReptFunctionTestCaseData.xls
rename to poi-main/src/test/resources/spreadsheet/ReptFunctionTestCaseData.xls
diff --git a/test-data/spreadsheet/RomanFunctionTestCaseData.xls b/poi-main/src/test/resources/spreadsheet/RomanFunctionTestCaseData.xls
similarity index 100%
rename from test-data/spreadsheet/RomanFunctionTestCaseData.xls
rename to poi-main/src/test/resources/spreadsheet/RomanFunctionTestCaseData.xls
diff --git a/test-data/spreadsheet/SampleSS.txt b/poi-main/src/test/resources/spreadsheet/SampleSS.txt
similarity index 100%
rename from test-data/spreadsheet/SampleSS.txt
rename to poi-main/src/test/resources/spreadsheet/SampleSS.txt
diff --git a/test-data/spreadsheet/SampleSS.xls b/poi-main/src/test/resources/spreadsheet/SampleSS.xls
similarity index 100%
rename from test-data/spreadsheet/SampleSS.xls
rename to poi-main/src/test/resources/spreadsheet/SampleSS.xls
diff --git a/test-data/spreadsheet/SampleSS.xlsx b/poi-main/src/test/resources/spreadsheet/SampleSS.xlsx
similarity index 100%
rename from test-data/spreadsheet/SampleSS.xlsx
rename to poi-main/src/test/resources/spreadsheet/SampleSS.xlsx
diff --git a/test-data/spreadsheet/SharedFormulaTest.xls b/poi-main/src/test/resources/spreadsheet/SharedFormulaTest.xls
similarity index 100%
rename from test-data/spreadsheet/SharedFormulaTest.xls
rename to poi-main/src/test/resources/spreadsheet/SharedFormulaTest.xls
diff --git a/test-data/spreadsheet/SheetWithDrawing.xls b/poi-main/src/test/resources/spreadsheet/SheetWithDrawing.xls
similarity index 100%
rename from test-data/spreadsheet/SheetWithDrawing.xls
rename to poi-main/src/test/resources/spreadsheet/SheetWithDrawing.xls
diff --git a/test-data/spreadsheet/ShrinkToFit.xls b/poi-main/src/test/resources/spreadsheet/ShrinkToFit.xls
similarity index 100%
rename from test-data/spreadsheet/ShrinkToFit.xls
rename to poi-main/src/test/resources/spreadsheet/ShrinkToFit.xls
diff --git a/test-data/spreadsheet/ShrinkToFit.xlsx b/poi-main/src/test/resources/spreadsheet/ShrinkToFit.xlsx
similarity index 100%
rename from test-data/spreadsheet/ShrinkToFit.xlsx
rename to poi-main/src/test/resources/spreadsheet/ShrinkToFit.xlsx
diff --git a/test-data/spreadsheet/Simple.xls b/poi-main/src/test/resources/spreadsheet/Simple.xls
similarity index 100%
rename from test-data/spreadsheet/Simple.xls
rename to poi-main/src/test/resources/spreadsheet/Simple.xls
diff --git a/test-data/spreadsheet/SimpleChart.xls b/poi-main/src/test/resources/spreadsheet/SimpleChart.xls
similarity index 100%
rename from test-data/spreadsheet/SimpleChart.xls
rename to poi-main/src/test/resources/spreadsheet/SimpleChart.xls
diff --git a/test-data/spreadsheet/SimpleMultiCell.xls b/poi-main/src/test/resources/spreadsheet/SimpleMultiCell.xls
similarity index 100%
rename from test-data/spreadsheet/SimpleMultiCell.xls
rename to poi-main/src/test/resources/spreadsheet/SimpleMultiCell.xls
diff --git a/test-data/spreadsheet/SimpleMultiCell.xlsx b/poi-main/src/test/resources/spreadsheet/SimpleMultiCell.xlsx
similarity index 100%
rename from test-data/spreadsheet/SimpleMultiCell.xlsx
rename to poi-main/src/test/resources/spreadsheet/SimpleMultiCell.xlsx
diff --git a/test-data/spreadsheet/SimpleWithAutofilter.xls b/poi-main/src/test/resources/spreadsheet/SimpleWithAutofilter.xls
similarity index 100%
rename from test-data/spreadsheet/SimpleWithAutofilter.xls
rename to poi-main/src/test/resources/spreadsheet/SimpleWithAutofilter.xls
diff --git a/test-data/spreadsheet/SimpleWithChoose.xls b/poi-main/src/test/resources/spreadsheet/SimpleWithChoose.xls
similarity index 100%
rename from test-data/spreadsheet/SimpleWithChoose.xls
rename to poi-main/src/test/resources/spreadsheet/SimpleWithChoose.xls
diff --git a/test-data/spreadsheet/SimpleWithColours.xls b/poi-main/src/test/resources/spreadsheet/SimpleWithColours.xls
similarity index 100%
rename from test-data/spreadsheet/SimpleWithColours.xls
rename to poi-main/src/test/resources/spreadsheet/SimpleWithColours.xls
diff --git a/test-data/spreadsheet/SimpleWithComments.xls b/poi-main/src/test/resources/spreadsheet/SimpleWithComments.xls
similarity index 100%
rename from test-data/spreadsheet/SimpleWithComments.xls
rename to poi-main/src/test/resources/spreadsheet/SimpleWithComments.xls
diff --git a/test-data/spreadsheet/SimpleWithComments.xlsx b/poi-main/src/test/resources/spreadsheet/SimpleWithComments.xlsx
similarity index 100%
rename from test-data/spreadsheet/SimpleWithComments.xlsx
rename to poi-main/src/test/resources/spreadsheet/SimpleWithComments.xlsx
diff --git a/test-data/spreadsheet/SimpleWithDataFormat.xls b/poi-main/src/test/resources/spreadsheet/SimpleWithDataFormat.xls
similarity index 100%
rename from test-data/spreadsheet/SimpleWithDataFormat.xls
rename to poi-main/src/test/resources/spreadsheet/SimpleWithDataFormat.xls
diff --git a/test-data/spreadsheet/SimpleWithFormula.xls b/poi-main/src/test/resources/spreadsheet/SimpleWithFormula.xls
similarity index 100%
rename from test-data/spreadsheet/SimpleWithFormula.xls
rename to poi-main/src/test/resources/spreadsheet/SimpleWithFormula.xls
diff --git a/test-data/spreadsheet/SimpleWithImages-mac.xls b/poi-main/src/test/resources/spreadsheet/SimpleWithImages-mac.xls
similarity index 100%
rename from test-data/spreadsheet/SimpleWithImages-mac.xls
rename to poi-main/src/test/resources/spreadsheet/SimpleWithImages-mac.xls
diff --git a/test-data/spreadsheet/SimpleWithImages.xls b/poi-main/src/test/resources/spreadsheet/SimpleWithImages.xls
similarity index 100%
rename from test-data/spreadsheet/SimpleWithImages.xls
rename to poi-main/src/test/resources/spreadsheet/SimpleWithImages.xls
diff --git a/test-data/spreadsheet/SimpleWithPageBreaks.xls b/poi-main/src/test/resources/spreadsheet/SimpleWithPageBreaks.xls
similarity index 100%
rename from test-data/spreadsheet/SimpleWithPageBreaks.xls
rename to poi-main/src/test/resources/spreadsheet/SimpleWithPageBreaks.xls
diff --git a/test-data/spreadsheet/SimpleWithPrintArea.xls b/poi-main/src/test/resources/spreadsheet/SimpleWithPrintArea.xls
similarity index 100%
rename from test-data/spreadsheet/SimpleWithPrintArea.xls
rename to poi-main/src/test/resources/spreadsheet/SimpleWithPrintArea.xls
diff --git a/test-data/spreadsheet/SimpleWithSkip.xls b/poi-main/src/test/resources/spreadsheet/SimpleWithSkip.xls
similarity index 100%
rename from test-data/spreadsheet/SimpleWithSkip.xls
rename to poi-main/src/test/resources/spreadsheet/SimpleWithSkip.xls
diff --git a/test-data/spreadsheet/SimpleWithStyling.xls b/poi-main/src/test/resources/spreadsheet/SimpleWithStyling.xls
similarity index 100%
rename from test-data/spreadsheet/SimpleWithStyling.xls
rename to poi-main/src/test/resources/spreadsheet/SimpleWithStyling.xls
diff --git a/test-data/spreadsheet/SingleLetterRanges.xls b/poi-main/src/test/resources/spreadsheet/SingleLetterRanges.xls
similarity index 100%
rename from test-data/spreadsheet/SingleLetterRanges.xls
rename to poi-main/src/test/resources/spreadsheet/SingleLetterRanges.xls
diff --git a/test-data/spreadsheet/SolverContainerAfterSPGR.xls b/poi-main/src/test/resources/spreadsheet/SolverContainerAfterSPGR.xls
similarity index 100%
rename from test-data/spreadsheet/SolverContainerAfterSPGR.xls
rename to poi-main/src/test/resources/spreadsheet/SolverContainerAfterSPGR.xls
diff --git a/test-data/spreadsheet/SquareMacro.xls b/poi-main/src/test/resources/spreadsheet/SquareMacro.xls
similarity index 100%
rename from test-data/spreadsheet/SquareMacro.xls
rename to poi-main/src/test/resources/spreadsheet/SquareMacro.xls
diff --git a/test-data/spreadsheet/StringContinueRecords.xls b/poi-main/src/test/resources/spreadsheet/StringContinueRecords.xls
similarity index 100%
rename from test-data/spreadsheet/StringContinueRecords.xls
rename to poi-main/src/test/resources/spreadsheet/StringContinueRecords.xls
diff --git a/test-data/spreadsheet/StringFormulas.xls b/poi-main/src/test/resources/spreadsheet/StringFormulas.xls
similarity index 100%
rename from test-data/spreadsheet/StringFormulas.xls
rename to poi-main/src/test/resources/spreadsheet/StringFormulas.xls
diff --git a/test-data/spreadsheet/SubtotalsNested.xls b/poi-main/src/test/resources/spreadsheet/SubtotalsNested.xls
similarity index 100%
rename from test-data/spreadsheet/SubtotalsNested.xls
rename to poi-main/src/test/resources/spreadsheet/SubtotalsNested.xls
diff --git a/test-data/spreadsheet/Tables.xlsx b/poi-main/src/test/resources/spreadsheet/Tables.xlsx
similarity index 100%
rename from test-data/spreadsheet/Tables.xlsx
rename to poi-main/src/test/resources/spreadsheet/Tables.xlsx
diff --git a/test-data/spreadsheet/TestRandBetween.xls b/poi-main/src/test/resources/spreadsheet/TestRandBetween.xls
similarity index 100%
rename from test-data/spreadsheet/TestRandBetween.xls
rename to poi-main/src/test/resources/spreadsheet/TestRandBetween.xls
diff --git a/test-data/spreadsheet/TextFormatTests.xlsx b/poi-main/src/test/resources/spreadsheet/TextFormatTests.xlsx
similarity index 100%
rename from test-data/spreadsheet/TextFormatTests.xlsx
rename to poi-main/src/test/resources/spreadsheet/TextFormatTests.xlsx
diff --git a/test-data/spreadsheet/TwoSheetsNoneHidden.xls b/poi-main/src/test/resources/spreadsheet/TwoSheetsNoneHidden.xls
similarity index 100%
rename from test-data/spreadsheet/TwoSheetsNoneHidden.xls
rename to poi-main/src/test/resources/spreadsheet/TwoSheetsNoneHidden.xls
diff --git a/test-data/spreadsheet/TwoSheetsNoneHidden.xlsx b/poi-main/src/test/resources/spreadsheet/TwoSheetsNoneHidden.xlsx
similarity index 100%
rename from test-data/spreadsheet/TwoSheetsNoneHidden.xlsx
rename to poi-main/src/test/resources/spreadsheet/TwoSheetsNoneHidden.xlsx
diff --git a/test-data/spreadsheet/TwoSheetsOneHidden.xls b/poi-main/src/test/resources/spreadsheet/TwoSheetsOneHidden.xls
similarity index 100%
rename from test-data/spreadsheet/TwoSheetsOneHidden.xls
rename to poi-main/src/test/resources/spreadsheet/TwoSheetsOneHidden.xls
diff --git a/test-data/spreadsheet/TwoSheetsOneHidden.xlsx b/poi-main/src/test/resources/spreadsheet/TwoSheetsOneHidden.xlsx
similarity index 100%
rename from test-data/spreadsheet/TwoSheetsOneHidden.xlsx
rename to poi-main/src/test/resources/spreadsheet/TwoSheetsOneHidden.xlsx
diff --git a/test-data/spreadsheet/UncalcedRecord.xls b/poi-main/src/test/resources/spreadsheet/UncalcedRecord.xls
similarity index 100%
rename from test-data/spreadsheet/UncalcedRecord.xls
rename to poi-main/src/test/resources/spreadsheet/UncalcedRecord.xls
diff --git a/test-data/spreadsheet/UnionPtg.xls b/poi-main/src/test/resources/spreadsheet/UnionPtg.xls
similarity index 100%
rename from test-data/spreadsheet/UnionPtg.xls
rename to poi-main/src/test/resources/spreadsheet/UnionPtg.xls
diff --git a/test-data/spreadsheet/WORKBOOK_in_capitals.xls b/poi-main/src/test/resources/spreadsheet/WORKBOOK_in_capitals.xls
similarity index 100%
rename from test-data/spreadsheet/WORKBOOK_in_capitals.xls
rename to poi-main/src/test/resources/spreadsheet/WORKBOOK_in_capitals.xls
diff --git a/test-data/spreadsheet/WeekNumFunctionTestCaseData.xls b/poi-main/src/test/resources/spreadsheet/WeekNumFunctionTestCaseData.xls
similarity index 100%
rename from test-data/spreadsheet/WeekNumFunctionTestCaseData.xls
rename to poi-main/src/test/resources/spreadsheet/WeekNumFunctionTestCaseData.xls
diff --git a/test-data/spreadsheet/WeekNumFunctionTestCaseData2013.xls b/poi-main/src/test/resources/spreadsheet/WeekNumFunctionTestCaseData2013.xls
similarity index 100%
rename from test-data/spreadsheet/WeekNumFunctionTestCaseData2013.xls
rename to poi-main/src/test/resources/spreadsheet/WeekNumFunctionTestCaseData2013.xls
diff --git a/test-data/spreadsheet/WithChart.xls b/poi-main/src/test/resources/spreadsheet/WithChart.xls
similarity index 100%
rename from test-data/spreadsheet/WithChart.xls
rename to poi-main/src/test/resources/spreadsheet/WithChart.xls
diff --git a/test-data/spreadsheet/WithChart.xlsx b/poi-main/src/test/resources/spreadsheet/WithChart.xlsx
similarity index 100%
rename from test-data/spreadsheet/WithChart.xlsx
rename to poi-main/src/test/resources/spreadsheet/WithChart.xlsx
diff --git a/test-data/spreadsheet/WithChartSheet.xlsx b/poi-main/src/test/resources/spreadsheet/WithChartSheet.xlsx
similarity index 100%
rename from test-data/spreadsheet/WithChartSheet.xlsx
rename to poi-main/src/test/resources/spreadsheet/WithChartSheet.xlsx
diff --git a/test-data/spreadsheet/WithCheckBoxes.xls b/poi-main/src/test/resources/spreadsheet/WithCheckBoxes.xls
similarity index 100%
rename from test-data/spreadsheet/WithCheckBoxes.xls
rename to poi-main/src/test/resources/spreadsheet/WithCheckBoxes.xls
diff --git a/test-data/spreadsheet/WithConditionalFormatting.xls b/poi-main/src/test/resources/spreadsheet/WithConditionalFormatting.xls
similarity index 100%
rename from test-data/spreadsheet/WithConditionalFormatting.xls
rename to poi-main/src/test/resources/spreadsheet/WithConditionalFormatting.xls
diff --git a/test-data/spreadsheet/WithConditionalFormatting.xlsx b/poi-main/src/test/resources/spreadsheet/WithConditionalFormatting.xlsx
similarity index 100%
rename from test-data/spreadsheet/WithConditionalFormatting.xlsx
rename to poi-main/src/test/resources/spreadsheet/WithConditionalFormatting.xlsx
diff --git a/test-data/spreadsheet/WithDrawing.xlsx b/poi-main/src/test/resources/spreadsheet/WithDrawing.xlsx
similarity index 100%
rename from test-data/spreadsheet/WithDrawing.xlsx
rename to poi-main/src/test/resources/spreadsheet/WithDrawing.xlsx
diff --git a/test-data/spreadsheet/WithEmbeddedObjects.xls b/poi-main/src/test/resources/spreadsheet/WithEmbeddedObjects.xls
similarity index 100%
rename from test-data/spreadsheet/WithEmbeddedObjects.xls
rename to poi-main/src/test/resources/spreadsheet/WithEmbeddedObjects.xls
diff --git a/test-data/spreadsheet/WithEmbeded.xlsx b/poi-main/src/test/resources/spreadsheet/WithEmbeded.xlsx
similarity index 100%
rename from test-data/spreadsheet/WithEmbeded.xlsx
rename to poi-main/src/test/resources/spreadsheet/WithEmbeded.xlsx
diff --git a/test-data/spreadsheet/WithExtendedStyles.xls b/poi-main/src/test/resources/spreadsheet/WithExtendedStyles.xls
similarity index 100%
rename from test-data/spreadsheet/WithExtendedStyles.xls
rename to poi-main/src/test/resources/spreadsheet/WithExtendedStyles.xls
diff --git a/test-data/spreadsheet/WithFormattedGraphTitle.xls b/poi-main/src/test/resources/spreadsheet/WithFormattedGraphTitle.xls
similarity index 100%
rename from test-data/spreadsheet/WithFormattedGraphTitle.xls
rename to poi-main/src/test/resources/spreadsheet/WithFormattedGraphTitle.xls
diff --git a/test-data/spreadsheet/WithHyperlink.xls b/poi-main/src/test/resources/spreadsheet/WithHyperlink.xls
similarity index 100%
rename from test-data/spreadsheet/WithHyperlink.xls
rename to poi-main/src/test/resources/spreadsheet/WithHyperlink.xls
diff --git a/test-data/spreadsheet/WithMoreVariousData.xlsx b/poi-main/src/test/resources/spreadsheet/WithMoreVariousData.xlsx
similarity index 100%
rename from test-data/spreadsheet/WithMoreVariousData.xlsx
rename to poi-main/src/test/resources/spreadsheet/WithMoreVariousData.xlsx
diff --git a/test-data/spreadsheet/WithTable.xlsx b/poi-main/src/test/resources/spreadsheet/WithTable.xlsx
similarity index 100%
rename from test-data/spreadsheet/WithTable.xlsx
rename to poi-main/src/test/resources/spreadsheet/WithTable.xlsx
diff --git a/test-data/spreadsheet/WithTextBox.xlsx b/poi-main/src/test/resources/spreadsheet/WithTextBox.xlsx
similarity index 100%
rename from test-data/spreadsheet/WithTextBox.xlsx
rename to poi-main/src/test/resources/spreadsheet/WithTextBox.xlsx
diff --git a/test-data/spreadsheet/WithTextBox2.xlsx b/poi-main/src/test/resources/spreadsheet/WithTextBox2.xlsx
similarity index 100%
rename from test-data/spreadsheet/WithTextBox2.xlsx
rename to poi-main/src/test/resources/spreadsheet/WithTextBox2.xlsx
diff --git a/test-data/spreadsheet/WithThreeCharts.xls b/poi-main/src/test/resources/spreadsheet/WithThreeCharts.xls
similarity index 100%
rename from test-data/spreadsheet/WithThreeCharts.xls
rename to poi-main/src/test/resources/spreadsheet/WithThreeCharts.xls
diff --git a/test-data/spreadsheet/WithThreeCharts.xlsx b/poi-main/src/test/resources/spreadsheet/WithThreeCharts.xlsx
similarity index 100%
rename from test-data/spreadsheet/WithThreeCharts.xlsx
rename to poi-main/src/test/resources/spreadsheet/WithThreeCharts.xlsx
diff --git a/test-data/spreadsheet/WithTwoCharts.xls b/poi-main/src/test/resources/spreadsheet/WithTwoCharts.xls
similarity index 100%
rename from test-data/spreadsheet/WithTwoCharts.xls
rename to poi-main/src/test/resources/spreadsheet/WithTwoCharts.xls
diff --git a/test-data/spreadsheet/WithTwoCharts.xlsx b/poi-main/src/test/resources/spreadsheet/WithTwoCharts.xlsx
similarity index 100%
rename from test-data/spreadsheet/WithTwoCharts.xlsx
rename to poi-main/src/test/resources/spreadsheet/WithTwoCharts.xlsx
diff --git a/test-data/spreadsheet/WithTwoHyperLinks.xls b/poi-main/src/test/resources/spreadsheet/WithTwoHyperLinks.xls
similarity index 100%
rename from test-data/spreadsheet/WithTwoHyperLinks.xls
rename to poi-main/src/test/resources/spreadsheet/WithTwoHyperLinks.xls
diff --git a/test-data/spreadsheet/WithVariousData.xlsx b/poi-main/src/test/resources/spreadsheet/WithVariousData.xlsx
similarity index 100%
rename from test-data/spreadsheet/WithVariousData.xlsx
rename to poi-main/src/test/resources/spreadsheet/WithVariousData.xlsx
diff --git a/test-data/spreadsheet/WrongFormulaRecordType.xls b/poi-main/src/test/resources/spreadsheet/WrongFormulaRecordType.xls
similarity index 100%
rename from test-data/spreadsheet/WrongFormulaRecordType.xls
rename to poi-main/src/test/resources/spreadsheet/WrongFormulaRecordType.xls
diff --git a/test-data/spreadsheet/XRefCalc.xls b/poi-main/src/test/resources/spreadsheet/XRefCalc.xls
similarity index 100%
rename from test-data/spreadsheet/XRefCalc.xls
rename to poi-main/src/test/resources/spreadsheet/XRefCalc.xls
diff --git a/test-data/spreadsheet/XRefCalcData.xls b/poi-main/src/test/resources/spreadsheet/XRefCalcData.xls
similarity index 100%
rename from test-data/spreadsheet/XRefCalcData.xls
rename to poi-main/src/test/resources/spreadsheet/XRefCalcData.xls
diff --git a/test-data/spreadsheet/atp.xls b/poi-main/src/test/resources/spreadsheet/atp.xls
similarity index 100%
rename from test-data/spreadsheet/atp.xls
rename to poi-main/src/test/resources/spreadsheet/atp.xls
diff --git a/test-data/spreadsheet/atp.xlsx b/poi-main/src/test/resources/spreadsheet/atp.xlsx
similarity index 100%
rename from test-data/spreadsheet/atp.xlsx
rename to poi-main/src/test/resources/spreadsheet/atp.xlsx
diff --git a/test-data/spreadsheet/blankworkbook.xls b/poi-main/src/test/resources/spreadsheet/blankworkbook.xls
similarity index 100%
rename from test-data/spreadsheet/blankworkbook.xls
rename to poi-main/src/test/resources/spreadsheet/blankworkbook.xls
diff --git a/test-data/spreadsheet/bug_42794.mdb b/poi-main/src/test/resources/spreadsheet/bug_42794.mdb
similarity index 100%
rename from test-data/spreadsheet/bug_42794.mdb
rename to poi-main/src/test/resources/spreadsheet/bug_42794.mdb
diff --git a/test-data/spreadsheet/bug_42794.xls b/poi-main/src/test/resources/spreadsheet/bug_42794.xls
similarity index 100%
rename from test-data/spreadsheet/bug_42794.xls
rename to poi-main/src/test/resources/spreadsheet/bug_42794.xls
diff --git a/test-data/spreadsheet/chart_sheet.xlsx b/poi-main/src/test/resources/spreadsheet/chart_sheet.xlsx
similarity index 100%
rename from test-data/spreadsheet/chart_sheet.xlsx
rename to poi-main/src/test/resources/spreadsheet/chart_sheet.xlsx
diff --git a/test-data/spreadsheet/colwidth.xls b/poi-main/src/test/resources/spreadsheet/colwidth.xls
similarity index 100%
rename from test-data/spreadsheet/colwidth.xls
rename to poi-main/src/test/resources/spreadsheet/colwidth.xls
diff --git a/test-data/spreadsheet/comments.xls b/poi-main/src/test/resources/spreadsheet/comments.xls
similarity index 100%
rename from test-data/spreadsheet/comments.xls
rename to poi-main/src/test/resources/spreadsheet/comments.xls
diff --git a/test-data/spreadsheet/comments.xlsx b/poi-main/src/test/resources/spreadsheet/comments.xlsx
similarity index 100%
rename from test-data/spreadsheet/comments.xlsx
rename to poi-main/src/test/resources/spreadsheet/comments.xlsx
diff --git a/test-data/spreadsheet/countblankExamples.xls b/poi-main/src/test/resources/spreadsheet/countblankExamples.xls
similarity index 100%
rename from test-data/spreadsheet/countblankExamples.xls
rename to poi-main/src/test/resources/spreadsheet/countblankExamples.xls
diff --git a/test-data/spreadsheet/countifExamples.xls b/poi-main/src/test/resources/spreadsheet/countifExamples.xls
similarity index 100%
rename from test-data/spreadsheet/countifExamples.xls
rename to poi-main/src/test/resources/spreadsheet/countifExamples.xls
diff --git a/test-data/spreadsheet/dg-text.xls b/poi-main/src/test/resources/spreadsheet/dg-text.xls
similarity index 100%
rename from test-data/spreadsheet/dg-text.xls
rename to poi-main/src/test/resources/spreadsheet/dg-text.xls
diff --git a/test-data/spreadsheet/drawings.xls b/poi-main/src/test/resources/spreadsheet/drawings.xls
similarity index 100%
rename from test-data/spreadsheet/drawings.xls
rename to poi-main/src/test/resources/spreadsheet/drawings.xls
diff --git a/test-data/spreadsheet/duprich1.xls b/poi-main/src/test/resources/spreadsheet/duprich1.xls
similarity index 100%
rename from test-data/spreadsheet/duprich1.xls
rename to poi-main/src/test/resources/spreadsheet/duprich1.xls
diff --git a/test-data/spreadsheet/duprich2.xls b/poi-main/src/test/resources/spreadsheet/duprich2.xls
similarity index 100%
rename from test-data/spreadsheet/duprich2.xls
rename to poi-main/src/test/resources/spreadsheet/duprich2.xls
diff --git a/test-data/spreadsheet/dvEmpty.xls b/poi-main/src/test/resources/spreadsheet/dvEmpty.xls
similarity index 100%
rename from test-data/spreadsheet/dvEmpty.xls
rename to poi-main/src/test/resources/spreadsheet/dvEmpty.xls
diff --git a/test-data/spreadsheet/empty.xls b/poi-main/src/test/resources/spreadsheet/empty.xls
similarity index 100%
rename from test-data/spreadsheet/empty.xls
rename to poi-main/src/test/resources/spreadsheet/empty.xls
diff --git a/test-data/spreadsheet/evencontinuation.txt b/poi-main/src/test/resources/spreadsheet/evencontinuation.txt
similarity index 100%
rename from test-data/spreadsheet/evencontinuation.txt
rename to poi-main/src/test/resources/spreadsheet/evencontinuation.txt
diff --git a/test-data/spreadsheet/ex41187-19267.xls b/poi-main/src/test/resources/spreadsheet/ex41187-19267.xls
similarity index 100%
rename from test-data/spreadsheet/ex41187-19267.xls
rename to poi-main/src/test/resources/spreadsheet/ex41187-19267.xls
diff --git a/test-data/spreadsheet/ex42564-21435.xls b/poi-main/src/test/resources/spreadsheet/ex42564-21435.xls
similarity index 100%
rename from test-data/spreadsheet/ex42564-21435.xls
rename to poi-main/src/test/resources/spreadsheet/ex42564-21435.xls
diff --git a/test-data/spreadsheet/ex42564-21503.xls b/poi-main/src/test/resources/spreadsheet/ex42564-21503.xls
similarity index 100%
rename from test-data/spreadsheet/ex42564-21503.xls
rename to poi-main/src/test/resources/spreadsheet/ex42564-21503.xls
diff --git a/test-data/spreadsheet/ex42564-elementOrder.xls b/poi-main/src/test/resources/spreadsheet/ex42564-elementOrder.xls
similarity index 100%
rename from test-data/spreadsheet/ex42564-elementOrder.xls
rename to poi-main/src/test/resources/spreadsheet/ex42564-elementOrder.xls
diff --git a/test-data/spreadsheet/ex42570-20305.xls b/poi-main/src/test/resources/spreadsheet/ex42570-20305.xls
similarity index 100%
rename from test-data/spreadsheet/ex42570-20305.xls
rename to poi-main/src/test/resources/spreadsheet/ex42570-20305.xls
diff --git a/test-data/spreadsheet/ex44921-21902.xls b/poi-main/src/test/resources/spreadsheet/ex44921-21902.xls
similarity index 100%
rename from test-data/spreadsheet/ex44921-21902.xls
rename to poi-main/src/test/resources/spreadsheet/ex44921-21902.xls
diff --git a/test-data/spreadsheet/ex45046-21984.xls b/poi-main/src/test/resources/spreadsheet/ex45046-21984.xls
similarity index 100%
rename from test-data/spreadsheet/ex45046-21984.xls
rename to poi-main/src/test/resources/spreadsheet/ex45046-21984.xls
diff --git a/test-data/spreadsheet/ex45582-22397.xls b/poi-main/src/test/resources/spreadsheet/ex45582-22397.xls
similarity index 100%
rename from test-data/spreadsheet/ex45582-22397.xls
rename to poi-main/src/test/resources/spreadsheet/ex45582-22397.xls
diff --git a/test-data/spreadsheet/ex45672.xls b/poi-main/src/test/resources/spreadsheet/ex45672.xls
similarity index 100%
rename from test-data/spreadsheet/ex45672.xls
rename to poi-main/src/test/resources/spreadsheet/ex45672.xls
diff --git a/test-data/spreadsheet/ex45698-22488.xls b/poi-main/src/test/resources/spreadsheet/ex45698-22488.xls
similarity index 100%
rename from test-data/spreadsheet/ex45698-22488.xls
rename to poi-main/src/test/resources/spreadsheet/ex45698-22488.xls
diff --git a/test-data/spreadsheet/ex45978-extraLinkTableSheets.xls b/poi-main/src/test/resources/spreadsheet/ex45978-extraLinkTableSheets.xls
similarity index 100%
rename from test-data/spreadsheet/ex45978-extraLinkTableSheets.xls
rename to poi-main/src/test/resources/spreadsheet/ex45978-extraLinkTableSheets.xls
diff --git a/test-data/spreadsheet/ex46548-23133.xls b/poi-main/src/test/resources/spreadsheet/ex46548-23133.xls
similarity index 100%
rename from test-data/spreadsheet/ex46548-23133.xls
rename to poi-main/src/test/resources/spreadsheet/ex46548-23133.xls
diff --git a/test-data/spreadsheet/ex47747-sharedFormula.xls b/poi-main/src/test/resources/spreadsheet/ex47747-sharedFormula.xls
similarity index 100%
rename from test-data/spreadsheet/ex47747-sharedFormula.xls
rename to poi-main/src/test/resources/spreadsheet/ex47747-sharedFormula.xls
diff --git a/test-data/spreadsheet/excel_with_embeded.xls b/poi-main/src/test/resources/spreadsheet/excel_with_embeded.xls
similarity index 100%
rename from test-data/spreadsheet/excel_with_embeded.xls
rename to poi-main/src/test/resources/spreadsheet/excel_with_embeded.xls
diff --git a/test-data/spreadsheet/excelant.xls b/poi-main/src/test/resources/spreadsheet/excelant.xls
similarity index 100%
rename from test-data/spreadsheet/excelant.xls
rename to poi-main/src/test/resources/spreadsheet/excelant.xls
diff --git a/test-data/spreadsheet/extendedtextstrings.txt b/poi-main/src/test/resources/spreadsheet/extendedtextstrings.txt
similarity index 100%
rename from test-data/spreadsheet/extendedtextstrings.txt
rename to poi-main/src/test/resources/spreadsheet/extendedtextstrings.txt
diff --git a/test-data/spreadsheet/externalFunctionExample.xls b/poi-main/src/test/resources/spreadsheet/externalFunctionExample.xls
similarity index 100%
rename from test-data/spreadsheet/externalFunctionExample.xls
rename to poi-main/src/test/resources/spreadsheet/externalFunctionExample.xls
diff --git a/test-data/spreadsheet/finance.xls b/poi-main/src/test/resources/spreadsheet/finance.xls
similarity index 100%
rename from test-data/spreadsheet/finance.xls
rename to poi-main/src/test/resources/spreadsheet/finance.xls
diff --git a/test-data/spreadsheet/headerFooterTest.xlsx b/poi-main/src/test/resources/spreadsheet/headerFooterTest.xlsx
similarity index 100%
rename from test-data/spreadsheet/headerFooterTest.xlsx
rename to poi-main/src/test/resources/spreadsheet/headerFooterTest.xlsx
diff --git a/test-data/spreadsheet/intercept.xls b/poi-main/src/test/resources/spreadsheet/intercept.xls
similarity index 100%
rename from test-data/spreadsheet/intercept.xls
rename to poi-main/src/test/resources/spreadsheet/intercept.xls
diff --git a/test-data/spreadsheet/logoKarmokar4.png b/poi-main/src/test/resources/spreadsheet/logoKarmokar4.png
similarity index 100%
rename from test-data/spreadsheet/logoKarmokar4.png
rename to poi-main/src/test/resources/spreadsheet/logoKarmokar4.png
diff --git a/test-data/spreadsheet/mirrTest.xls b/poi-main/src/test/resources/spreadsheet/mirrTest.xls
similarity index 100%
rename from test-data/spreadsheet/mirrTest.xls
rename to poi-main/src/test/resources/spreadsheet/mirrTest.xls
diff --git a/test-data/spreadsheet/missingFuncs44675.xls b/poi-main/src/test/resources/spreadsheet/missingFuncs44675.xls
similarity index 100%
rename from test-data/spreadsheet/missingFuncs44675.xls
rename to poi-main/src/test/resources/spreadsheet/missingFuncs44675.xls
diff --git a/test-data/spreadsheet/mortgage-calculation.xls b/poi-main/src/test/resources/spreadsheet/mortgage-calculation.xls
similarity index 100%
rename from test-data/spreadsheet/mortgage-calculation.xls
rename to poi-main/src/test/resources/spreadsheet/mortgage-calculation.xls
diff --git a/test-data/spreadsheet/multibookFormulaA.xls b/poi-main/src/test/resources/spreadsheet/multibookFormulaA.xls
similarity index 100%
rename from test-data/spreadsheet/multibookFormulaA.xls
rename to poi-main/src/test/resources/spreadsheet/multibookFormulaA.xls
diff --git a/test-data/spreadsheet/multibookFormulaB.xls b/poi-main/src/test/resources/spreadsheet/multibookFormulaB.xls
similarity index 100%
rename from test-data/spreadsheet/multibookFormulaB.xls
rename to poi-main/src/test/resources/spreadsheet/multibookFormulaB.xls
diff --git a/test-data/spreadsheet/namedinput.xls b/poi-main/src/test/resources/spreadsheet/namedinput.xls
similarity index 100%
rename from test-data/spreadsheet/namedinput.xls
rename to poi-main/src/test/resources/spreadsheet/namedinput.xls
diff --git a/test-data/spreadsheet/noHeaderFooter47244.xls b/poi-main/src/test/resources/spreadsheet/noHeaderFooter47244.xls
similarity index 100%
rename from test-data/spreadsheet/noHeaderFooter47244.xls
rename to poi-main/src/test/resources/spreadsheet/noHeaderFooter47244.xls
diff --git a/test-data/spreadsheet/ole2-embedding.xls b/poi-main/src/test/resources/spreadsheet/ole2-embedding.xls
similarity index 100%
rename from test-data/spreadsheet/ole2-embedding.xls
rename to poi-main/src/test/resources/spreadsheet/ole2-embedding.xls
diff --git a/test-data/spreadsheet/overlapSharedFormula.xls b/poi-main/src/test/resources/spreadsheet/overlapSharedFormula.xls
similarity index 100%
rename from test-data/spreadsheet/overlapSharedFormula.xls
rename to poi-main/src/test/resources/spreadsheet/overlapSharedFormula.xls
diff --git a/test-data/spreadsheet/password.xls b/poi-main/src/test/resources/spreadsheet/password.xls
similarity index 100%
rename from test-data/spreadsheet/password.xls
rename to poi-main/src/test/resources/spreadsheet/password.xls
diff --git a/test-data/spreadsheet/picture.xlsx b/poi-main/src/test/resources/spreadsheet/picture.xlsx
similarity index 100%
rename from test-data/spreadsheet/picture.xlsx
rename to poi-main/src/test/resources/spreadsheet/picture.xlsx
diff --git a/test-data/spreadsheet/rank.xls b/poi-main/src/test/resources/spreadsheet/rank.xls
similarity index 100%
rename from test-data/spreadsheet/rank.xls
rename to poi-main/src/test/resources/spreadsheet/rank.xls
diff --git a/test-data/spreadsheet/reordered_sheets.xlsx b/poi-main/src/test/resources/spreadsheet/reordered_sheets.xlsx
similarity index 100%
rename from test-data/spreadsheet/reordered_sheets.xlsx
rename to poi-main/src/test/resources/spreadsheet/reordered_sheets.xlsx
diff --git a/test-data/spreadsheet/richtextdata.txt b/poi-main/src/test/resources/spreadsheet/richtextdata.txt
similarity index 100%
rename from test-data/spreadsheet/richtextdata.txt
rename to poi-main/src/test/resources/spreadsheet/richtextdata.txt
diff --git a/test-data/spreadsheet/rk.xls b/poi-main/src/test/resources/spreadsheet/rk.xls
similarity index 100%
rename from test-data/spreadsheet/rk.xls
rename to poi-main/src/test/resources/spreadsheet/rk.xls
diff --git a/test-data/spreadsheet/sample-beta.xlsx b/poi-main/src/test/resources/spreadsheet/sample-beta.xlsx
similarity index 100%
rename from test-data/spreadsheet/sample-beta.xlsx
rename to poi-main/src/test/resources/spreadsheet/sample-beta.xlsx
diff --git a/test-data/spreadsheet/sample.xlsx b/poi-main/src/test/resources/spreadsheet/sample.xlsx
similarity index 100%
rename from test-data/spreadsheet/sample.xlsx
rename to poi-main/src/test/resources/spreadsheet/sample.xlsx
diff --git a/test-data/spreadsheet/shared_formulas.xls b/poi-main/src/test/resources/spreadsheet/shared_formulas.xls
similarity index 100%
rename from test-data/spreadsheet/shared_formulas.xls
rename to poi-main/src/test/resources/spreadsheet/shared_formulas.xls
diff --git a/test-data/spreadsheet/shared_formulas.xlsx b/poi-main/src/test/resources/spreadsheet/shared_formulas.xlsx
similarity index 100%
rename from test-data/spreadsheet/shared_formulas.xlsx
rename to poi-main/src/test/resources/spreadsheet/shared_formulas.xlsx
diff --git a/test-data/spreadsheet/sheetProtection_allLocked.xlsx b/poi-main/src/test/resources/spreadsheet/sheetProtection_allLocked.xlsx
similarity index 100%
rename from test-data/spreadsheet/sheetProtection_allLocked.xlsx
rename to poi-main/src/test/resources/spreadsheet/sheetProtection_allLocked.xlsx
diff --git a/test-data/spreadsheet/sheetProtection_not_protected.xlsx b/poi-main/src/test/resources/spreadsheet/sheetProtection_not_protected.xlsx
similarity index 100%
rename from test-data/spreadsheet/sheetProtection_not_protected.xlsx
rename to poi-main/src/test/resources/spreadsheet/sheetProtection_not_protected.xlsx
diff --git a/test-data/spreadsheet/stringacross2continuations.txt b/poi-main/src/test/resources/spreadsheet/stringacross2continuations.txt
similarity index 100%
rename from test-data/spreadsheet/stringacross2continuations.txt
rename to poi-main/src/test/resources/spreadsheet/stringacross2continuations.txt
diff --git a/test-data/spreadsheet/styles.xlsx b/poi-main/src/test/resources/spreadsheet/styles.xlsx
similarity index 100%
rename from test-data/spreadsheet/styles.xlsx
rename to poi-main/src/test/resources/spreadsheet/styles.xlsx
diff --git a/test-data/spreadsheet/sumifformula.xls b/poi-main/src/test/resources/spreadsheet/sumifformula.xls
similarity index 100%
rename from test-data/spreadsheet/sumifformula.xls
rename to poi-main/src/test/resources/spreadsheet/sumifformula.xls
diff --git a/test-data/spreadsheet/sumifs.xls b/poi-main/src/test/resources/spreadsheet/sumifs.xls
similarity index 100%
rename from test-data/spreadsheet/sumifs.xls
rename to poi-main/src/test/resources/spreadsheet/sumifs.xls
diff --git a/test-data/spreadsheet/templateExcelWithAutofilter.xls b/poi-main/src/test/resources/spreadsheet/templateExcelWithAutofilter.xls
similarity index 100%
rename from test-data/spreadsheet/templateExcelWithAutofilter.xls
rename to poi-main/src/test/resources/spreadsheet/templateExcelWithAutofilter.xls
diff --git a/test-data/spreadsheet/test.xltx b/poi-main/src/test/resources/spreadsheet/test.xltx
similarity index 100%
rename from test-data/spreadsheet/test.xltx
rename to poi-main/src/test/resources/spreadsheet/test.xltx
diff --git a/test-data/spreadsheet/testArraysAndTables.xls b/poi-main/src/test/resources/spreadsheet/testArraysAndTables.xls
similarity index 100%
rename from test-data/spreadsheet/testArraysAndTables.xls
rename to poi-main/src/test/resources/spreadsheet/testArraysAndTables.xls
diff --git a/test-data/spreadsheet/testNames.xls b/poi-main/src/test/resources/spreadsheet/testNames.xls
similarity index 100%
rename from test-data/spreadsheet/testNames.xls
rename to poi-main/src/test/resources/spreadsheet/testNames.xls
diff --git a/test-data/spreadsheet/testRRaC.xls b/poi-main/src/test/resources/spreadsheet/testRRaC.xls
similarity index 100%
rename from test-data/spreadsheet/testRRaC.xls
rename to poi-main/src/test/resources/spreadsheet/testRRaC.xls
diff --git a/test-data/spreadsheet/testRVA.xls b/poi-main/src/test/resources/spreadsheet/testRVA.xls
similarity index 100%
rename from test-data/spreadsheet/testRVA.xls
rename to poi-main/src/test/resources/spreadsheet/testRVA.xls
diff --git a/test-data/spreadsheet/test_properties1 b/poi-main/src/test/resources/spreadsheet/test_properties1
similarity index 100%
rename from test-data/spreadsheet/test_properties1
rename to poi-main/src/test/resources/spreadsheet/test_properties1
diff --git a/test-data/spreadsheet/text.xls b/poi-main/src/test/resources/spreadsheet/text.xls
similarity index 100%
rename from test-data/spreadsheet/text.xls
rename to poi-main/src/test/resources/spreadsheet/text.xls
diff --git a/test-data/spreadsheet/unicodeNameRecord.xls b/poi-main/src/test/resources/spreadsheet/unicodeNameRecord.xls
similarity index 100%
rename from test-data/spreadsheet/unicodeNameRecord.xls
rename to poi-main/src/test/resources/spreadsheet/unicodeNameRecord.xls
diff --git a/test-data/spreadsheet/vmlDrawing1.vml b/poi-main/src/test/resources/spreadsheet/vmlDrawing1.vml
similarity index 100%
rename from test-data/spreadsheet/vmlDrawing1.vml
rename to poi-main/src/test/resources/spreadsheet/vmlDrawing1.vml
diff --git a/test-data/spreadsheet/workbookProtection_not_protected.xlsx b/poi-main/src/test/resources/spreadsheet/workbookProtection_not_protected.xlsx
similarity index 100%
rename from test-data/spreadsheet/workbookProtection_not_protected.xlsx
rename to poi-main/src/test/resources/spreadsheet/workbookProtection_not_protected.xlsx
diff --git a/test-data/spreadsheet/workbookProtection_workbook_revision_protected.xlsx b/poi-main/src/test/resources/spreadsheet/workbookProtection_workbook_revision_protected.xlsx
similarity index 100%
rename from test-data/spreadsheet/workbookProtection_workbook_revision_protected.xlsx
rename to poi-main/src/test/resources/spreadsheet/workbookProtection_workbook_revision_protected.xlsx
diff --git a/test-data/spreadsheet/workbookProtection_workbook_structure_protected.xlsx b/poi-main/src/test/resources/spreadsheet/workbookProtection_workbook_structure_protected.xlsx
similarity index 100%
rename from test-data/spreadsheet/workbookProtection_workbook_structure_protected.xlsx
rename to poi-main/src/test/resources/spreadsheet/workbookProtection_workbook_structure_protected.xlsx
diff --git a/test-data/spreadsheet/workbookProtection_workbook_windows_protected.xlsx b/poi-main/src/test/resources/spreadsheet/workbookProtection_workbook_windows_protected.xlsx
similarity index 100%
rename from test-data/spreadsheet/workbookProtection_workbook_windows_protected.xlsx
rename to poi-main/src/test/resources/spreadsheet/workbookProtection_workbook_windows_protected.xlsx
diff --git a/test-data/spreadsheet/workbookProtection_worksheet_protected.xlsx b/poi-main/src/test/resources/spreadsheet/workbookProtection_worksheet_protected.xlsx
similarity index 100%
rename from test-data/spreadsheet/workbookProtection_worksheet_protected.xlsx
rename to poi-main/src/test/resources/spreadsheet/workbookProtection_worksheet_protected.xlsx
diff --git a/test-data/spreadsheet/xlsx-jdbc.xlsx b/poi-main/src/test/resources/spreadsheet/xlsx-jdbc.xlsx
similarity index 100%
rename from test-data/spreadsheet/xlsx-jdbc.xlsx
rename to poi-main/src/test/resources/spreadsheet/xlsx-jdbc.xlsx
diff --git a/test-data/spreadsheet/xor-encryption-abc.xls b/poi-main/src/test/resources/spreadsheet/xor-encryption-abc.xls
similarity index 100%
rename from test-data/spreadsheet/xor-encryption-abc.xls
rename to poi-main/src/test/resources/spreadsheet/xor-encryption-abc.xls
diff --git a/test-data/spreadsheet/yearfracExamples.xls b/poi-main/src/test/resources/spreadsheet/yearfracExamples.xls
similarity index 100%
rename from test-data/spreadsheet/yearfracExamples.xls
rename to poi-main/src/test/resources/spreadsheet/yearfracExamples.xls