You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2020/09/01 15:25:15 UTC
[tika] branch main updated: TIKA-3179 (#349)
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/main by this push:
new 852b974 TIKA-3179 (#349)
852b974 is described below
commit 852b974d215f7550ab667171af44086bb0d34437
Author: Tim Allison <ta...@apache.org>
AuthorDate: Tue Sep 1 11:25:06 2020 -0400
TIKA-3179 (#349)
* TIKA-3179 -- refactor parser modules so that there's tall, grande and venti, er, tika-parsers, tika-parsers-extended and tika-parsers-advanced
---
pom.xml | 6 +-
tika-app/pom.xml | 5 -
tika-parser-modules/pom.xml | 89 --------
tika-parser-modules/tika-parser-db-module/pom.xml | 49 ----
.../pom.xml | 2 +-
.../tika-dl/pom.xml | 0
.../tika/dl/imagerec/DL4JInceptionV3Net.java | 0
.../org/apache/tika/dl/imagerec/DL4JVGG16Net.java | 0
.../tika/dl/imagerec/DL4JInceptionV3NetTest.java | 0
.../apache/tika/dl/imagerec/DL4JVGG16NetTest.java | 0
.../resources/org/apache/tika/dl/imagerec/cat.jpg | Bin
.../tika/dl/imagerec/dl4j-inception3-config.xml | 0
.../apache/tika/dl/imagerec/dl4j-vgg16-config.xml | 0
.../resources/org/apache/tika/dl/imagerec/lion.jpg | Bin
.../tika-nlp/pom.xml | 0
.../tika/parser/recognition/AgeRecogniser.java | 0
.../parser/recognition/AgeRecogniserConfig.java | 0
.../tika/parser/recognition/AgeRecogniserTest.java | 0
.../tika/parser/recognition/tika-config-age.xml | 0
.../tika-parser-advancedmedia-module/pom.xml | 0
.../tika/parser/captioning/CaptionObject.java | 0
.../captioning/tf/TensorflowRESTCaptioner.java | 0
.../tika/parser/pot/PooledTimeSeriesParser.java | 0
.../tika/parser/recognition/ObjectRecogniser.java | 0
.../recognition/ObjectRecognitionParser.java | 0
.../tika/parser/recognition/RecognisedObject.java | 0
.../recognition/tf/TensorflowImageRecParser.java | 0
.../recognition/tf/TensorflowRESTRecogniser.java | 0
.../tf/TensorflowRESTVideoRecogniser.java | 0
.../tika/parser/captioning/tf/caption_generator.py | 0
.../apache/tika/parser/captioning/tf/im2txtapi.py | 0
.../tika/parser/captioning/tf/model_info.xml | 0
.../tika/parser/captioning/tf/model_wrapper.py | 0
.../apache/tika/parser/captioning/tf/vocabulary.py | 0
.../tika/parser/recognition/tf/inception_v4.py | 0
.../tika/parser/recognition/tf/inceptionapi.py | 0
.../tika/parser/recognition/tf/video_util.py | 0
.../recognition/tika-config-tflow-im2txt-rest.xml | 0
.../parser/recognition/tika-config-tflow-rest.xml | 0
.../recognition/tika-config-tflow-video-rest.xml | 0
.../tika/parser/recognition/tika-config-tflow.xml | 0
.../recognition/ObjectRecognitionParserTest.java | 0
.../tf/TensorflowImageRecParserTest.java | 0
.../tf/TensorflowVideoRecParserTest.java | 0
.../tika-parser-nlp-module/pom.xml | 0
.../parser/ctakes/CTAKESAnnotationProperty.java | 0
.../apache/tika/parser/ctakes/CTAKESConfig.java | 0
.../tika/parser/ctakes/CTAKESContentHandler.java | 0
.../apache/tika/parser/ctakes/CTAKESParser.java | 0
.../tika/parser/ctakes/CTAKESSerializer.java | 0
.../org/apache/tika/parser/ctakes/CTAKESUtils.java | 0
.../java/org/apache/tika/parser/geo/GeoParser.java | 0
.../apache/tika/parser/geo/GeoParserConfig.java | 0
.../java/org/apache/tika/parser/geo/GeoTag.java | 0
.../tika/parser/geo/NameEntityExtractor.java | 0
.../parser/geo/gazetteer/GeoGazetteerClient.java | 0
.../apache/tika/parser/geo/gazetteer/Location.java | 0
.../tika/parser/journal/GrobidRESTParser.java | 0
.../apache/tika/parser/journal/JournalParser.java | 0
.../apache/tika/parser/journal/TEIDOMParser.java | 0
.../org/apache/tika/parser/ner/NERecogniser.java | 0
.../apache/tika/parser/ner/NamedEntityParser.java | 0
.../parser/ner/corenlp/CoreNLPNERecogniser.java | 0
.../tika/parser/ner/grobid/GrobidNERecogniser.java | 0
.../tika/parser/ner/mitie/MITIENERecogniser.java | 0
.../tika/parser/ner/nltk/NLTKNERecogniser.java | 0
.../parser/ner/opennlp/OpenNLPNERecogniser.java | 0
.../tika/parser/ner/opennlp/OpenNLPNameFinder.java | 0
.../tika/parser/ner/regex/RegexNERecogniser.java | 0
.../parser/sentiment/SentimentAnalysisParser.java | 0
.../services/org.apache.tika.parser.Parser | 0
.../tika/parser/ctakes/CTAKESConfig.properties | 0
.../tika/parser/geo/GeoTopicConfig.properties | 0
.../tika/parser/journal/GrobidExtractor.properties | 0
.../tika/parser/ner/grobid/GrobidServer.properties | 0
.../tika/parser/ner/nltk/NLTKServer.properties | 0
.../org/apache/tika/parser/ner/regex/ner-regex.txt | 0
.../org/apache/tika/parser/geo/GeoParserTest.java | 0
.../tika/parser/journal/JournalParserTest.java | 0
.../org/apache/tika/parser/journal/TEITest.java | 0
.../tika/parser/ner/NamedEntityParserTest.java | 0
.../tika/parser/ner/nltk/NLTKNERecogniserTest.java | 0
.../parser/ner/regex/RegexNERecogniserTest.java | 0
.../sentiment/SentimentAnalysisParserTest.java | 0
.../tika/config/TIKA-3078-geo.topic.GeoParser.xml | 0
.../tika/parser/ner/opennlp/ModelGetter.groovy | 0
.../apache/tika/parser/ner/opennlp/get-models.sh | 0
.../org/apache/tika/parser/ner/regex/ner-regex.txt | 0
.../apache/tika/parser/ner/regex}/tika-config.xml | 0
.../org/apache/tika/parser/ner}/tika-config.xml | 0
.../tika-config-sentiment-opennlp-cat.xml | 0
.../sentiment/tika-config-sentiment-opennlp.xml | 0
.../src/test/resources/test-documents/testTEI.xml | 0
tika-parsers-extended/pom.xml | 41 ++++
.../tika-parser-scientific-module/pom.xml | 44 ++++
.../apache/tika/parser/envi/EnviHeaderParser.java | 0
.../org/apache/tika/parser/gdal/GDALParser.java | 0
.../geoinfo/GeographicInformationParser.java | 0
.../org/apache/tika/parser/grib/GribParser.java | 0
.../java/org/apache/tika/parser/hdf/HDFParser.java | 0
.../org/apache/tika/parser/isatab/ISATabUtils.java | 0
.../apache/tika/parser/isatab/ISArchiveParser.java | 0
.../apache/tika/parser/netcdf/NetCDFParser.java | 0
.../services/org.apache.tika.parser.Parser | 0
.../tika/parser/envi/EnviHeaderParserTest.java | 0
.../apache/tika/parser/gdal/TestGDALParser.java | 0
.../geoinfo/GeographicInformationParserTest.java | 0
.../apache/tika/parser/grib/GribParserTest.java | 0
.../org/apache/tika/parser/hdf/HDFParserTest.java | 0
.../tika/parser/isatab/ISArchiveParserTest.java | 0
.../tika/parser/netcdf/NetCDFParserTest.java | 0
.../GLDAS_CLM10SUBP_3H.A19790202.0000.001.grb | Bin
.../test-documents/WFPC2u5780205r_c0fx.fits | 0
.../ang20150420t182050_corr_v1e_img.hdr | 0
.../test-documents/egyl03.gdas.200811.00Z.grb2 | Bin
.../resources/test-documents/envi_test_header.hdr | 0
.../test-documents/gdas1.forecmwf.2014062612.grib2 | Bin
.../resources/test-documents/sampleFile.iso19139 | 0
.../sresa1b_ncar_ccsm3_0_run1_200001.nc | Bin
.../src/test/resources/test-documents/test.hdf | Bin
.../src/test/resources/test-documents/test.he5 | Bin
...i-s-2_metabolite profiling_NMR spectroscopy.txt | 0
.../testISATab_BII-I-1/a_metabolome.txt | 0
.../testISATab_BII-I-1/a_microarray.txt | 0
.../testISATab_BII-I-1/a_proteome.txt | 0
.../testISATab_BII-I-1/a_transcriptome.txt | 0
.../testISATab_BII-I-1/i_investigation.txt | 0
.../testISATab_BII-I-1/s_BII-S-1.txt | 0
.../testISATab_BII-I-1/s_BII-S-2.txt | 0
.../tika-parser-sqlite3-module/pom.xml | 92 ++++++++
.../tika/parser/sqlite3/SQLite3DBParser.java | 0
.../apache/tika/parser/sqlite3/SQLite3Parser.java | 0
.../tika/parser/sqlite3/SQLite3TableReader.java | 0
.../services/org.apache.tika.parser.Parser | 0
.../tika/parser/sqlite3/SQLite3ParserTest.java | 8 +-
.../test/resources/test-documents/testSQLITE3.db | Bin
.../test/resources/test-documents/testSqlite3b.db | Bin
.../pom.xml | 49 ++++
.../apache/tika/mime/TestMimeTypesExtended.java | 40 ++++
.../tika/parser/sqlite3/SQLite3ParserTest.java | 2 +-
{tika-parser-modules => tika-parsers}/.gitignore | 0
tika-parsers/pom.xml | 252 +++++----------------
.../tika-parser-apple-module/pom.xml | 0
.../tika/detect/apple/iwork/IWorkDetector.java | 0
.../tika/parser/apple/AppleSingleFileParser.java | 0
.../apache/tika/parser/apple/BPListDetector.java | 0
.../org/apache/tika/parser/apple/PListParser.java | 0
.../tika/parser/iwork/AutoPageNumberUtils.java | 0
.../tika/parser/iwork/IWorkPackageParser.java | 0
.../tika/parser/iwork/KeynoteContentHandler.java | 0
.../tika/parser/iwork/NumbersContentHandler.java | 0
.../tika/parser/iwork/PagesContentHandler.java | 0
.../parser/iwork/iwana/IWork13PackageParser.java | 0
.../parser/iwork/iwana/IWork18PackageParser.java | 0
.../services/org.apache.tika.detect.Detector | 0
...org.apache.tika.detect.zip.ZipContainerDetector | 0
.../services/org.apache.tika.parser.Parser | 0
.../apache/tika/parser/apple/PListParserTest.java | 0
.../tika/parser/iwork/AutoPageNumberUtilsTest.java | 0
.../apache/tika/parser/iwork/IWorkParserTest.java | 0
.../tika/parser/iwork/iwana/IWork13ParserTest.java | 0
.../resources/test-documents/tableHeaders.numbers | Bin
.../resources/test-documents/tableNames.numbers | Bin
.../test-documents/testAppleSingleFile.pdf | Bin
.../resources/test-documents/testBPList.bplist | Bin
.../resources/test-documents/testBulletPoints.key | Bin
.../test/resources/test-documents/testKeynote.key | Bin
.../resources/test-documents/testKeynote2013.key | Bin
.../resources/test-documents/testKeynote2018.key | Bin
.../test-documents/testMasterSlideTable.key | Bin
.../resources/test-documents/testNumbers.numbers | Bin
.../test-documents/testNumbers2013.numbers | Bin
.../test-documents/testNumbersCharts.numbers | Bin
.../test/resources/test-documents/testPages.pages | Bin
.../resources/test-documents/testPages2013.pages | Bin
.../test-documents/testPagesComments.pages | Bin
.../testPagesHeadersFootersAlphaLower.pages | Bin
.../testPagesHeadersFootersAlphaUpper.pages | Bin
.../testPagesHeadersFootersFootnotes.pages | Bin
.../testPagesHeadersFootersRomanLower.pages | Bin
.../testPagesHeadersFootersRomanUpper.pages | Bin
.../resources/test-documents/testPagesLayout.pages | Bin
.../test-documents/testPagesPwdProtected.pages | Bin
.../test/resources/test-documents/testTables.key | Bin
.../resources/test-documents/testTextBoxes.key | Bin
.../test-documents/testWEBARCHIVE.webarchive | 0
.../tika-parser-audiovideo-module/pom.xml | 0
.../org/apache/tika/parser/audio/AudioParser.java | 0
.../org/apache/tika/parser/audio/MidiParser.java | 0
.../org/apache/tika/parser/mp3/AudioFrame.java | 0
.../tika/parser/mp3/CompositeTagHandler.java | 0
.../java/org/apache/tika/parser/mp3/ID3Tags.java | 0
.../org/apache/tika/parser/mp3/ID3v1Handler.java | 0
.../org/apache/tika/parser/mp3/ID3v22Handler.java | 0
.../org/apache/tika/parser/mp3/ID3v23Handler.java | 0
.../org/apache/tika/parser/mp3/ID3v24Handler.java | 0
.../org/apache/tika/parser/mp3/ID3v2Frame.java | 0
.../org/apache/tika/parser/mp3/LyricsHandler.java | 0
.../java/org/apache/tika/parser/mp3/MP3Frame.java | 0
.../java/org/apache/tika/parser/mp3/Mp3Parser.java | 0
.../org/apache/tika/parser/mp3/MpegStream.java | 0
.../apache/tika/parser/mp4/ISO6709Extractor.java | 0
.../java/org/apache/tika/parser/mp4/MP4Parser.java | 0
.../org/apache/tika/parser/video/FLVParser.java | 0
.../services/org.apache.tika.parser.Parser | 0
.../apache/tika/parser/audio/AudioParserTest.java | 0
.../apache/tika/parser/audio/MidiParserTest.java | 0
.../org/apache/tika/parser/mp3/Mp3ParserTest.java | 0
.../org/apache/tika/parser/mp3/MpegStreamTest.java | 0
.../org/apache/tika/parser/mp4/MP4ParserTest.java | 0
.../apache/tika/parser/video/FLVParserTest.java | 0
.../src/test/resources/test-documents/testAIFF.aif | Bin
.../src/test/resources/test-documents/testAU.au | Bin
.../src/test/resources/test-documents/testFLV.flv | Bin
.../src/test/resources/test-documents/testMID.mid | Bin
.../test/resources/test-documents/testMP3i18n.mp3 | Bin
.../test-documents/testMP3i18n_truncated.mp3 | Bin
.../test/resources/test-documents/testMP3id3v1.mp3 | Bin
.../resources/test-documents/testMP3id3v1_v2.mp3 | Bin
.../test/resources/test-documents/testMP3id3v2.mp3 | Bin
.../resources/test-documents/testMP3id3v24.mp3 | Bin
.../resources/test-documents/testMP3lyrics.mp3 | Bin
.../test/resources/test-documents/testMP3noid3.mp3 | Bin
.../resources/test-documents/testMP3truncated.mp3 | Bin
.../src/test/resources/test-documents/testMP4.m4a | Bin
.../resources/test-documents/testMP4_truncated.m4a | Bin
.../resources/test-documents/testNakedUTF16BOM.mp3 | Bin
.../src/test/resources/test-documents/testWAV.wav | Bin
.../tika-parser-cad-module/pom.xml | 0
.../java/org/apache/tika/parser/dwg/DWGParser.java | 0
.../java/org/apache/tika/parser/prt/PRTParser.java | 0
.../services/org.apache.tika.parser.Parser | 0
.../org/apache/tika/parser/dwg/DWGParserTest.java | 0
.../org/apache/tika/parser/prt/PRTParserTest.java | 0
.../test/resources/test-documents/testCADKEY.prt | Bin
.../test/resources/test-documents/testCADKEY2.prt | Bin
.../test/resources/test-documents/testDWG2000.dwg | Bin
.../test/resources/test-documents/testDWG2004.dwg | Bin
.../test-documents/testDWG2004_no_header.dwg | Bin
.../test/resources/test-documents/testDWG2007.dwg | Bin
.../test/resources/test-documents/testDWG2010.dwg | Bin
.../test-documents/testDWG2010_custom_props.dwg | Bin
.../resources/test-documents/testDWGmech2004.dwg | Bin
.../resources/test-documents/testDWGmech2004DX.dwg | Bin
.../resources/test-documents/testDWGmech2005.dwg | Bin
.../resources/test-documents/testDWGmech2006.dwg | Bin
.../resources/test-documents/testDWGmech2007.dwg | Bin
.../resources/test-documents/testDWGmech2008.dwg | Bin
.../resources/test-documents/testDWGmech2009.dwg | Bin
.../resources/test-documents/testDWGmech2010.dwg | Bin
.../resources/test-documents/testDWGmech2011.dwg | Bin
.../test/resources/test-documents/testDWGmech6.dwg | Bin
.../tika-parser-code-module/pom.xml | 0
.../org/apache/tika/parser/asm/ClassParser.java | 0
.../apache/tika/parser/asm/XHTMLClassVisitor.java | 0
.../apache/tika/parser/code/SourceCodeParser.java | 0
.../tika/parser/executable/ExecutableParser.java | 0
.../java/org/apache/tika/parser/mat/MatParser.java | 0
.../org/apache/tika/parser/sas/SAS7BDATParser.java | 0
.../services/org.apache.tika.parser.Parser | 0
.../apache/tika/parser/asm/ClassParserTest.java | 0
.../tika/parser/code/SourceCodeParserTest.java | 0
.../parser/executable/ExecutableParserTest.java | 0
.../org/apache/tika/parser/mat/MatParserTest.java | 0
.../apache/tika/parser/sas/SAS7BDATParserTest.java | 0
.../test-documents/AppleSingleFileParser.class | Bin
.../test-documents/AutoDetectParser.class | Bin
.../breidamerkurjokull_radar_profiles_2009.mat | Bin
.../resources/test-documents/test-columnar.sas.xml | 0
.../test-documents/test-columnar.sas7bdat | Bin
.../src/test/resources/test-documents/testC.c | 0
.../src/test/resources/test-documents/testCPP.cpp | 0
.../resources/test-documents/testGROOVY.groovy | 0
.../test/resources/test-documents/testJAVA.java | 0
.../src/test/resources/test-documents/testJS.js | 0
.../test/resources/test-documents/testJS_HTML.js | 0
.../resources/test-documents/testLinux-arm-32le | Bin
.../resources/test-documents/testLinux-mips-32be | Bin
.../resources/test-documents/testLinux-mips-32le | Bin
.../resources/test-documents/testLinux-ppc-32be | Bin
.../test/resources/test-documents/testLinux-x86-32 | Bin
.../test/resources/test-documents/testLinux-x86-64 | Bin
.../src/test/resources/test-documents/testMATLAB.m | 0
.../resources/test-documents/testMATLAB_barcast.m | 0
.../resources/test-documents/testMATLAB_wtsgaus.m | 0
.../src/test/resources/test-documents/testSAS.sas | 0
.../test/resources/test-documents/testSAS.sas7bdat | Bin
.../src/test/resources/test-documents/testSAS.sd2 | Bin
.../src/test/resources/test-documents/testSAS.xpt | Bin
.../src/test/resources/test-documents/testSAS2.sas | 0
.../test-documents/testWindows-x86-32.exe | Bin
.../resources/test-documents/test_mat_text.mat | Bin
.../tika-parser-crypto-module/pom.xml | 0
.../org/apache/tika/parser/crypto/Pkcs7Parser.java | 0
.../org/apache/tika/parser/crypto/TSDParser.java | 0
.../services/org.apache.tika.parser.Parser | 0
.../apache/tika/parser/crypto/Pkcs7ParserTest.java | 0
.../apache/tika/parser/crypto/TSDParserTest.java | 0
.../test/resources/test-documents/MANIFEST.XML.TSD | Bin
.../test/resources/test-documents/Test1.txt.tsd | Bin
.../test/resources/test-documents/Test2.txt.tsd | Bin
.../test/resources/test-documents/Test3.docx.tsd | Bin
.../test/resources/test-documents/Test4.pdf.tsd | Bin
.../test/resources/test-documents/Test5.PNG.tsd | Bin
.../test/resources/test-documents/testDetached.p7s | Bin
.../test-documents/testTSD_broken_pdf.tsd | Bin
.../tika-parser-digest-commons/pom.xml | 0
.../parser/digestutils/BouncyCastleDigester.java | 0
.../tika/parser/digestutils/CommonsDigester.java | 0
.../tika-parser-font-module/pom.xml | 0
.../tika/parser/font/AdobeFontMetricParser.java | 0
.../apache/tika/parser/font/TrueTypeParser.java | 0
.../services/org.apache.tika.parser.Parser | 0
.../apache/tika/parser/font/FontParsersTest.java | 0
.../src/test/resources/test-documents/testAFM.afm | 0
.../resources/test-documents/testTrueType3.ttf | Bin
.../tika-parser-html-module/pom.xml | 0
.../tika/parser/html/BoilerpipeContentHandler.java | 0
.../org/apache/tika/parser/html/DataURIScheme.java | 0
.../parser/html/DataURISchemeParseException.java | 0
.../apache/tika/parser/html/DataURISchemeUtil.java | 0
.../apache/tika/parser/html/DefaultHtmlMapper.java | 0
.../tika/parser/html/HtmlEncodingDetector.java | 0
.../org/apache/tika/parser/html/HtmlHandler.java | 0
.../org/apache/tika/parser/html/HtmlMapper.java | 0
.../org/apache/tika/parser/html/HtmlParser.java | 0
.../tika/parser/html/IdentityHtmlMapper.java | 0
.../tika/parser/html/XHTMLDowngradeHandler.java | 0
.../html/charsetdetector/CharsetAliases.java | 0
.../charsetdetector/CharsetDetectionResult.java | 0
.../parser/html/charsetdetector/MetaProcessor.java | 0
.../parser/html/charsetdetector/PreScanner.java | 0
.../StandardHtmlEncodingDetector.java | 0
.../charsets/ReplacementCharset.java | 0
.../charsets/XUserDefinedCharset.java | 0
.../org.apache.tika.detect.EncodingDetector | 0
.../services/org.apache.tika.parser.Parser | 0
.../html/StandardCharsets_unsupported_by_IANA.txt | 0
.../tika/parser/html/DataURISchemeParserTest.java | 0
.../tika/parser/html/HtmlEncodingDetectorTest.java | 0
.../apache/tika/parser/html/HtmlParserTest.java | 0
.../html/StandardHtmlEncodingDetectorTest.java | 0
.../org/apache/tika/parser/html/tika-config.xml | 0
.../resources/test-documents/big-preamble.html | 0
.../test-documents/boilerplate-whitespace.html | 0
.../test/resources/test-documents/boilerplate.html | 0
.../testBoilerplateMissingSpace.html | 0
.../test/resources/test-documents/testHTML.html | 0
.../test-documents/testHTMLBadScript.html | 0
.../test-documents/testHTMLGoodScript.html | 0
.../testHTMLNoisyMetaEncoding_1.html | 0
.../testHTMLNoisyMetaEncoding_2.html | 0
.../testHTMLNoisyMetaEncoding_3.html | 0
.../testHTMLNoisyMetaEncoding_4.html | 0
.../test-documents/testHTML_charset_utf16le.html | Bin
.../test-documents/testHTML_charset_utf8.html | 0
.../testHTML_embedded_data_uri_js.html | 0
.../test-documents/testHTML_embedded_img.html | 0
.../testHTML_embedded_img_in_js.html | 0
.../resources/test-documents/testHTML_head.html | 0
.../resources/test-documents/testHTML_utf8.html | 0
.../test-documents/testUserDefinedCharset.mhtml | 0
.../test/resources/test-documents/testXHTML.html | 0
.../src/test/resources/test-documents/tika434.html | 0
.../tika-parser-image-module/pom.xml | 0
.../org/apache/tika/parser/image/BPGParser.java | 0
.../org/apache/tika/parser/image/HeifParser.java | 0
.../org/apache/tika/parser/image/ICNSParser.java | 0
.../org/apache/tika/parser/image/ICNSType.java | 0
.../tika/parser/image/ImageMetadataExtractor.java | 0
.../org/apache/tika/parser/image/ImageParser.java | 0
.../org/apache/tika/parser/image/JpegParser.java | 0
.../apache/tika/parser/image/MetadataFields.java | 0
.../org/apache/tika/parser/image/PSDParser.java | 0
.../org/apache/tika/parser/image/TiffParser.java | 0
.../org/apache/tika/parser/image/WebPParser.java | 0
.../services/org.apache.tika.parser.Parser | 0
.../apache/tika/parser/image/HeifParserTest.java | 0
.../apache/tika/parser/image/ICNSParserTest.java | 0
.../parser/image/ImageMetadataExtractorTest.java | 0
.../apache/tika/parser/image/ImageParserTest.java | 0
.../apache/tika/parser/image/JpegParserTest.java | 0
.../apache/tika/parser/image/PSDParserTest.java | 0
.../apache/tika/parser/image/WebPParserTest.java | 0
.../test/resources/test-documents/IMG_1034.heic | Bin
.../src/test/resources/test-documents/testBMP.bmp | Bin
.../src/test/resources/test-documents/testBPG.bpg | Bin
.../test/resources/test-documents/testBPG_GEO.bpg | Bin
.../resources/test-documents/testBPG_commented.bpg | Bin
.../testBPG_commented_xnviewmp026.bpg | Bin
.../src/test/resources/test-documents/testGIF.gif | Bin
.../test/resources/test-documents/testHEIF.heic | Bin
.../test/resources/test-documents/testICNS.icns | Bin
.../resources/test-documents/testICNS_basic.icns | Bin
.../test/resources/test-documents/testJBIG2.jb2 | Bin
.../src/test/resources/test-documents/testJPEG.jp2 | Bin
.../src/test/resources/test-documents/testJPEG.jpg | Bin
.../resources/test-documents/testJPEG_EXIF.jpg | Bin
.../test-documents/testJPEG_EXIF_emptyDateTime.jpg | Bin
.../test/resources/test-documents/testJPEG_GEO.jpg | Bin
.../resources/test-documents/testJPEG_GEO_2.jpg | Bin
.../test-documents/testJPEG_oddTagComponent.jpg | Bin
.../src/test/resources/test-documents/testPNG.png | Bin
.../src/test/resources/test-documents/testPSD.psd | Bin
.../src/test/resources/test-documents/testPSD2.psd | Bin
.../test/resources/test-documents/testPSD_xmp.psd | Bin
.../src/test/resources/test-documents/testTIFF.tif | Bin
.../test-documents/testTIFF_multipage.tif | Bin
.../test/resources/test-documents/testWEBP.webp | Bin
.../test-documents/testWebp_Alpha_Lossless.webp | Bin
.../test-documents/testWebp_Alpha_Lossy.webp | Bin
.../tika-parser-integration-tests/pom.xml | 27 ---
.../apache/tika/config/TikaDetectorConfigTest.java | 0
.../tika/config/TikaEncodingDetectorTest.java | 6 +-
.../apache/tika/config/TikaParserConfigTest.java | 0
.../tika/config/TikaTranslatorConfigTest.java | 0
.../tika/detect/TestContainerAwareDetector.java | 0
.../tika/extractor/EmbeddedDocumentUtilTest.java | 0
.../java/org/apache/tika/mime/MimeTypeTest.java | 0
.../java/org/apache/tika/mime/MimeTypesTest.java | 0
.../java/org/apache/tika/mime/TestMimeTypes.java | 5 -
.../apache/tika/parser/AutoDetectParserTest.java | 0
.../tika/parser/AutoDetectReaderParserTest.java | 0
.../parser/BouncyCastleDigestingParserTest.java | 0
.../apache/tika/parser/DigestingParserTest.java | 0
.../org/apache/tika/parser/ParsingReaderTest.java | 0
.../tika/parser/RecursiveParserWrapperTest.java | 0
.../org/apache/tika/parser/TabularFormatsTest.java | 0
.../java/org/apache/tika/parser/TestParsers.java | 0
.../apache/tika/parser/TestXMLEntityExpansion.java | 0
.../java/org/apache/tika/parser/TestXXEInXML.java | 0
.../java/org/apache/tika/parser/XMLTestBase.java | 0
.../parser/apple/AppleSingleFileParserTest.java | 0
.../apache/tika/parser/apple/PListParserTest.java | 0
.../apache/tika/parser/crypto/TSDParserTest.java | 0
.../parser/fork/ForkParserIntegrationTest.java | 0
.../apache/tika/parser/html/HtmlParserTest.java | 0
.../apache/tika/parser/mail/MboxParserTest.java | 0
.../apache/tika/parser/mail/RFC822ParserTest.java | 0
.../tika/parser/microsoft/EMFParserTest.java | 0
.../tika/parser/microsoft/ExcelParserTest.java | 0
.../microsoft/POIContainerExtractionTest.java | 0
.../parser/microsoft/PowerPointParserTest.java | 0
.../tika/parser/microsoft/XML2003ParserTest.java | 0
.../parser/microsoft/ooxml/OOXMLParserTest.java | 0
.../parser/microsoft/ooxml/TruncatedOOXMLTest.java | 0
.../tika/parser/microsoft/rtf/RTFParserTest.java | 0
.../apache/tika/parser/mock/MockParserTest.java | 0
.../tika/parser/ocr/TesseractOCRParserTest.java | 0
.../org/apache/tika/parser/odf/ODFParserTest.java | 0
.../org/apache/tika/parser/pdf/PDFParserTest.java | 0
.../org/apache/tika/parser/pkg/ArParserTest.java | 0
.../apache/tika/parser/pkg/Bzip2ParserTest.java | 0
.../pkg/CompositeZipContainerDetectorTest.java | 0
.../apache/tika/parser/pkg/CompressParserTest.java | 0
.../tika/parser/pkg/CompressorParserTest.java | 0
.../org/apache/tika/parser/pkg/GzipParserTest.java | 0
.../org/apache/tika/parser/pkg/RarParserTest.java | 0
.../apache/tika/parser/pkg/Seven7ParserTest.java | 0
.../org/apache/tika/parser/pkg/TarParserTest.java | 0
.../org/apache/tika/parser/pkg/ZipParserTest.java | 0
.../org/apache/tika/parser/pkg/ZlibParserTest.java | 0
.../tika/parser/xml/FictionBookParserTest.java | 0
.../sax/PhoneExtractingContentHandlerTest.java | 0
.../sax/StandardsExtractingContentHandlerTest.java | 0
.../apache/tika/utils/ServiceLoaderUtilsTest.java | 0
.../src/test/resources/log4j.properties | 0
.../org/apache/tika/config/TIKA-1558-exclude.xml | 0
.../apache/tika/config/TIKA-1558-excludesub.xml | 0
.../tika/config/TIKA-1702-detector-exclude.xml | 0
.../tika/config/TIKA-1702-translator-default.xml | 0
.../config/TIKA-1702-translator-empty-default.xml | 0
.../tika/config/TIKA-1702-translator-empty.xml | 0
.../tika/config/TIKA-1708-detector-composite.xml | 0
.../tika/config/TIKA-1708-detector-default.xml | 0
...-2273-encoding-detector-outside-static-init.xml | 0
...TIKA-2273-exclude-encoding-detector-default.xml | 0
.../TIKA-2273-no-icu4j-encoding-detector.xml | 0
.../TIKA-2273-non-detecting-params-bad-charset.xml | 0
.../tika/config/TIKA-2273-non-detecting-params.xml | 0
.../TIKA-2273-parameterize-encoding-detector.xml | 0
.../TIKA-2485-encoding-detector-mark-limits.xml | 0
.../org/apache/tika/parser/TIKA-3137-include.xml | 0
.../apache/tika/parser/odf/tika-config-macros.xml | 0
.../CVLKRA-KYC_Download_File_Structure_V3.1.xlsx | Bin
.../test/resources/test-documents/NUTCH-1997.cbor | 0
.../active_layer_arcss_grid_barrow_alaska_2012.dif | 0
.../src/test/resources/test-documents/baseball.gif | Bin
.../src/test/resources/test-documents/baseball.jpg | Bin
.../src/test/resources/test-documents/baseball.png | Bin
..._values_of_alkanes_extracted_from_paleosols.dif | 0
.../test-documents/mock/embedded_then_npe.xml | 0
.../test/resources/test-documents/mock/example.xml | 0
.../resources/test-documents/mock/fake_oom.xml | 0
.../resources/test-documents/mock/heavy_hang.xml | 0
.../resources/test-documents/mock/nothing_bad.xml | 0
.../resources/test-documents/mock/null_pointer.xml | 0
.../test-documents/mock/null_pointer_no_msg.xml | 0
.../resources/test-documents/mock/real_oom.xml | 0
.../test/resources/test-documents/mock/sleep.xml | 0
.../test-documents/mock/sleep_interruptible.xml | 0
.../mock/sleep_not_interruptible.xml | 0
.../resources/test-documents/mock/system_exit.xml | 0
.../test-documents/mock/thread_interrupt.xml | 0
.../resources/test-documents/test-columnar.csv | 0
.../resources/test-documents/test-columnar.ods | Bin
.../resources/test-documents/test-columnar.xpt | Bin
.../src/test/resources/test-documents/test1.swf | Bin
.../src/test/resources/test-documents/test2.swf | Bin
.../src/test/resources/test-documents/test3.swf | Bin
.../src/test/resources/test-documents/testAC3.ac3 | Bin
.../test/resources/test-documents/testAMR-WB.amr | Bin
.../src/test/resources/test-documents/testAMR.amr | Bin
.../src/test/resources/test-documents/testAPK.apk | Bin
.../src/test/resources/test-documents/testASF.asf | Bin
.../test/resources/test-documents/testASiCE.asice | Bin
.../test/resources/test-documents/testASiCS.asics | Bin
.../src/test/resources/test-documents/testBAT.bat | 0
.../test/resources/test-documents/testBATUpper.bat | 0
.../resources/test-documents/testBDB_btree_2.db | Bin
.../resources/test-documents/testBDB_btree_3.db | Bin
.../resources/test-documents/testBDB_btree_4.db | Bin
.../resources/test-documents/testBDB_btree_5.db | Bin
.../resources/test-documents/testBDB_hash_2.db | Bin
.../resources/test-documents/testBDB_hash_3.db | Bin
.../resources/test-documents/testBDB_hash_4.db | Bin
.../resources/test-documents/testBDB_hash_5.db | Bin
.../test/resources/test-documents/testBIBTEX.bib | 0
.../test/resources/test-documents/testBMPfp.txt | 0
.../test/resources/test-documents/testCOREL.shw | Bin
.../src/test/resources/test-documents/testCSS.css | 0
.../src/test/resources/test-documents/testCSV.csv | 0
.../test/resources/test-documents/testComment.pdf | Bin
.../src/test/resources/test-documents/testDCX.dcx | Bin
.../test/resources/test-documents/testDITA.dita | 0
.../test/resources/test-documents/testDITA.ditamap | 0
.../test/resources/test-documents/testDITA2.dita | 0
.../test/resources/test-documents/testDJVU.djvu | Bin
.../test/resources/test-documents/testDWF2010.dwf | Bin
.../resources/test-documents/testDXF_ascii.dxf | 0
.../test/resources/test-documents/testDigilite.fdf | 0
.../src/test/resources/test-documents/testEAC3.ac3 | Bin
.../src/test/resources/test-documents/testEAR.ear | Bin
.../test-documents/testEndNoteImportFile.enw | 0
.../test/resources/test-documents/testFITS.fits | 0
.../test-documents/testFITS_ShorterHeader.fits | 0
.../test/resources/test-documents/testFLAC.flac | Bin
.../src/test/resources/test-documents/testFLAC.oga | Bin
.../test/resources/test-documents/testFOXMAIL.box | 0
.../resources/test-documents/testFreeBSD-x86-64 | Bin
.../resources/test-documents/testGRAPHVIZd.dot | 0
.../resources/test-documents/testGRAPHVIZdc.dot | 0
.../resources/test-documents/testGRAPHVIZg.dot | 0
.../src/test/resources/test-documents/testH.h | 0
.../src/test/resources/test-documents/testHFA.hfa | Bin
.../resources/test-documents/testICalendar.ics | 0
.../test/resources/test-documents/testINDD.indd | Bin
.../src/test/resources/test-documents/testIPA.ipa | Bin
.../test-documents/testJAVAPROPS.properties | 0
.../resources/test-documents/testJNILIB.jnilib | Bin
.../resources/test-documents/testJavaHprofBinary | Bin
.../resources/test-documents/testJavaHprofText | 0
.../src/test/resources/test-documents/testKML.kml | 0
.../test-documents/testLotus123-lotusftp.123 | Bin
.../test-documents/testLotus123-lotusftp.wk4 | Bin
.../test/resources/test-documents/testLotus123.wk1 | Bin
.../test/resources/test-documents/testLotus123.wk3 | Bin
.../test/resources/test-documents/testLotus123.wks | Bin
.../test/resources/test-documents/testLotusEml.eml | 0
.../test-documents/testMHTMLFirefox.mhtml | 0
.../src/test/resources/test-documents/testMIF.mif | Bin
.../src/test/resources/test-documents/testMKV.mkv | Bin
.../resources/test-documents/testMSWriteFile.wri | Bin
.../test/resources/test-documents/testMYSQL.MYD | Bin
.../test/resources/test-documents/testMYSQL.MYI | Bin
.../test/resources/test-documents/testMYSQL.frm | Bin
.../resources/test-documents/testMemgraph.memgraph | Bin
.../resources/test-documents/testMessageNews.txt | 0
.../src/test/resources/test-documents/testNLS1.nls | Bin
.../src/test/resources/test-documents/testNLS2.nls | Bin
.../test/resources/test-documents/testOPUS.opus | Bin
.../test-documents/testOptionalHyphen.doc | Bin
.../test-documents/testOptionalHyphen.docx | Bin
.../test-documents/testOptionalHyphen.ppt | Bin
.../test-documents/testOptionalHyphen.pptx | Bin
.../test-documents/testOptionalHyphen.rtf | 0
.../src/test/resources/test-documents/testPBM.pbm | 0
.../src/test/resources/test-documents/testPCX.pcx | Bin
.../src/test/resources/test-documents/testPGM.pgm | 0
.../src/test/resources/test-documents/testPICT.pct | Bin
.../test-documents/testPKCS17Sig-v2.xml.p7m | Bin
.../test-documents/testPKCS17Sig-v3.xml.p7m | 0
.../test-documents/testPKCS17Sig-v4.xml.p7m | 0
.../resources/test-documents/testPKCS17Sig.xml.p7m | 0
.../test-documents/testPhoneNumberExtractor.odt | Bin
.../src/test/resources/test-documents/testRDF.rdf | 0
.../test/resources/test-documents/testRotated.png | Bin
.../resources/test-documents/testSolaris-x86-32 | Bin
.../test-documents/testStarOffice-5.2-calc.sdc | Bin
.../test-documents/testStarOffice-5.2-draw.sda | Bin
.../test-documents/testStarOffice-5.2-impress.sdd | Bin
.../test-documents/testStarOffice-5.2-writer.sdw | Bin
.../test-documents/testStarOffice-6.0-calc.sxc | Bin
.../test-documents/testStarOffice-6.0-draw.sxd | Bin
.../test-documents/testStarOffice-6.0-draw.sxi | Bin
.../testStarOffice-6.0-writer-template.stw | Bin
.../test-documents/testStarOffice-6.0-writer.sxw | Bin
.../test/resources/test-documents/testStataDTA.dta | Bin
.../test/resources/test-documents/testStataDTA.txt | 0
.../resources/test-documents/testTAR_no_magic.tar | Bin
.../test/resources/test-documents/testTXT-tika.axx | Bin
.../src/test/resources/test-documents/testTXT.txt | 0
.../test-documents/testTXTNonASCIIUTF8.txt | 0
.../test-documents/testThunderbirdEml.eml | 0
.../test/resources/test-documents/testTinyPE.exe | Bin
.../test/resources/test-documents/testVORBIS.ogg | Bin
.../test-documents/testVORCalcTemplate.vor | Bin
.../test-documents/testVORDrawTemplate.vor | Bin
.../test-documents/testVORImpressTemplate.vor | Bin
.../test-documents/testVORWriterTemplate.vor | Bin
.../test/resources/test-documents/testVideoMp4.mp4 | Bin
.../src/test/resources/test-documents/testWAR.war | Bin
.../test/resources/test-documents/testWEBM.webm | Bin
.../src/test/resources/test-documents/testWMA.wma | Bin
.../src/test/resources/test-documents/testWMV.wmv | Bin
.../test/resources/test-documents/testWMV_WMV2.wmv | Bin
.../test/resources/test-documents/testWORKS.wps | Bin
.../resources/test-documents/testWORKS2000.wps | Bin
.../test-documents/testWORKSWordProcessor3.0.wps | Bin
.../test-documents/testWORKSWordProcessor4.0.wps | Bin
.../test/resources/test-documents/testWebVTT.vtt | 0
.../resources/test-documents/testWebVTT_header.vtt | 0
.../resources/test-documents/testWebVTT_simple.vtt | 0
.../test-documents/testWindowsMediaMeta.asx | 0
.../src/test/resources/test-documents/testXDP.xdp | 0
.../test/resources/test-documents/testXFDF.xfdf | 0
.../tika-parser-jdbc-commons}/pom.xml | 16 +-
.../apache/tika/parser/jdbc/AbstractDBParser.java | 0
.../apache/tika/parser/jdbc/JDBCTableReader.java | 0
.../tika-parser-mail-commons/pom.xml | 0
.../tika/parser/mailcommons/MailDateParser.java | 0
.../apache/tika/parser/mailcommons/MailUtil.java | 0
.../tika/parser/mailcommons/MailUtilTest.java | 0
.../tika-parser-mail-module/pom.xml | 0
.../tika/parser/mail/MailContentHandler.java | 0
.../org/apache/tika/parser/mail/RFC822Parser.java | 0
.../org/apache/tika/parser/mbox/MboxParser.java | 0
.../services/org.apache.tika.parser.Parser | 0
.../apache/tika/parser/mail/RFC822ParserTest.java | 0
.../apache/tika/parser/mbox/MboxParserTest.java | 0
.../mail/tika-config-extract-all-alternatives.xml | 0
.../src/test/resources/test-documents/complex.mbox | 0
.../src/test/resources/test-documents/headers.mbox | 0
.../test/resources/test-documents/multiline.mbox | 0
.../src/test/resources/test-documents/quoted.mbox | 0
.../src/test/resources/test-documents/simple.mbox | 0
.../test/resources/test-documents/single_mail.mbox | 0
.../test-documents/testEmailWithPNGAtt.eml | 0
.../resources/test-documents/testGroupWiseEml.eml | 0
.../resources/test-documents/testMBOX_complex.mbox | 0
.../test-documents/testMBOX_lengthy_x-headers.mbox | 0
.../src/test/resources/test-documents/testRFC822 | 0
.../resources/test-documents/testRFC822-CC-BCC | 0
.../test/resources/test-documents/testRFC822-big | 0
.../test-documents/testRFC822-limitedheaders | 0
.../test-documents/testRFC822-mixed-simple | 0
.../testRFC822-mixed-with-pdf-inline | 0
.../resources/test-documents/testRFC822-multipart | 0
.../resources/test-documents/testRFC822-txt-body | 0
.../resources/test-documents/testRFC822_base64 | 0
.../resources/test-documents/testRFC822_date_utf8 | 0
.../resources/test-documents/testRFC822_dkim.eml | 0
.../test/resources/test-documents/testRFC822_eml | 0
.../test-documents/testRFC822_encrypted_zip | 0
.../test-documents/testRFC822_i18nheaders | 0
.../resources/test-documents/testRFC822_normal_zip | 0
.../resources/test-documents/testRFC822_oddfrom | 0
.../resources/test-documents/testRFC822_quoted | 0
.../testRFC822_simple_inline_body.txt | 0
.../resources/test-documents/testRFC822_x-.eml | 0
.../tika-parser-microsoft-module/pom.xml | 0
.../detect/microsoft/POIFSContainerDetector.java | 0
.../detect/microsoft/ooxml/OPCPackageDetector.java | 0
.../tika/parser/microsoft/AbstractListManager.java | 0
.../parser/microsoft/AbstractOfficeParser.java | 0
.../parser/microsoft/AbstractPOIFSExtractor.java | 0
.../org/apache/tika/parser/microsoft/Cell.java | 0
.../tika/parser/microsoft/CellDecorator.java | 0
.../apache/tika/parser/microsoft/EMFParser.java | 0
.../tika/parser/microsoft/ExcelExtractor.java | 0
.../tika/parser/microsoft/FormattingUtils.java | 0
.../tika/parser/microsoft/HSLFExtractor.java | 0
.../tika/parser/microsoft/JackcessExtractor.java | 0
.../tika/parser/microsoft/JackcessParser.java | 0
.../apache/tika/parser/microsoft/LinkedCell.java | 0
.../apache/tika/parser/microsoft/ListManager.java | 0
.../tika/parser/microsoft/MSOwnerFileParser.java | 0
.../apache/tika/parser/microsoft/NumberCell.java | 0
.../apache/tika/parser/microsoft/OfficeParser.java | 0
.../tika/parser/microsoft/OfficeParserConfig.java | 0
.../tika/parser/microsoft/OldExcelParser.java | 0
.../tika/parser/microsoft/OutlookExtractor.java | 0
.../tika/parser/microsoft/SummaryExtractor.java | 0
.../apache/tika/parser/microsoft/TNEFParser.java | 0
.../org/apache/tika/parser/microsoft/TextCell.java | 0
.../parser/microsoft/TikaExcelDataFormatter.java | 0
.../parser/microsoft/TikaExcelGeneralFormat.java | 0
.../apache/tika/parser/microsoft/WMFParser.java | 0
.../tika/parser/microsoft/WordExtractor.java | 0
.../tika/parser/microsoft/chm/ChmAccessor.java | 0
.../tika/parser/microsoft/chm/ChmAssert.java | 0
.../tika/parser/microsoft/chm/ChmBlockInfo.java | 0
.../tika/parser/microsoft/chm/ChmCommons.java | 0
.../tika/parser/microsoft/chm/ChmConstants.java | 0
.../microsoft/chm/ChmDirectoryListingSet.java | 0
.../tika/parser/microsoft/chm/ChmExtractor.java | 0
.../tika/parser/microsoft/chm/ChmItsfHeader.java | 0
.../tika/parser/microsoft/chm/ChmItspHeader.java | 0
.../tika/parser/microsoft/chm/ChmLzxBlock.java | 0
.../tika/parser/microsoft/chm/ChmLzxState.java | 0
.../parser/microsoft/chm/ChmLzxcControlData.java | 0
.../parser/microsoft/chm/ChmLzxcResetTable.java | 0
.../tika/parser/microsoft/chm/ChmParser.java | 0
.../parser/microsoft/chm/ChmParsingException.java | 0
.../tika/parser/microsoft/chm/ChmPmgiHeader.java | 0
.../tika/parser/microsoft/chm/ChmPmglHeader.java | 0
.../tika/parser/microsoft/chm/ChmSection.java | 0
.../tika/parser/microsoft/chm/ChmWrapper.java | 0
.../microsoft/chm/DirectoryListingEntry.java | 0
.../microsoft/onenote/CheckedFileNodePushBack.java | 0
.../tika/parser/microsoft/onenote/CompactID.java | 0
.../tika/parser/microsoft/onenote/Error.java | 0
.../parser/microsoft/onenote/ExtendedGUID.java | 0
.../microsoft/onenote/FileChunkReference.java | 0
.../microsoft/onenote/FileDataStoreObject.java | 0
.../onenote/FileDataStoreObjectReference.java | 0
.../tika/parser/microsoft/onenote/FileNode.java | 0
.../parser/microsoft/onenote/FileNodeList.java | 0
.../microsoft/onenote/FileNodeListHeader.java | 0
.../tika/parser/microsoft/onenote/FileNodePtr.java | 0
.../microsoft/onenote/FileNodePtrBackPush.java | 0
.../parser/microsoft/onenote/FileNodeUnion.java | 0
.../microsoft/onenote/FndStructureConstants.java | 0
.../apache/tika/parser/microsoft/onenote/GUID.java | 0
.../microsoft/onenote/GlobalIdTableEntry2FNDX.java | 0
.../microsoft/onenote/GlobalIdTableEntry3FNDX.java | 0
.../microsoft/onenote/GlobalIdTableEntryFNDX.java | 0
.../microsoft/onenote/GlobalIdTableStartFNDX.java | 0
.../tika/parser/microsoft/onenote/IndentUtil.java | 0
.../tika/parser/microsoft/onenote/Int24.java | 0
.../apache/tika/parser/microsoft/onenote/JCID.java | 0
.../microsoft/onenote/JCIDPropertySetTypeEnum.java | 0
.../onenote/ObjectDeclarationWithRefCount.java | 0
.../onenote/ObjectDeclarationWithRefCountBody.java | 0
.../onenote/ObjectInfoDependencyOverrideData.java | 0
.../onenote/ObjectInfoDependencyOverrides.java | 0
.../onenote/ObjectRevisionWithRefCountFNDX.java | 0
.../onenote/ObjectSpaceObjectPropSet.java | 0
...ctSpaceObjectStreamOfOIDsOSIDsOrContextIDs.java | 0
.../microsoft/onenote/ObjectStreamCounters.java | 0
.../onenote/OneNoteDirectFileResource.java | 0
.../parser/microsoft/onenote/OneNoteDocument.java | 0
.../parser/microsoft/onenote/OneNoteHeader.java | 0
.../onenote/OneNoteLegacyDumpStrings.java | 0
.../parser/microsoft/onenote/OneNoteParser.java | 0
.../microsoft/onenote/OneNotePropertyEnum.java | 0
.../microsoft/onenote/OneNotePropertyId.java | 0
.../tika/parser/microsoft/onenote/OneNotePtr.java | 0
.../microsoft/onenote/OneNoteTreeWalker.java | 0
.../onenote/OneNoteTreeWalkerOptions.java | 0
.../parser/microsoft/onenote/PropertyIDType.java | 0
.../tika/parser/microsoft/onenote/PropertySet.java | 0
.../parser/microsoft/onenote/PropertyValue.java | 0
.../tika/parser/microsoft/onenote/Revision.java | 0
.../parser/microsoft/onenote/RevisionManifest.java | 0
.../onenote/RevisionManifestListStart.java | 0
.../microsoft/onenote/RevisionRoleDeclaration.java | 0
.../microsoft/onenote/RootObjectReference.java | 0
.../microsoft/onenote/RootObjectReferenceBase.java | 0
.../microsoft/ooxml/AbstractOOXMLExtractor.java | 0
.../parser/microsoft/ooxml/MetadataExtractor.java | 0
.../parser/microsoft/ooxml/OOXMLExtractor.java | 0
.../microsoft/ooxml/OOXMLExtractorFactory.java | 0
.../tika/parser/microsoft/ooxml/OOXMLParser.java | 0
.../microsoft/ooxml/OOXMLTikaBodyPartHandler.java | 0
.../ooxml/OOXMLWordAndPowerPointTextHandler.java | 0
.../ooxml/POIXMLTextExtractorDecorator.java | 0
.../microsoft/ooxml/ParagraphProperties.java | 0
.../tika/parser/microsoft/ooxml/RunProperties.java | 0
.../ooxml/SXSLFPowerPointExtractorDecorator.java | 0
.../ooxml/SXWPFWordExtractorDecorator.java | 0
.../ooxml/XSLFPowerPointExtractorDecorator.java | 0
.../ooxml/XSSFBExcelExtractorDecorator.java | 0
.../ooxml/XSSFExcelExtractorDecorator.java | 0
.../parser/microsoft/ooxml/XWPFListManager.java | 0
.../ooxml/XWPFWordExtractorDecorator.java | 0
.../microsoft/ooxml/xps/XPSExtractorDecorator.java | 0
.../microsoft/ooxml/xps/XPSPageContentHandler.java | 0
.../microsoft/ooxml/xps/XPSTextExtractor.java | 0
.../xslf/XSLFEventBasedPowerPointExtractor.java | 0
.../ooxml/xwpf/XWPFEventBasedWordExtractor.java | 0
.../microsoft/ooxml/xwpf/XWPFNumberingShim.java | 0
.../microsoft/ooxml/xwpf/XWPFStylesShim.java | 0
.../ooxml/xwpf/ml2006/AbstractPartHandler.java | 0
.../ooxml/xwpf/ml2006/BinaryDataHandler.java | 0
.../ooxml/xwpf/ml2006/CorePropertiesHandler.java | 0
.../xwpf/ml2006/ExtendedPropertiesHandler.java | 0
.../microsoft/ooxml/xwpf/ml2006/PartHandler.java | 0
.../microsoft/ooxml/xwpf/ml2006/Relationship.java | 0
.../ooxml/xwpf/ml2006/RelationshipsHandler.java | 0
.../ooxml/xwpf/ml2006/RelationshipsManager.java | 0
.../ooxml/xwpf/ml2006/Word2006MLDocHandler.java | 0
.../ooxml/xwpf/ml2006/Word2006MLParser.java | 0
.../ml2006/WordAndPowerPointTextPartHandler.java | 0
.../parser/microsoft/pst/OutlookPSTParser.java | 0
.../tika/parser/microsoft/rtf/GroupState.java | 0
.../tika/parser/microsoft/rtf/ListDescriptor.java | 0
.../parser/microsoft/rtf/RTFEmbObjHandler.java | 0
.../parser/microsoft/rtf/RTFObjDataParser.java | 0
.../tika/parser/microsoft/rtf/RTFParser.java | 0
.../tika/parser/microsoft/rtf/TextExtractor.java | 0
.../microsoft/xml/AbstractXML2003Parser.java | 0
.../parser/microsoft/xml/HyperlinkHandler.java | 0
.../parser/microsoft/xml/SpreadsheetMLParser.java | 0
.../tika/parser/microsoft/xml/WordMLParser.java | 0
.../services/org.apache.tika.detect.Detector | 0
...org.apache.tika.detect.zip.ZipContainerDetector | 0
.../services/org.apache.tika.parser.Parser | 0
.../AbstractPOIContainerExtractionTest.java | 0
.../tika/parser/microsoft/EMFParserTest.java | 0
.../tika/parser/microsoft/ExcelParserTest.java | 0
.../tika/parser/microsoft/JackcessParserTest.java | 0
.../parser/microsoft/MSOwnerFileParserTest.java | 0
.../tika/parser/microsoft/OfficeParserTest.java | 0
.../tika/parser/microsoft/OldExcelParserTest.java | 0
.../tika/parser/microsoft/OutlookParserTest.java | 0
.../microsoft/POIContainerExtractionTest.java | 0
.../parser/microsoft/PowerPointParserTest.java | 0
.../tika/parser/microsoft/ProjectParserTest.java | 0
.../tika/parser/microsoft/PublisherParserTest.java | 0
.../parser/microsoft/SolidworksParserTest.java | 0
.../tika/parser/microsoft/TNEFParserTest.java | 0
.../tika/parser/microsoft/VisioParserTest.java | 0
.../tika/parser/microsoft/WMFParserTest.java | 0
.../tika/parser/microsoft/WordParserTest.java | 0
.../parser/microsoft/WriteProtectedParserTest.java | 0
.../parser/microsoft/chm/TestChmBlockInfo.java | 0
.../parser/microsoft/chm/TestChmExtraction.java | 0
.../parser/microsoft/chm/TestChmExtractor.java | 0
.../parser/microsoft/chm/TestChmItsfHeader.java | 0
.../parser/microsoft/chm/TestChmItspHeader.java | 0
.../tika/parser/microsoft/chm/TestChmLzxState.java | 0
.../microsoft/chm/TestChmLzxcControlData.java | 0
.../microsoft/chm/TestChmLzxcResetTable.java | 0
.../microsoft/chm/TestDirectoryListingEntry.java | 0
.../tika/parser/microsoft/chm/TestParameters.java | 0
.../tika/parser/microsoft/chm/TestPmgiHeader.java | 0
.../tika/parser/microsoft/chm/TestPmglHeader.java | 0
.../microsoft/onenote/OneNoteParserTest.java | 0
.../ooxml/OOXMLContainerExtractionTest.java | 0
.../parser/microsoft/ooxml/OOXMLParserTest.java | 0
.../parser/microsoft/ooxml/SXSLFExtractorTest.java | 0
.../parser/microsoft/ooxml/SXWPFExtractorTest.java | 0
.../parser/microsoft/ooxml/TruncatedOOXMLTest.java | 0
.../parser/microsoft/ooxml/xps/XPSParserTest.java | 0
.../ooxml/xwpf/ml2006/Word2006MLParserTest.java | 0
.../parser/microsoft/pst/OutlookPSTParserTest.java | 0
.../tika/parser/microsoft/rtf/RTFParserTest.java | 0
.../parser/microsoft/xml/XML2003ParserTest.java | 0
.../ooxml}/tika-config-custom-date-override.xml | 0
.../microsoft/ooxml/tika-config-dom-macros.xml | 0
.../microsoft/ooxml/tika-config-sax-macros.xml | 0
.../microsoft/rtf/ignoreListMarkup-tika-config.xml | 0
.../tika/parser/microsoft/rtf/tika-config.xml | 0
.../tika-config-custom-date-override.xml | 0
.../microsoft/tika-config-exclude-phonetic.xml | 0
.../tika-config-extract-all-alternatives-msg.xml | 0
.../tika/parser/microsoft/tika-config-macros.xml | 0
.../tika/parser/microsoft/tika-config-sax-docx.xml | 0
.../src/test/resources/test-documents/Doc1_ole.doc | Bin
.../resources/test-documents/EmbeddedDocument.docx | Bin
.../resources/test-documents/EmbeddedOutlook.docx | Bin
.../test/resources/test-documents/EmbeddedPDF.docx | Bin
.../test/resources/test-documents/NullHeader.docx | Bin
.../test/resources/test-documents/chm/IMJPCL.CHM | Bin
.../test/resources/test-documents/chm/IMJPCLE.CHM | Bin
.../test/resources/test-documents/chm/IMTCEN.CHM | Bin
.../test/resources/test-documents/chm/admin.chm | Bin
.../test/resources/test-documents/chm/cmak_ops.CHM | Bin
.../test/resources/test-documents/chm/comexp.CHM | Bin
.../test/resources/test-documents/chm/gpedit.CHM | Bin
.../test/resources/test-documents/chm/tcpip.CHM | Bin
.../resources/test-documents/chm/wmicontrol.CHM | Bin
.../test/resources/test-documents/footnotes.docx | Bin
.../test/resources/test-documents/headerPic.docx | Bin
.../src/test/resources/test-documents/jxl.xls | Bin
.../src/test/resources/test-documents/pictures.ppt | Bin
.../src/test/resources/test-documents/protect.xlsx | Bin
.../resources/test-documents/protectedFile.xlsx | Bin
.../resources/test-documents/protectedSheets.xlsx | Bin
.../resources/test-documents/test-columnar.xls | Bin
.../resources/test-documents/test-columnar.xlsb | Bin
.../resources/test-documents/test-columnar.xlsx | Bin
.../test/resources/test-documents/test-outlook.msg | Bin
.../resources/test-documents/test-outlook2003.msg | Bin
.../src/test/resources/test-documents/test.doc | Bin
.../test/resources/test-documents/testACCESS.mdb | Bin
.../resources/test-documents/testAccess2.accdb | Bin
.../resources/test-documents/testAccess2_2000.mdb | Bin
.../test-documents/testAccess2_2002-2003.mdb | Bin
.../test-documents/testAccess2_encrypted.accdb | Bin
.../resources/test-documents/testAccess_V1997.mdb | Bin
.../test-documents/testBinControlWord.rtf | 0
.../src/test/resources/test-documents/testChm.chm | Bin
.../src/test/resources/test-documents/testChm2.chm | Bin
.../src/test/resources/test-documents/testChm3.chm | Bin
.../test/resources/test-documents/testChm_oom.chm | Bin
.../test/resources/test-documents/testComment.doc | Bin
.../test/resources/test-documents/testComment.docx | Bin
.../test/resources/test-documents/testComment.ppt | Bin
.../test/resources/test-documents/testComment.pptx | Bin
.../test/resources/test-documents/testComment.rtf | 0
.../test/resources/test-documents/testComment.xls | Bin
.../test/resources/test-documents/testComment.xlsx | Bin
.../test-documents/testControlCharacters.doc | Bin
.../test-documents/testDOCX_Thumbnail.docx | Bin
.../test/resources/test-documents/testDOTM.dotm | Bin
.../resources/test-documents/testDocumentLink.doc | Bin
.../src/test/resources/test-documents/testEMF.emf | Bin
.../test/resources/test-documents/testEMLX.emlx | 0
.../testEML_embedded_xhtml_and_img.eml | 0
.../resources/test-documents/testEXCEL-charts.xls | Bin
.../resources/test-documents/testEXCEL-formats.xls | Bin
.../test-documents/testEXCEL-formats.xlsx | Bin
.../resources/test-documents/testEXCEL.strict.xlsx | Bin
.../test/resources/test-documents/testEXCEL.xls | Bin
.../test/resources/test-documents/testEXCEL.xlsb | Bin
.../test/resources/test-documents/testEXCEL.xlsx | Bin
.../resources/test-documents/testEXCEL2003.xml | 0
.../resources/test-documents/testEXCEL_1img.xls | Bin
.../resources/test-documents/testEXCEL_1img.xlsx | Bin
.../test/resources/test-documents/testEXCEL_4.xls | Bin
.../test/resources/test-documents/testEXCEL_5.xls | Bin
.../test/resources/test-documents/testEXCEL_95.xls | Bin
.../testEXCEL_WORKBOOK_in_capitals.xls | Bin
.../test-documents/testEXCEL_big_numbers.xls | Bin
.../test-documents/testEXCEL_big_numbers.xlsx | Bin
.../resources/test-documents/testEXCEL_charts.xlsb | Bin
.../resources/test-documents/testEXCEL_charts.xlsx | Bin
.../test-documents/testEXCEL_custom_props.xls | Bin
.../test-documents/testEXCEL_custom_props.xlsx | Bin
.../test-documents/testEXCEL_dateFormats.xls | Bin
.../test-documents/testEXCEL_dateFormats.xlsx | Bin
.../test-documents/testEXCEL_diagramData.xlsb | Bin
.../test-documents/testEXCEL_diagramData.xlsx | Bin
.../test-documents/testEXCEL_embeddedPDF_mac.xls | Bin
.../test-documents/testEXCEL_embeddedPDF_mac.xlsx | Bin
.../testEXCEL_embeddedPDF_windows.xls | Bin
.../testEXCEL_embeddedPDF_windows.xlsx | Bin
.../resources/test-documents/testEXCEL_embeded.xls | Bin
.../test-documents/testEXCEL_embeded.xlsx | Bin
.../test-documents/testEXCEL_headers_footers.xls | Bin
.../test-documents/testEXCEL_headers_footers.xlsx | Bin
.../test-documents/testEXCEL_hyperlinks.xls | Bin
.../test-documents/testEXCEL_hyperlinks.xlsx | Bin
.../testEXCEL_labels-govdocs-515858.xls | Bin
.../resources/test-documents/testEXCEL_macro.xls | Bin
.../resources/test-documents/testEXCEL_macro.xlsm | Bin
.../testEXCEL_macro_enabled_template.xltm | Bin
.../test-documents/testEXCEL_phonetic.xls | Bin
.../test-documents/testEXCEL_phonetic.xlsx | Bin
.../test-documents/testEXCEL_poi-61034.xlsx | Bin
.../resources/test-documents/testEXCEL_poi.xlsx | Bin
.../testEXCEL_protected_passtika.xls | Bin
.../testEXCEL_protected_passtika.xlsx | Bin
.../testEXCEL_protected_passtika_2.xlsx | Bin
.../resources/test-documents/testEXCEL_signed.xlsx | Bin
.../test-documents/testEXCEL_template.xlt | Bin
.../test-documents/testEXCEL_template.xltx | Bin
.../resources/test-documents/testEXCEL_textbox.xls | Bin
.../test-documents/testEXCEL_textbox.xlsx | Bin
.../test-documents/testEXCEL_various.xlsb | Bin
.../test-documents/testExcel_embeddedPDF.xls | Bin
.../test-documents/testExcel_embeddedPDF.xlsx | Bin
.../resources/test-documents/testException1.doc | Bin
.../resources/test-documents/testException2.doc | Bin
.../test-documents/testFontAfterBufferedText.rtf | 0
.../test-documents/testMSChart-govdocs-428996.ppt | Bin
.../test-documents/testMSChart-govdocs-428996.pptx | Bin
.../test-documents/testMSChart-govdocs-428996.xls | Bin
.../test-documents/testMSChart-govdocs-428996.xlsx | Bin
.../testMSEquation-govdocs-863534.doc | Bin
.../src/test/resources/test-documents/testMSG.msg | Bin
.../test-documents/testMSG_Appointment.msg | Bin
.../resources/test-documents/testMSG_Contact.msg | Bin
.../test/resources/test-documents/testMSG_Post.msg | Bin
.../test-documents/testMSG_StickyNote.msg | Bin
.../test/resources/test-documents/testMSG_Task.msg | Bin
.../resources/test-documents/testMSG_att_doc.msg | Bin
.../resources/test-documents/testMSG_att_msg.msg | Bin
.../resources/test-documents/testMSG_chinese.msg | Bin
.../resources/test-documents/testMSG_forwarded.msg | Bin
.../test/resources/test-documents/testMSOwnerFile | Bin
.../test/resources/test-documents/testOneNote.one | Bin
.../test/resources/test-documents/testOneNote1.one | Bin
.../test/resources/test-documents/testOneNote2.one | Bin
.../test-documents/testOneNote2007OrEarlier1.one | Bin
.../test-documents/testOneNote2007OrEarlier2.one | Bin
.../resources/test-documents/testOneNote2016.one | Bin
.../test/resources/test-documents/testOneNote3.one | Bin
.../test/resources/test-documents/testOneNote4.one | Bin
.../test-documents/testOneNoteEmbeddedWordDoc.one | Bin
.../src/test/resources/test-documents/testPPM.ppm | 0
.../src/test/resources/test-documents/testPPT.potm | Bin
.../src/test/resources/test-documents/testPPT.ppsm | Bin
.../src/test/resources/test-documents/testPPT.ppsx | Bin
.../src/test/resources/test-documents/testPPT.ppt | Bin
.../src/test/resources/test-documents/testPPT.pptm | Bin
.../src/test/resources/test-documents/testPPT.pptx | Bin
.../src/test/resources/test-documents/testPPT.thmx | Bin
.../src/test/resources/test-documents/testPPT.xps | Bin
.../test-documents/testPPTX_Thumbnail.pptx | Bin
.../testPPTX_overlappingRelations.pptx | Bin
.../resources/test-documents/testPPT_2imgs.ppt | Bin
.../resources/test-documents/testPPT_2imgs.pptx | Bin
.../test-documents/testPPT_EmbeddedPDF.ppt | Bin
.../test-documents/testPPT_EmbeddedPDF.pptx | Bin
.../resources/test-documents/testPPT_autodate.ppt | Bin
.../resources/test-documents/testPPT_autodate.pptx | Bin
.../resources/test-documents/testPPT_charts.pptx | Bin
.../resources/test-documents/testPPT_comment.ppt | Bin
.../resources/test-documents/testPPT_comment.pptx | Bin
.../test-documents/testPPT_custom_props.ppt | Bin
.../test-documents/testPPT_custom_props.pptx | Bin
.../test-documents/testPPT_diagramData.pptx | Bin
.../resources/test-documents/testPPT_embedded2.ppt | Bin
.../test-documents/testPPT_embeddedMP3.pptx | Bin
.../testPPT_embedded_two_slides.pptx | Bin
.../resources/test-documents/testPPT_embeded.ppt | Bin
.../resources/test-documents/testPPT_embeded.pptx | Bin
.../resources/test-documents/testPPT_groups.ppt | Bin
.../resources/test-documents/testPPT_groups.pptx | Bin
.../resources/test-documents/testPPT_macros.ppt | Bin
.../resources/test-documents/testPPT_macros.pptm | Bin
.../test-documents/testPPT_masterFooter.ppt | Bin
.../test-documents/testPPT_masterFooter.pptx | Bin
.../test-documents/testPPT_masterText.ppt | Bin
.../test-documents/testPPT_masterText.pptx | Bin
.../test-documents/testPPT_masterText2.ppt | Bin
.../test-documents/testPPT_masterText2.pptx | Bin
.../test-documents/testPPT_oleWorkbook.ppt | Bin
.../test-documents/testPPT_oleWorkbook.pptx | Bin
.../test-documents/testPPT_protected_passtika.ppt | Bin
.../test-documents/testPPT_protected_passtika.pptx | Bin
.../resources/test-documents/testPPT_signed.pptx | Bin
.../testPPT_skipBadCompressedObject.ppt | Bin
.../resources/test-documents/testPPT_various.ppt | Bin
.../resources/test-documents/testPPT_various.pptx | Bin
.../resources/test-documents/testPPT_various2.pptx | Bin
.../resources/test-documents/testPROJECT2003.mpp | Bin
.../resources/test-documents/testPROJECT2007.mpp | Bin
.../src/test/resources/test-documents/testPST.pst | Bin
.../test-documents/testPST_variousBodyTypes.pst | Bin
.../resources/test-documents/testPUBLISHER.pub | Bin
.../resources/test-documents/testRTF-ms932.rtf | 0
.../src/test/resources/test-documents/testRTF.rtf | 0
.../resources/test-documents/testRTFBoldItalic.rtf | 0
.../resources/test-documents/testRTFBoldPlain.rtf | 0
.../resources/test-documents/testRTFControls.rtf | 0
.../test-documents/testRTFCorruptListOverride.rtf | 0
.../test-documents/testRTFEmbeddedFiles.rtf | 0
.../test-documents/testRTFEmbeddedLink.rtf | 0
.../test-documents/testRTFHexEscapeInsideWord.rtf | 0
.../resources/test-documents/testRTFHyperlink.rtf | 0
.../test-documents/testRTFIgnoredControlWord.rtf | 0
.../test-documents/testRTFInvalidUnicode.rtf | 0
.../resources/test-documents/testRTFJapanese.rtf | 0
.../test-documents/testRTFListLibreOffice.rtf | 0
.../test-documents/testRTFListMicrosoftWord.rtf | 0
.../test-documents/testRTFListOverride.rtf | 0
.../resources/test-documents/testRTFNewlines.rtf | 0
.../test-documents/testRTFRegularImages.rtf | 0
.../resources/test-documents/testRTFTIKA_1713.rtf | 0
.../resources/test-documents/testRTFTIKA_2150.rtf | 0
.../resources/test-documents/testRTFTIKA_2500.rtf | 0
.../resources/test-documents/testRTFTIKA_2883.rtf | Bin
.../resources/test-documents/testRTFTIKA_2899.rtf | 0
.../test-documents/testRTFTableCellSeparation.rtf | 0
.../test-documents/testRTFTableCellSeparation2.rtf | 0
.../test-documents/testRTFUmlautSpaces.rtf | 0
.../test-documents/testRTFUmlautSpaces2.rtf | 0
.../test-documents/testRTFUnicodeGothic.rtf | 0
...stRTFUnicodeUCNControlWordCharacterDoubling.rtf | 0
.../resources/test-documents/testRTFVarious.rtf | 0
.../test-documents/testRTFWindowsCodepage1250.rtf | 0
.../test-documents/testRTFWithCurlyBraces.rtf | 0
.../testRTFWord2010CzechCharacters.rtf | 0
.../testRTFWordPadCzechCharacters.rtf | 0
.../test-documents/testRTF_annotation_spacing.rtf | 0
.../test/resources/test-documents/testVISIO.vsd | Bin
.../test/resources/test-documents/testVISIO.vsdm | Bin
.../test/resources/test-documents/testVISIO.vsdx | Bin
.../test/resources/test-documents/testVISIO.vssm | Bin
.../test/resources/test-documents/testVISIO.vssx | Bin
.../test/resources/test-documents/testVISIO.vstm | Bin
.../test/resources/test-documents/testVISIO.vstx | Bin
.../test/resources/test-documents/testWINMAIL.dat | Bin
.../src/test/resources/test-documents/testWMF.wmf | Bin
.../resources/test-documents/testWMF_charset.wmf | Bin
.../src/test/resources/test-documents/testWORD.doc | Bin
.../test/resources/test-documents/testWORD.docx | Bin
.../test/resources/test-documents/testWORD2003.xml | 0
.../test/resources/test-documents/testWORD6.doc | Bin
.../resources/test-documents/testWORD_1img.doc | Bin
.../resources/test-documents/testWORD_1img.docx | Bin
.../resources/test-documents/testWORD_2003ml.xml | 0
.../resources/test-documents/testWORD_2006ml.doc | Bin
.../resources/test-documents/testWORD_2006ml.docx | Bin
.../resources/test-documents/testWORD_2006ml.xml | 0
.../resources/test-documents/testWORD_3imgs.doc | Bin
.../resources/test-documents/testWORD_3imgs.docx | Bin
.../test-documents/testWORD_boldHyperlink.doc | Bin
.../test-documents/testWORD_boldHyperlink.docx | Bin
.../testWORD_bold_character_runs.doc | Bin
.../testWORD_bold_character_runs.docx | Bin
.../testWORD_bold_character_runs2.doc | Bin
.../testWORD_bold_character_runs2.docx | Bin
.../resources/test-documents/testWORD_charts.docx | Bin
.../testWORD_closingSmartQInHyperLink.doc | Bin
.../test-documents/testWORD_custom_props.doc | Bin
.../test-documents/testWORD_custom_props.docx | Bin
.../test-documents/testWORD_diagramData.docx | Bin
.../test-documents/testWORD_docSecurity.docx | Bin
.../test-documents/testWORD_embedded_pdf.doc | Bin
.../test-documents/testWORD_embedded_pdf.docx | Bin
.../test-documents/testWORD_embedded_pics.docx | Bin
.../test-documents/testWORD_embedded_rtf.doc | Bin
.../resources/test-documents/testWORD_embeded.doc | Bin
.../resources/test-documents/testWORD_embeded.docx | Bin
.../test-documents/testWORD_header_hyperlink.doc | Bin
.../testWORD_italicsSurroundingHyperlink.doc | Bin
.../resources/test-documents/testWORD_macros.doc | Bin
.../resources/test-documents/testWORD_macros.docm | Bin
.../testWORD_missing_ooxml_bean1.docx | Bin
.../test-documents/testWORD_missing_text.docx | Bin
.../test-documents/testWORD_multi_authors.doc | Bin
.../test-documents/testWORD_multi_authors.docx | Bin
.../test-documents/testWORD_no_format.doc | Bin
.../test-documents/testWORD_no_format.docx | Bin
.../test-documents/testWORD_null_style.docx | Bin
.../test-documents/testWORD_numbered_list.doc | Bin
.../test-documents/testWORD_numbered_list.docx | Bin
.../testWORD_override_list_numbering.doc | Bin
.../testWORD_override_list_numbering.docx | Bin
.../resources/test-documents/testWORD_phonetic.doc | Bin
.../test-documents/testWORD_phonetic.docx | Bin
.../test-documents/testWORD_protected_passtika.doc | Bin
.../testWORD_protected_passtika.docx | Bin
.../test-documents/testWORD_sdtInTextBox.docx | Bin
.../resources/test-documents/testWORD_signed.docx | Bin
.../testWORD_specialControlCharacter1415.doc | Bin
.../test-documents/testWORD_tabular_symbol.doc | Bin
.../test-documents/testWORD_template.docx | Bin
.../test-documents/testWORD_template.dotx | Bin
.../test-documents/testWORD_text_box.docx | Bin
.../testWORD_totalTimeOutOfRange.docx | Bin
.../test-documents/testWORD_truncated.docx | Bin
.../resources/test-documents/testWORD_various.doc | Bin
.../resources/test-documents/testWORD_various.docx | Bin
.../test-documents/testWORKSSpreadsheet7.0.xlr | Bin
.../test/resources/test-documents/testWordArt.pptx | Bin
.../test-documents/testXLSX_Thumbnail.xlsx | Bin
.../resources/test-documents/testXPS_various.xps | Bin
.../test-documents/testZIP_corrupted_oom.zip | Bin
.../resources/test-documents/test_TIKA-1251.doc | Bin
.../test-documents/test_embedded_zip.pptx | Bin
.../test-documents/test_list_override.rtf | 0
.../test-documents/test_recursive_embedded.doc | Bin
.../test-documents/test_recursive_embedded.docx | Bin
.../test_recursive_embedded_npe.docx | Bin
.../testsolidworksAssembly2013SP2.SLDASM | Bin
.../testsolidworksAssembly2014SP0.SLDASM | Bin
.../testsolidworksDrawing2013SP2.SLDDRW | Bin
.../testsolidworksDrawing2014SP0.SLDDRW | Bin
.../testsolidworksPart2013SP2.SLDPRT | Bin
.../testsolidworksPart2014SP0.SLDPRT | Bin
.../tika-parser-miscoffice-module/pom.xml | 0
.../apache/tika/detect/ole/MiscOLEDetector.java | 0
.../java/org/apache/tika/parser/dbf/DBFCell.java | 0
.../apache/tika/parser/dbf/DBFColumnHeader.java | 0
.../org/apache/tika/parser/dbf/DBFFileHeader.java | 0
.../java/org/apache/tika/parser/dbf/DBFParser.java | 0
.../java/org/apache/tika/parser/dbf/DBFReader.java | 0
.../java/org/apache/tika/parser/dbf/DBFRow.java | 0
.../apache/tika/parser/dif/DIFContentHandler.java | 0
.../java/org/apache/tika/parser/dif/DIFParser.java | 0
.../apache/tika/parser/epub/EpubContentParser.java | 0
.../org/apache/tika/parser/epub/EpubParser.java | 0
.../apache/tika/parser/hwp/HwpStreamReader.java | 0
.../apache/tika/parser/hwp/HwpTextExtractorV5.java | 0
.../org/apache/tika/parser/hwp/HwpV5Parser.java | 0
.../parser/odf/FlatOpenDocumentMacroHandler.java | 0
.../tika/parser/odf/FlatOpenDocumentParser.java | 0
.../parser/odf/NSNormalizerContentHandler.java | 0
.../tika/parser/odf/OpenDocumentBodyHandler.java | 0
.../tika/parser/odf/OpenDocumentContentParser.java | 0
.../tika/parser/odf/OpenDocumentMacroHandler.java | 0
.../tika/parser/odf/OpenDocumentMetaParser.java | 0
.../apache/tika/parser/odf/OpenDocumentParser.java | 0
.../tika/parser/wordperfect/QPWTextExtractor.java | 0
.../tika/parser/wordperfect/QuattroProParser.java | 0
.../tika/parser/wordperfect/WP5Charsets.java | 0
.../wordperfect/WP5DocumentAreaExtractor.java | 0
.../tika/parser/wordperfect/WP6Charsets.java | 0
.../wordperfect/WP6DocumentAreaExtractor.java | 0
.../wordperfect/WPDocumentAreaExtractor.java | 0
.../tika/parser/wordperfect/WPInputStream.java | 0
.../tika/parser/wordperfect/WPPrefixArea.java | 0
.../parser/wordperfect/WPPrefixAreaExtractor.java | 0
.../tika/parser/wordperfect/WordPerfectParser.java | 0
.../services/org.apache.tika.detect.Detector | 0
.../services/org.apache.tika.parser.Parser | 0
.../org/apache/tika/parser/dbf/DBFParserTest.java | 0
.../org/apache/tika/parser/dif/DIFParserTest.java | 0
.../apache/tika/parser/epub/EpubParserTest.java | 0
.../apache/tika/parser/hwp/HwpV5ParserTest.java | 0
.../tika/parser/ibooks/iBooksParserTest.java | 0
.../org/apache/tika/parser/odf/ODFParserTest.java | 0
.../tika/parser/wordperfect/QuattroProTest.java | 0
.../tika/parser/wordperfect/WPInputStreamTest.java | 0
.../tika/parser/wordperfect/WordPerfectTest.java | 0
.../org/apache/tika/parser/epub/tika-config.xml | 0
.../apache/tika/parser/odf/tika-config-macros.xml | 0
.../apache/tika/parser/wordperfect/tika-config.xml | 0
.../test/resources/test-documents/Zamora2010.dif | 0
.../src/test/resources/test-documents/testDBF.dbf | Bin
.../resources/test-documents/testDBF_gb18030.dbf | Bin
.../test/resources/test-documents/testEPUB.epub | Bin
.../resources/test-documents/testEPUB_xml_ext.epub | Bin
.../test/resources/test-documents/testFooter.ods | Bin
.../test/resources/test-documents/testFooter.odt | Bin
.../resources/test-documents/testHWP-v5-dist.hwp | Bin
.../test/resources/test-documents/testHWP-v5b.hwp | Bin
.../test/resources/test-documents/testHWP_3.0.hwp | Bin
.../test/resources/test-documents/testHWP_5.0.hwp | Bin
.../resources/test-documents/testMasterFooter.odp | Bin
.../test-documents/testNPEOpenDocument.odt | Bin
.../resources/test-documents/testODFwithOOo3.odt | Bin
.../resources/test-documents/testODPMacro.fodp | 0
.../test/resources/test-documents/testODPMacro.odp | Bin
.../test/resources/test-documents/testODP_NPE.odp | Bin
.../resources/test-documents/testODSMacro.fods | 0
.../test/resources/test-documents/testODSMacro.ods | Bin
.../resources/test-documents/testODT-TIKA-6000.odt | Bin
.../resources/test-documents/testODTEmbedded.odt | Bin
.../resources/test-documents/testODTMacro.fodt | 0
.../test/resources/test-documents/testODTMacro.odt | Bin
.../resources/test-documents/testODTNoMeta.odt | Bin
.../resources/test-documents/testODTStyles2.odt | Bin
.../resources/test-documents/testODTStyles3.odt | Bin
.../test-documents/testODTnotaZipFile.odt | 0
.../test-documents/testOpenOffice-autotext.bau | Bin
.../test-documents/testOpenOffice-extension.oxt | Bin
.../resources/test-documents/testOpenOffice2.odf | Bin
.../resources/test-documents/testOpenOffice2.odt | Bin
.../test-documents/testOpenOfficeInAZip.zip | Bin
.../test/resources/test-documents/testQUATTRO.qpw | Bin
.../test/resources/test-documents/testQUATTRO.wb3 | Bin
.../test/resources/test-documents/testQuattro.wb1 | Bin
.../test/resources/test-documents/testQuattro.wb2 | Bin
.../test/resources/test-documents/testQuattro.wq1 | Bin
.../test/resources/test-documents/testQuattro.wq2 | Bin
.../test/resources/test-documents/testStyles.odt | Bin
.../resources/test-documents/testWordPerfect.wpd | Bin
.../test-documents/testWordPerfect_42.doc | Bin
.../test-documents/testWordPerfect_5_0.wp | Bin
.../test-documents/testWordPerfect_5_1.wp | Bin
.../resources/test-documents/testiBooks.ibooks | Bin
.../tika-parser-news-module/pom.xml | 0
.../org/apache/tika/parser/feed/FeedParser.java | 0
.../apache/tika/parser/iptc/IptcAnpaParser.java | 0
.../services/org.apache.tika.parser.Parser | 0
.../apache/tika/parser/feed/FeedParserTest.java | 0
.../test/resources/test-documents/rsstest_091.rss | 0
.../test/resources/test-documents/rsstest_20.rss | 0
.../test/resources/test-documents/testATOM.atom | 0
.../tika-parser-ocr-module/pom.xml | 0
.../apache/tika/parser/ocr/TesseractOCRConfig.java | 0
.../apache/tika/parser/ocr/TesseractOCRParser.java | 0
.../services/org.apache.tika.parser.Parser | 0
.../tika/parser/ocr/TesseractOCRConfig.properties | 0
.../org/apache/tika/parser/ocr/rotation.py | 0
.../test-properties/StringsConfig-full.properties | 0
.../StringsConfig-partial.properties | 0
.../TesseractOCRConfig-full.properties | 0
.../TesseractOCRConfig-partial.properties | 0
.../tika/parser/ocr/TesseractOCRConfigTest.java | 0
.../tika/parser/ocr/TesseractOCRParserTest.java | 0
.../org/apache/tika/config/TIKA-2705-tesseract.xml | 0
.../src/test/resources/test-documents/testOCR.docx | Bin
.../src/test/resources/test-documents/testOCR.jpg | Bin
.../src/test/resources/test-documents/testOCR.pptx | Bin
.../resources/test-documents/testOCR_spacing.png | Bin
.../tika-parser-pdf-module/pom.xml | 0
.../apache/tika/parser/pdf/AbstractPDF2XHTML.java | 0
.../org/apache/tika/parser/pdf/AccessChecker.java | 0
.../tika/parser/pdf/ImageGraphicsEngine.java | 0
.../java/org/apache/tika/parser/pdf/OCR2XHTML.java | 0
.../java/org/apache/tika/parser/pdf/PDF2XHTML.java | 0
.../tika/parser/pdf/PDFEncodedStringDecoder.java | 0
.../tika/parser/pdf/PDFMarkedContent2XHTML.java | 0
.../java/org/apache/tika/parser/pdf/PDFParser.java | 0
.../apache/tika/parser/pdf/PDFParserConfig.java | 0
.../apache/tika/parser/pdf/PDFPreflightParser.java | 0
.../tika/parser/pdf/PDMetadataExtractor.java | 0
.../org/apache/tika/parser/pdf/XFAExtractor.java | 0
.../services/org.apache.tika.parser.Parser | 0
.../apache/tika/parser/pdf/PDFParser.properties | 0
.../apache/tika/parser/pdf/AccessCheckerTest.java | 0
.../parser/pdf/PDFMarkedContent2XHTMLTest.java | 0
.../org/apache/tika/parser/pdf/PDFParserTest.java | 0
.../tika/parser/pdf/PDFPreflightParserTest.java | 0
.../tika/parser/pdf/tika-config-non-primitives.xml | 0
.../org/apache/tika/parser/pdf/tika-config.xml | 0
.../apache/tika/parser/pdf/tika-inline-config.xml | 0
.../org/apache/tika/parser/pdf/tika-ocr-config.xml | 0
.../tika/parser/pdf/tika-preflight-config.xml | 0
.../tika/parser/pdf/tika-xml-profiler-config.xml | 0
.../resources/test-documents/testAnnotations.pdf | Bin
.../resources/test-documents/testExtraSpaces.pdf | Bin
.../resources/test-documents/testJournalParser.pdf | Bin
.../src/test/resources/test-documents/testOCR.pdf | Bin
.../test-documents/testOptionalHyphen.pdf | Bin
.../test-documents/testOverlappingText.pdf | Bin
.../test-documents/testPDF-custommetadata.pdf | Bin
.../src/test/resources/test-documents/testPDF.pdf | Bin
.../testPDFEmbeddingAndEmbedded.docx | Bin
.../test-documents/testPDFFileEmbInAnnotation.pdf | Bin
.../testPDFFileEmbInAnnotation_noContents.pdf | 0
.../resources/test-documents/testPDFPackage.pdf | Bin
.../test-documents/testPDFTripleLangTitle.pdf | Bin
.../test-documents/testPDFTwoTextBoxes.pdf | Bin
.../resources/test-documents/testPDFVarious.pdf | Bin
.../resources/test-documents/testPDF_JBIG2.pdf | Bin
.../testPDF_PDFEncodedStringInXMP.pdf | Bin
.../test-documents/testPDF_Version.10.x.pdf | Bin
.../testPDF_Version.11.x.PDFA-1b.pdf | Bin
.../test-documents/testPDF_Version.4.x.pdf | Bin
.../test-documents/testPDF_Version.5.x.pdf | Bin
.../test-documents/testPDF_Version.6.x.pdf | Bin
.../test-documents/testPDF_Version.7.x.pdf | Bin
.../test-documents/testPDF_Version.8.x.pdf | Bin
.../test-documents/testPDF_Version.9.x.pdf | Bin
.../test-documents/testPDF_XFA_govdocs1_258578.pdf | Bin
.../test-documents/testPDF_XMPBasicSchema.pdf | Bin
.../resources/test-documents/testPDF_acroform3.pdf | Bin
.../resources/test-documents/testPDF_angles.pdf | Bin
.../test-documents/testPDF_bad_page_303226.pdf | Bin
.../test/resources/test-documents/testPDF_bom.pdf | Bin
.../resources/test-documents/testPDF_bookmarks.pdf | Bin
.../test-documents/testPDF_childAttachments.pdf | Bin
.../test-documents/testPDF_diffTitles.pdf | 0
.../test-documents/testPDF_multiFormatEmbFiles.pdf | Bin
...PDF_no_extract_no_accessibility_owner_empty.pdf | 0
...tPDF_no_extract_no_accessibility_owner_user.pdf | 0
...DF_no_extract_yes_accessibility_owner_empty.pdf | 0
...PDF_no_extract_yes_accessibility_owner_user.pdf | 0
.../resources/test-documents/testPDF_protected.pdf | Bin
.../test-documents/testPDF_twoAuthors.pdf | Bin
.../resources/test-documents/testPageNumber.pdf | Bin
.../test-documents/testPopupAnnotation.pdf | Bin
.../test-documents/testStandardsExtractor.pdf | Bin
.../tika-parser-pkg-module/pom.xml | 0
.../apache/tika/parser/pkg/CompressorParser.java | 0
.../tika/parser/pkg/CompressorParserOptions.java | 0
.../org/apache/tika/parser/pkg/PackageParser.java | 0
.../java/org/apache/tika/parser/pkg/RarParser.java | 0
.../services/org.apache.tika.parser.Parser | 0
.../apache/tika/parser/pkg/AbstractPkgTest.java | 0
.../org/apache/tika/parser/pkg/ArParserTest.java | 0
.../apache/tika/parser/pkg/Bzip2ParserTest.java | 0
.../apache/tika/parser/pkg/CompressParserTest.java | 0
.../tika/parser/pkg/CompressorParserTest.java | 0
.../org/apache/tika/parser/pkg/GzipParserTest.java | 0
.../apache/tika/parser/pkg/PackageParserTest.java | 0
.../org/apache/tika/parser/pkg/RarParserTest.java | 0
.../apache/tika/parser/pkg/Seven7ParserTest.java | 0
.../org/apache/tika/parser/pkg/TarParserTest.java | 0
.../org/apache/tika/parser/pkg/ZipParserTest.java | 0
.../org/apache/tika/parser/pkg/ZlibParserTest.java | 0
.../org/apache/tika/parser/pkg/tika-config.xml | 0
.../src/test/resources/test-documents/TIKA-216.tgz | Bin
.../src/test/resources/test-documents/droste.zip | Bin
.../resources/test-documents/full_encrypted.7z | Bin
.../src/test/resources/test-documents/moby.zip | Bin
.../src/test/resources/test-documents/quine.gz | Bin
.../test-documents/test-documents-enc.rar | Bin
.../test-documents/test-documents-spanned.z01 | Bin
.../test-documents/test-documents-spanned.zip | Bin
.../resources/test-documents/test-documents.7z | Bin
.../resources/test-documents/test-documents.cab | Bin
.../resources/test-documents/test-documents.cpio | Bin
.../resources/test-documents/test-documents.ddf | 0
.../resources/test-documents/test-documents.dmg | Bin
.../resources/test-documents/test-documents.rar | Bin
.../resources/test-documents/test-documents.tar | Bin
.../resources/test-documents/test-documents.tar.Z | Bin
.../resources/test-documents/test-documents.tbz2 | Bin
.../resources/test-documents/test-documents.tgz | Bin
.../resources/test-documents/test-documents.zip | Bin
.../resources/test-documents/test-zip-of-zip.zip | Bin
.../test-documents/test7Z_protected_passTika.7z | Bin
.../test/resources/test-documents/testARofSND.ar | Bin
.../test/resources/test-documents/testARofText.ar | 0
.../test-documents/testBROTLI_compressed.br | Bin
.../test/resources/test-documents/testEmbedded.zip | Bin
.../resources/test-documents/testJAR_with_HTML.jar | Bin
.../test-documents/testJAR_with_PEHDR.jar | Bin
.../resources/test-documents/testLZ4-framed.lz4 | Bin
.../src/test/resources/test-documents/testLZMA_oom | Bin
.../src/test/resources/test-documents/testSVG.svg | 0
.../src/test/resources/test-documents/testSVG.svgz | Bin
.../resources/test-documents/testSnappy-framed.sz | Bin
.../src/test/resources/test-documents/testTXT.zlib | Bin
.../test/resources/test-documents/testTXT.zlib0 | Bin
.../test/resources/test-documents/testTXT.zlib5 | Bin
.../test/resources/test-documents/testTXT.zlib9 | Bin
.../test/resources/test-documents/testZSTD.zstd | Bin
.../src/test/resources/test-documents/testZ_oom.Z | 0
.../resources/test-documents/testZipEncrypted.zip | Bin
.../tika-parser-text-module/pom.xml | 0
.../java/org/apache/tika/parser/csv/CSVParams.java | 0
.../java/org/apache/tika/parser/csv/CSVResult.java | 0
.../org/apache/tika/parser/csv/CSVSniffer.java | 0
.../apache/tika/parser/csv/TextAndCSVParser.java | 0
.../org/apache/tika/parser/strings/FileConfig.java | 0
.../tika/parser/strings/Latin1StringsParser.java | 0
.../apache/tika/parser/strings/StringsConfig.java | 0
.../tika/parser/strings/StringsEncoding.java | 0
.../apache/tika/parser/strings/StringsParser.java | 0
.../apache/tika/parser/txt/CharsetDetector.java | 0
.../org/apache/tika/parser/txt/CharsetMatch.java | 0
.../apache/tika/parser/txt/CharsetRecog_2022.java | 0
.../apache/tika/parser/txt/CharsetRecog_UTF8.java | 0
.../tika/parser/txt/CharsetRecog_Unicode.java | 0
.../apache/tika/parser/txt/CharsetRecog_mbcs.java | 0
.../apache/tika/parser/txt/CharsetRecog_sbcs.java | 0
.../apache/tika/parser/txt/CharsetRecognizer.java | 0
.../tika/parser/txt/Icu4jEncodingDetector.java | 0
.../java/org/apache/tika/parser/txt/TXTParser.java | 0
.../tika/parser/txt/UniversalEncodingDetector.java | 0
.../tika/parser/txt/UniversalEncodingListener.java | 0
.../org.apache.tika.detect.EncodingDetector | 0
.../services/org.apache.tika.parser.Parser | 0
.../org/apache/tika/parser/csv/CSVSnifferTest.java | 0
.../tika/parser/csv/TextAndCSVParserTest.java | 0
.../apache/tika/parser/strings/FileConfigTest.java | 0
.../parser/strings/Latin1StringsParserTest.java | 0
.../tika/parser/strings/StringsConfigTest.java | 0
.../tika/parser/strings/StringsParserTest.java | 0
.../tika/parser/txt/CharsetDetectorTest.java | 0
.../org/apache/tika/parser/txt/TXTParserTest.java | 0
.../org/apache/tika/parser/csv/tika-config.xml | 0
.../resources/test-documents/english.cp500.txt | 0
.../resources/test-documents/multi-language.txt | 0
.../src/test/resources/test-documents/resume.html | 0
.../resources/test-documents/russian.cp866.txt | 0
.../test-documents/testOCTET_header.dbase3 | Bin
.../resources/test-documents/testTXT_win-1252.txt | 0
.../resources/test-documents/testVCalendar.vcs | 0
.../test-properties/StringsConfig-full.properties | 0
.../StringsConfig-partial.properties | 0
.../tika-parser-xml-module/pom.xml | 0
.../tika/parser/xliff/XLIFF12ContentHandler.java | 0
.../apache/tika/parser/xliff/XLIFF12Parser.java | 0
.../org/apache/tika/parser/xliff/XLZParser.java | 0
.../tika/parser/xml/AbstractMetadataHandler.java | 0
.../xml/AttributeDependantMetadataHandler.java | 0
.../tika/parser/xml/AttributeMetadataHandler.java | 0
.../org/apache/tika/parser/xml/DcXMLParser.java | 0
.../tika/parser/xml/ElementMetadataHandler.java | 0
.../apache/tika/parser/xml/FictionBookParser.java | 0
.../apache/tika/parser/xml/MetadataHandler.java | 0
.../java/org/apache/tika/parser/xml/XMLParser.java | 0
.../org/apache/tika/parser/xml/XMLProfiler.java | 0
.../services/org.apache.tika.parser.Parser | 0
.../tika/parser/xliff/XLIFF12ParserTest.java | 0
.../apache/tika/parser/xliff/XLZParserTest.java | 0
.../apache/tika/parser/xml/DcXMLParserTest.java | 0
.../EmptyAndDuplicateElementsXMLParserTest.java | 0
.../tika/parser/xml/FictionBookParserTest.java | 0
.../src/test/resources/test-documents/test.fb2 | 0
.../test/resources/test-documents/testXLIFF12.xlf | 0
.../test/resources/test-documents/testXLIFF12.xlz | Bin
.../src/test/resources/test-documents/testXML.xml | 0
.../src/test/resources/test-documents/testXML2.xml | 0
.../src/test/resources/test-documents/testXML3.xml | 0
.../src/test/resources/test-documents/testXXE.xml | 0
.../tika-parser-xmp-commons/pom.xml | 0
.../apache/tika/parser/xmp/JempboxExtractor.java | 0
.../apache/tika/parser/xmp/XMPPacketScanner.java | 0
.../tika/parser/xmp/JempboxExtractorTest.java | 0
.../test-documents/testJPEG_commented.jpg | Bin
.../testJPEG_commented_pspcs2mac.jpg | Bin
.../testJPEG_commented_xnviewmp026.jpg | Bin
.../src/test/resources/test-documents/testXMP.xmp | 0
.../tika-parser-zip-commons/pom.xml | 0
.../tika/detect/zip/CompressorConstants.java | 0
.../detect/zip/DefaultZipContainerDetector.java | 0
.../DeprecatedStreamingZipContainerDetector.java | 0
.../detect/zip/DeprecatedZipContainerDetector.java | 0
.../org/apache/tika/detect/zip/IPADetector.java | 0
.../org/apache/tika/detect/zip/JarDetector.java | 0
.../org/apache/tika/detect/zip/KMZDetector.java | 0
.../tika/detect/zip/OpenDocumentDetector.java | 0
.../apache/tika/detect/zip/PackageConstants.java | 0
.../apache/tika/detect/zip/StarOfficeDetector.java | 0
.../tika/detect/zip/StreamingDetectContext.java | 0
.../detect/zip/StreamingZipContainerDetector.java | 0
.../tika/detect/zip/ZipContainerDetector.java | 0
.../tika/detect/zip/ZipContainerDetectorBase.java | 0
.../org/apache/tika/zip/utils/ZipSalvager.java | 0
.../services/org.apache.tika.detect.Detector | 0
...org.apache.tika.detect.zip.ZipContainerDetector | 0
.../org/apache/tika/detect/zip/ZipParserTest.java | 0
.../src/test/resources/test-documents/testJAR.jar | Bin
.../src/test/resources/test-documents/testKMZ.kmz | Bin
tika-server/pom.xml | 5 -
1528 files changed, 343 insertions(+), 395 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9f714e5..1fa7a53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,8 @@
<modules>
<module>tika-parent</module>
<module>tika-core</module>
- <module>tika-parser-modules</module>
+ <module>tika-parsers</module>
+ <module>tika-parsers-extended</module>
<!-- <module>tika-bundle</module> turn this off for now -->
<module>tika-xmp</module>
@@ -51,8 +52,7 @@
<module>tika-example</module>
<module>tika-java7</module>
<module>tika-eval</module>
- <module>tika-advanced-parser-modules</module>
- <module>tika-parsers</module>
+ <module>tika-parsers-advanced</module>
</modules>
<profiles>
diff --git a/tika-app/pom.xml b/tika-app/pom.xml
index 431c730..b5d7afb 100644
--- a/tika-app/pom.xml
+++ b/tika-app/pom.xml
@@ -115,11 +115,6 @@
<createDependencyReducedPom>
false
</createDependencyReducedPom>
- <artifactSet>
- <excludes>
- <exclude>org.apache.tika:tika-parsers:jar:</exclude>
- </excludes>
- </artifactSet>
<filters>
<filter>
<artifact>*:*</artifact>
diff --git a/tika-parser-modules/pom.xml b/tika-parser-modules/pom.xml
deleted file mode 100644
index 5f31d24..0000000
--- a/tika-parser-modules/pom.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>tika-parent</artifactId>
- <groupId>org.apache.tika</groupId>
- <version>2.0.0-SNAPSHOT</version>
- <relativePath>../tika-parent/pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>tika-parser-modules</artifactId>
- <packaging>pom</packaging>
- <name>Apache Tika parser modules</name>
- <url>http://tika.apache.org/</url>
-
- <properties>
-
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <!-- test dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-core</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <modules>
- <module>tika-parser-digest-commons</module>
- <module>tika-parser-mail-commons</module>
- <module>tika-parser-xmp-commons</module>
- <module>tika-parser-zip-commons</module>
-
- <module>tika-parser-ocr-module</module>
- <module>tika-parser-audiovideo-module</module>
- <module>tika-parser-code-module</module>
- <module>tika-parser-html-module</module>
- <module>tika-parser-image-module</module>
- <module>tika-parser-text-module</module>
- <module>tika-parser-font-module</module>
- <module>tika-parser-microsoft-module</module>
- <module>tika-parser-pkg-module</module>
- <module>tika-parser-xml-module</module>
- <module>tika-parser-pdf-module</module>
- <module>tika-parser-apple-module</module>
- <module>tika-parser-cad-module</module>
- <module>tika-parser-mail-module</module>
- <module>tika-parser-miscoffice-module</module>
- <module>tika-parser-news-module</module>
- <module>tika-parser-db-module</module>
- <module>tika-parser-crypto-module</module>
- <module>tika-parser-scientific-module</module>
- <module>tika-parser-integration-tests</module>
- </modules>
-
-</project>
\ No newline at end of file
diff --git a/tika-parser-modules/tika-parser-db-module/pom.xml b/tika-parser-modules/tika-parser-db-module/pom.xml
deleted file mode 100644
index 36ba122..0000000
--- a/tika-parser-modules/tika-parser-db-module/pom.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>tika-parser-modules</artifactId>
- <groupId>org.apache.tika</groupId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>tika-parser-db-module</artifactId>
-
-
- <dependencies>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons.io.version}</version>
- </dependency>
- <dependency>
- <groupId>org.xerial</groupId>
- <artifactId>sqlite-jdbc</artifactId>
- <version>${sqlite.version}</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <Automatic-Module-Name>org.apache.tika.parser.sqlite3</Automatic-Module-Name>
- </manifestEntries>
- </archive>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
diff --git a/tika-advanced-parser-modules/pom.xml b/tika-parsers-advanced/pom.xml
similarity index 91%
rename from tika-advanced-parser-modules/pom.xml
rename to tika-parsers-advanced/pom.xml
index e41c9e0..b169102 100644
--- a/tika-advanced-parser-modules/pom.xml
+++ b/tika-parsers-advanced/pom.xml
@@ -11,7 +11,7 @@
<modelVersion>4.0.0</modelVersion>
- <artifactId>tika-advanced-parser-modules</artifactId>
+ <artifactId>tika-parsers-advanced</artifactId>
<packaging>pom</packaging>
<modules>
diff --git a/tika-advanced-parser-modules/tika-dl/pom.xml b/tika-parsers-advanced/tika-dl/pom.xml
similarity index 100%
rename from tika-advanced-parser-modules/tika-dl/pom.xml
rename to tika-parsers-advanced/tika-dl/pom.xml
diff --git a/tika-advanced-parser-modules/tika-dl/src/main/java/org/apache/tika/dl/imagerec/DL4JInceptionV3Net.java b/tika-parsers-advanced/tika-dl/src/main/java/org/apache/tika/dl/imagerec/DL4JInceptionV3Net.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-dl/src/main/java/org/apache/tika/dl/imagerec/DL4JInceptionV3Net.java
rename to tika-parsers-advanced/tika-dl/src/main/java/org/apache/tika/dl/imagerec/DL4JInceptionV3Net.java
diff --git a/tika-advanced-parser-modules/tika-dl/src/main/java/org/apache/tika/dl/imagerec/DL4JVGG16Net.java b/tika-parsers-advanced/tika-dl/src/main/java/org/apache/tika/dl/imagerec/DL4JVGG16Net.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-dl/src/main/java/org/apache/tika/dl/imagerec/DL4JVGG16Net.java
rename to tika-parsers-advanced/tika-dl/src/main/java/org/apache/tika/dl/imagerec/DL4JVGG16Net.java
diff --git a/tika-advanced-parser-modules/tika-dl/src/test/java/org/apache/tika/dl/imagerec/DL4JInceptionV3NetTest.java b/tika-parsers-advanced/tika-dl/src/test/java/org/apache/tika/dl/imagerec/DL4JInceptionV3NetTest.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-dl/src/test/java/org/apache/tika/dl/imagerec/DL4JInceptionV3NetTest.java
rename to tika-parsers-advanced/tika-dl/src/test/java/org/apache/tika/dl/imagerec/DL4JInceptionV3NetTest.java
diff --git a/tika-advanced-parser-modules/tika-dl/src/test/java/org/apache/tika/dl/imagerec/DL4JVGG16NetTest.java b/tika-parsers-advanced/tika-dl/src/test/java/org/apache/tika/dl/imagerec/DL4JVGG16NetTest.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-dl/src/test/java/org/apache/tika/dl/imagerec/DL4JVGG16NetTest.java
rename to tika-parsers-advanced/tika-dl/src/test/java/org/apache/tika/dl/imagerec/DL4JVGG16NetTest.java
diff --git a/tika-advanced-parser-modules/tika-dl/src/test/resources/org/apache/tika/dl/imagerec/cat.jpg b/tika-parsers-advanced/tika-dl/src/test/resources/org/apache/tika/dl/imagerec/cat.jpg
similarity index 100%
rename from tika-advanced-parser-modules/tika-dl/src/test/resources/org/apache/tika/dl/imagerec/cat.jpg
rename to tika-parsers-advanced/tika-dl/src/test/resources/org/apache/tika/dl/imagerec/cat.jpg
diff --git a/tika-advanced-parser-modules/tika-dl/src/test/resources/org/apache/tika/dl/imagerec/dl4j-inception3-config.xml b/tika-parsers-advanced/tika-dl/src/test/resources/org/apache/tika/dl/imagerec/dl4j-inception3-config.xml
similarity index 100%
rename from tika-advanced-parser-modules/tika-dl/src/test/resources/org/apache/tika/dl/imagerec/dl4j-inception3-config.xml
rename to tika-parsers-advanced/tika-dl/src/test/resources/org/apache/tika/dl/imagerec/dl4j-inception3-config.xml
diff --git a/tika-advanced-parser-modules/tika-dl/src/test/resources/org/apache/tika/dl/imagerec/dl4j-vgg16-config.xml b/tika-parsers-advanced/tika-dl/src/test/resources/org/apache/tika/dl/imagerec/dl4j-vgg16-config.xml
similarity index 100%
rename from tika-advanced-parser-modules/tika-dl/src/test/resources/org/apache/tika/dl/imagerec/dl4j-vgg16-config.xml
rename to tika-parsers-advanced/tika-dl/src/test/resources/org/apache/tika/dl/imagerec/dl4j-vgg16-config.xml
diff --git a/tika-advanced-parser-modules/tika-dl/src/test/resources/org/apache/tika/dl/imagerec/lion.jpg b/tika-parsers-advanced/tika-dl/src/test/resources/org/apache/tika/dl/imagerec/lion.jpg
similarity index 100%
rename from tika-advanced-parser-modules/tika-dl/src/test/resources/org/apache/tika/dl/imagerec/lion.jpg
rename to tika-parsers-advanced/tika-dl/src/test/resources/org/apache/tika/dl/imagerec/lion.jpg
diff --git a/tika-advanced-parser-modules/tika-nlp/pom.xml b/tika-parsers-advanced/tika-nlp/pom.xml
similarity index 100%
rename from tika-advanced-parser-modules/tika-nlp/pom.xml
rename to tika-parsers-advanced/tika-nlp/pom.xml
diff --git a/tika-advanced-parser-modules/tika-nlp/src/main/java/org/apache/tika/parser/recognition/AgeRecogniser.java b/tika-parsers-advanced/tika-nlp/src/main/java/org/apache/tika/parser/recognition/AgeRecogniser.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-nlp/src/main/java/org/apache/tika/parser/recognition/AgeRecogniser.java
rename to tika-parsers-advanced/tika-nlp/src/main/java/org/apache/tika/parser/recognition/AgeRecogniser.java
diff --git a/tika-advanced-parser-modules/tika-nlp/src/main/java/org/apache/tika/parser/recognition/AgeRecogniserConfig.java b/tika-parsers-advanced/tika-nlp/src/main/java/org/apache/tika/parser/recognition/AgeRecogniserConfig.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-nlp/src/main/java/org/apache/tika/parser/recognition/AgeRecogniserConfig.java
rename to tika-parsers-advanced/tika-nlp/src/main/java/org/apache/tika/parser/recognition/AgeRecogniserConfig.java
diff --git a/tika-advanced-parser-modules/tika-nlp/src/test/java/org/apache/tika/parser/recognition/AgeRecogniserTest.java b/tika-parsers-advanced/tika-nlp/src/test/java/org/apache/tika/parser/recognition/AgeRecogniserTest.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-nlp/src/test/java/org/apache/tika/parser/recognition/AgeRecogniserTest.java
rename to tika-parsers-advanced/tika-nlp/src/test/java/org/apache/tika/parser/recognition/AgeRecogniserTest.java
diff --git a/tika-advanced-parser-modules/tika-nlp/src/test/resources/org/apache/tika/parser/recognition/tika-config-age.xml b/tika-parsers-advanced/tika-nlp/src/test/resources/org/apache/tika/parser/recognition/tika-config-age.xml
similarity index 100%
rename from tika-advanced-parser-modules/tika-nlp/src/test/resources/org/apache/tika/parser/recognition/tika-config-age.xml
rename to tika-parsers-advanced/tika-nlp/src/test/resources/org/apache/tika/parser/recognition/tika-config-age.xml
diff --git a/tika-advanced-parser-modules/tika-parser-advancedmedia-module/pom.xml b/tika-parsers-advanced/tika-parser-advancedmedia-module/pom.xml
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-advancedmedia-module/pom.xml
rename to tika-parsers-advanced/tika-parser-advancedmedia-module/pom.xml
diff --git a/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/captioning/CaptionObject.java b/tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/captioning/CaptionObject.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/captioning/CaptionObject.java
rename to tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/captioning/CaptionObject.java
diff --git a/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/captioning/tf/TensorflowRESTCaptioner.java b/tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/captioning/tf/TensorflowRESTCaptioner.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/captioning/tf/TensorflowRESTCaptioner.java
rename to tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/captioning/tf/TensorflowRESTCaptioner.java
diff --git a/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/pot/PooledTimeSeriesParser.java b/tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/pot/PooledTimeSeriesParser.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/pot/PooledTimeSeriesParser.java
rename to tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/pot/PooledTimeSeriesParser.java
diff --git a/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/ObjectRecogniser.java b/tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/ObjectRecogniser.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/ObjectRecogniser.java
rename to tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/ObjectRecogniser.java
diff --git a/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/ObjectRecognitionParser.java b/tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/ObjectRecognitionParser.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/ObjectRecognitionParser.java
rename to tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/ObjectRecognitionParser.java
diff --git a/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/RecognisedObject.java b/tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/RecognisedObject.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/RecognisedObject.java
rename to tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/RecognisedObject.java
diff --git a/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowImageRecParser.java b/tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowImageRecParser.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowImageRecParser.java
rename to tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowImageRecParser.java
diff --git a/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowRESTRecogniser.java b/tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowRESTRecogniser.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowRESTRecogniser.java
rename to tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowRESTRecogniser.java
diff --git a/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowRESTVideoRecogniser.java b/tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowRESTVideoRecogniser.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowRESTVideoRecogniser.java
rename to tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowRESTVideoRecogniser.java
diff --git a/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/caption_generator.py b/tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/caption_generator.py
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/caption_generator.py
rename to tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/caption_generator.py
diff --git a/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/im2txtapi.py b/tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/im2txtapi.py
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/im2txtapi.py
rename to tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/im2txtapi.py
diff --git a/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/model_info.xml b/tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/model_info.xml
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/model_info.xml
rename to tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/model_info.xml
diff --git a/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/model_wrapper.py b/tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/model_wrapper.py
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/model_wrapper.py
rename to tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/model_wrapper.py
diff --git a/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/vocabulary.py b/tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/vocabulary.py
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/vocabulary.py
rename to tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/captioning/tf/vocabulary.py
diff --git a/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tf/inception_v4.py b/tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tf/inception_v4.py
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tf/inception_v4.py
rename to tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tf/inception_v4.py
diff --git a/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tf/inceptionapi.py b/tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tf/inceptionapi.py
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tf/inceptionapi.py
rename to tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tf/inceptionapi.py
diff --git a/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tf/video_util.py b/tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tf/video_util.py
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tf/video_util.py
rename to tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tf/video_util.py
diff --git a/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tika-config-tflow-im2txt-rest.xml b/tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tika-config-tflow-im2txt-rest.xml
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tika-config-tflow-im2txt-rest.xml
rename to tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tika-config-tflow-im2txt-rest.xml
diff --git a/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tika-config-tflow-rest.xml b/tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tika-config-tflow-rest.xml
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tika-config-tflow-rest.xml
rename to tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tika-config-tflow-rest.xml
diff --git a/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tika-config-tflow-video-rest.xml b/tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tika-config-tflow-video-rest.xml
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tika-config-tflow-video-rest.xml
rename to tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tika-config-tflow-video-rest.xml
diff --git a/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tika-config-tflow.xml b/tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tika-config-tflow.xml
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tika-config-tflow.xml
rename to tika-parsers-advanced/tika-parser-advancedmedia-module/src/main/resources/org/apache/tika/parser/recognition/tika-config-tflow.xml
diff --git a/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/test/java/org/apache/tika/parser/recognition/ObjectRecognitionParserTest.java b/tika-parsers-advanced/tika-parser-advancedmedia-module/src/test/java/org/apache/tika/parser/recognition/ObjectRecognitionParserTest.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/test/java/org/apache/tika/parser/recognition/ObjectRecognitionParserTest.java
rename to tika-parsers-advanced/tika-parser-advancedmedia-module/src/test/java/org/apache/tika/parser/recognition/ObjectRecognitionParserTest.java
diff --git a/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/test/java/org/apache/tika/parser/recognition/tf/TensorflowImageRecParserTest.java b/tika-parsers-advanced/tika-parser-advancedmedia-module/src/test/java/org/apache/tika/parser/recognition/tf/TensorflowImageRecParserTest.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/test/java/org/apache/tika/parser/recognition/tf/TensorflowImageRecParserTest.java
rename to tika-parsers-advanced/tika-parser-advancedmedia-module/src/test/java/org/apache/tika/parser/recognition/tf/TensorflowImageRecParserTest.java
diff --git a/tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/test/java/org/apache/tika/parser/recognition/tf/TensorflowVideoRecParserTest.java b/tika-parsers-advanced/tika-parser-advancedmedia-module/src/test/java/org/apache/tika/parser/recognition/tf/TensorflowVideoRecParserTest.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-advancedmedia-module/src/test/java/org/apache/tika/parser/recognition/tf/TensorflowVideoRecParserTest.java
rename to tika-parsers-advanced/tika-parser-advancedmedia-module/src/test/java/org/apache/tika/parser/recognition/tf/TensorflowVideoRecParserTest.java
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/pom.xml b/tika-parsers-advanced/tika-parser-nlp-module/pom.xml
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/pom.xml
rename to tika-parsers-advanced/tika-parser-nlp-module/pom.xml
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESAnnotationProperty.java b/tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESAnnotationProperty.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESAnnotationProperty.java
rename to tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESAnnotationProperty.java
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESConfig.java b/tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESConfig.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESConfig.java
rename to tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESConfig.java
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESContentHandler.java b/tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESContentHandler.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESContentHandler.java
rename to tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESContentHandler.java
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESParser.java b/tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESParser.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESParser.java
rename to tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESParser.java
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESSerializer.java b/tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESSerializer.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESSerializer.java
rename to tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESSerializer.java
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESUtils.java b/tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESUtils.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESUtils.java
rename to tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESUtils.java
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/GeoParser.java b/tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/GeoParser.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/GeoParser.java
rename to tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/GeoParser.java
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/GeoParserConfig.java b/tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/GeoParserConfig.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/GeoParserConfig.java
rename to tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/GeoParserConfig.java
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/GeoTag.java b/tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/GeoTag.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/GeoTag.java
rename to tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/GeoTag.java
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/NameEntityExtractor.java b/tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/NameEntityExtractor.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/NameEntityExtractor.java
rename to tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/NameEntityExtractor.java
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/gazetteer/GeoGazetteerClient.java b/tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/gazetteer/GeoGazetteerClient.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/gazetteer/GeoGazetteerClient.java
rename to tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/gazetteer/GeoGazetteerClient.java
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/gazetteer/Location.java b/tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/gazetteer/Location.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/gazetteer/Location.java
rename to tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/geo/gazetteer/Location.java
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/journal/GrobidRESTParser.java b/tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/journal/GrobidRESTParser.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/journal/GrobidRESTParser.java
rename to tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/journal/GrobidRESTParser.java
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/journal/JournalParser.java b/tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/journal/JournalParser.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/journal/JournalParser.java
rename to tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/journal/JournalParser.java
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/journal/TEIDOMParser.java b/tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/journal/TEIDOMParser.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/journal/TEIDOMParser.java
rename to tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/journal/TEIDOMParser.java
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/NERecogniser.java b/tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/NERecogniser.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/NERecogniser.java
rename to tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/NERecogniser.java
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/NamedEntityParser.java b/tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/NamedEntityParser.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/NamedEntityParser.java
rename to tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/NamedEntityParser.java
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/corenlp/CoreNLPNERecogniser.java b/tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/corenlp/CoreNLPNERecogniser.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/corenlp/CoreNLPNERecogniser.java
rename to tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/corenlp/CoreNLPNERecogniser.java
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/grobid/GrobidNERecogniser.java b/tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/grobid/GrobidNERecogniser.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/grobid/GrobidNERecogniser.java
rename to tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/grobid/GrobidNERecogniser.java
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/mitie/MITIENERecogniser.java b/tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/mitie/MITIENERecogniser.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/mitie/MITIENERecogniser.java
rename to tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/mitie/MITIENERecogniser.java
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/nltk/NLTKNERecogniser.java b/tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/nltk/NLTKNERecogniser.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/nltk/NLTKNERecogniser.java
rename to tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/nltk/NLTKNERecogniser.java
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/opennlp/OpenNLPNERecogniser.java b/tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/opennlp/OpenNLPNERecogniser.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/opennlp/OpenNLPNERecogniser.java
rename to tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/opennlp/OpenNLPNERecogniser.java
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/opennlp/OpenNLPNameFinder.java b/tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/opennlp/OpenNLPNameFinder.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/opennlp/OpenNLPNameFinder.java
rename to tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/opennlp/OpenNLPNameFinder.java
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/regex/RegexNERecogniser.java b/tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/regex/RegexNERecogniser.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/regex/RegexNERecogniser.java
rename to tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ner/regex/RegexNERecogniser.java
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/sentiment/SentimentAnalysisParser.java b/tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/sentiment/SentimentAnalysisParser.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/sentiment/SentimentAnalysisParser.java
rename to tika-parsers-advanced/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/sentiment/SentimentAnalysisParser.java
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser b/tika-parsers-advanced/tika-parser-nlp-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
rename to tika-parsers-advanced/tika-parser-nlp-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/ctakes/CTAKESConfig.properties b/tika-parsers-advanced/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/ctakes/CTAKESConfig.properties
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/ctakes/CTAKESConfig.properties
rename to tika-parsers-advanced/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/ctakes/CTAKESConfig.properties
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/geo/GeoTopicConfig.properties b/tika-parsers-advanced/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/geo/GeoTopicConfig.properties
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/geo/GeoTopicConfig.properties
rename to tika-parsers-advanced/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/geo/GeoTopicConfig.properties
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/journal/GrobidExtractor.properties b/tika-parsers-advanced/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/journal/GrobidExtractor.properties
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/journal/GrobidExtractor.properties
rename to tika-parsers-advanced/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/journal/GrobidExtractor.properties
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/ner/grobid/GrobidServer.properties b/tika-parsers-advanced/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/ner/grobid/GrobidServer.properties
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/ner/grobid/GrobidServer.properties
rename to tika-parsers-advanced/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/ner/grobid/GrobidServer.properties
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/ner/nltk/NLTKServer.properties b/tika-parsers-advanced/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/ner/nltk/NLTKServer.properties
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/ner/nltk/NLTKServer.properties
rename to tika-parsers-advanced/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/ner/nltk/NLTKServer.properties
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/ner/regex/ner-regex.txt b/tika-parsers-advanced/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/ner/regex/ner-regex.txt
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/ner/regex/ner-regex.txt
rename to tika-parsers-advanced/tika-parser-nlp-module/src/main/resources/org/apache/tika/parser/ner/regex/ner-regex.txt
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/geo/GeoParserTest.java b/tika-parsers-advanced/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/geo/GeoParserTest.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/geo/GeoParserTest.java
rename to tika-parsers-advanced/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/geo/GeoParserTest.java
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/journal/JournalParserTest.java b/tika-parsers-advanced/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/journal/JournalParserTest.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/journal/JournalParserTest.java
rename to tika-parsers-advanced/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/journal/JournalParserTest.java
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/journal/TEITest.java b/tika-parsers-advanced/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/journal/TEITest.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/journal/TEITest.java
rename to tika-parsers-advanced/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/journal/TEITest.java
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/NamedEntityParserTest.java b/tika-parsers-advanced/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/NamedEntityParserTest.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/NamedEntityParserTest.java
rename to tika-parsers-advanced/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/NamedEntityParserTest.java
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/nltk/NLTKNERecogniserTest.java b/tika-parsers-advanced/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/nltk/NLTKNERecogniserTest.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/nltk/NLTKNERecogniserTest.java
rename to tika-parsers-advanced/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/nltk/NLTKNERecogniserTest.java
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/regex/RegexNERecogniserTest.java b/tika-parsers-advanced/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/regex/RegexNERecogniserTest.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/regex/RegexNERecogniserTest.java
rename to tika-parsers-advanced/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/regex/RegexNERecogniserTest.java
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/sentiment/SentimentAnalysisParserTest.java b/tika-parsers-advanced/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/sentiment/SentimentAnalysisParserTest.java
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/sentiment/SentimentAnalysisParserTest.java
rename to tika-parsers-advanced/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/sentiment/SentimentAnalysisParserTest.java
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/test/resources/org/apache/tika/config/TIKA-3078-geo.topic.GeoParser.xml b/tika-parsers-advanced/tika-parser-nlp-module/src/test/resources/org/apache/tika/config/TIKA-3078-geo.topic.GeoParser.xml
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/test/resources/org/apache/tika/config/TIKA-3078-geo.topic.GeoParser.xml
rename to tika-parsers-advanced/tika-parser-nlp-module/src/test/resources/org/apache/tika/config/TIKA-3078-geo.topic.GeoParser.xml
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/ner/opennlp/ModelGetter.groovy b/tika-parsers-advanced/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/ner/opennlp/ModelGetter.groovy
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/ner/opennlp/ModelGetter.groovy
rename to tika-parsers-advanced/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/ner/opennlp/ModelGetter.groovy
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/ner/opennlp/get-models.sh b/tika-parsers-advanced/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/ner/opennlp/get-models.sh
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/ner/opennlp/get-models.sh
rename to tika-parsers-advanced/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/ner/opennlp/get-models.sh
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/ner/regex/ner-regex.txt b/tika-parsers-advanced/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/ner/regex/ner-regex.txt
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/ner/regex/ner-regex.txt
rename to tika-parsers-advanced/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/ner/regex/ner-regex.txt
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/ner/tika-config.xml b/tika-parsers-advanced/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/ner/regex/tika-config.xml
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/ner/tika-config.xml
rename to tika-parsers-advanced/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/ner/regex/tika-config.xml
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/ner/regex/tika-config.xml b/tika-parsers-advanced/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/ner/tika-config.xml
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/ner/regex/tika-config.xml
rename to tika-parsers-advanced/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/ner/tika-config.xml
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/sentiment/tika-config-sentiment-opennlp-cat.xml b/tika-parsers-advanced/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/sentiment/tika-config-sentiment-opennlp-cat.xml
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/sentiment/tika-config-sentiment-opennlp-cat.xml
rename to tika-parsers-advanced/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/sentiment/tika-config-sentiment-opennlp-cat.xml
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/sentiment/tika-config-sentiment-opennlp.xml b/tika-parsers-advanced/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/sentiment/tika-config-sentiment-opennlp.xml
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/sentiment/tika-config-sentiment-opennlp.xml
rename to tika-parsers-advanced/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/sentiment/tika-config-sentiment-opennlp.xml
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/src/test/resources/test-documents/testTEI.xml b/tika-parsers-advanced/tika-parser-nlp-module/src/test/resources/test-documents/testTEI.xml
similarity index 100%
rename from tika-advanced-parser-modules/tika-parser-nlp-module/src/test/resources/test-documents/testTEI.xml
rename to tika-parsers-advanced/tika-parser-nlp-module/src/test/resources/test-documents/testTEI.xml
diff --git a/tika-parsers-extended/pom.xml b/tika-parsers-extended/pom.xml
new file mode 100644
index 0000000..e17b43b
--- /dev/null
+++ b/tika-parsers-extended/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>tika</artifactId>
+ <groupId>org.apache.tika</groupId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>tika-parsers-extended</artifactId>
+ <packaging>pom</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-core</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <modules>
+ <module>tika-parser-sqlite3-module</module>
+ <module>tika-parser-scientific-module</module>
+ <module>tika-parsers-extended-integration-tests</module>
+ </modules>
+
+</project>
\ No newline at end of file
diff --git a/tika-parser-modules/tika-parser-scientific-module/pom.xml b/tika-parsers-extended/tika-parser-scientific-module/pom.xml
similarity index 73%
rename from tika-parser-modules/tika-parser-scientific-module/pom.xml
rename to tika-parsers-extended/tika-parser-scientific-module/pom.xml
index 6ee69e4..5d374d4 100644
--- a/tika-parser-modules/tika-parser-scientific-module/pom.xml
+++ b/tika-parsers-extended/tika-parser-scientific-module/pom.xml
@@ -171,6 +171,50 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>${maven.shade.version}</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <createDependencyReducedPom>
+ false
+ </createDependencyReducedPom>
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ <transformers>
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
+ <addHeader>false</addHeader>
+ </transformer>
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
+
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+ <resource>META-INF/LICENSE</resource>
+ <file>target/classes/META-INF/LICENSE</file>
+ </transformer>
+ </transformers>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
+
</build>
</project>
\ No newline at end of file
diff --git a/tika-parser-modules/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/envi/EnviHeaderParser.java b/tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/envi/EnviHeaderParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/envi/EnviHeaderParser.java
rename to tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/envi/EnviHeaderParser.java
diff --git a/tika-parser-modules/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/gdal/GDALParser.java b/tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/gdal/GDALParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/gdal/GDALParser.java
rename to tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/gdal/GDALParser.java
diff --git a/tika-parser-modules/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/geoinfo/GeographicInformationParser.java b/tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/geoinfo/GeographicInformationParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/geoinfo/GeographicInformationParser.java
rename to tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/geoinfo/GeographicInformationParser.java
diff --git a/tika-parser-modules/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/grib/GribParser.java b/tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/grib/GribParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/grib/GribParser.java
rename to tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/grib/GribParser.java
diff --git a/tika-parser-modules/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/hdf/HDFParser.java b/tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/hdf/HDFParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/hdf/HDFParser.java
rename to tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/hdf/HDFParser.java
diff --git a/tika-parser-modules/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/isatab/ISATabUtils.java b/tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/isatab/ISATabUtils.java
similarity index 100%
rename from tika-parser-modules/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/isatab/ISATabUtils.java
rename to tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/isatab/ISATabUtils.java
diff --git a/tika-parser-modules/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/isatab/ISArchiveParser.java b/tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/isatab/ISArchiveParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/isatab/ISArchiveParser.java
rename to tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/isatab/ISArchiveParser.java
diff --git a/tika-parser-modules/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/netcdf/NetCDFParser.java b/tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/netcdf/NetCDFParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/netcdf/NetCDFParser.java
rename to tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/netcdf/NetCDFParser.java
diff --git a/tika-parser-modules/tika-parser-scientific-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser b/tika-parsers-extended/tika-parser-scientific-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
similarity index 100%
rename from tika-parser-modules/tika-parser-scientific-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
rename to tika-parsers-extended/tika-parser-scientific-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
diff --git a/tika-parser-modules/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/envi/EnviHeaderParserTest.java b/tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/envi/EnviHeaderParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/envi/EnviHeaderParserTest.java
rename to tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/envi/EnviHeaderParserTest.java
diff --git a/tika-parser-modules/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/gdal/TestGDALParser.java b/tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/gdal/TestGDALParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/gdal/TestGDALParser.java
rename to tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/gdal/TestGDALParser.java
diff --git a/tika-parser-modules/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/geoinfo/GeographicInformationParserTest.java b/tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/geoinfo/GeographicInformationParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/geoinfo/GeographicInformationParserTest.java
rename to tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/geoinfo/GeographicInformationParserTest.java
diff --git a/tika-parser-modules/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/grib/GribParserTest.java b/tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/grib/GribParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/grib/GribParserTest.java
rename to tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/grib/GribParserTest.java
diff --git a/tika-parser-modules/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/hdf/HDFParserTest.java b/tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/hdf/HDFParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/hdf/HDFParserTest.java
rename to tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/hdf/HDFParserTest.java
diff --git a/tika-parser-modules/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/isatab/ISArchiveParserTest.java b/tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/isatab/ISArchiveParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/isatab/ISArchiveParserTest.java
rename to tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/isatab/ISArchiveParserTest.java
diff --git a/tika-parser-modules/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/netcdf/NetCDFParserTest.java b/tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/netcdf/NetCDFParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/netcdf/NetCDFParserTest.java
rename to tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/netcdf/NetCDFParserTest.java
diff --git a/tika-parser-modules/tika-parser-scientific-module/src/test/resources/test-documents/GLDAS_CLM10SUBP_3H.A19790202.0000.001.grb b/tika-parsers-extended/tika-parser-scientific-module/src/test/resources/test-documents/GLDAS_CLM10SUBP_3H.A19790202.0000.001.grb
similarity index 100%
rename from tika-parser-modules/tika-parser-scientific-module/src/test/resources/test-documents/GLDAS_CLM10SUBP_3H.A19790202.0000.001.grb
rename to tika-parsers-extended/tika-parser-scientific-module/src/test/resources/test-documents/GLDAS_CLM10SUBP_3H.A19790202.0000.001.grb
diff --git a/tika-parser-modules/tika-parser-scientific-module/src/test/resources/test-documents/WFPC2u5780205r_c0fx.fits b/tika-parsers-extended/tika-parser-scientific-module/src/test/resources/test-documents/WFPC2u5780205r_c0fx.fits
similarity index 100%
rename from tika-parser-modules/tika-parser-scientific-module/src/test/resources/test-documents/WFPC2u5780205r_c0fx.fits
rename to tika-parsers-extended/tika-parser-scientific-module/src/test/resources/test-documents/WFPC2u5780205r_c0fx.fits
diff --git a/tika-parser-modules/tika-parser-scientific-module/src/test/resources/test-documents/ang20150420t182050_corr_v1e_img.hdr b/tika-parsers-extended/tika-parser-scientific-module/src/test/resources/test-documents/ang20150420t182050_corr_v1e_img.hdr
similarity index 100%
rename from tika-parser-modules/tika-parser-scientific-module/src/test/resources/test-documents/ang20150420t182050_corr_v1e_img.hdr
rename to tika-parsers-extended/tika-parser-scientific-module/src/test/resources/test-documents/ang20150420t182050_corr_v1e_img.hdr
diff --git a/tika-parser-modules/tika-parser-scientific-module/src/test/resources/test-documents/egyl03.gdas.200811.00Z.grb2 b/tika-parsers-extended/tika-parser-scientific-module/src/test/resources/test-documents/egyl03.gdas.200811.00Z.grb2
similarity index 100%
rename from tika-parser-modules/tika-parser-scientific-module/src/test/resources/test-documents/egyl03.gdas.200811.00Z.grb2
rename to tika-parsers-extended/tika-parser-scientific-module/src/test/resources/test-documents/egyl03.gdas.200811.00Z.grb2
diff --git a/tika-parser-modules/tika-parser-scientific-module/src/test/resources/test-documents/envi_test_header.hdr b/tika-parsers-extended/tika-parser-scientific-module/src/test/resources/test-documents/envi_test_header.hdr
similarity index 100%
rename from tika-parser-modules/tika-parser-scientific-module/src/test/resources/test-documents/envi_test_header.hdr
rename to tika-parsers-extended/tika-parser-scientific-module/src/test/resources/test-documents/envi_test_header.hdr
diff --git a/tika-parser-modules/tika-parser-scientific-module/src/test/resources/test-documents/gdas1.forecmwf.2014062612.grib2 b/tika-parsers-extended/tika-parser-scientific-module/src/test/resources/test-documents/gdas1.forecmwf.2014062612.grib2
similarity index 100%
rename from tika-parser-modules/tika-parser-scientific-module/src/test/resources/test-documents/gdas1.forecmwf.2014062612.grib2
rename to tika-parsers-extended/tika-parser-scientific-module/src/test/resources/test-documents/gdas1.forecmwf.2014062612.grib2
diff --git a/tika-parser-modules/tika-parser-scientific-module/src/test/resources/test-documents/sampleFile.iso19139 b/tika-parsers-extended/tika-parser-scientific-module/src/test/resources/test-documents/sampleFile.iso19139
similarity index 100%
rename from tika-parser-modules/tika-parser-scientific-module/src/test/resources/test-documents/sampleFile.iso19139
rename to tika-parsers-extended/tika-parser-scientific-module/src/test/resources/test-documents/sampleFile.iso19139
diff --git a/tika-parser-modules/tika-parser-scientific-module/src/test/resources/test-documents/sresa1b_ncar_ccsm3_0_run1_200001.nc b/tika-parsers-extended/tika-parser-scientific-module/src/test/resources/test-documents/sresa1b_ncar_ccsm3_0_run1_200001.nc
similarity index 100%
rename from tika-parser-modules/tika-parser-scientific-module/src/test/resources/test-documents/sresa1b_ncar_ccsm3_0_run1_200001.nc
rename to tika-parsers-extended/tika-parser-scientific-module/src/test/resources/test-documents/sresa1b_ncar_ccsm3_0_run1_200001.nc
diff --git a/tika-parser-modules/tika-parser-scientific-module/src/test/resources/test-documents/test.hdf b/tika-parsers-extended/tika-parser-scientific-module/src/test/resources/test-documents/test.hdf
similarity index 100%
rename from tika-parser-modules/tika-parser-scientific-module/src/test/resources/test-documents/test.hdf
rename to tika-parsers-extended/tika-parser-scientific-module/src/test/resources/test-documents/test.hdf
diff --git a/tika-parser-modules/tika-parser-scientific-module/src/test/resources/test-documents/test.he5 b/tika-parsers-extended/tika-parser-scientific-module/src/test/resources/test-documents/test.he5
similarity index 100%
rename from tika-parser-modules/tika-parser-scientific-module/src/test/resources/test-documents/test.he5
rename to tika-parsers-extended/tika-parser-scientific-module/src/test/resources/test-documents/test.he5
diff --git a/tika-parser-modules/tika-parser-scientific-module/src/test/resources/test-documents/testISATab_BII-I-1/a_bii-s-2_metabolite profiling_NMR spectroscopy.txt b/tika-parsers-extended/tika-parser-scientific-module/src/test/resources/test-documents/testISATab_BII-I-1/a_bii-s-2_metabolite profiling_NMR spectroscopy.txt
similarity index 100%
rename from tika-parser-modules/tika-parser-scientific-module/src/test/resources/test-documents/testISATab_BII-I-1/a_bii-s-2_metabolite profiling_NMR spectroscopy.txt
rename to tika-parsers-extended/tika-parser-scientific-module/src/test/resources/test-documents/testISATab_BII-I-1/a_bii-s-2_metabolite profiling_NMR spectroscopy.txt
diff --git a/tika-parser-modules/tika-parser-scientific-module/src/test/resources/test-documents/testISATab_BII-I-1/a_metabolome.txt b/tika-parsers-extended/tika-parser-scientific-module/src/test/resources/test-documents/testISATab_BII-I-1/a_metabolome.txt
similarity index 100%
rename from tika-parser-modules/tika-parser-scientific-module/src/test/resources/test-documents/testISATab_BII-I-1/a_metabolome.txt
rename to tika-parsers-extended/tika-parser-scientific-module/src/test/resources/test-documents/testISATab_BII-I-1/a_metabolome.txt
diff --git a/tika-parser-modules/tika-parser-scientific-module/src/test/resources/test-documents/testISATab_BII-I-1/a_microarray.txt b/tika-parsers-extended/tika-parser-scientific-module/src/test/resources/test-documents/testISATab_BII-I-1/a_microarray.txt
similarity index 100%
rename from tika-parser-modules/tika-parser-scientific-module/src/test/resources/test-documents/testISATab_BII-I-1/a_microarray.txt
rename to tika-parsers-extended/tika-parser-scientific-module/src/test/resources/test-documents/testISATab_BII-I-1/a_microarray.txt
diff --git a/tika-parser-modules/tika-parser-scientific-module/src/test/resources/test-documents/testISATab_BII-I-1/a_proteome.txt b/tika-parsers-extended/tika-parser-scientific-module/src/test/resources/test-documents/testISATab_BII-I-1/a_proteome.txt
similarity index 100%
rename from tika-parser-modules/tika-parser-scientific-module/src/test/resources/test-documents/testISATab_BII-I-1/a_proteome.txt
rename to tika-parsers-extended/tika-parser-scientific-module/src/test/resources/test-documents/testISATab_BII-I-1/a_proteome.txt
diff --git a/tika-parser-modules/tika-parser-scientific-module/src/test/resources/test-documents/testISATab_BII-I-1/a_transcriptome.txt b/tika-parsers-extended/tika-parser-scientific-module/src/test/resources/test-documents/testISATab_BII-I-1/a_transcriptome.txt
similarity index 100%
rename from tika-parser-modules/tika-parser-scientific-module/src/test/resources/test-documents/testISATab_BII-I-1/a_transcriptome.txt
rename to tika-parsers-extended/tika-parser-scientific-module/src/test/resources/test-documents/testISATab_BII-I-1/a_transcriptome.txt
diff --git a/tika-parser-modules/tika-parser-scientific-module/src/test/resources/test-documents/testISATab_BII-I-1/i_investigation.txt b/tika-parsers-extended/tika-parser-scientific-module/src/test/resources/test-documents/testISATab_BII-I-1/i_investigation.txt
similarity index 100%
rename from tika-parser-modules/tika-parser-scientific-module/src/test/resources/test-documents/testISATab_BII-I-1/i_investigation.txt
rename to tika-parsers-extended/tika-parser-scientific-module/src/test/resources/test-documents/testISATab_BII-I-1/i_investigation.txt
diff --git a/tika-parser-modules/tika-parser-scientific-module/src/test/resources/test-documents/testISATab_BII-I-1/s_BII-S-1.txt b/tika-parsers-extended/tika-parser-scientific-module/src/test/resources/test-documents/testISATab_BII-I-1/s_BII-S-1.txt
similarity index 100%
rename from tika-parser-modules/tika-parser-scientific-module/src/test/resources/test-documents/testISATab_BII-I-1/s_BII-S-1.txt
rename to tika-parsers-extended/tika-parser-scientific-module/src/test/resources/test-documents/testISATab_BII-I-1/s_BII-S-1.txt
diff --git a/tika-parser-modules/tika-parser-scientific-module/src/test/resources/test-documents/testISATab_BII-I-1/s_BII-S-2.txt b/tika-parsers-extended/tika-parser-scientific-module/src/test/resources/test-documents/testISATab_BII-I-1/s_BII-S-2.txt
similarity index 100%
rename from tika-parser-modules/tika-parser-scientific-module/src/test/resources/test-documents/testISATab_BII-I-1/s_BII-S-2.txt
rename to tika-parsers-extended/tika-parser-scientific-module/src/test/resources/test-documents/testISATab_BII-I-1/s_BII-S-2.txt
diff --git a/tika-parsers-extended/tika-parser-sqlite3-module/pom.xml b/tika-parsers-extended/tika-parser-sqlite3-module/pom.xml
new file mode 100644
index 0000000..0b79d17
--- /dev/null
+++ b/tika-parsers-extended/tika-parser-sqlite3-module/pom.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>tika-parsers-extended</artifactId>
+ <groupId>org.apache.tika</groupId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>tika-parser-sqlite3-module</artifactId>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-jdbc-commons</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.xerial</groupId>
+ <artifactId>sqlite-jdbc</artifactId>
+ <version>3.31.1</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Automatic-Module-Name>org.apache.tika.parser.sqlite3</Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>${maven.shade.version}</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <createDependencyReducedPom>
+ false
+ </createDependencyReducedPom>
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ <transformers>
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
+ <addHeader>false</addHeader>
+ </transformer>
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
+
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+ <resource>META-INF/LICENSE</resource>
+ <file>target/classes/META-INF/LICENSE</file>
+ </transformer>
+ </transformers>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
diff --git a/tika-parser-modules/tika-parser-db-module/src/main/java/org/apache/tika/parser/sqlite3/SQLite3DBParser.java b/tika-parsers-extended/tika-parser-sqlite3-module/src/main/java/org/apache/tika/parser/sqlite3/SQLite3DBParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-db-module/src/main/java/org/apache/tika/parser/sqlite3/SQLite3DBParser.java
rename to tika-parsers-extended/tika-parser-sqlite3-module/src/main/java/org/apache/tika/parser/sqlite3/SQLite3DBParser.java
diff --git a/tika-parser-modules/tika-parser-db-module/src/main/java/org/apache/tika/parser/sqlite3/SQLite3Parser.java b/tika-parsers-extended/tika-parser-sqlite3-module/src/main/java/org/apache/tika/parser/sqlite3/SQLite3Parser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-db-module/src/main/java/org/apache/tika/parser/sqlite3/SQLite3Parser.java
rename to tika-parsers-extended/tika-parser-sqlite3-module/src/main/java/org/apache/tika/parser/sqlite3/SQLite3Parser.java
diff --git a/tika-parser-modules/tika-parser-db-module/src/main/java/org/apache/tika/parser/sqlite3/SQLite3TableReader.java b/tika-parsers-extended/tika-parser-sqlite3-module/src/main/java/org/apache/tika/parser/sqlite3/SQLite3TableReader.java
similarity index 100%
rename from tika-parser-modules/tika-parser-db-module/src/main/java/org/apache/tika/parser/sqlite3/SQLite3TableReader.java
rename to tika-parsers-extended/tika-parser-sqlite3-module/src/main/java/org/apache/tika/parser/sqlite3/SQLite3TableReader.java
diff --git a/tika-parser-modules/tika-parser-db-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser b/tika-parsers-extended/tika-parser-sqlite3-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
similarity index 100%
rename from tika-parser-modules/tika-parser-db-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
rename to tika-parsers-extended/tika-parser-sqlite3-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
diff --git a/tika-parser-modules/tika-parser-db-module/src/test/java/org/apache/tika/parser/sqlite3/SQLite3ParserTest.java b/tika-parsers-extended/tika-parser-sqlite3-module/src/test/java/org/apache/tika/parser/sqlite3/SQLite3ParserTest.java
similarity index 96%
rename from tika-parser-modules/tika-parser-db-module/src/test/java/org/apache/tika/parser/sqlite3/SQLite3ParserTest.java
rename to tika-parsers-extended/tika-parser-sqlite3-module/src/test/java/org/apache/tika/parser/sqlite3/SQLite3ParserTest.java
index 600a53b..6c692f4 100644
--- a/tika-parser-modules/tika-parser-db-module/src/test/java/org/apache/tika/parser/sqlite3/SQLite3ParserTest.java
+++ b/tika-parsers-extended/tika-parser-sqlite3-module/src/test/java/org/apache/tika/parser/sqlite3/SQLite3ParserTest.java
@@ -61,18 +61,18 @@ public class SQLite3ParserTest extends TikaTest {
ContentHandler handler = new BodyContentHandler(-1);
ParseContext ctx = new ParseContext();
try (InputStream stream = getResourceAsStream(TEST_FILE1)) {
- AUTO_DETECT_PARSER.parse(stream, handler, metadata, ctx);
+ TikaTest.AUTO_DETECT_PARSER.parse(stream, handler, metadata, ctx);
}
String s = handler.toString();
- assertContains("0\t2.3\t2.4\tlorem", s);
- assertContains("tempor\n", s);
+ TikaTest.assertContains("0\t2.3\t2.4\tlorem", s);
+ TikaTest.assertContains("tempor\n", s);
}
@Test
public void testNulls() throws Exception {
String xml = getXML(TEST_FILE_NAME).xml.replaceAll("\\s+", "");
//everything except for the first key column should be empty
- assertContains("<tr><td>2</td><td/><td/><td/><td/><td/><td/><td/><td/><td/></tr>", xml);
+ TikaTest.assertContains("<tr><td>2</td><td/><td/><td/><td/><td/><td/><td/><td/><td/></tr>", xml);
}
//code used for creating the test file
diff --git a/tika-parser-modules/tika-parser-db-module/src/test/resources/test-documents/testSQLITE3.db b/tika-parsers-extended/tika-parser-sqlite3-module/src/test/resources/test-documents/testSQLITE3.db
similarity index 100%
rename from tika-parser-modules/tika-parser-db-module/src/test/resources/test-documents/testSQLITE3.db
rename to tika-parsers-extended/tika-parser-sqlite3-module/src/test/resources/test-documents/testSQLITE3.db
diff --git a/tika-parser-modules/tika-parser-db-module/src/test/resources/test-documents/testSqlite3b.db b/tika-parsers-extended/tika-parser-sqlite3-module/src/test/resources/test-documents/testSqlite3b.db
similarity index 100%
rename from tika-parser-modules/tika-parser-db-module/src/test/resources/test-documents/testSqlite3b.db
rename to tika-parsers-extended/tika-parser-sqlite3-module/src/test/resources/test-documents/testSqlite3b.db
diff --git a/tika-parsers-extended/tika-parsers-extended-integration-tests/pom.xml b/tika-parsers-extended/tika-parsers-extended-integration-tests/pom.xml
new file mode 100644
index 0000000..afdc621
--- /dev/null
+++ b/tika-parsers-extended/tika-parsers-extended-integration-tests/pom.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>tika-parsers-extended</artifactId>
+ <groupId>org.apache.tika</groupId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>tika-parsers-extended-integration-tests</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-image-module</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-microsoft-module</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-sqlite3-module</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-sqlite3-module</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-scientific-module</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/tika-parsers-extended/tika-parsers-extended-integration-tests/src/test/java/org/apache/tika/mime/TestMimeTypesExtended.java b/tika-parsers-extended/tika-parsers-extended-integration-tests/src/test/java/org/apache/tika/mime/TestMimeTypesExtended.java
new file mode 100644
index 0000000..c8577ca
--- /dev/null
+++ b/tika-parsers-extended/tika-parsers-extended-integration-tests/src/test/java/org/apache/tika/mime/TestMimeTypesExtended.java
@@ -0,0 +1,40 @@
+package org.apache.tika.mime;
+
+import org.apache.tika.config.TikaConfig;
+import org.apache.tika.io.TikaInputStream;
+import org.apache.tika.metadata.Metadata;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+public class TestMimeTypesExtended {
+
+ MimeTypes repo;
+
+ @Before
+ public void setUp() throws Exception {
+ TikaConfig config = TikaConfig.getDefaultConfig();
+ repo = config.getMimeRepository();
+ }
+
+ @Test
+ public void testNetCDF() throws Exception {
+ assertTypeByData("application/x-netcdf", "sresa1b_ncar_ccsm3_0_run1_200001.nc");
+ }
+
+ private void assertTypeByData(String expected, String filename)
+ throws IOException {
+ try (InputStream stream = TikaInputStream.get(
+ TestMimeTypesExtended.class.getResourceAsStream(
+ "/test-documents/" + filename))) {
+ assertNotNull("Test file not found: " + filename, stream);
+ Metadata metadata = new Metadata();
+ assertEquals(expected, repo.detect(stream, metadata).toString());
+ }
+ }
+}
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/sqlite3/SQLite3ParserTest.java b/tika-parsers-extended/tika-parsers-extended-integration-tests/src/test/java/org/apache/tika/parser/sqlite3/SQLite3ParserTest.java
similarity index 99%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/sqlite3/SQLite3ParserTest.java
rename to tika-parsers-extended/tika-parsers-extended-integration-tests/src/test/java/org/apache/tika/parser/sqlite3/SQLite3ParserTest.java
index 42bd12c..b875c6c 100644
--- a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/sqlite3/SQLite3ParserTest.java
+++ b/tika-parsers-extended/tika-parsers-extended-integration-tests/src/test/java/org/apache/tika/parser/sqlite3/SQLite3ParserTest.java
@@ -1,9 +1,9 @@
package org.apache.tika.parser.sqlite3;
-import org.apache.commons.io.IOUtils;
import org.apache.tika.TikaTest;
import org.apache.tika.extractor.EmbeddedResourceHandler;
import org.apache.tika.extractor.ParserContainerExtractor;
+import org.apache.tika.io.IOUtils;
import org.apache.tika.io.TikaInputStream;
import org.apache.tika.metadata.Database;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parser-modules/.gitignore b/tika-parsers/.gitignore
similarity index 100%
rename from tika-parser-modules/.gitignore
rename to tika-parsers/.gitignore
diff --git a/tika-parsers/pom.xml b/tika-parsers/pom.xml
index 6361b9e..a2cfcb1 100644
--- a/tika-parsers/pom.xml
+++ b/tika-parsers/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,211 +17,82 @@
specific language governing permissions and limitations
under the License.
-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>tika-parent</artifactId>
+ <groupId>org.apache.tika</groupId>
+ <version>2.0.0-SNAPSHOT</version>
+ <relativePath>../tika-parent/pom.xml</relativePath>
+ </parent>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <relativePath>../tika-parent/pom.xml</relativePath>
- </parent>
+ <modelVersion>4.0.0</modelVersion>
- <artifactId>tika-parsers</artifactId>
- <name>Apache Tika parsers</name>
- <url>http://tika.apache.org/</url>
+ <artifactId>tika-parser-modules</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Tika parser modules</name>
+ <url>http://tika.apache.org/</url>
+ <properties>
+ <jempbox.version>1.8.16</jempbox.version>
+ <mime4j.version>0.8.3</mime4j.version>
+ <pdfbox.version>2.0.21</pdfbox.version>
+ <jempbox.version>1.8.16</jempbox.version>
+ <tagsoup.version>1.2.1</tagsoup.version>
+ <commons.logging.version>1.2</commons.logging.version>
+ <commons.collections4.version>4.4</commons.collections4.version>
+ <commons.csv.version>1.8</commons.csv.version>
+ <!-- used by POI, PDFBox and Jackcess ...try to sync -->
+ <bouncycastle.version>1.65</bouncycastle.version>
+ <parso.version>2.0.11</parso.version>
+ </properties>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-apple-module</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-audiovideo-module</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-cad-module</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-code-module</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-crypto-module</artifactId>
- <version>${project.version}</version>
- </dependency>
- <!-- skip db -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-digest-commons</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-font-module</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-html-module</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-image-module</artifactId>
+ <artifactId>tika-core</artifactId>
<version>${project.version}</version>
</dependency>
+ <!-- test dependencies -->
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-mail-module</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-microsoft-module</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-miscoffice-module</artifactId>
- <version>${project.version}</version>
- </dependency>
- <!-- news? -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-ocr-module</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-pdf-module</artifactId>
- <version>${project.version}</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-pkg-module</artifactId>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-core</artifactId>
<version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
- <!--skip scientific -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-text-module</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-xml-module</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- externally maintained parsers -->
- <dependency>
- <groupId>org.gagravarr</groupId>
- <artifactId>vorbis-java-tika</artifactId>
- <version>${vorbis.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.gagravarr</groupId>
- <artifactId>vorbis-java-core</artifactId>
- <version>${vorbis.version}</version>
- </dependency>
-
</dependencies>
+ <modules>
+ <module>tika-parser-jdbc-commons</module>
+ <module>tika-parser-digest-commons</module>
+ <module>tika-parser-mail-commons</module>
+ <module>tika-parser-xmp-commons</module>
+ <module>tika-parser-zip-commons</module>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-shade-plugin</artifactId>
- <version>${maven.shade.version}</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <createDependencyReducedPom>
- false
- </createDependencyReducedPom>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
- <transformers>
- <transformer
- implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
- <addHeader>false</addHeader>
- </transformer>
- <transformer
- implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
-
- <transformer
- implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
- <transformer
- implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
- <resource>META-INF/LICENSE</resource>
- <file>target/classes/META-INF/LICENSE</file>
- </transformer>
- <!-- <transformer
- implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
- <resource>META-INF/DEPENDENCIES</resource>
- <file>target/classes/META-INF/DEPENDENCIES</file>
- </transformer> -->
- </transformers>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <Automatic-Module-Name>org.apache.tika.app</Automatic-Module-Name>
- </manifestEntries>
- </archive>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>${rat.version}</version>
- <configuration>
- <excludes>
- <exclude>src/test/resources/test-data/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <module>tika-parser-ocr-module</module>
+ <module>tika-parser-audiovideo-module</module>
+ <module>tika-parser-code-module</module>
+ <module>tika-parser-html-module</module>
+ <module>tika-parser-image-module</module>
+ <module>tika-parser-text-module</module>
+ <module>tika-parser-font-module</module>
+ <module>tika-parser-microsoft-module</module>
+ <module>tika-parser-pkg-module</module>
+ <module>tika-parser-xml-module</module>
+ <module>tika-parser-pdf-module</module>
+ <module>tika-parser-apple-module</module>
+ <module>tika-parser-cad-module</module>
+ <module>tika-parser-mail-module</module>
+ <module>tika-parser-miscoffice-module</module>
+ <module>tika-parser-news-module</module>
+ <module>tika-parser-crypto-module</module>
+ <module>tika-parser-integration-tests</module>
+ </modules>
</project>
\ No newline at end of file
diff --git a/tika-parser-modules/tika-parser-apple-module/pom.xml b/tika-parsers/tika-parser-apple-module/pom.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/pom.xml
rename to tika-parsers/tika-parser-apple-module/pom.xml
diff --git a/tika-parser-modules/tika-parser-apple-module/src/main/java/org/apache/tika/detect/apple/iwork/IWorkDetector.java b/tika-parsers/tika-parser-apple-module/src/main/java/org/apache/tika/detect/apple/iwork/IWorkDetector.java
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/main/java/org/apache/tika/detect/apple/iwork/IWorkDetector.java
rename to tika-parsers/tika-parser-apple-module/src/main/java/org/apache/tika/detect/apple/iwork/IWorkDetector.java
diff --git a/tika-parser-modules/tika-parser-apple-module/src/main/java/org/apache/tika/parser/apple/AppleSingleFileParser.java b/tika-parsers/tika-parser-apple-module/src/main/java/org/apache/tika/parser/apple/AppleSingleFileParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/main/java/org/apache/tika/parser/apple/AppleSingleFileParser.java
rename to tika-parsers/tika-parser-apple-module/src/main/java/org/apache/tika/parser/apple/AppleSingleFileParser.java
diff --git a/tika-parser-modules/tika-parser-apple-module/src/main/java/org/apache/tika/parser/apple/BPListDetector.java b/tika-parsers/tika-parser-apple-module/src/main/java/org/apache/tika/parser/apple/BPListDetector.java
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/main/java/org/apache/tika/parser/apple/BPListDetector.java
rename to tika-parsers/tika-parser-apple-module/src/main/java/org/apache/tika/parser/apple/BPListDetector.java
diff --git a/tika-parser-modules/tika-parser-apple-module/src/main/java/org/apache/tika/parser/apple/PListParser.java b/tika-parsers/tika-parser-apple-module/src/main/java/org/apache/tika/parser/apple/PListParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/main/java/org/apache/tika/parser/apple/PListParser.java
rename to tika-parsers/tika-parser-apple-module/src/main/java/org/apache/tika/parser/apple/PListParser.java
diff --git a/tika-parser-modules/tika-parser-apple-module/src/main/java/org/apache/tika/parser/iwork/AutoPageNumberUtils.java b/tika-parsers/tika-parser-apple-module/src/main/java/org/apache/tika/parser/iwork/AutoPageNumberUtils.java
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/main/java/org/apache/tika/parser/iwork/AutoPageNumberUtils.java
rename to tika-parsers/tika-parser-apple-module/src/main/java/org/apache/tika/parser/iwork/AutoPageNumberUtils.java
diff --git a/tika-parser-modules/tika-parser-apple-module/src/main/java/org/apache/tika/parser/iwork/IWorkPackageParser.java b/tika-parsers/tika-parser-apple-module/src/main/java/org/apache/tika/parser/iwork/IWorkPackageParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/main/java/org/apache/tika/parser/iwork/IWorkPackageParser.java
rename to tika-parsers/tika-parser-apple-module/src/main/java/org/apache/tika/parser/iwork/IWorkPackageParser.java
diff --git a/tika-parser-modules/tika-parser-apple-module/src/main/java/org/apache/tika/parser/iwork/KeynoteContentHandler.java b/tika-parsers/tika-parser-apple-module/src/main/java/org/apache/tika/parser/iwork/KeynoteContentHandler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/main/java/org/apache/tika/parser/iwork/KeynoteContentHandler.java
rename to tika-parsers/tika-parser-apple-module/src/main/java/org/apache/tika/parser/iwork/KeynoteContentHandler.java
diff --git a/tika-parser-modules/tika-parser-apple-module/src/main/java/org/apache/tika/parser/iwork/NumbersContentHandler.java b/tika-parsers/tika-parser-apple-module/src/main/java/org/apache/tika/parser/iwork/NumbersContentHandler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/main/java/org/apache/tika/parser/iwork/NumbersContentHandler.java
rename to tika-parsers/tika-parser-apple-module/src/main/java/org/apache/tika/parser/iwork/NumbersContentHandler.java
diff --git a/tika-parser-modules/tika-parser-apple-module/src/main/java/org/apache/tika/parser/iwork/PagesContentHandler.java b/tika-parsers/tika-parser-apple-module/src/main/java/org/apache/tika/parser/iwork/PagesContentHandler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/main/java/org/apache/tika/parser/iwork/PagesContentHandler.java
rename to tika-parsers/tika-parser-apple-module/src/main/java/org/apache/tika/parser/iwork/PagesContentHandler.java
diff --git a/tika-parser-modules/tika-parser-apple-module/src/main/java/org/apache/tika/parser/iwork/iwana/IWork13PackageParser.java b/tika-parsers/tika-parser-apple-module/src/main/java/org/apache/tika/parser/iwork/iwana/IWork13PackageParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/main/java/org/apache/tika/parser/iwork/iwana/IWork13PackageParser.java
rename to tika-parsers/tika-parser-apple-module/src/main/java/org/apache/tika/parser/iwork/iwana/IWork13PackageParser.java
diff --git a/tika-parser-modules/tika-parser-apple-module/src/main/java/org/apache/tika/parser/iwork/iwana/IWork18PackageParser.java b/tika-parsers/tika-parser-apple-module/src/main/java/org/apache/tika/parser/iwork/iwana/IWork18PackageParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/main/java/org/apache/tika/parser/iwork/iwana/IWork18PackageParser.java
rename to tika-parsers/tika-parser-apple-module/src/main/java/org/apache/tika/parser/iwork/iwana/IWork18PackageParser.java
diff --git a/tika-parser-modules/tika-parser-apple-module/src/main/resources/META-INF/services/org.apache.tika.detect.Detector b/tika-parsers/tika-parser-apple-module/src/main/resources/META-INF/services/org.apache.tika.detect.Detector
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/main/resources/META-INF/services/org.apache.tika.detect.Detector
rename to tika-parsers/tika-parser-apple-module/src/main/resources/META-INF/services/org.apache.tika.detect.Detector
diff --git a/tika-parser-modules/tika-parser-apple-module/src/main/resources/META-INF/services/org.apache.tika.detect.zip.ZipContainerDetector b/tika-parsers/tika-parser-apple-module/src/main/resources/META-INF/services/org.apache.tika.detect.zip.ZipContainerDetector
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/main/resources/META-INF/services/org.apache.tika.detect.zip.ZipContainerDetector
rename to tika-parsers/tika-parser-apple-module/src/main/resources/META-INF/services/org.apache.tika.detect.zip.ZipContainerDetector
diff --git a/tika-parser-modules/tika-parser-apple-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser b/tika-parsers/tika-parser-apple-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
rename to tika-parsers/tika-parser-apple-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
diff --git a/tika-parser-modules/tika-parser-apple-module/src/test/java/org/apache/tika/parser/apple/PListParserTest.java b/tika-parsers/tika-parser-apple-module/src/test/java/org/apache/tika/parser/apple/PListParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/test/java/org/apache/tika/parser/apple/PListParserTest.java
rename to tika-parsers/tika-parser-apple-module/src/test/java/org/apache/tika/parser/apple/PListParserTest.java
diff --git a/tika-parser-modules/tika-parser-apple-module/src/test/java/org/apache/tika/parser/iwork/AutoPageNumberUtilsTest.java b/tika-parsers/tika-parser-apple-module/src/test/java/org/apache/tika/parser/iwork/AutoPageNumberUtilsTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/test/java/org/apache/tika/parser/iwork/AutoPageNumberUtilsTest.java
rename to tika-parsers/tika-parser-apple-module/src/test/java/org/apache/tika/parser/iwork/AutoPageNumberUtilsTest.java
diff --git a/tika-parser-modules/tika-parser-apple-module/src/test/java/org/apache/tika/parser/iwork/IWorkParserTest.java b/tika-parsers/tika-parser-apple-module/src/test/java/org/apache/tika/parser/iwork/IWorkParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/test/java/org/apache/tika/parser/iwork/IWorkParserTest.java
rename to tika-parsers/tika-parser-apple-module/src/test/java/org/apache/tika/parser/iwork/IWorkParserTest.java
diff --git a/tika-parser-modules/tika-parser-apple-module/src/test/java/org/apache/tika/parser/iwork/iwana/IWork13ParserTest.java b/tika-parsers/tika-parser-apple-module/src/test/java/org/apache/tika/parser/iwork/iwana/IWork13ParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/test/java/org/apache/tika/parser/iwork/iwana/IWork13ParserTest.java
rename to tika-parsers/tika-parser-apple-module/src/test/java/org/apache/tika/parser/iwork/iwana/IWork13ParserTest.java
diff --git a/tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/tableHeaders.numbers b/tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/tableHeaders.numbers
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/tableHeaders.numbers
rename to tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/tableHeaders.numbers
diff --git a/tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/tableNames.numbers b/tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/tableNames.numbers
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/tableNames.numbers
rename to tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/tableNames.numbers
diff --git a/tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testAppleSingleFile.pdf b/tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testAppleSingleFile.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testAppleSingleFile.pdf
rename to tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testAppleSingleFile.pdf
diff --git a/tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testBPList.bplist b/tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testBPList.bplist
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testBPList.bplist
rename to tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testBPList.bplist
diff --git a/tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testBulletPoints.key b/tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testBulletPoints.key
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testBulletPoints.key
rename to tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testBulletPoints.key
diff --git a/tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testKeynote.key b/tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testKeynote.key
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testKeynote.key
rename to tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testKeynote.key
diff --git a/tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testKeynote2013.key b/tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testKeynote2013.key
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testKeynote2013.key
rename to tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testKeynote2013.key
diff --git a/tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testKeynote2018.key b/tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testKeynote2018.key
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testKeynote2018.key
rename to tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testKeynote2018.key
diff --git a/tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testMasterSlideTable.key b/tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testMasterSlideTable.key
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testMasterSlideTable.key
rename to tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testMasterSlideTable.key
diff --git a/tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testNumbers.numbers b/tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testNumbers.numbers
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testNumbers.numbers
rename to tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testNumbers.numbers
diff --git a/tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testNumbers2013.numbers b/tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testNumbers2013.numbers
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testNumbers2013.numbers
rename to tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testNumbers2013.numbers
diff --git a/tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testNumbersCharts.numbers b/tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testNumbersCharts.numbers
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testNumbersCharts.numbers
rename to tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testNumbersCharts.numbers
diff --git a/tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testPages.pages b/tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testPages.pages
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testPages.pages
rename to tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testPages.pages
diff --git a/tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testPages2013.pages b/tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testPages2013.pages
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testPages2013.pages
rename to tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testPages2013.pages
diff --git a/tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testPagesComments.pages b/tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testPagesComments.pages
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testPagesComments.pages
rename to tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testPagesComments.pages
diff --git a/tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testPagesHeadersFootersAlphaLower.pages b/tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testPagesHeadersFootersAlphaLower.pages
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testPagesHeadersFootersAlphaLower.pages
rename to tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testPagesHeadersFootersAlphaLower.pages
diff --git a/tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testPagesHeadersFootersAlphaUpper.pages b/tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testPagesHeadersFootersAlphaUpper.pages
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testPagesHeadersFootersAlphaUpper.pages
rename to tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testPagesHeadersFootersAlphaUpper.pages
diff --git a/tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testPagesHeadersFootersFootnotes.pages b/tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testPagesHeadersFootersFootnotes.pages
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testPagesHeadersFootersFootnotes.pages
rename to tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testPagesHeadersFootersFootnotes.pages
diff --git a/tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testPagesHeadersFootersRomanLower.pages b/tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testPagesHeadersFootersRomanLower.pages
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testPagesHeadersFootersRomanLower.pages
rename to tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testPagesHeadersFootersRomanLower.pages
diff --git a/tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testPagesHeadersFootersRomanUpper.pages b/tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testPagesHeadersFootersRomanUpper.pages
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testPagesHeadersFootersRomanUpper.pages
rename to tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testPagesHeadersFootersRomanUpper.pages
diff --git a/tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testPagesLayout.pages b/tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testPagesLayout.pages
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testPagesLayout.pages
rename to tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testPagesLayout.pages
diff --git a/tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testPagesPwdProtected.pages b/tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testPagesPwdProtected.pages
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testPagesPwdProtected.pages
rename to tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testPagesPwdProtected.pages
diff --git a/tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testTables.key b/tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testTables.key
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testTables.key
rename to tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testTables.key
diff --git a/tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testTextBoxes.key b/tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testTextBoxes.key
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testTextBoxes.key
rename to tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testTextBoxes.key
diff --git a/tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testWEBARCHIVE.webarchive b/tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testWEBARCHIVE.webarchive
similarity index 100%
rename from tika-parser-modules/tika-parser-apple-module/src/test/resources/test-documents/testWEBARCHIVE.webarchive
rename to tika-parsers/tika-parser-apple-module/src/test/resources/test-documents/testWEBARCHIVE.webarchive
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/pom.xml b/tika-parsers/tika-parser-audiovideo-module/pom.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/pom.xml
rename to tika-parsers/tika-parser-audiovideo-module/pom.xml
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/audio/AudioParser.java b/tika-parsers/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/audio/AudioParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/audio/AudioParser.java
rename to tika-parsers/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/audio/AudioParser.java
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/audio/MidiParser.java b/tika-parsers/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/audio/MidiParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/audio/MidiParser.java
rename to tika-parsers/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/audio/MidiParser.java
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/AudioFrame.java b/tika-parsers/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/AudioFrame.java
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/AudioFrame.java
rename to tika-parsers/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/AudioFrame.java
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/CompositeTagHandler.java b/tika-parsers/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/CompositeTagHandler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/CompositeTagHandler.java
rename to tika-parsers/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/CompositeTagHandler.java
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/ID3Tags.java b/tika-parsers/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/ID3Tags.java
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/ID3Tags.java
rename to tika-parsers/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/ID3Tags.java
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/ID3v1Handler.java b/tika-parsers/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/ID3v1Handler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/ID3v1Handler.java
rename to tika-parsers/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/ID3v1Handler.java
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/ID3v22Handler.java b/tika-parsers/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/ID3v22Handler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/ID3v22Handler.java
rename to tika-parsers/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/ID3v22Handler.java
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/ID3v23Handler.java b/tika-parsers/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/ID3v23Handler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/ID3v23Handler.java
rename to tika-parsers/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/ID3v23Handler.java
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/ID3v24Handler.java b/tika-parsers/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/ID3v24Handler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/ID3v24Handler.java
rename to tika-parsers/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/ID3v24Handler.java
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/ID3v2Frame.java b/tika-parsers/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/ID3v2Frame.java
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/ID3v2Frame.java
rename to tika-parsers/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/ID3v2Frame.java
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/LyricsHandler.java b/tika-parsers/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/LyricsHandler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/LyricsHandler.java
rename to tika-parsers/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/LyricsHandler.java
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/MP3Frame.java b/tika-parsers/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/MP3Frame.java
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/MP3Frame.java
rename to tika-parsers/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/MP3Frame.java
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/Mp3Parser.java b/tika-parsers/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/Mp3Parser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/Mp3Parser.java
rename to tika-parsers/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/Mp3Parser.java
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/MpegStream.java b/tika-parsers/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/MpegStream.java
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/MpegStream.java
rename to tika-parsers/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/MpegStream.java
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp4/ISO6709Extractor.java b/tika-parsers/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp4/ISO6709Extractor.java
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp4/ISO6709Extractor.java
rename to tika-parsers/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp4/ISO6709Extractor.java
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp4/MP4Parser.java b/tika-parsers/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp4/MP4Parser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp4/MP4Parser.java
rename to tika-parsers/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp4/MP4Parser.java
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/video/FLVParser.java b/tika-parsers/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/video/FLVParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/video/FLVParser.java
rename to tika-parsers/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/video/FLVParser.java
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser b/tika-parsers/tika-parser-audiovideo-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
rename to tika-parsers/tika-parser-audiovideo-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/audio/AudioParserTest.java b/tika-parsers/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/audio/AudioParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/audio/AudioParserTest.java
rename to tika-parsers/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/audio/AudioParserTest.java
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/audio/MidiParserTest.java b/tika-parsers/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/audio/MidiParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/audio/MidiParserTest.java
rename to tika-parsers/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/audio/MidiParserTest.java
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/mp3/Mp3ParserTest.java b/tika-parsers/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/mp3/Mp3ParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/mp3/Mp3ParserTest.java
rename to tika-parsers/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/mp3/Mp3ParserTest.java
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/mp3/MpegStreamTest.java b/tika-parsers/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/mp3/MpegStreamTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/mp3/MpegStreamTest.java
rename to tika-parsers/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/mp3/MpegStreamTest.java
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/mp4/MP4ParserTest.java b/tika-parsers/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/mp4/MP4ParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/mp4/MP4ParserTest.java
rename to tika-parsers/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/mp4/MP4ParserTest.java
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/video/FLVParserTest.java b/tika-parsers/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/video/FLVParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/video/FLVParserTest.java
rename to tika-parsers/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/video/FLVParserTest.java
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/test/resources/test-documents/testAIFF.aif b/tika-parsers/tika-parser-audiovideo-module/src/test/resources/test-documents/testAIFF.aif
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/test/resources/test-documents/testAIFF.aif
rename to tika-parsers/tika-parser-audiovideo-module/src/test/resources/test-documents/testAIFF.aif
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/test/resources/test-documents/testAU.au b/tika-parsers/tika-parser-audiovideo-module/src/test/resources/test-documents/testAU.au
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/test/resources/test-documents/testAU.au
rename to tika-parsers/tika-parser-audiovideo-module/src/test/resources/test-documents/testAU.au
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/test/resources/test-documents/testFLV.flv b/tika-parsers/tika-parser-audiovideo-module/src/test/resources/test-documents/testFLV.flv
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/test/resources/test-documents/testFLV.flv
rename to tika-parsers/tika-parser-audiovideo-module/src/test/resources/test-documents/testFLV.flv
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/test/resources/test-documents/testMID.mid b/tika-parsers/tika-parser-audiovideo-module/src/test/resources/test-documents/testMID.mid
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/test/resources/test-documents/testMID.mid
rename to tika-parsers/tika-parser-audiovideo-module/src/test/resources/test-documents/testMID.mid
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP3i18n.mp3 b/tika-parsers/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP3i18n.mp3
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP3i18n.mp3
rename to tika-parsers/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP3i18n.mp3
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP3i18n_truncated.mp3 b/tika-parsers/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP3i18n_truncated.mp3
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP3i18n_truncated.mp3
rename to tika-parsers/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP3i18n_truncated.mp3
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP3id3v1.mp3 b/tika-parsers/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP3id3v1.mp3
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP3id3v1.mp3
rename to tika-parsers/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP3id3v1.mp3
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP3id3v1_v2.mp3 b/tika-parsers/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP3id3v1_v2.mp3
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP3id3v1_v2.mp3
rename to tika-parsers/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP3id3v1_v2.mp3
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP3id3v2.mp3 b/tika-parsers/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP3id3v2.mp3
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP3id3v2.mp3
rename to tika-parsers/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP3id3v2.mp3
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP3id3v24.mp3 b/tika-parsers/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP3id3v24.mp3
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP3id3v24.mp3
rename to tika-parsers/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP3id3v24.mp3
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP3lyrics.mp3 b/tika-parsers/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP3lyrics.mp3
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP3lyrics.mp3
rename to tika-parsers/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP3lyrics.mp3
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP3noid3.mp3 b/tika-parsers/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP3noid3.mp3
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP3noid3.mp3
rename to tika-parsers/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP3noid3.mp3
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP3truncated.mp3 b/tika-parsers/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP3truncated.mp3
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP3truncated.mp3
rename to tika-parsers/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP3truncated.mp3
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP4.m4a b/tika-parsers/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP4.m4a
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP4.m4a
rename to tika-parsers/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP4.m4a
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP4_truncated.m4a b/tika-parsers/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP4_truncated.m4a
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP4_truncated.m4a
rename to tika-parsers/tika-parser-audiovideo-module/src/test/resources/test-documents/testMP4_truncated.m4a
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/test/resources/test-documents/testNakedUTF16BOM.mp3 b/tika-parsers/tika-parser-audiovideo-module/src/test/resources/test-documents/testNakedUTF16BOM.mp3
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/test/resources/test-documents/testNakedUTF16BOM.mp3
rename to tika-parsers/tika-parser-audiovideo-module/src/test/resources/test-documents/testNakedUTF16BOM.mp3
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/test/resources/test-documents/testWAV.wav b/tika-parsers/tika-parser-audiovideo-module/src/test/resources/test-documents/testWAV.wav
similarity index 100%
rename from tika-parser-modules/tika-parser-audiovideo-module/src/test/resources/test-documents/testWAV.wav
rename to tika-parsers/tika-parser-audiovideo-module/src/test/resources/test-documents/testWAV.wav
diff --git a/tika-parser-modules/tika-parser-cad-module/pom.xml b/tika-parsers/tika-parser-cad-module/pom.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-cad-module/pom.xml
rename to tika-parsers/tika-parser-cad-module/pom.xml
diff --git a/tika-parser-modules/tika-parser-cad-module/src/main/java/org/apache/tika/parser/dwg/DWGParser.java b/tika-parsers/tika-parser-cad-module/src/main/java/org/apache/tika/parser/dwg/DWGParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-cad-module/src/main/java/org/apache/tika/parser/dwg/DWGParser.java
rename to tika-parsers/tika-parser-cad-module/src/main/java/org/apache/tika/parser/dwg/DWGParser.java
diff --git a/tika-parser-modules/tika-parser-cad-module/src/main/java/org/apache/tika/parser/prt/PRTParser.java b/tika-parsers/tika-parser-cad-module/src/main/java/org/apache/tika/parser/prt/PRTParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-cad-module/src/main/java/org/apache/tika/parser/prt/PRTParser.java
rename to tika-parsers/tika-parser-cad-module/src/main/java/org/apache/tika/parser/prt/PRTParser.java
diff --git a/tika-parser-modules/tika-parser-cad-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser b/tika-parsers/tika-parser-cad-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
similarity index 100%
rename from tika-parser-modules/tika-parser-cad-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
rename to tika-parsers/tika-parser-cad-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
diff --git a/tika-parser-modules/tika-parser-cad-module/src/test/java/org/apache/tika/parser/dwg/DWGParserTest.java b/tika-parsers/tika-parser-cad-module/src/test/java/org/apache/tika/parser/dwg/DWGParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-cad-module/src/test/java/org/apache/tika/parser/dwg/DWGParserTest.java
rename to tika-parsers/tika-parser-cad-module/src/test/java/org/apache/tika/parser/dwg/DWGParserTest.java
diff --git a/tika-parser-modules/tika-parser-cad-module/src/test/java/org/apache/tika/parser/prt/PRTParserTest.java b/tika-parsers/tika-parser-cad-module/src/test/java/org/apache/tika/parser/prt/PRTParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-cad-module/src/test/java/org/apache/tika/parser/prt/PRTParserTest.java
rename to tika-parsers/tika-parser-cad-module/src/test/java/org/apache/tika/parser/prt/PRTParserTest.java
diff --git a/tika-parser-modules/tika-parser-cad-module/src/test/resources/test-documents/testCADKEY.prt b/tika-parsers/tika-parser-cad-module/src/test/resources/test-documents/testCADKEY.prt
similarity index 100%
rename from tika-parser-modules/tika-parser-cad-module/src/test/resources/test-documents/testCADKEY.prt
rename to tika-parsers/tika-parser-cad-module/src/test/resources/test-documents/testCADKEY.prt
diff --git a/tika-parser-modules/tika-parser-cad-module/src/test/resources/test-documents/testCADKEY2.prt b/tika-parsers/tika-parser-cad-module/src/test/resources/test-documents/testCADKEY2.prt
similarity index 100%
rename from tika-parser-modules/tika-parser-cad-module/src/test/resources/test-documents/testCADKEY2.prt
rename to tika-parsers/tika-parser-cad-module/src/test/resources/test-documents/testCADKEY2.prt
diff --git a/tika-parser-modules/tika-parser-cad-module/src/test/resources/test-documents/testDWG2000.dwg b/tika-parsers/tika-parser-cad-module/src/test/resources/test-documents/testDWG2000.dwg
similarity index 100%
rename from tika-parser-modules/tika-parser-cad-module/src/test/resources/test-documents/testDWG2000.dwg
rename to tika-parsers/tika-parser-cad-module/src/test/resources/test-documents/testDWG2000.dwg
diff --git a/tika-parser-modules/tika-parser-cad-module/src/test/resources/test-documents/testDWG2004.dwg b/tika-parsers/tika-parser-cad-module/src/test/resources/test-documents/testDWG2004.dwg
similarity index 100%
rename from tika-parser-modules/tika-parser-cad-module/src/test/resources/test-documents/testDWG2004.dwg
rename to tika-parsers/tika-parser-cad-module/src/test/resources/test-documents/testDWG2004.dwg
diff --git a/tika-parser-modules/tika-parser-cad-module/src/test/resources/test-documents/testDWG2004_no_header.dwg b/tika-parsers/tika-parser-cad-module/src/test/resources/test-documents/testDWG2004_no_header.dwg
similarity index 100%
rename from tika-parser-modules/tika-parser-cad-module/src/test/resources/test-documents/testDWG2004_no_header.dwg
rename to tika-parsers/tika-parser-cad-module/src/test/resources/test-documents/testDWG2004_no_header.dwg
diff --git a/tika-parser-modules/tika-parser-cad-module/src/test/resources/test-documents/testDWG2007.dwg b/tika-parsers/tika-parser-cad-module/src/test/resources/test-documents/testDWG2007.dwg
similarity index 100%
rename from tika-parser-modules/tika-parser-cad-module/src/test/resources/test-documents/testDWG2007.dwg
rename to tika-parsers/tika-parser-cad-module/src/test/resources/test-documents/testDWG2007.dwg
diff --git a/tika-parser-modules/tika-parser-cad-module/src/test/resources/test-documents/testDWG2010.dwg b/tika-parsers/tika-parser-cad-module/src/test/resources/test-documents/testDWG2010.dwg
similarity index 100%
rename from tika-parser-modules/tika-parser-cad-module/src/test/resources/test-documents/testDWG2010.dwg
rename to tika-parsers/tika-parser-cad-module/src/test/resources/test-documents/testDWG2010.dwg
diff --git a/tika-parser-modules/tika-parser-cad-module/src/test/resources/test-documents/testDWG2010_custom_props.dwg b/tika-parsers/tika-parser-cad-module/src/test/resources/test-documents/testDWG2010_custom_props.dwg
similarity index 100%
rename from tika-parser-modules/tika-parser-cad-module/src/test/resources/test-documents/testDWG2010_custom_props.dwg
rename to tika-parsers/tika-parser-cad-module/src/test/resources/test-documents/testDWG2010_custom_props.dwg
diff --git a/tika-parser-modules/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech2004.dwg b/tika-parsers/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech2004.dwg
similarity index 100%
rename from tika-parser-modules/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech2004.dwg
rename to tika-parsers/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech2004.dwg
diff --git a/tika-parser-modules/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech2004DX.dwg b/tika-parsers/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech2004DX.dwg
similarity index 100%
rename from tika-parser-modules/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech2004DX.dwg
rename to tika-parsers/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech2004DX.dwg
diff --git a/tika-parser-modules/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech2005.dwg b/tika-parsers/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech2005.dwg
similarity index 100%
rename from tika-parser-modules/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech2005.dwg
rename to tika-parsers/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech2005.dwg
diff --git a/tika-parser-modules/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech2006.dwg b/tika-parsers/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech2006.dwg
similarity index 100%
rename from tika-parser-modules/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech2006.dwg
rename to tika-parsers/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech2006.dwg
diff --git a/tika-parser-modules/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech2007.dwg b/tika-parsers/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech2007.dwg
similarity index 100%
rename from tika-parser-modules/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech2007.dwg
rename to tika-parsers/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech2007.dwg
diff --git a/tika-parser-modules/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech2008.dwg b/tika-parsers/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech2008.dwg
similarity index 100%
rename from tika-parser-modules/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech2008.dwg
rename to tika-parsers/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech2008.dwg
diff --git a/tika-parser-modules/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech2009.dwg b/tika-parsers/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech2009.dwg
similarity index 100%
rename from tika-parser-modules/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech2009.dwg
rename to tika-parsers/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech2009.dwg
diff --git a/tika-parser-modules/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech2010.dwg b/tika-parsers/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech2010.dwg
similarity index 100%
rename from tika-parser-modules/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech2010.dwg
rename to tika-parsers/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech2010.dwg
diff --git a/tika-parser-modules/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech2011.dwg b/tika-parsers/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech2011.dwg
similarity index 100%
rename from tika-parser-modules/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech2011.dwg
rename to tika-parsers/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech2011.dwg
diff --git a/tika-parser-modules/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech6.dwg b/tika-parsers/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech6.dwg
similarity index 100%
rename from tika-parser-modules/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech6.dwg
rename to tika-parsers/tika-parser-cad-module/src/test/resources/test-documents/testDWGmech6.dwg
diff --git a/tika-parser-modules/tika-parser-code-module/pom.xml b/tika-parsers/tika-parser-code-module/pom.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/pom.xml
rename to tika-parsers/tika-parser-code-module/pom.xml
diff --git a/tika-parser-modules/tika-parser-code-module/src/main/java/org/apache/tika/parser/asm/ClassParser.java b/tika-parsers/tika-parser-code-module/src/main/java/org/apache/tika/parser/asm/ClassParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/main/java/org/apache/tika/parser/asm/ClassParser.java
rename to tika-parsers/tika-parser-code-module/src/main/java/org/apache/tika/parser/asm/ClassParser.java
diff --git a/tika-parser-modules/tika-parser-code-module/src/main/java/org/apache/tika/parser/asm/XHTMLClassVisitor.java b/tika-parsers/tika-parser-code-module/src/main/java/org/apache/tika/parser/asm/XHTMLClassVisitor.java
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/main/java/org/apache/tika/parser/asm/XHTMLClassVisitor.java
rename to tika-parsers/tika-parser-code-module/src/main/java/org/apache/tika/parser/asm/XHTMLClassVisitor.java
diff --git a/tika-parser-modules/tika-parser-code-module/src/main/java/org/apache/tika/parser/code/SourceCodeParser.java b/tika-parsers/tika-parser-code-module/src/main/java/org/apache/tika/parser/code/SourceCodeParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/main/java/org/apache/tika/parser/code/SourceCodeParser.java
rename to tika-parsers/tika-parser-code-module/src/main/java/org/apache/tika/parser/code/SourceCodeParser.java
diff --git a/tika-parser-modules/tika-parser-code-module/src/main/java/org/apache/tika/parser/executable/ExecutableParser.java b/tika-parsers/tika-parser-code-module/src/main/java/org/apache/tika/parser/executable/ExecutableParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/main/java/org/apache/tika/parser/executable/ExecutableParser.java
rename to tika-parsers/tika-parser-code-module/src/main/java/org/apache/tika/parser/executable/ExecutableParser.java
diff --git a/tika-parser-modules/tika-parser-code-module/src/main/java/org/apache/tika/parser/mat/MatParser.java b/tika-parsers/tika-parser-code-module/src/main/java/org/apache/tika/parser/mat/MatParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/main/java/org/apache/tika/parser/mat/MatParser.java
rename to tika-parsers/tika-parser-code-module/src/main/java/org/apache/tika/parser/mat/MatParser.java
diff --git a/tika-parser-modules/tika-parser-code-module/src/main/java/org/apache/tika/parser/sas/SAS7BDATParser.java b/tika-parsers/tika-parser-code-module/src/main/java/org/apache/tika/parser/sas/SAS7BDATParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/main/java/org/apache/tika/parser/sas/SAS7BDATParser.java
rename to tika-parsers/tika-parser-code-module/src/main/java/org/apache/tika/parser/sas/SAS7BDATParser.java
diff --git a/tika-parser-modules/tika-parser-code-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser b/tika-parsers/tika-parser-code-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
rename to tika-parsers/tika-parser-code-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
diff --git a/tika-parser-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/asm/ClassParserTest.java b/tika-parsers/tika-parser-code-module/src/test/java/org/apache/tika/parser/asm/ClassParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/asm/ClassParserTest.java
rename to tika-parsers/tika-parser-code-module/src/test/java/org/apache/tika/parser/asm/ClassParserTest.java
diff --git a/tika-parser-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/code/SourceCodeParserTest.java b/tika-parsers/tika-parser-code-module/src/test/java/org/apache/tika/parser/code/SourceCodeParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/code/SourceCodeParserTest.java
rename to tika-parsers/tika-parser-code-module/src/test/java/org/apache/tika/parser/code/SourceCodeParserTest.java
diff --git a/tika-parser-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/executable/ExecutableParserTest.java b/tika-parsers/tika-parser-code-module/src/test/java/org/apache/tika/parser/executable/ExecutableParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/executable/ExecutableParserTest.java
rename to tika-parsers/tika-parser-code-module/src/test/java/org/apache/tika/parser/executable/ExecutableParserTest.java
diff --git a/tika-parser-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/mat/MatParserTest.java b/tika-parsers/tika-parser-code-module/src/test/java/org/apache/tika/parser/mat/MatParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/mat/MatParserTest.java
rename to tika-parsers/tika-parser-code-module/src/test/java/org/apache/tika/parser/mat/MatParserTest.java
diff --git a/tika-parser-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/sas/SAS7BDATParserTest.java b/tika-parsers/tika-parser-code-module/src/test/java/org/apache/tika/parser/sas/SAS7BDATParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/sas/SAS7BDATParserTest.java
rename to tika-parsers/tika-parser-code-module/src/test/java/org/apache/tika/parser/sas/SAS7BDATParserTest.java
diff --git a/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/AppleSingleFileParser.class b/tika-parsers/tika-parser-code-module/src/test/resources/test-documents/AppleSingleFileParser.class
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/AppleSingleFileParser.class
rename to tika-parsers/tika-parser-code-module/src/test/resources/test-documents/AppleSingleFileParser.class
diff --git a/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/AutoDetectParser.class b/tika-parsers/tika-parser-code-module/src/test/resources/test-documents/AutoDetectParser.class
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/AutoDetectParser.class
rename to tika-parsers/tika-parser-code-module/src/test/resources/test-documents/AutoDetectParser.class
diff --git a/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/breidamerkurjokull_radar_profiles_2009.mat b/tika-parsers/tika-parser-code-module/src/test/resources/test-documents/breidamerkurjokull_radar_profiles_2009.mat
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/breidamerkurjokull_radar_profiles_2009.mat
rename to tika-parsers/tika-parser-code-module/src/test/resources/test-documents/breidamerkurjokull_radar_profiles_2009.mat
diff --git a/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/test-columnar.sas.xml b/tika-parsers/tika-parser-code-module/src/test/resources/test-documents/test-columnar.sas.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/test-columnar.sas.xml
rename to tika-parsers/tika-parser-code-module/src/test/resources/test-documents/test-columnar.sas.xml
diff --git a/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/test-columnar.sas7bdat b/tika-parsers/tika-parser-code-module/src/test/resources/test-documents/test-columnar.sas7bdat
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/test-columnar.sas7bdat
rename to tika-parsers/tika-parser-code-module/src/test/resources/test-documents/test-columnar.sas7bdat
diff --git a/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testC.c b/tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testC.c
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testC.c
rename to tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testC.c
diff --git a/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testCPP.cpp b/tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testCPP.cpp
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testCPP.cpp
rename to tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testCPP.cpp
diff --git a/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testGROOVY.groovy b/tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testGROOVY.groovy
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testGROOVY.groovy
rename to tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testGROOVY.groovy
diff --git a/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testJAVA.java b/tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testJAVA.java
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testJAVA.java
rename to tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testJAVA.java
diff --git a/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testJS.js b/tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testJS.js
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testJS.js
rename to tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testJS.js
diff --git a/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testJS_HTML.js b/tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testJS_HTML.js
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testJS_HTML.js
rename to tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testJS_HTML.js
diff --git a/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testLinux-arm-32le b/tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testLinux-arm-32le
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testLinux-arm-32le
rename to tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testLinux-arm-32le
diff --git a/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testLinux-mips-32be b/tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testLinux-mips-32be
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testLinux-mips-32be
rename to tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testLinux-mips-32be
diff --git a/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testLinux-mips-32le b/tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testLinux-mips-32le
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testLinux-mips-32le
rename to tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testLinux-mips-32le
diff --git a/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testLinux-ppc-32be b/tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testLinux-ppc-32be
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testLinux-ppc-32be
rename to tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testLinux-ppc-32be
diff --git a/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testLinux-x86-32 b/tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testLinux-x86-32
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testLinux-x86-32
rename to tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testLinux-x86-32
diff --git a/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testLinux-x86-64 b/tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testLinux-x86-64
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testLinux-x86-64
rename to tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testLinux-x86-64
diff --git a/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testMATLAB.m b/tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testMATLAB.m
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testMATLAB.m
rename to tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testMATLAB.m
diff --git a/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testMATLAB_barcast.m b/tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testMATLAB_barcast.m
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testMATLAB_barcast.m
rename to tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testMATLAB_barcast.m
diff --git a/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testMATLAB_wtsgaus.m b/tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testMATLAB_wtsgaus.m
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testMATLAB_wtsgaus.m
rename to tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testMATLAB_wtsgaus.m
diff --git a/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testSAS.sas b/tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testSAS.sas
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testSAS.sas
rename to tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testSAS.sas
diff --git a/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testSAS.sas7bdat b/tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testSAS.sas7bdat
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testSAS.sas7bdat
rename to tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testSAS.sas7bdat
diff --git a/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testSAS.sd2 b/tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testSAS.sd2
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testSAS.sd2
rename to tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testSAS.sd2
diff --git a/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testSAS.xpt b/tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testSAS.xpt
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testSAS.xpt
rename to tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testSAS.xpt
diff --git a/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testSAS2.sas b/tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testSAS2.sas
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testSAS2.sas
rename to tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testSAS2.sas
diff --git a/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testWindows-x86-32.exe b/tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testWindows-x86-32.exe
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testWindows-x86-32.exe
rename to tika-parsers/tika-parser-code-module/src/test/resources/test-documents/testWindows-x86-32.exe
diff --git a/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/test_mat_text.mat b/tika-parsers/tika-parser-code-module/src/test/resources/test-documents/test_mat_text.mat
similarity index 100%
rename from tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/test_mat_text.mat
rename to tika-parsers/tika-parser-code-module/src/test/resources/test-documents/test_mat_text.mat
diff --git a/tika-parser-modules/tika-parser-crypto-module/pom.xml b/tika-parsers/tika-parser-crypto-module/pom.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-crypto-module/pom.xml
rename to tika-parsers/tika-parser-crypto-module/pom.xml
diff --git a/tika-parser-modules/tika-parser-crypto-module/src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java b/tika-parsers/tika-parser-crypto-module/src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-crypto-module/src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java
rename to tika-parsers/tika-parser-crypto-module/src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java
diff --git a/tika-parser-modules/tika-parser-crypto-module/src/main/java/org/apache/tika/parser/crypto/TSDParser.java b/tika-parsers/tika-parser-crypto-module/src/main/java/org/apache/tika/parser/crypto/TSDParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-crypto-module/src/main/java/org/apache/tika/parser/crypto/TSDParser.java
rename to tika-parsers/tika-parser-crypto-module/src/main/java/org/apache/tika/parser/crypto/TSDParser.java
diff --git a/tika-parser-modules/tika-parser-crypto-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser b/tika-parsers/tika-parser-crypto-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
similarity index 100%
rename from tika-parser-modules/tika-parser-crypto-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
rename to tika-parsers/tika-parser-crypto-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
diff --git a/tika-parser-modules/tika-parser-crypto-module/src/test/java/org/apache/tika/parser/crypto/Pkcs7ParserTest.java b/tika-parsers/tika-parser-crypto-module/src/test/java/org/apache/tika/parser/crypto/Pkcs7ParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-crypto-module/src/test/java/org/apache/tika/parser/crypto/Pkcs7ParserTest.java
rename to tika-parsers/tika-parser-crypto-module/src/test/java/org/apache/tika/parser/crypto/Pkcs7ParserTest.java
diff --git a/tika-parser-modules/tika-parser-crypto-module/src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java b/tika-parsers/tika-parser-crypto-module/src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-crypto-module/src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java
rename to tika-parsers/tika-parser-crypto-module/src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java
diff --git a/tika-parser-modules/tika-parser-crypto-module/src/test/resources/test-documents/MANIFEST.XML.TSD b/tika-parsers/tika-parser-crypto-module/src/test/resources/test-documents/MANIFEST.XML.TSD
similarity index 100%
rename from tika-parser-modules/tika-parser-crypto-module/src/test/resources/test-documents/MANIFEST.XML.TSD
rename to tika-parsers/tika-parser-crypto-module/src/test/resources/test-documents/MANIFEST.XML.TSD
diff --git a/tika-parser-modules/tika-parser-crypto-module/src/test/resources/test-documents/Test1.txt.tsd b/tika-parsers/tika-parser-crypto-module/src/test/resources/test-documents/Test1.txt.tsd
similarity index 100%
rename from tika-parser-modules/tika-parser-crypto-module/src/test/resources/test-documents/Test1.txt.tsd
rename to tika-parsers/tika-parser-crypto-module/src/test/resources/test-documents/Test1.txt.tsd
diff --git a/tika-parser-modules/tika-parser-crypto-module/src/test/resources/test-documents/Test2.txt.tsd b/tika-parsers/tika-parser-crypto-module/src/test/resources/test-documents/Test2.txt.tsd
similarity index 100%
rename from tika-parser-modules/tika-parser-crypto-module/src/test/resources/test-documents/Test2.txt.tsd
rename to tika-parsers/tika-parser-crypto-module/src/test/resources/test-documents/Test2.txt.tsd
diff --git a/tika-parser-modules/tika-parser-crypto-module/src/test/resources/test-documents/Test3.docx.tsd b/tika-parsers/tika-parser-crypto-module/src/test/resources/test-documents/Test3.docx.tsd
similarity index 100%
rename from tika-parser-modules/tika-parser-crypto-module/src/test/resources/test-documents/Test3.docx.tsd
rename to tika-parsers/tika-parser-crypto-module/src/test/resources/test-documents/Test3.docx.tsd
diff --git a/tika-parser-modules/tika-parser-crypto-module/src/test/resources/test-documents/Test4.pdf.tsd b/tika-parsers/tika-parser-crypto-module/src/test/resources/test-documents/Test4.pdf.tsd
similarity index 100%
rename from tika-parser-modules/tika-parser-crypto-module/src/test/resources/test-documents/Test4.pdf.tsd
rename to tika-parsers/tika-parser-crypto-module/src/test/resources/test-documents/Test4.pdf.tsd
diff --git a/tika-parser-modules/tika-parser-crypto-module/src/test/resources/test-documents/Test5.PNG.tsd b/tika-parsers/tika-parser-crypto-module/src/test/resources/test-documents/Test5.PNG.tsd
similarity index 100%
rename from tika-parser-modules/tika-parser-crypto-module/src/test/resources/test-documents/Test5.PNG.tsd
rename to tika-parsers/tika-parser-crypto-module/src/test/resources/test-documents/Test5.PNG.tsd
diff --git a/tika-parser-modules/tika-parser-crypto-module/src/test/resources/test-documents/testDetached.p7s b/tika-parsers/tika-parser-crypto-module/src/test/resources/test-documents/testDetached.p7s
similarity index 100%
rename from tika-parser-modules/tika-parser-crypto-module/src/test/resources/test-documents/testDetached.p7s
rename to tika-parsers/tika-parser-crypto-module/src/test/resources/test-documents/testDetached.p7s
diff --git a/tika-parser-modules/tika-parser-crypto-module/src/test/resources/test-documents/testTSD_broken_pdf.tsd b/tika-parsers/tika-parser-crypto-module/src/test/resources/test-documents/testTSD_broken_pdf.tsd
similarity index 100%
rename from tika-parser-modules/tika-parser-crypto-module/src/test/resources/test-documents/testTSD_broken_pdf.tsd
rename to tika-parsers/tika-parser-crypto-module/src/test/resources/test-documents/testTSD_broken_pdf.tsd
diff --git a/tika-parser-modules/tika-parser-digest-commons/pom.xml b/tika-parsers/tika-parser-digest-commons/pom.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-digest-commons/pom.xml
rename to tika-parsers/tika-parser-digest-commons/pom.xml
diff --git a/tika-parser-modules/tika-parser-digest-commons/src/main/java/org/apache/tika/parser/digestutils/BouncyCastleDigester.java b/tika-parsers/tika-parser-digest-commons/src/main/java/org/apache/tika/parser/digestutils/BouncyCastleDigester.java
similarity index 100%
rename from tika-parser-modules/tika-parser-digest-commons/src/main/java/org/apache/tika/parser/digestutils/BouncyCastleDigester.java
rename to tika-parsers/tika-parser-digest-commons/src/main/java/org/apache/tika/parser/digestutils/BouncyCastleDigester.java
diff --git a/tika-parser-modules/tika-parser-digest-commons/src/main/java/org/apache/tika/parser/digestutils/CommonsDigester.java b/tika-parsers/tika-parser-digest-commons/src/main/java/org/apache/tika/parser/digestutils/CommonsDigester.java
similarity index 100%
rename from tika-parser-modules/tika-parser-digest-commons/src/main/java/org/apache/tika/parser/digestutils/CommonsDigester.java
rename to tika-parsers/tika-parser-digest-commons/src/main/java/org/apache/tika/parser/digestutils/CommonsDigester.java
diff --git a/tika-parser-modules/tika-parser-font-module/pom.xml b/tika-parsers/tika-parser-font-module/pom.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-font-module/pom.xml
rename to tika-parsers/tika-parser-font-module/pom.xml
diff --git a/tika-parser-modules/tika-parser-font-module/src/main/java/org/apache/tika/parser/font/AdobeFontMetricParser.java b/tika-parsers/tika-parser-font-module/src/main/java/org/apache/tika/parser/font/AdobeFontMetricParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-font-module/src/main/java/org/apache/tika/parser/font/AdobeFontMetricParser.java
rename to tika-parsers/tika-parser-font-module/src/main/java/org/apache/tika/parser/font/AdobeFontMetricParser.java
diff --git a/tika-parser-modules/tika-parser-font-module/src/main/java/org/apache/tika/parser/font/TrueTypeParser.java b/tika-parsers/tika-parser-font-module/src/main/java/org/apache/tika/parser/font/TrueTypeParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-font-module/src/main/java/org/apache/tika/parser/font/TrueTypeParser.java
rename to tika-parsers/tika-parser-font-module/src/main/java/org/apache/tika/parser/font/TrueTypeParser.java
diff --git a/tika-parser-modules/tika-parser-font-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser b/tika-parsers/tika-parser-font-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
similarity index 100%
rename from tika-parser-modules/tika-parser-font-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
rename to tika-parsers/tika-parser-font-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
diff --git a/tika-parser-modules/tika-parser-font-module/src/test/java/org/apache/tika/parser/font/FontParsersTest.java b/tika-parsers/tika-parser-font-module/src/test/java/org/apache/tika/parser/font/FontParsersTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-font-module/src/test/java/org/apache/tika/parser/font/FontParsersTest.java
rename to tika-parsers/tika-parser-font-module/src/test/java/org/apache/tika/parser/font/FontParsersTest.java
diff --git a/tika-parser-modules/tika-parser-font-module/src/test/resources/test-documents/testAFM.afm b/tika-parsers/tika-parser-font-module/src/test/resources/test-documents/testAFM.afm
similarity index 100%
rename from tika-parser-modules/tika-parser-font-module/src/test/resources/test-documents/testAFM.afm
rename to tika-parsers/tika-parser-font-module/src/test/resources/test-documents/testAFM.afm
diff --git a/tika-parser-modules/tika-parser-font-module/src/test/resources/test-documents/testTrueType3.ttf b/tika-parsers/tika-parser-font-module/src/test/resources/test-documents/testTrueType3.ttf
similarity index 100%
rename from tika-parser-modules/tika-parser-font-module/src/test/resources/test-documents/testTrueType3.ttf
rename to tika-parsers/tika-parser-font-module/src/test/resources/test-documents/testTrueType3.ttf
diff --git a/tika-parser-modules/tika-parser-html-module/pom.xml b/tika-parsers/tika-parser-html-module/pom.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/pom.xml
rename to tika-parsers/tika-parser-html-module/pom.xml
diff --git a/tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/BoilerpipeContentHandler.java b/tika-parsers/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/BoilerpipeContentHandler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/BoilerpipeContentHandler.java
rename to tika-parsers/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/BoilerpipeContentHandler.java
diff --git a/tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/DataURIScheme.java b/tika-parsers/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/DataURIScheme.java
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/DataURIScheme.java
rename to tika-parsers/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/DataURIScheme.java
diff --git a/tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/DataURISchemeParseException.java b/tika-parsers/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/DataURISchemeParseException.java
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/DataURISchemeParseException.java
rename to tika-parsers/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/DataURISchemeParseException.java
diff --git a/tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/DataURISchemeUtil.java b/tika-parsers/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/DataURISchemeUtil.java
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/DataURISchemeUtil.java
rename to tika-parsers/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/DataURISchemeUtil.java
diff --git a/tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/DefaultHtmlMapper.java b/tika-parsers/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/DefaultHtmlMapper.java
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/DefaultHtmlMapper.java
rename to tika-parsers/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/DefaultHtmlMapper.java
diff --git a/tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/HtmlEncodingDetector.java b/tika-parsers/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/HtmlEncodingDetector.java
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/HtmlEncodingDetector.java
rename to tika-parsers/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/HtmlEncodingDetector.java
diff --git a/tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/HtmlHandler.java b/tika-parsers/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/HtmlHandler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/HtmlHandler.java
rename to tika-parsers/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/HtmlHandler.java
diff --git a/tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/HtmlMapper.java b/tika-parsers/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/HtmlMapper.java
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/HtmlMapper.java
rename to tika-parsers/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/HtmlMapper.java
diff --git a/tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/HtmlParser.java b/tika-parsers/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/HtmlParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/HtmlParser.java
rename to tika-parsers/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/HtmlParser.java
diff --git a/tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/IdentityHtmlMapper.java b/tika-parsers/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/IdentityHtmlMapper.java
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/IdentityHtmlMapper.java
rename to tika-parsers/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/IdentityHtmlMapper.java
diff --git a/tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/XHTMLDowngradeHandler.java b/tika-parsers/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/XHTMLDowngradeHandler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/XHTMLDowngradeHandler.java
rename to tika-parsers/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/XHTMLDowngradeHandler.java
diff --git a/tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/charsetdetector/CharsetAliases.java b/tika-parsers/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/charsetdetector/CharsetAliases.java
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/charsetdetector/CharsetAliases.java
rename to tika-parsers/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/charsetdetector/CharsetAliases.java
diff --git a/tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/charsetdetector/CharsetDetectionResult.java b/tika-parsers/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/charsetdetector/CharsetDetectionResult.java
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/charsetdetector/CharsetDetectionResult.java
rename to tika-parsers/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/charsetdetector/CharsetDetectionResult.java
diff --git a/tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/charsetdetector/MetaProcessor.java b/tika-parsers/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/charsetdetector/MetaProcessor.java
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/charsetdetector/MetaProcessor.java
rename to tika-parsers/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/charsetdetector/MetaProcessor.java
diff --git a/tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/charsetdetector/PreScanner.java b/tika-parsers/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/charsetdetector/PreScanner.java
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/charsetdetector/PreScanner.java
rename to tika-parsers/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/charsetdetector/PreScanner.java
diff --git a/tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/charsetdetector/StandardHtmlEncodingDetector.java b/tika-parsers/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/charsetdetector/StandardHtmlEncodingDetector.java
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/charsetdetector/StandardHtmlEncodingDetector.java
rename to tika-parsers/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/charsetdetector/StandardHtmlEncodingDetector.java
diff --git a/tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/charsetdetector/charsets/ReplacementCharset.java b/tika-parsers/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/charsetdetector/charsets/ReplacementCharset.java
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/charsetdetector/charsets/ReplacementCharset.java
rename to tika-parsers/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/charsetdetector/charsets/ReplacementCharset.java
diff --git a/tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/charsetdetector/charsets/XUserDefinedCharset.java b/tika-parsers/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/charsetdetector/charsets/XUserDefinedCharset.java
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/charsetdetector/charsets/XUserDefinedCharset.java
rename to tika-parsers/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/charsetdetector/charsets/XUserDefinedCharset.java
diff --git a/tika-parser-modules/tika-parser-html-module/src/main/resources/META-INF/services/org.apache.tika.detect.EncodingDetector b/tika-parsers/tika-parser-html-module/src/main/resources/META-INF/services/org.apache.tika.detect.EncodingDetector
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/main/resources/META-INF/services/org.apache.tika.detect.EncodingDetector
rename to tika-parsers/tika-parser-html-module/src/main/resources/META-INF/services/org.apache.tika.detect.EncodingDetector
diff --git a/tika-parser-modules/tika-parser-html-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser b/tika-parsers/tika-parser-html-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
rename to tika-parsers/tika-parser-html-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
diff --git a/tika-parser-modules/tika-parser-html-module/src/main/resources/org/apache/tika/parser/html/StandardCharsets_unsupported_by_IANA.txt b/tika-parsers/tika-parser-html-module/src/main/resources/org/apache/tika/parser/html/StandardCharsets_unsupported_by_IANA.txt
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/main/resources/org/apache/tika/parser/html/StandardCharsets_unsupported_by_IANA.txt
rename to tika-parsers/tika-parser-html-module/src/main/resources/org/apache/tika/parser/html/StandardCharsets_unsupported_by_IANA.txt
diff --git a/tika-parser-modules/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/DataURISchemeParserTest.java b/tika-parsers/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/DataURISchemeParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/DataURISchemeParserTest.java
rename to tika-parsers/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/DataURISchemeParserTest.java
diff --git a/tika-parser-modules/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/HtmlEncodingDetectorTest.java b/tika-parsers/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/HtmlEncodingDetectorTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/HtmlEncodingDetectorTest.java
rename to tika-parsers/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/HtmlEncodingDetectorTest.java
diff --git a/tika-parser-modules/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java b/tika-parsers/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java
rename to tika-parsers/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java
diff --git a/tika-parser-modules/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/StandardHtmlEncodingDetectorTest.java b/tika-parsers/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/StandardHtmlEncodingDetectorTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/StandardHtmlEncodingDetectorTest.java
rename to tika-parsers/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/StandardHtmlEncodingDetectorTest.java
diff --git a/tika-parser-modules/tika-parser-html-module/src/test/resources/org/apache/tika/parser/html/tika-config.xml b/tika-parsers/tika-parser-html-module/src/test/resources/org/apache/tika/parser/html/tika-config.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/test/resources/org/apache/tika/parser/html/tika-config.xml
rename to tika-parsers/tika-parser-html-module/src/test/resources/org/apache/tika/parser/html/tika-config.xml
diff --git a/tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/big-preamble.html b/tika-parsers/tika-parser-html-module/src/test/resources/test-documents/big-preamble.html
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/big-preamble.html
rename to tika-parsers/tika-parser-html-module/src/test/resources/test-documents/big-preamble.html
diff --git a/tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/boilerplate-whitespace.html b/tika-parsers/tika-parser-html-module/src/test/resources/test-documents/boilerplate-whitespace.html
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/boilerplate-whitespace.html
rename to tika-parsers/tika-parser-html-module/src/test/resources/test-documents/boilerplate-whitespace.html
diff --git a/tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/boilerplate.html b/tika-parsers/tika-parser-html-module/src/test/resources/test-documents/boilerplate.html
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/boilerplate.html
rename to tika-parsers/tika-parser-html-module/src/test/resources/test-documents/boilerplate.html
diff --git a/tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/testBoilerplateMissingSpace.html b/tika-parsers/tika-parser-html-module/src/test/resources/test-documents/testBoilerplateMissingSpace.html
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/testBoilerplateMissingSpace.html
rename to tika-parsers/tika-parser-html-module/src/test/resources/test-documents/testBoilerplateMissingSpace.html
diff --git a/tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/testHTML.html b/tika-parsers/tika-parser-html-module/src/test/resources/test-documents/testHTML.html
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/testHTML.html
rename to tika-parsers/tika-parser-html-module/src/test/resources/test-documents/testHTML.html
diff --git a/tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/testHTMLBadScript.html b/tika-parsers/tika-parser-html-module/src/test/resources/test-documents/testHTMLBadScript.html
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/testHTMLBadScript.html
rename to tika-parsers/tika-parser-html-module/src/test/resources/test-documents/testHTMLBadScript.html
diff --git a/tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/testHTMLGoodScript.html b/tika-parsers/tika-parser-html-module/src/test/resources/test-documents/testHTMLGoodScript.html
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/testHTMLGoodScript.html
rename to tika-parsers/tika-parser-html-module/src/test/resources/test-documents/testHTMLGoodScript.html
diff --git a/tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/testHTMLNoisyMetaEncoding_1.html b/tika-parsers/tika-parser-html-module/src/test/resources/test-documents/testHTMLNoisyMetaEncoding_1.html
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/testHTMLNoisyMetaEncoding_1.html
rename to tika-parsers/tika-parser-html-module/src/test/resources/test-documents/testHTMLNoisyMetaEncoding_1.html
diff --git a/tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/testHTMLNoisyMetaEncoding_2.html b/tika-parsers/tika-parser-html-module/src/test/resources/test-documents/testHTMLNoisyMetaEncoding_2.html
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/testHTMLNoisyMetaEncoding_2.html
rename to tika-parsers/tika-parser-html-module/src/test/resources/test-documents/testHTMLNoisyMetaEncoding_2.html
diff --git a/tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/testHTMLNoisyMetaEncoding_3.html b/tika-parsers/tika-parser-html-module/src/test/resources/test-documents/testHTMLNoisyMetaEncoding_3.html
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/testHTMLNoisyMetaEncoding_3.html
rename to tika-parsers/tika-parser-html-module/src/test/resources/test-documents/testHTMLNoisyMetaEncoding_3.html
diff --git a/tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/testHTMLNoisyMetaEncoding_4.html b/tika-parsers/tika-parser-html-module/src/test/resources/test-documents/testHTMLNoisyMetaEncoding_4.html
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/testHTMLNoisyMetaEncoding_4.html
rename to tika-parsers/tika-parser-html-module/src/test/resources/test-documents/testHTMLNoisyMetaEncoding_4.html
diff --git a/tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/testHTML_charset_utf16le.html b/tika-parsers/tika-parser-html-module/src/test/resources/test-documents/testHTML_charset_utf16le.html
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/testHTML_charset_utf16le.html
rename to tika-parsers/tika-parser-html-module/src/test/resources/test-documents/testHTML_charset_utf16le.html
diff --git a/tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/testHTML_charset_utf8.html b/tika-parsers/tika-parser-html-module/src/test/resources/test-documents/testHTML_charset_utf8.html
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/testHTML_charset_utf8.html
rename to tika-parsers/tika-parser-html-module/src/test/resources/test-documents/testHTML_charset_utf8.html
diff --git a/tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/testHTML_embedded_data_uri_js.html b/tika-parsers/tika-parser-html-module/src/test/resources/test-documents/testHTML_embedded_data_uri_js.html
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/testHTML_embedded_data_uri_js.html
rename to tika-parsers/tika-parser-html-module/src/test/resources/test-documents/testHTML_embedded_data_uri_js.html
diff --git a/tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/testHTML_embedded_img.html b/tika-parsers/tika-parser-html-module/src/test/resources/test-documents/testHTML_embedded_img.html
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/testHTML_embedded_img.html
rename to tika-parsers/tika-parser-html-module/src/test/resources/test-documents/testHTML_embedded_img.html
diff --git a/tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/testHTML_embedded_img_in_js.html b/tika-parsers/tika-parser-html-module/src/test/resources/test-documents/testHTML_embedded_img_in_js.html
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/testHTML_embedded_img_in_js.html
rename to tika-parsers/tika-parser-html-module/src/test/resources/test-documents/testHTML_embedded_img_in_js.html
diff --git a/tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/testHTML_head.html b/tika-parsers/tika-parser-html-module/src/test/resources/test-documents/testHTML_head.html
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/testHTML_head.html
rename to tika-parsers/tika-parser-html-module/src/test/resources/test-documents/testHTML_head.html
diff --git a/tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/testHTML_utf8.html b/tika-parsers/tika-parser-html-module/src/test/resources/test-documents/testHTML_utf8.html
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/testHTML_utf8.html
rename to tika-parsers/tika-parser-html-module/src/test/resources/test-documents/testHTML_utf8.html
diff --git a/tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/testUserDefinedCharset.mhtml b/tika-parsers/tika-parser-html-module/src/test/resources/test-documents/testUserDefinedCharset.mhtml
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/testUserDefinedCharset.mhtml
rename to tika-parsers/tika-parser-html-module/src/test/resources/test-documents/testUserDefinedCharset.mhtml
diff --git a/tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/testXHTML.html b/tika-parsers/tika-parser-html-module/src/test/resources/test-documents/testXHTML.html
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/testXHTML.html
rename to tika-parsers/tika-parser-html-module/src/test/resources/test-documents/testXHTML.html
diff --git a/tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/tika434.html b/tika-parsers/tika-parser-html-module/src/test/resources/test-documents/tika434.html
similarity index 100%
rename from tika-parser-modules/tika-parser-html-module/src/test/resources/test-documents/tika434.html
rename to tika-parsers/tika-parser-html-module/src/test/resources/test-documents/tika434.html
diff --git a/tika-parser-modules/tika-parser-image-module/pom.xml b/tika-parsers/tika-parser-image-module/pom.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/pom.xml
rename to tika-parsers/tika-parser-image-module/pom.xml
diff --git a/tika-parser-modules/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/BPGParser.java b/tika-parsers/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/BPGParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/BPGParser.java
rename to tika-parsers/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/BPGParser.java
diff --git a/tika-parser-modules/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/HeifParser.java b/tika-parsers/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/HeifParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/HeifParser.java
rename to tika-parsers/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/HeifParser.java
diff --git a/tika-parser-modules/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/ICNSParser.java b/tika-parsers/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/ICNSParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/ICNSParser.java
rename to tika-parsers/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/ICNSParser.java
diff --git a/tika-parser-modules/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/ICNSType.java b/tika-parsers/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/ICNSType.java
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/ICNSType.java
rename to tika-parsers/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/ICNSType.java
diff --git a/tika-parser-modules/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java b/tika-parsers/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java
rename to tika-parsers/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java
diff --git a/tika-parser-modules/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/ImageParser.java b/tika-parsers/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/ImageParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/ImageParser.java
rename to tika-parsers/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/ImageParser.java
diff --git a/tika-parser-modules/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/JpegParser.java b/tika-parsers/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/JpegParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/JpegParser.java
rename to tika-parsers/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/JpegParser.java
diff --git a/tika-parser-modules/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/MetadataFields.java b/tika-parsers/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/MetadataFields.java
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/MetadataFields.java
rename to tika-parsers/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/MetadataFields.java
diff --git a/tika-parser-modules/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/PSDParser.java b/tika-parsers/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/PSDParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/PSDParser.java
rename to tika-parsers/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/PSDParser.java
diff --git a/tika-parser-modules/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/TiffParser.java b/tika-parsers/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/TiffParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/TiffParser.java
rename to tika-parsers/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/TiffParser.java
diff --git a/tika-parser-modules/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/WebPParser.java b/tika-parsers/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/WebPParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/WebPParser.java
rename to tika-parsers/tika-parser-image-module/src/main/java/org/apache/tika/parser/image/WebPParser.java
diff --git a/tika-parser-modules/tika-parser-image-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser b/tika-parsers/tika-parser-image-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
rename to tika-parsers/tika-parser-image-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
diff --git a/tika-parser-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/HeifParserTest.java b/tika-parsers/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/HeifParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/HeifParserTest.java
rename to tika-parsers/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/HeifParserTest.java
diff --git a/tika-parser-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/ICNSParserTest.java b/tika-parsers/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/ICNSParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/ICNSParserTest.java
rename to tika-parsers/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/ICNSParserTest.java
diff --git a/tika-parser-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/ImageMetadataExtractorTest.java b/tika-parsers/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/ImageMetadataExtractorTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/ImageMetadataExtractorTest.java
rename to tika-parsers/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/ImageMetadataExtractorTest.java
diff --git a/tika-parser-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/ImageParserTest.java b/tika-parsers/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/ImageParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/ImageParserTest.java
rename to tika-parsers/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/ImageParserTest.java
diff --git a/tika-parser-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/JpegParserTest.java b/tika-parsers/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/JpegParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/JpegParserTest.java
rename to tika-parsers/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/JpegParserTest.java
diff --git a/tika-parser-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/PSDParserTest.java b/tika-parsers/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/PSDParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/PSDParserTest.java
rename to tika-parsers/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/PSDParserTest.java
diff --git a/tika-parser-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/WebPParserTest.java b/tika-parsers/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/WebPParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/WebPParserTest.java
rename to tika-parsers/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/WebPParserTest.java
diff --git a/tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/IMG_1034.heic b/tika-parsers/tika-parser-image-module/src/test/resources/test-documents/IMG_1034.heic
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/IMG_1034.heic
rename to tika-parsers/tika-parser-image-module/src/test/resources/test-documents/IMG_1034.heic
diff --git a/tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testBMP.bmp b/tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testBMP.bmp
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testBMP.bmp
rename to tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testBMP.bmp
diff --git a/tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testBPG.bpg b/tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testBPG.bpg
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testBPG.bpg
rename to tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testBPG.bpg
diff --git a/tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testBPG_GEO.bpg b/tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testBPG_GEO.bpg
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testBPG_GEO.bpg
rename to tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testBPG_GEO.bpg
diff --git a/tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testBPG_commented.bpg b/tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testBPG_commented.bpg
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testBPG_commented.bpg
rename to tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testBPG_commented.bpg
diff --git a/tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testBPG_commented_xnviewmp026.bpg b/tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testBPG_commented_xnviewmp026.bpg
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testBPG_commented_xnviewmp026.bpg
rename to tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testBPG_commented_xnviewmp026.bpg
diff --git a/tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testGIF.gif b/tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testGIF.gif
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testGIF.gif
rename to tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testGIF.gif
diff --git a/tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testHEIF.heic b/tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testHEIF.heic
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testHEIF.heic
rename to tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testHEIF.heic
diff --git a/tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testICNS.icns b/tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testICNS.icns
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testICNS.icns
rename to tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testICNS.icns
diff --git a/tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testICNS_basic.icns b/tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testICNS_basic.icns
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testICNS_basic.icns
rename to tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testICNS_basic.icns
diff --git a/tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testJBIG2.jb2 b/tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testJBIG2.jb2
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testJBIG2.jb2
rename to tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testJBIG2.jb2
diff --git a/tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testJPEG.jp2 b/tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testJPEG.jp2
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testJPEG.jp2
rename to tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testJPEG.jp2
diff --git a/tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testJPEG.jpg b/tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testJPEG.jpg
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testJPEG.jpg
rename to tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testJPEG.jpg
diff --git a/tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testJPEG_EXIF.jpg b/tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testJPEG_EXIF.jpg
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testJPEG_EXIF.jpg
rename to tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testJPEG_EXIF.jpg
diff --git a/tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testJPEG_EXIF_emptyDateTime.jpg b/tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testJPEG_EXIF_emptyDateTime.jpg
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testJPEG_EXIF_emptyDateTime.jpg
rename to tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testJPEG_EXIF_emptyDateTime.jpg
diff --git a/tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testJPEG_GEO.jpg b/tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testJPEG_GEO.jpg
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testJPEG_GEO.jpg
rename to tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testJPEG_GEO.jpg
diff --git a/tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testJPEG_GEO_2.jpg b/tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testJPEG_GEO_2.jpg
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testJPEG_GEO_2.jpg
rename to tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testJPEG_GEO_2.jpg
diff --git a/tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testJPEG_oddTagComponent.jpg b/tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testJPEG_oddTagComponent.jpg
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testJPEG_oddTagComponent.jpg
rename to tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testJPEG_oddTagComponent.jpg
diff --git a/tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testPNG.png b/tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testPNG.png
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testPNG.png
rename to tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testPNG.png
diff --git a/tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testPSD.psd b/tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testPSD.psd
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testPSD.psd
rename to tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testPSD.psd
diff --git a/tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testPSD2.psd b/tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testPSD2.psd
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testPSD2.psd
rename to tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testPSD2.psd
diff --git a/tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testPSD_xmp.psd b/tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testPSD_xmp.psd
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testPSD_xmp.psd
rename to tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testPSD_xmp.psd
diff --git a/tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testTIFF.tif b/tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testTIFF.tif
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testTIFF.tif
rename to tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testTIFF.tif
diff --git a/tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testTIFF_multipage.tif b/tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testTIFF_multipage.tif
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testTIFF_multipage.tif
rename to tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testTIFF_multipage.tif
diff --git a/tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testWEBP.webp b/tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testWEBP.webp
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testWEBP.webp
rename to tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testWEBP.webp
diff --git a/tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testWebp_Alpha_Lossless.webp b/tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testWebp_Alpha_Lossless.webp
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testWebp_Alpha_Lossless.webp
rename to tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testWebp_Alpha_Lossless.webp
diff --git a/tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testWebp_Alpha_Lossy.webp b/tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testWebp_Alpha_Lossy.webp
similarity index 100%
rename from tika-parser-modules/tika-parser-image-module/src/test/resources/test-documents/testWebp_Alpha_Lossy.webp
rename to tika-parsers/tika-parser-image-module/src/test/resources/test-documents/testWebp_Alpha_Lossy.webp
diff --git a/tika-parser-modules/tika-parser-integration-tests/pom.xml b/tika-parsers/tika-parser-integration-tests/pom.xml
similarity index 91%
rename from tika-parser-modules/tika-parser-integration-tests/pom.xml
rename to tika-parsers/tika-parser-integration-tests/pom.xml
index 26e507e..6cba03c 100644
--- a/tika-parser-modules/tika-parser-integration-tests/pom.xml
+++ b/tika-parsers/tika-parser-integration-tests/pom.xml
@@ -39,12 +39,6 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-db-module</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>tika-parser-digest-commons</artifactId>
<version>${project.version}</version>
<scope>test</scope>
@@ -143,12 +137,6 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-scientific-module</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>tika-parser-text-module</artifactId>
<version>${project.version}</version>
<scope>test</scope>
@@ -211,13 +199,6 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-db-module</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>tika-parser-font-module</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
@@ -295,14 +276,6 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-scientific-module</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>tika-parser-text-module</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaDetectorConfigTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaDetectorConfigTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaDetectorConfigTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaDetectorConfigTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaEncodingDetectorTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaEncodingDetectorTest.java
similarity index 99%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaEncodingDetectorTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaEncodingDetectorTest.java
index 8f83960..86fd328 100644
--- a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaEncodingDetectorTest.java
+++ b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaEncodingDetectorTest.java
@@ -134,7 +134,7 @@ public class TikaEncodingDetectorTest extends AbstractTikaConfigTest {
List<Parser> parsers = new ArrayList<>();
findEncodingDetectionParsers(p, parsers);
- assertEquals(4, parsers.size());
+ assertEquals(3, parsers.size());
EncodingDetector encodingDetector = ((AbstractEncodingDetectorParser)parsers.get(0)).getEncodingDetector();
assertTrue(encodingDetector instanceof CompositeEncodingDetector);
assertEquals(1, ((CompositeEncodingDetector) encodingDetector).getDetectors().size());
@@ -166,7 +166,7 @@ public class TikaEncodingDetectorTest extends AbstractTikaConfigTest {
List<Parser> parsers = new ArrayList<>();
findEncodingDetectionParsers(p, parsers);
- assertEquals(5, parsers.size());
+ assertEquals(4, parsers.size());
for (Parser encodingDetectingParser : parsers) {
EncodingDetector encodingDetector = ((AbstractEncodingDetectorParser) encodingDetectingParser).getEncodingDetector();
@@ -195,7 +195,7 @@ public class TikaEncodingDetectorTest extends AbstractTikaConfigTest {
List<Parser> parsers = new ArrayList<>();
findEncodingDetectionParsers(p, parsers);
- assertEquals(4, parsers.size());
+ assertEquals(3, parsers.size());
for (Parser childParser : parsers) {
EncodingDetector encodingDetector = ((AbstractEncodingDetectorParser)childParser).getEncodingDetector();
assertTrue(encodingDetector instanceof CompositeEncodingDetector);
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaParserConfigTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaParserConfigTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaParserConfigTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaParserConfigTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaTranslatorConfigTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaTranslatorConfigTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaTranslatorConfigTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaTranslatorConfigTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/detect/TestContainerAwareDetector.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/detect/TestContainerAwareDetector.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/detect/TestContainerAwareDetector.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/detect/TestContainerAwareDetector.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/extractor/EmbeddedDocumentUtilTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/extractor/EmbeddedDocumentUtilTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/extractor/EmbeddedDocumentUtilTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/extractor/EmbeddedDocumentUtilTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/mime/MimeTypeTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/mime/MimeTypeTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/mime/MimeTypeTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/mime/MimeTypeTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/mime/MimeTypesTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/mime/MimeTypesTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/mime/MimeTypesTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/mime/MimeTypesTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/mime/TestMimeTypes.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/mime/TestMimeTypes.java
similarity index 99%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/mime/TestMimeTypes.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/mime/TestMimeTypes.java
index 27ea4fe..de6f9b2 100644
--- a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/mime/TestMimeTypes.java
+++ b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/mime/TestMimeTypes.java
@@ -72,11 +72,6 @@ public class TestMimeTypes {
}
@Test
- public void testNetCDF() throws Exception {
- assertTypeByData("application/x-netcdf", "sresa1b_ncar_ccsm3_0_run1_200001.nc");
- }
-
- @Test
public void testLoadMimeTypes() throws MimeTypeException {
assertNotNull(repo.forName("application/octet-stream"));
assertNotNull(repo.forName("text/x-tex"));
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/AutoDetectReaderParserTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/AutoDetectReaderParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/AutoDetectReaderParserTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/AutoDetectReaderParserTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/BouncyCastleDigestingParserTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/BouncyCastleDigestingParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/BouncyCastleDigestingParserTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/BouncyCastleDigestingParserTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/DigestingParserTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/DigestingParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/DigestingParserTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/DigestingParserTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/ParsingReaderTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/ParsingReaderTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/ParsingReaderTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/ParsingReaderTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/RecursiveParserWrapperTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/RecursiveParserWrapperTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/RecursiveParserWrapperTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/RecursiveParserWrapperTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/TabularFormatsTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/TabularFormatsTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/TabularFormatsTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/TabularFormatsTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/TestParsers.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/TestParsers.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/TestParsers.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/TestParsers.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/TestXMLEntityExpansion.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/TestXMLEntityExpansion.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/TestXMLEntityExpansion.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/TestXMLEntityExpansion.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/TestXXEInXML.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/TestXXEInXML.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/TestXXEInXML.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/TestXXEInXML.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/XMLTestBase.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/XMLTestBase.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/XMLTestBase.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/XMLTestBase.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/apple/AppleSingleFileParserTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/apple/AppleSingleFileParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/apple/AppleSingleFileParserTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/apple/AppleSingleFileParserTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/apple/PListParserTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/apple/PListParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/apple/PListParserTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/apple/PListParserTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/fork/ForkParserIntegrationTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/fork/ForkParserIntegrationTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/fork/ForkParserIntegrationTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/fork/ForkParserIntegrationTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/mail/MboxParserTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/mail/MboxParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/mail/MboxParserTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/mail/MboxParserTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/EMFParserTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/EMFParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/EMFParserTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/EMFParserTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/POIContainerExtractionTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/POIContainerExtractionTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/POIContainerExtractionTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/POIContainerExtractionTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/XML2003ParserTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/XML2003ParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/XML2003ParserTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/XML2003ParserTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/ooxml/TruncatedOOXMLTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/ooxml/TruncatedOOXMLTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/ooxml/TruncatedOOXMLTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/ooxml/TruncatedOOXMLTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/rtf/RTFParserTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/rtf/RTFParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/rtf/RTFParserTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/rtf/RTFParserTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/mock/MockParserTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/mock/MockParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/mock/MockParserTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/mock/MockParserTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/ocr/TesseractOCRParserTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/ocr/TesseractOCRParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/ocr/TesseractOCRParserTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/ocr/TesseractOCRParserTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/CompositeZipContainerDetectorTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/CompositeZipContainerDetectorTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/CompositeZipContainerDetectorTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/CompositeZipContainerDetectorTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/CompressParserTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/CompressParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/CompressParserTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/CompressParserTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/CompressorParserTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/CompressorParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/CompressorParserTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/CompressorParserTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ZlibParserTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ZlibParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ZlibParserTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ZlibParserTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/xml/FictionBookParserTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/xml/FictionBookParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/xml/FictionBookParserTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/xml/FictionBookParserTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/sax/PhoneExtractingContentHandlerTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/sax/PhoneExtractingContentHandlerTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/sax/PhoneExtractingContentHandlerTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/sax/PhoneExtractingContentHandlerTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/sax/StandardsExtractingContentHandlerTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/sax/StandardsExtractingContentHandlerTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/sax/StandardsExtractingContentHandlerTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/sax/StandardsExtractingContentHandlerTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/utils/ServiceLoaderUtilsTest.java b/tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/utils/ServiceLoaderUtilsTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/utils/ServiceLoaderUtilsTest.java
rename to tika-parsers/tika-parser-integration-tests/src/test/java/org/apache/tika/utils/ServiceLoaderUtilsTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/log4j.properties b/tika-parsers/tika-parser-integration-tests/src/test/resources/log4j.properties
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/log4j.properties
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/log4j.properties
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1558-exclude.xml b/tika-parsers/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1558-exclude.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1558-exclude.xml
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1558-exclude.xml
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1558-excludesub.xml b/tika-parsers/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1558-excludesub.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1558-excludesub.xml
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1558-excludesub.xml
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1702-detector-exclude.xml b/tika-parsers/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1702-detector-exclude.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1702-detector-exclude.xml
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1702-detector-exclude.xml
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1702-translator-default.xml b/tika-parsers/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1702-translator-default.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1702-translator-default.xml
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1702-translator-default.xml
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1702-translator-empty-default.xml b/tika-parsers/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1702-translator-empty-default.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1702-translator-empty-default.xml
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1702-translator-empty-default.xml
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1702-translator-empty.xml b/tika-parsers/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1702-translator-empty.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1702-translator-empty.xml
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1702-translator-empty.xml
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1708-detector-composite.xml b/tika-parsers/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1708-detector-composite.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1708-detector-composite.xml
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1708-detector-composite.xml
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1708-detector-default.xml b/tika-parsers/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1708-detector-default.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1708-detector-default.xml
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1708-detector-default.xml
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-encoding-detector-outside-static-init.xml b/tika-parsers/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-encoding-detector-outside-static-init.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-encoding-detector-outside-static-init.xml
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-encoding-detector-outside-static-init.xml
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-exclude-encoding-detector-default.xml b/tika-parsers/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-exclude-encoding-detector-default.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-exclude-encoding-detector-default.xml
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-exclude-encoding-detector-default.xml
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-no-icu4j-encoding-detector.xml b/tika-parsers/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-no-icu4j-encoding-detector.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-no-icu4j-encoding-detector.xml
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-no-icu4j-encoding-detector.xml
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-non-detecting-params-bad-charset.xml b/tika-parsers/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-non-detecting-params-bad-charset.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-non-detecting-params-bad-charset.xml
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-non-detecting-params-bad-charset.xml
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-non-detecting-params.xml b/tika-parsers/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-non-detecting-params.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-non-detecting-params.xml
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-non-detecting-params.xml
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-parameterize-encoding-detector.xml b/tika-parsers/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-parameterize-encoding-detector.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-parameterize-encoding-detector.xml
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-parameterize-encoding-detector.xml
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2485-encoding-detector-mark-limits.xml b/tika-parsers/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2485-encoding-detector-mark-limits.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2485-encoding-detector-mark-limits.xml
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2485-encoding-detector-mark-limits.xml
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/parser/TIKA-3137-include.xml b/tika-parsers/tika-parser-integration-tests/src/test/resources/org/apache/tika/parser/TIKA-3137-include.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/parser/TIKA-3137-include.xml
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/org/apache/tika/parser/TIKA-3137-include.xml
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/org/apache/tika/parser/odf/tika-config-macros.xml b/tika-parsers/tika-parser-integration-tests/src/test/resources/org/apache/tika/parser/odf/tika-config-macros.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/org/apache/tika/parser/odf/tika-config-macros.xml
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/org/apache/tika/parser/odf/tika-config-macros.xml
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/CVLKRA-KYC_Download_File_Structure_V3.1.xlsx b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/CVLKRA-KYC_Download_File_Structure_V3.1.xlsx
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/CVLKRA-KYC_Download_File_Structure_V3.1.xlsx
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/CVLKRA-KYC_Download_File_Structure_V3.1.xlsx
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/NUTCH-1997.cbor b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/NUTCH-1997.cbor
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/NUTCH-1997.cbor
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/NUTCH-1997.cbor
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/active_layer_arcss_grid_barrow_alaska_2012.dif b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/active_layer_arcss_grid_barrow_alaska_2012.dif
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/active_layer_arcss_grid_barrow_alaska_2012.dif
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/active_layer_arcss_grid_barrow_alaska_2012.dif
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/baseball.gif b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/baseball.gif
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/baseball.gif
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/baseball.gif
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/baseball.jpg b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/baseball.jpg
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/baseball.jpg
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/baseball.jpg
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/baseball.png b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/baseball.png
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/baseball.png
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/baseball.png
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/carbon_isotopic_values_of_alkanes_extracted_from_paleosols.dif b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/carbon_isotopic_values_of_alkanes_extracted_from_paleosols.dif
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/carbon_isotopic_values_of_alkanes_extracted_from_paleosols.dif
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/carbon_isotopic_values_of_alkanes_extracted_from_paleosols.dif
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/embedded_then_npe.xml b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/mock/embedded_then_npe.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/embedded_then_npe.xml
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/mock/embedded_then_npe.xml
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/example.xml b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/mock/example.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/example.xml
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/mock/example.xml
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/fake_oom.xml b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/mock/fake_oom.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/fake_oom.xml
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/mock/fake_oom.xml
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/heavy_hang.xml b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/mock/heavy_hang.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/heavy_hang.xml
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/mock/heavy_hang.xml
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/nothing_bad.xml b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/mock/nothing_bad.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/nothing_bad.xml
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/mock/nothing_bad.xml
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/null_pointer.xml b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/mock/null_pointer.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/null_pointer.xml
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/mock/null_pointer.xml
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/null_pointer_no_msg.xml b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/mock/null_pointer_no_msg.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/null_pointer_no_msg.xml
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/mock/null_pointer_no_msg.xml
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/real_oom.xml b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/mock/real_oom.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/real_oom.xml
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/mock/real_oom.xml
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/sleep.xml b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/mock/sleep.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/sleep.xml
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/mock/sleep.xml
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/sleep_interruptible.xml b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/mock/sleep_interruptible.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/sleep_interruptible.xml
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/mock/sleep_interruptible.xml
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/sleep_not_interruptible.xml b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/mock/sleep_not_interruptible.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/sleep_not_interruptible.xml
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/mock/sleep_not_interruptible.xml
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/system_exit.xml b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/mock/system_exit.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/system_exit.xml
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/mock/system_exit.xml
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/thread_interrupt.xml b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/mock/thread_interrupt.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/thread_interrupt.xml
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/mock/thread_interrupt.xml
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/test-columnar.csv b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/test-columnar.csv
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/test-columnar.csv
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/test-columnar.csv
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/test-columnar.ods b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/test-columnar.ods
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/test-columnar.ods
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/test-columnar.ods
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/test-columnar.xpt b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/test-columnar.xpt
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/test-columnar.xpt
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/test-columnar.xpt
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/test1.swf b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/test1.swf
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/test1.swf
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/test1.swf
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/test2.swf b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/test2.swf
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/test2.swf
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/test2.swf
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/test3.swf b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/test3.swf
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/test3.swf
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/test3.swf
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testAC3.ac3 b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testAC3.ac3
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testAC3.ac3
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testAC3.ac3
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testAMR-WB.amr b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testAMR-WB.amr
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testAMR-WB.amr
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testAMR-WB.amr
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testAMR.amr b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testAMR.amr
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testAMR.amr
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testAMR.amr
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testAPK.apk b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testAPK.apk
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testAPK.apk
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testAPK.apk
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testASF.asf b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testASF.asf
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testASF.asf
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testASF.asf
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testASiCE.asice b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testASiCE.asice
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testASiCE.asice
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testASiCE.asice
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testASiCS.asics b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testASiCS.asics
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testASiCS.asics
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testASiCS.asics
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBAT.bat b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testBAT.bat
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBAT.bat
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testBAT.bat
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBATUpper.bat b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testBATUpper.bat
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBATUpper.bat
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testBATUpper.bat
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_btree_2.db b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_btree_2.db
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_btree_2.db
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_btree_2.db
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_btree_3.db b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_btree_3.db
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_btree_3.db
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_btree_3.db
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_btree_4.db b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_btree_4.db
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_btree_4.db
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_btree_4.db
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_btree_5.db b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_btree_5.db
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_btree_5.db
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_btree_5.db
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_hash_2.db b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_hash_2.db
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_hash_2.db
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_hash_2.db
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_hash_3.db b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_hash_3.db
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_hash_3.db
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_hash_3.db
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_hash_4.db b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_hash_4.db
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_hash_4.db
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_hash_4.db
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_hash_5.db b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_hash_5.db
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_hash_5.db
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_hash_5.db
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBIBTEX.bib b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testBIBTEX.bib
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBIBTEX.bib
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testBIBTEX.bib
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBMPfp.txt b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testBMPfp.txt
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBMPfp.txt
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testBMPfp.txt
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testCOREL.shw b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testCOREL.shw
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testCOREL.shw
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testCOREL.shw
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testCSS.css b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testCSS.css
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testCSS.css
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testCSS.css
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testCSV.csv b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testCSV.csv
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testCSV.csv
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testCSV.csv
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testComment.pdf b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testComment.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testComment.pdf
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testComment.pdf
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDCX.dcx b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testDCX.dcx
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDCX.dcx
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testDCX.dcx
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDITA.dita b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testDITA.dita
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDITA.dita
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testDITA.dita
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDITA.ditamap b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testDITA.ditamap
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDITA.ditamap
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testDITA.ditamap
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDITA2.dita b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testDITA2.dita
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDITA2.dita
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testDITA2.dita
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDJVU.djvu b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testDJVU.djvu
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDJVU.djvu
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testDJVU.djvu
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDWF2010.dwf b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testDWF2010.dwf
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDWF2010.dwf
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testDWF2010.dwf
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDXF_ascii.dxf b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testDXF_ascii.dxf
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDXF_ascii.dxf
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testDXF_ascii.dxf
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDigilite.fdf b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testDigilite.fdf
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDigilite.fdf
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testDigilite.fdf
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testEAC3.ac3 b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testEAC3.ac3
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testEAC3.ac3
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testEAC3.ac3
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testEAR.ear b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testEAR.ear
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testEAR.ear
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testEAR.ear
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testEndNoteImportFile.enw b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testEndNoteImportFile.enw
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testEndNoteImportFile.enw
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testEndNoteImportFile.enw
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testFITS.fits b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testFITS.fits
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testFITS.fits
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testFITS.fits
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testFITS_ShorterHeader.fits b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testFITS_ShorterHeader.fits
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testFITS_ShorterHeader.fits
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testFITS_ShorterHeader.fits
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testFLAC.flac b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testFLAC.flac
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testFLAC.flac
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testFLAC.flac
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testFLAC.oga b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testFLAC.oga
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testFLAC.oga
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testFLAC.oga
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testFOXMAIL.box b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testFOXMAIL.box
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testFOXMAIL.box
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testFOXMAIL.box
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testFreeBSD-x86-64 b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testFreeBSD-x86-64
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testFreeBSD-x86-64
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testFreeBSD-x86-64
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testGRAPHVIZd.dot b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testGRAPHVIZd.dot
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testGRAPHVIZd.dot
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testGRAPHVIZd.dot
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testGRAPHVIZdc.dot b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testGRAPHVIZdc.dot
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testGRAPHVIZdc.dot
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testGRAPHVIZdc.dot
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testGRAPHVIZg.dot b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testGRAPHVIZg.dot
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testGRAPHVIZg.dot
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testGRAPHVIZg.dot
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testH.h b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testH.h
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testH.h
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testH.h
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testHFA.hfa b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testHFA.hfa
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testHFA.hfa
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testHFA.hfa
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testICalendar.ics b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testICalendar.ics
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testICalendar.ics
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testICalendar.ics
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testINDD.indd b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testINDD.indd
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testINDD.indd
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testINDD.indd
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testIPA.ipa b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testIPA.ipa
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testIPA.ipa
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testIPA.ipa
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testJAVAPROPS.properties b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testJAVAPROPS.properties
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testJAVAPROPS.properties
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testJAVAPROPS.properties
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testJNILIB.jnilib b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testJNILIB.jnilib
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testJNILIB.jnilib
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testJNILIB.jnilib
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testJavaHprofBinary b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testJavaHprofBinary
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testJavaHprofBinary
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testJavaHprofBinary
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testJavaHprofText b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testJavaHprofText
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testJavaHprofText
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testJavaHprofText
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testKML.kml b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testKML.kml
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testKML.kml
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testKML.kml
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testLotus123-lotusftp.123 b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testLotus123-lotusftp.123
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testLotus123-lotusftp.123
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testLotus123-lotusftp.123
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testLotus123-lotusftp.wk4 b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testLotus123-lotusftp.wk4
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testLotus123-lotusftp.wk4
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testLotus123-lotusftp.wk4
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testLotus123.wk1 b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testLotus123.wk1
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testLotus123.wk1
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testLotus123.wk1
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testLotus123.wk3 b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testLotus123.wk3
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testLotus123.wk3
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testLotus123.wk3
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testLotus123.wks b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testLotus123.wks
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testLotus123.wks
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testLotus123.wks
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testLotusEml.eml b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testLotusEml.eml
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testLotusEml.eml
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testLotusEml.eml
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testMHTMLFirefox.mhtml b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testMHTMLFirefox.mhtml
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testMHTMLFirefox.mhtml
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testMHTMLFirefox.mhtml
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testMIF.mif b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testMIF.mif
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testMIF.mif
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testMIF.mif
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testMKV.mkv b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testMKV.mkv
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testMKV.mkv
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testMKV.mkv
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testMSWriteFile.wri b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testMSWriteFile.wri
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testMSWriteFile.wri
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testMSWriteFile.wri
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testMYSQL.MYD b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testMYSQL.MYD
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testMYSQL.MYD
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testMYSQL.MYD
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testMYSQL.MYI b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testMYSQL.MYI
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testMYSQL.MYI
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testMYSQL.MYI
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testMYSQL.frm b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testMYSQL.frm
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testMYSQL.frm
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testMYSQL.frm
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testMemgraph.memgraph b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testMemgraph.memgraph
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testMemgraph.memgraph
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testMemgraph.memgraph
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testMessageNews.txt b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testMessageNews.txt
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testMessageNews.txt
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testMessageNews.txt
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testNLS1.nls b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testNLS1.nls
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testNLS1.nls
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testNLS1.nls
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testNLS2.nls b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testNLS2.nls
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testNLS2.nls
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testNLS2.nls
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testOPUS.opus b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testOPUS.opus
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testOPUS.opus
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testOPUS.opus
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testOptionalHyphen.doc b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testOptionalHyphen.doc
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testOptionalHyphen.doc
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testOptionalHyphen.doc
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testOptionalHyphen.docx b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testOptionalHyphen.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testOptionalHyphen.docx
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testOptionalHyphen.docx
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testOptionalHyphen.ppt b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testOptionalHyphen.ppt
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testOptionalHyphen.ppt
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testOptionalHyphen.ppt
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testOptionalHyphen.pptx b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testOptionalHyphen.pptx
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testOptionalHyphen.pptx
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testOptionalHyphen.pptx
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testOptionalHyphen.rtf b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testOptionalHyphen.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testOptionalHyphen.rtf
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testOptionalHyphen.rtf
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testPBM.pbm b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testPBM.pbm
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testPBM.pbm
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testPBM.pbm
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testPCX.pcx b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testPCX.pcx
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testPCX.pcx
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testPCX.pcx
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testPGM.pgm b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testPGM.pgm
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testPGM.pgm
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testPGM.pgm
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testPICT.pct b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testPICT.pct
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testPICT.pct
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testPICT.pct
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testPKCS17Sig-v2.xml.p7m b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testPKCS17Sig-v2.xml.p7m
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testPKCS17Sig-v2.xml.p7m
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testPKCS17Sig-v2.xml.p7m
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testPKCS17Sig-v3.xml.p7m b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testPKCS17Sig-v3.xml.p7m
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testPKCS17Sig-v3.xml.p7m
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testPKCS17Sig-v3.xml.p7m
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testPKCS17Sig-v4.xml.p7m b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testPKCS17Sig-v4.xml.p7m
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testPKCS17Sig-v4.xml.p7m
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testPKCS17Sig-v4.xml.p7m
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testPKCS17Sig.xml.p7m b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testPKCS17Sig.xml.p7m
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testPKCS17Sig.xml.p7m
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testPKCS17Sig.xml.p7m
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testPhoneNumberExtractor.odt b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testPhoneNumberExtractor.odt
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testPhoneNumberExtractor.odt
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testPhoneNumberExtractor.odt
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testRDF.rdf b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testRDF.rdf
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testRDF.rdf
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testRDF.rdf
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testRotated.png b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testRotated.png
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testRotated.png
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testRotated.png
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testSolaris-x86-32 b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testSolaris-x86-32
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testSolaris-x86-32
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testSolaris-x86-32
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-5.2-calc.sdc b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-5.2-calc.sdc
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-5.2-calc.sdc
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-5.2-calc.sdc
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-5.2-draw.sda b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-5.2-draw.sda
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-5.2-draw.sda
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-5.2-draw.sda
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-5.2-impress.sdd b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-5.2-impress.sdd
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-5.2-impress.sdd
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-5.2-impress.sdd
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-5.2-writer.sdw b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-5.2-writer.sdw
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-5.2-writer.sdw
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-5.2-writer.sdw
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-6.0-calc.sxc b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-6.0-calc.sxc
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-6.0-calc.sxc
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-6.0-calc.sxc
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-6.0-draw.sxd b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-6.0-draw.sxd
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-6.0-draw.sxd
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-6.0-draw.sxd
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-6.0-draw.sxi b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-6.0-draw.sxi
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-6.0-draw.sxi
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-6.0-draw.sxi
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-6.0-writer-template.stw b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-6.0-writer-template.stw
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-6.0-writer-template.stw
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-6.0-writer-template.stw
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-6.0-writer.sxw b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-6.0-writer.sxw
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-6.0-writer.sxw
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testStarOffice-6.0-writer.sxw
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStataDTA.dta b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testStataDTA.dta
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStataDTA.dta
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testStataDTA.dta
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStataDTA.txt b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testStataDTA.txt
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testStataDTA.txt
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testStataDTA.txt
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testTAR_no_magic.tar b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testTAR_no_magic.tar
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testTAR_no_magic.tar
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testTAR_no_magic.tar
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testTXT-tika.axx b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testTXT-tika.axx
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testTXT-tika.axx
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testTXT-tika.axx
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testTXT.txt b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testTXT.txt
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testTXT.txt
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testTXT.txt
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testTXTNonASCIIUTF8.txt b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testTXTNonASCIIUTF8.txt
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testTXTNonASCIIUTF8.txt
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testTXTNonASCIIUTF8.txt
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testThunderbirdEml.eml b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testThunderbirdEml.eml
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testThunderbirdEml.eml
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testThunderbirdEml.eml
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testTinyPE.exe b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testTinyPE.exe
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testTinyPE.exe
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testTinyPE.exe
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testVORBIS.ogg b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testVORBIS.ogg
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testVORBIS.ogg
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testVORBIS.ogg
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testVORCalcTemplate.vor b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testVORCalcTemplate.vor
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testVORCalcTemplate.vor
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testVORCalcTemplate.vor
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testVORDrawTemplate.vor b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testVORDrawTemplate.vor
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testVORDrawTemplate.vor
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testVORDrawTemplate.vor
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testVORImpressTemplate.vor b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testVORImpressTemplate.vor
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testVORImpressTemplate.vor
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testVORImpressTemplate.vor
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testVORWriterTemplate.vor b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testVORWriterTemplate.vor
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testVORWriterTemplate.vor
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testVORWriterTemplate.vor
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testVideoMp4.mp4 b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testVideoMp4.mp4
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testVideoMp4.mp4
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testVideoMp4.mp4
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWAR.war b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testWAR.war
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWAR.war
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testWAR.war
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWEBM.webm b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testWEBM.webm
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWEBM.webm
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testWEBM.webm
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWMA.wma b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testWMA.wma
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWMA.wma
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testWMA.wma
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWMV.wmv b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testWMV.wmv
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWMV.wmv
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testWMV.wmv
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWMV_WMV2.wmv b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testWMV_WMV2.wmv
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWMV_WMV2.wmv
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testWMV_WMV2.wmv
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWORKS.wps b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testWORKS.wps
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWORKS.wps
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testWORKS.wps
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWORKS2000.wps b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testWORKS2000.wps
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWORKS2000.wps
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testWORKS2000.wps
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWORKSWordProcessor3.0.wps b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testWORKSWordProcessor3.0.wps
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWORKSWordProcessor3.0.wps
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testWORKSWordProcessor3.0.wps
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWORKSWordProcessor4.0.wps b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testWORKSWordProcessor4.0.wps
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWORKSWordProcessor4.0.wps
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testWORKSWordProcessor4.0.wps
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWebVTT.vtt b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testWebVTT.vtt
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWebVTT.vtt
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testWebVTT.vtt
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWebVTT_header.vtt b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testWebVTT_header.vtt
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWebVTT_header.vtt
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testWebVTT_header.vtt
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWebVTT_simple.vtt b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testWebVTT_simple.vtt
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWebVTT_simple.vtt
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testWebVTT_simple.vtt
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWindowsMediaMeta.asx b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testWindowsMediaMeta.asx
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testWindowsMediaMeta.asx
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testWindowsMediaMeta.asx
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testXDP.xdp b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testXDP.xdp
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testXDP.xdp
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testXDP.xdp
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testXFDF.xfdf b/tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testXFDF.xfdf
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testXFDF.xfdf
rename to tika-parsers/tika-parser-integration-tests/src/test/resources/test-documents/testXFDF.xfdf
diff --git a/tika-parser-modules/tika-parser-mail-commons/pom.xml b/tika-parsers/tika-parser-jdbc-commons/pom.xml
similarity index 56%
copy from tika-parser-modules/tika-parser-mail-commons/pom.xml
copy to tika-parsers/tika-parser-jdbc-commons/pom.xml
index 03e8313..02e321a 100644
--- a/tika-parser-modules/tika-parser-mail-commons/pom.xml
+++ b/tika-parsers/tika-parser-jdbc-commons/pom.xml
@@ -7,22 +7,14 @@
<groupId>org.apache.tika</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
-
<modelVersion>4.0.0</modelVersion>
- <artifactId>tika-parser-mail-commons</artifactId>
-
-
+ <artifactId>tika-parser-jdbc-commons</artifactId>
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-mime4j-core</artifactId>
- <version>${mime4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-mime4j-dom</artifactId>
- <version>${mime4j.version}</version>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons.io.version}</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/tika-parser-modules/tika-parser-db-module/src/main/java/org/apache/tika/parser/jdbc/AbstractDBParser.java b/tika-parsers/tika-parser-jdbc-commons/src/main/java/org/apache/tika/parser/jdbc/AbstractDBParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-db-module/src/main/java/org/apache/tika/parser/jdbc/AbstractDBParser.java
rename to tika-parsers/tika-parser-jdbc-commons/src/main/java/org/apache/tika/parser/jdbc/AbstractDBParser.java
diff --git a/tika-parser-modules/tika-parser-db-module/src/main/java/org/apache/tika/parser/jdbc/JDBCTableReader.java b/tika-parsers/tika-parser-jdbc-commons/src/main/java/org/apache/tika/parser/jdbc/JDBCTableReader.java
similarity index 100%
rename from tika-parser-modules/tika-parser-db-module/src/main/java/org/apache/tika/parser/jdbc/JDBCTableReader.java
rename to tika-parsers/tika-parser-jdbc-commons/src/main/java/org/apache/tika/parser/jdbc/JDBCTableReader.java
diff --git a/tika-parser-modules/tika-parser-mail-commons/pom.xml b/tika-parsers/tika-parser-mail-commons/pom.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-commons/pom.xml
rename to tika-parsers/tika-parser-mail-commons/pom.xml
diff --git a/tika-parser-modules/tika-parser-mail-commons/src/main/java/org/apache/tika/parser/mailcommons/MailDateParser.java b/tika-parsers/tika-parser-mail-commons/src/main/java/org/apache/tika/parser/mailcommons/MailDateParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-commons/src/main/java/org/apache/tika/parser/mailcommons/MailDateParser.java
rename to tika-parsers/tika-parser-mail-commons/src/main/java/org/apache/tika/parser/mailcommons/MailDateParser.java
diff --git a/tika-parser-modules/tika-parser-mail-commons/src/main/java/org/apache/tika/parser/mailcommons/MailUtil.java b/tika-parsers/tika-parser-mail-commons/src/main/java/org/apache/tika/parser/mailcommons/MailUtil.java
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-commons/src/main/java/org/apache/tika/parser/mailcommons/MailUtil.java
rename to tika-parsers/tika-parser-mail-commons/src/main/java/org/apache/tika/parser/mailcommons/MailUtil.java
diff --git a/tika-parser-modules/tika-parser-mail-commons/src/test/java/org/apache/tika/parser/mailcommons/MailUtilTest.java b/tika-parsers/tika-parser-mail-commons/src/test/java/org/apache/tika/parser/mailcommons/MailUtilTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-commons/src/test/java/org/apache/tika/parser/mailcommons/MailUtilTest.java
rename to tika-parsers/tika-parser-mail-commons/src/test/java/org/apache/tika/parser/mailcommons/MailUtilTest.java
diff --git a/tika-parser-modules/tika-parser-mail-module/pom.xml b/tika-parsers/tika-parser-mail-module/pom.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-module/pom.xml
rename to tika-parsers/tika-parser-mail-module/pom.xml
diff --git a/tika-parser-modules/tika-parser-mail-module/src/main/java/org/apache/tika/parser/mail/MailContentHandler.java b/tika-parsers/tika-parser-mail-module/src/main/java/org/apache/tika/parser/mail/MailContentHandler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-module/src/main/java/org/apache/tika/parser/mail/MailContentHandler.java
rename to tika-parsers/tika-parser-mail-module/src/main/java/org/apache/tika/parser/mail/MailContentHandler.java
diff --git a/tika-parser-modules/tika-parser-mail-module/src/main/java/org/apache/tika/parser/mail/RFC822Parser.java b/tika-parsers/tika-parser-mail-module/src/main/java/org/apache/tika/parser/mail/RFC822Parser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-module/src/main/java/org/apache/tika/parser/mail/RFC822Parser.java
rename to tika-parsers/tika-parser-mail-module/src/main/java/org/apache/tika/parser/mail/RFC822Parser.java
diff --git a/tika-parser-modules/tika-parser-mail-module/src/main/java/org/apache/tika/parser/mbox/MboxParser.java b/tika-parsers/tika-parser-mail-module/src/main/java/org/apache/tika/parser/mbox/MboxParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-module/src/main/java/org/apache/tika/parser/mbox/MboxParser.java
rename to tika-parsers/tika-parser-mail-module/src/main/java/org/apache/tika/parser/mbox/MboxParser.java
diff --git a/tika-parser-modules/tika-parser-mail-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser b/tika-parsers/tika-parser-mail-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
rename to tika-parsers/tika-parser-mail-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
diff --git a/tika-parser-modules/tika-parser-mail-module/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java b/tika-parsers/tika-parser-mail-module/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-module/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java
rename to tika-parsers/tika-parser-mail-module/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java
diff --git a/tika-parser-modules/tika-parser-mail-module/src/test/java/org/apache/tika/parser/mbox/MboxParserTest.java b/tika-parsers/tika-parser-mail-module/src/test/java/org/apache/tika/parser/mbox/MboxParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-module/src/test/java/org/apache/tika/parser/mbox/MboxParserTest.java
rename to tika-parsers/tika-parser-mail-module/src/test/java/org/apache/tika/parser/mbox/MboxParserTest.java
diff --git a/tika-parser-modules/tika-parser-mail-module/src/test/resources/org/apache/tika/parser/mail/tika-config-extract-all-alternatives.xml b/tika-parsers/tika-parser-mail-module/src/test/resources/org/apache/tika/parser/mail/tika-config-extract-all-alternatives.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-module/src/test/resources/org/apache/tika/parser/mail/tika-config-extract-all-alternatives.xml
rename to tika-parsers/tika-parser-mail-module/src/test/resources/org/apache/tika/parser/mail/tika-config-extract-all-alternatives.xml
diff --git a/tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/complex.mbox b/tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/complex.mbox
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/complex.mbox
rename to tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/complex.mbox
diff --git a/tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/headers.mbox b/tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/headers.mbox
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/headers.mbox
rename to tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/headers.mbox
diff --git a/tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/multiline.mbox b/tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/multiline.mbox
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/multiline.mbox
rename to tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/multiline.mbox
diff --git a/tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/quoted.mbox b/tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/quoted.mbox
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/quoted.mbox
rename to tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/quoted.mbox
diff --git a/tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/simple.mbox b/tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/simple.mbox
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/simple.mbox
rename to tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/simple.mbox
diff --git a/tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/single_mail.mbox b/tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/single_mail.mbox
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/single_mail.mbox
rename to tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/single_mail.mbox
diff --git a/tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testEmailWithPNGAtt.eml b/tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testEmailWithPNGAtt.eml
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testEmailWithPNGAtt.eml
rename to tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testEmailWithPNGAtt.eml
diff --git a/tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testGroupWiseEml.eml b/tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testGroupWiseEml.eml
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testGroupWiseEml.eml
rename to tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testGroupWiseEml.eml
diff --git a/tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testMBOX_complex.mbox b/tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testMBOX_complex.mbox
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testMBOX_complex.mbox
rename to tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testMBOX_complex.mbox
diff --git a/tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testMBOX_lengthy_x-headers.mbox b/tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testMBOX_lengthy_x-headers.mbox
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testMBOX_lengthy_x-headers.mbox
rename to tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testMBOX_lengthy_x-headers.mbox
diff --git a/tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822 b/tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822
rename to tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822
diff --git a/tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822-CC-BCC b/tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822-CC-BCC
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822-CC-BCC
rename to tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822-CC-BCC
diff --git a/tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822-big b/tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822-big
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822-big
rename to tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822-big
diff --git a/tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822-limitedheaders b/tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822-limitedheaders
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822-limitedheaders
rename to tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822-limitedheaders
diff --git a/tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822-mixed-simple b/tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822-mixed-simple
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822-mixed-simple
rename to tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822-mixed-simple
diff --git a/tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822-mixed-with-pdf-inline b/tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822-mixed-with-pdf-inline
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822-mixed-with-pdf-inline
rename to tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822-mixed-with-pdf-inline
diff --git a/tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822-multipart b/tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822-multipart
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822-multipart
rename to tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822-multipart
diff --git a/tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822-txt-body b/tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822-txt-body
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822-txt-body
rename to tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822-txt-body
diff --git a/tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_base64 b/tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_base64
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_base64
rename to tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_base64
diff --git a/tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_date_utf8 b/tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_date_utf8
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_date_utf8
rename to tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_date_utf8
diff --git a/tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_dkim.eml b/tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_dkim.eml
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_dkim.eml
rename to tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_dkim.eml
diff --git a/tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_eml b/tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_eml
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_eml
rename to tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_eml
diff --git a/tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_encrypted_zip b/tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_encrypted_zip
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_encrypted_zip
rename to tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_encrypted_zip
diff --git a/tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_i18nheaders b/tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_i18nheaders
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_i18nheaders
rename to tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_i18nheaders
diff --git a/tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_normal_zip b/tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_normal_zip
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_normal_zip
rename to tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_normal_zip
diff --git a/tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_oddfrom b/tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_oddfrom
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_oddfrom
rename to tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_oddfrom
diff --git a/tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_quoted b/tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_quoted
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_quoted
rename to tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_quoted
diff --git a/tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_simple_inline_body.txt b/tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_simple_inline_body.txt
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_simple_inline_body.txt
rename to tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_simple_inline_body.txt
diff --git a/tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_x-.eml b/tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_x-.eml
similarity index 100%
rename from tika-parser-modules/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_x-.eml
rename to tika-parsers/tika-parser-mail-module/src/test/resources/test-documents/testRFC822_x-.eml
diff --git a/tika-parser-modules/tika-parser-microsoft-module/pom.xml b/tika-parsers/tika-parser-microsoft-module/pom.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/pom.xml
rename to tika-parsers/tika-parser-microsoft-module/pom.xml
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/detect/microsoft/POIFSContainerDetector.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/detect/microsoft/POIFSContainerDetector.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/detect/microsoft/POIFSContainerDetector.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/detect/microsoft/POIFSContainerDetector.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/detect/microsoft/ooxml/OPCPackageDetector.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/detect/microsoft/ooxml/OPCPackageDetector.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/detect/microsoft/ooxml/OPCPackageDetector.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/detect/microsoft/ooxml/OPCPackageDetector.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/AbstractListManager.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/AbstractListManager.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/AbstractListManager.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/AbstractListManager.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/AbstractOfficeParser.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/AbstractOfficeParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/AbstractOfficeParser.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/AbstractOfficeParser.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/AbstractPOIFSExtractor.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/AbstractPOIFSExtractor.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/AbstractPOIFSExtractor.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/AbstractPOIFSExtractor.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/Cell.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/Cell.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/Cell.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/Cell.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/CellDecorator.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/CellDecorator.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/CellDecorator.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/CellDecorator.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/EMFParser.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/EMFParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/EMFParser.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/EMFParser.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ExcelExtractor.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ExcelExtractor.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ExcelExtractor.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ExcelExtractor.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/FormattingUtils.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/FormattingUtils.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/FormattingUtils.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/FormattingUtils.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/HSLFExtractor.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/HSLFExtractor.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/HSLFExtractor.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/HSLFExtractor.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/JackcessExtractor.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/JackcessExtractor.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/JackcessExtractor.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/JackcessExtractor.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/JackcessParser.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/JackcessParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/JackcessParser.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/JackcessParser.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/LinkedCell.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/LinkedCell.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/LinkedCell.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/LinkedCell.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ListManager.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ListManager.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ListManager.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ListManager.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/MSOwnerFileParser.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/MSOwnerFileParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/MSOwnerFileParser.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/MSOwnerFileParser.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/NumberCell.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/NumberCell.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/NumberCell.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/NumberCell.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/OfficeParser.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/OfficeParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/OfficeParser.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/OfficeParser.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/OfficeParserConfig.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/OfficeParserConfig.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/OfficeParserConfig.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/OfficeParserConfig.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/OldExcelParser.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/OldExcelParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/OldExcelParser.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/OldExcelParser.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/OutlookExtractor.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/OutlookExtractor.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/OutlookExtractor.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/OutlookExtractor.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/SummaryExtractor.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/SummaryExtractor.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/SummaryExtractor.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/SummaryExtractor.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/TNEFParser.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/TNEFParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/TNEFParser.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/TNEFParser.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/TextCell.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/TextCell.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/TextCell.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/TextCell.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/TikaExcelDataFormatter.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/TikaExcelDataFormatter.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/TikaExcelDataFormatter.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/TikaExcelDataFormatter.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/TikaExcelGeneralFormat.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/TikaExcelGeneralFormat.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/TikaExcelGeneralFormat.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/TikaExcelGeneralFormat.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/WMFParser.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/WMFParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/WMFParser.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/WMFParser.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/WordExtractor.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/WordExtractor.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/WordExtractor.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/WordExtractor.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmAccessor.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmAccessor.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmAccessor.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmAccessor.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmAssert.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmAssert.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmAssert.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmAssert.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmBlockInfo.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmBlockInfo.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmBlockInfo.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmBlockInfo.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmCommons.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmCommons.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmCommons.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmCommons.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmConstants.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmConstants.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmConstants.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmConstants.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmDirectoryListingSet.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmDirectoryListingSet.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmDirectoryListingSet.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmDirectoryListingSet.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmExtractor.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmExtractor.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmExtractor.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmExtractor.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmItsfHeader.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmItsfHeader.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmItsfHeader.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmItsfHeader.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmItspHeader.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmItspHeader.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmItspHeader.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmItspHeader.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmLzxBlock.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmLzxBlock.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmLzxBlock.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmLzxBlock.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmLzxState.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmLzxState.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmLzxState.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmLzxState.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmLzxcControlData.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmLzxcControlData.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmLzxcControlData.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmLzxcControlData.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmLzxcResetTable.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmLzxcResetTable.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmLzxcResetTable.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmLzxcResetTable.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmParser.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmParser.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmParser.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmParsingException.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmParsingException.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmParsingException.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmParsingException.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmPmgiHeader.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmPmgiHeader.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmPmgiHeader.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmPmgiHeader.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmPmglHeader.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmPmglHeader.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmPmglHeader.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmPmglHeader.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmSection.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmSection.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmSection.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmSection.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmWrapper.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmWrapper.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmWrapper.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmWrapper.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/DirectoryListingEntry.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/DirectoryListingEntry.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/DirectoryListingEntry.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/DirectoryListingEntry.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/CheckedFileNodePushBack.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/CheckedFileNodePushBack.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/CheckedFileNodePushBack.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/CheckedFileNodePushBack.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/CompactID.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/CompactID.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/CompactID.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/CompactID.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/Error.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/Error.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/Error.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/Error.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/ExtendedGUID.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/ExtendedGUID.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/ExtendedGUID.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/ExtendedGUID.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FileChunkReference.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FileChunkReference.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FileChunkReference.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FileChunkReference.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FileDataStoreObject.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FileDataStoreObject.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FileDataStoreObject.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FileDataStoreObject.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FileDataStoreObjectReference.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FileDataStoreObjectReference.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FileDataStoreObjectReference.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FileDataStoreObjectReference.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FileNode.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FileNode.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FileNode.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FileNode.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FileNodeList.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FileNodeList.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FileNodeList.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FileNodeList.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FileNodeListHeader.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FileNodeListHeader.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FileNodeListHeader.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FileNodeListHeader.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FileNodePtr.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FileNodePtr.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FileNodePtr.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FileNodePtr.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FileNodePtrBackPush.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FileNodePtrBackPush.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FileNodePtrBackPush.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FileNodePtrBackPush.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FileNodeUnion.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FileNodeUnion.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FileNodeUnion.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FileNodeUnion.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FndStructureConstants.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FndStructureConstants.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FndStructureConstants.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/FndStructureConstants.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/GUID.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/GUID.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/GUID.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/GUID.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/GlobalIdTableEntry2FNDX.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/GlobalIdTableEntry2FNDX.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/GlobalIdTableEntry2FNDX.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/GlobalIdTableEntry2FNDX.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/GlobalIdTableEntry3FNDX.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/GlobalIdTableEntry3FNDX.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/GlobalIdTableEntry3FNDX.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/GlobalIdTableEntry3FNDX.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/GlobalIdTableEntryFNDX.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/GlobalIdTableEntryFNDX.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/GlobalIdTableEntryFNDX.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/GlobalIdTableEntryFNDX.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/GlobalIdTableStartFNDX.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/GlobalIdTableStartFNDX.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/GlobalIdTableStartFNDX.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/GlobalIdTableStartFNDX.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/IndentUtil.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/IndentUtil.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/IndentUtil.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/IndentUtil.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/Int24.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/Int24.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/Int24.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/Int24.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/JCID.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/JCID.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/JCID.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/JCID.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/JCIDPropertySetTypeEnum.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/JCIDPropertySetTypeEnum.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/JCIDPropertySetTypeEnum.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/JCIDPropertySetTypeEnum.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/ObjectDeclarationWithRefCount.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/ObjectDeclarationWithRefCount.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/ObjectDeclarationWithRefCount.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/ObjectDeclarationWithRefCount.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/ObjectDeclarationWithRefCountBody.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/ObjectDeclarationWithRefCountBody.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/ObjectDeclarationWithRefCountBody.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/ObjectDeclarationWithRefCountBody.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/ObjectInfoDependencyOverrideData.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/ObjectInfoDependencyOverrideData.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/ObjectInfoDependencyOverrideData.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/ObjectInfoDependencyOverrideData.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/ObjectInfoDependencyOverrides.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/ObjectInfoDependencyOverrides.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/ObjectInfoDependencyOverrides.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/ObjectInfoDependencyOverrides.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/ObjectRevisionWithRefCountFNDX.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/ObjectRevisionWithRefCountFNDX.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/ObjectRevisionWithRefCountFNDX.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/ObjectRevisionWithRefCountFNDX.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/ObjectSpaceObjectPropSet.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/ObjectSpaceObjectPropSet.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/ObjectSpaceObjectPropSet.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/ObjectSpaceObjectPropSet.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/ObjectSpaceObjectStreamOfOIDsOSIDsOrContextIDs.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/ObjectSpaceObjectStreamOfOIDsOSIDsOrContextIDs.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/ObjectSpaceObjectStreamOfOIDsOSIDsOrContextIDs.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/ObjectSpaceObjectStreamOfOIDsOSIDsOrContextIDs.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/ObjectStreamCounters.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/ObjectStreamCounters.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/ObjectStreamCounters.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/ObjectStreamCounters.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteDirectFileResource.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteDirectFileResource.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteDirectFileResource.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteDirectFileResource.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteDocument.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteDocument.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteDocument.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteDocument.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteHeader.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteHeader.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteHeader.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteHeader.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteLegacyDumpStrings.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteLegacyDumpStrings.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteLegacyDumpStrings.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteLegacyDumpStrings.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteParser.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteParser.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteParser.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNotePropertyEnum.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNotePropertyEnum.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNotePropertyEnum.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNotePropertyEnum.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNotePropertyId.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNotePropertyId.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNotePropertyId.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNotePropertyId.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNotePtr.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNotePtr.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNotePtr.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNotePtr.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteTreeWalker.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteTreeWalker.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteTreeWalker.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteTreeWalker.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteTreeWalkerOptions.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteTreeWalkerOptions.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteTreeWalkerOptions.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteTreeWalkerOptions.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/PropertyIDType.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/PropertyIDType.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/PropertyIDType.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/PropertyIDType.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/PropertySet.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/PropertySet.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/PropertySet.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/PropertySet.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/PropertyValue.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/PropertyValue.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/PropertyValue.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/PropertyValue.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/Revision.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/Revision.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/Revision.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/Revision.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/RevisionManifest.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/RevisionManifest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/RevisionManifest.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/RevisionManifest.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/RevisionManifestListStart.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/RevisionManifestListStart.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/RevisionManifestListStart.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/RevisionManifestListStart.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/RevisionRoleDeclaration.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/RevisionRoleDeclaration.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/RevisionRoleDeclaration.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/RevisionRoleDeclaration.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/RootObjectReference.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/RootObjectReference.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/RootObjectReference.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/RootObjectReference.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/RootObjectReferenceBase.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/RootObjectReferenceBase.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/RootObjectReferenceBase.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/RootObjectReferenceBase.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/AbstractOOXMLExtractor.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/AbstractOOXMLExtractor.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/AbstractOOXMLExtractor.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/AbstractOOXMLExtractor.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/MetadataExtractor.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/MetadataExtractor.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/MetadataExtractor.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/MetadataExtractor.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLExtractor.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLExtractor.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLExtractor.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLExtractor.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLExtractorFactory.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLExtractorFactory.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLExtractorFactory.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLExtractorFactory.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParser.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParser.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParser.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLTikaBodyPartHandler.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLTikaBodyPartHandler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLTikaBodyPartHandler.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLTikaBodyPartHandler.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLWordAndPowerPointTextHandler.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLWordAndPowerPointTextHandler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLWordAndPowerPointTextHandler.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLWordAndPowerPointTextHandler.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/POIXMLTextExtractorDecorator.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/POIXMLTextExtractorDecorator.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/POIXMLTextExtractorDecorator.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/POIXMLTextExtractorDecorator.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/ParagraphProperties.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/ParagraphProperties.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/ParagraphProperties.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/ParagraphProperties.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/RunProperties.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/RunProperties.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/RunProperties.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/RunProperties.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/SXSLFPowerPointExtractorDecorator.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/SXSLFPowerPointExtractorDecorator.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/SXSLFPowerPointExtractorDecorator.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/SXSLFPowerPointExtractorDecorator.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/SXWPFWordExtractorDecorator.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/SXWPFWordExtractorDecorator.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/SXWPFWordExtractorDecorator.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/SXWPFWordExtractorDecorator.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/XSLFPowerPointExtractorDecorator.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/XSLFPowerPointExtractorDecorator.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/XSLFPowerPointExtractorDecorator.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/XSLFPowerPointExtractorDecorator.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/XSSFBExcelExtractorDecorator.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/XSSFBExcelExtractorDecorator.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/XSSFBExcelExtractorDecorator.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/XSSFBExcelExtractorDecorator.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/XSSFExcelExtractorDecorator.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/XSSFExcelExtractorDecorator.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/XSSFExcelExtractorDecorator.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/XSSFExcelExtractorDecorator.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/XWPFListManager.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/XWPFListManager.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/XWPFListManager.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/XWPFListManager.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/XWPFWordExtractorDecorator.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/XWPFWordExtractorDecorator.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/XWPFWordExtractorDecorator.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/XWPFWordExtractorDecorator.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xps/XPSExtractorDecorator.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xps/XPSExtractorDecorator.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xps/XPSExtractorDecorator.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xps/XPSExtractorDecorator.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xps/XPSPageContentHandler.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xps/XPSPageContentHandler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xps/XPSPageContentHandler.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xps/XPSPageContentHandler.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xps/XPSTextExtractor.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xps/XPSTextExtractor.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xps/XPSTextExtractor.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xps/XPSTextExtractor.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xslf/XSLFEventBasedPowerPointExtractor.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xslf/XSLFEventBasedPowerPointExtractor.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xslf/XSLFEventBasedPowerPointExtractor.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xslf/XSLFEventBasedPowerPointExtractor.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/XWPFEventBasedWordExtractor.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/XWPFEventBasedWordExtractor.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/XWPFEventBasedWordExtractor.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/XWPFEventBasedWordExtractor.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/XWPFNumberingShim.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/XWPFNumberingShim.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/XWPFNumberingShim.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/XWPFNumberingShim.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/XWPFStylesShim.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/XWPFStylesShim.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/XWPFStylesShim.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/XWPFStylesShim.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/AbstractPartHandler.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/AbstractPartHandler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/AbstractPartHandler.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/AbstractPartHandler.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/BinaryDataHandler.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/BinaryDataHandler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/BinaryDataHandler.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/BinaryDataHandler.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/CorePropertiesHandler.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/CorePropertiesHandler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/CorePropertiesHandler.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/CorePropertiesHandler.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/ExtendedPropertiesHandler.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/ExtendedPropertiesHandler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/ExtendedPropertiesHandler.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/ExtendedPropertiesHandler.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/PartHandler.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/PartHandler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/PartHandler.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/PartHandler.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/Relationship.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/Relationship.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/Relationship.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/Relationship.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/RelationshipsHandler.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/RelationshipsHandler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/RelationshipsHandler.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/RelationshipsHandler.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/RelationshipsManager.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/RelationshipsManager.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/RelationshipsManager.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/RelationshipsManager.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/Word2006MLDocHandler.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/Word2006MLDocHandler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/Word2006MLDocHandler.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/Word2006MLDocHandler.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/Word2006MLParser.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/Word2006MLParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/Word2006MLParser.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/Word2006MLParser.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/WordAndPowerPointTextPartHandler.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/WordAndPowerPointTextPartHandler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/WordAndPowerPointTextPartHandler.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/WordAndPowerPointTextPartHandler.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/pst/OutlookPSTParser.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/pst/OutlookPSTParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/pst/OutlookPSTParser.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/pst/OutlookPSTParser.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/rtf/GroupState.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/rtf/GroupState.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/rtf/GroupState.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/rtf/GroupState.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/rtf/ListDescriptor.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/rtf/ListDescriptor.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/rtf/ListDescriptor.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/rtf/ListDescriptor.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/rtf/RTFEmbObjHandler.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/rtf/RTFEmbObjHandler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/rtf/RTFEmbObjHandler.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/rtf/RTFEmbObjHandler.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/rtf/RTFObjDataParser.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/rtf/RTFObjDataParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/rtf/RTFObjDataParser.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/rtf/RTFObjDataParser.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/rtf/RTFParser.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/rtf/RTFParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/rtf/RTFParser.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/rtf/RTFParser.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/rtf/TextExtractor.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/rtf/TextExtractor.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/rtf/TextExtractor.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/rtf/TextExtractor.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/xml/AbstractXML2003Parser.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/xml/AbstractXML2003Parser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/xml/AbstractXML2003Parser.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/xml/AbstractXML2003Parser.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/xml/HyperlinkHandler.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/xml/HyperlinkHandler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/xml/HyperlinkHandler.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/xml/HyperlinkHandler.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/xml/SpreadsheetMLParser.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/xml/SpreadsheetMLParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/xml/SpreadsheetMLParser.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/xml/SpreadsheetMLParser.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/xml/WordMLParser.java b/tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/xml/WordMLParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/xml/WordMLParser.java
rename to tika-parsers/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/xml/WordMLParser.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/resources/META-INF/services/org.apache.tika.detect.Detector b/tika-parsers/tika-parser-microsoft-module/src/main/resources/META-INF/services/org.apache.tika.detect.Detector
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/resources/META-INF/services/org.apache.tika.detect.Detector
rename to tika-parsers/tika-parser-microsoft-module/src/main/resources/META-INF/services/org.apache.tika.detect.Detector
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/resources/META-INF/services/org.apache.tika.detect.zip.ZipContainerDetector b/tika-parsers/tika-parser-microsoft-module/src/main/resources/META-INF/services/org.apache.tika.detect.zip.ZipContainerDetector
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/resources/META-INF/services/org.apache.tika.detect.zip.ZipContainerDetector
rename to tika-parsers/tika-parser-microsoft-module/src/main/resources/META-INF/services/org.apache.tika.detect.zip.ZipContainerDetector
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser b/tika-parsers/tika-parser-microsoft-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
rename to tika-parsers/tika-parser-microsoft-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/AbstractPOIContainerExtractionTest.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/AbstractPOIContainerExtractionTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/AbstractPOIContainerExtractionTest.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/AbstractPOIContainerExtractionTest.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/EMFParserTest.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/EMFParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/EMFParserTest.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/EMFParserTest.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/JackcessParserTest.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/JackcessParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/JackcessParserTest.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/JackcessParserTest.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/MSOwnerFileParserTest.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/MSOwnerFileParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/MSOwnerFileParserTest.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/MSOwnerFileParserTest.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/OfficeParserTest.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/OfficeParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/OfficeParserTest.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/OfficeParserTest.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/OldExcelParserTest.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/OldExcelParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/OldExcelParserTest.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/OldExcelParserTest.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/OutlookParserTest.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/OutlookParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/OutlookParserTest.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/OutlookParserTest.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/POIContainerExtractionTest.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/POIContainerExtractionTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/POIContainerExtractionTest.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/POIContainerExtractionTest.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ProjectParserTest.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ProjectParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ProjectParserTest.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ProjectParserTest.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/PublisherParserTest.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/PublisherParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/PublisherParserTest.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/PublisherParserTest.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/SolidworksParserTest.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/SolidworksParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/SolidworksParserTest.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/SolidworksParserTest.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/TNEFParserTest.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/TNEFParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/TNEFParserTest.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/TNEFParserTest.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/VisioParserTest.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/VisioParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/VisioParserTest.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/VisioParserTest.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/WMFParserTest.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/WMFParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/WMFParserTest.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/WMFParserTest.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/WriteProtectedParserTest.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/WriteProtectedParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/WriteProtectedParserTest.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/WriteProtectedParserTest.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmBlockInfo.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmBlockInfo.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmBlockInfo.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmBlockInfo.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmExtraction.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmExtraction.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmExtraction.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmExtraction.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmExtractor.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmExtractor.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmExtractor.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmExtractor.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmItsfHeader.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmItsfHeader.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmItsfHeader.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmItsfHeader.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmItspHeader.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmItspHeader.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmItspHeader.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmItspHeader.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmLzxState.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmLzxState.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmLzxState.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmLzxState.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmLzxcControlData.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmLzxcControlData.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmLzxcControlData.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmLzxcControlData.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmLzxcResetTable.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmLzxcResetTable.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmLzxcResetTable.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmLzxcResetTable.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestDirectoryListingEntry.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestDirectoryListingEntry.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestDirectoryListingEntry.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestDirectoryListingEntry.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestParameters.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestParameters.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestParameters.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestParameters.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestPmgiHeader.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestPmgiHeader.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestPmgiHeader.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestPmgiHeader.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestPmglHeader.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestPmglHeader.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestPmglHeader.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestPmglHeader.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/onenote/OneNoteParserTest.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/onenote/OneNoteParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/onenote/OneNoteParserTest.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/onenote/OneNoteParserTest.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLContainerExtractionTest.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLContainerExtractionTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLContainerExtractionTest.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLContainerExtractionTest.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/SXSLFExtractorTest.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/SXSLFExtractorTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/SXSLFExtractorTest.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/SXSLFExtractorTest.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/SXWPFExtractorTest.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/SXWPFExtractorTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/SXWPFExtractorTest.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/SXWPFExtractorTest.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/TruncatedOOXMLTest.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/TruncatedOOXMLTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/TruncatedOOXMLTest.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/TruncatedOOXMLTest.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/xps/XPSParserTest.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/xps/XPSParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/xps/XPSParserTest.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/xps/XPSParserTest.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/Word2006MLParserTest.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/Word2006MLParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/Word2006MLParserTest.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/xwpf/ml2006/Word2006MLParserTest.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/pst/OutlookPSTParserTest.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/pst/OutlookPSTParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/pst/OutlookPSTParserTest.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/pst/OutlookPSTParserTest.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/rtf/RTFParserTest.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/rtf/RTFParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/rtf/RTFParserTest.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/rtf/RTFParserTest.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/xml/XML2003ParserTest.java b/tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/xml/XML2003ParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/xml/XML2003ParserTest.java
rename to tika-parsers/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/xml/XML2003ParserTest.java
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/tika-config-custom-date-override.xml b/tika-parsers/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/ooxml/tika-config-custom-date-override.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/tika-config-custom-date-override.xml
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/ooxml/tika-config-custom-date-override.xml
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/ooxml/tika-config-dom-macros.xml b/tika-parsers/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/ooxml/tika-config-dom-macros.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/ooxml/tika-config-dom-macros.xml
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/ooxml/tika-config-dom-macros.xml
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/ooxml/tika-config-sax-macros.xml b/tika-parsers/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/ooxml/tika-config-sax-macros.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/ooxml/tika-config-sax-macros.xml
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/ooxml/tika-config-sax-macros.xml
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/rtf/ignoreListMarkup-tika-config.xml b/tika-parsers/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/rtf/ignoreListMarkup-tika-config.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/rtf/ignoreListMarkup-tika-config.xml
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/rtf/ignoreListMarkup-tika-config.xml
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/rtf/tika-config.xml b/tika-parsers/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/rtf/tika-config.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/rtf/tika-config.xml
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/rtf/tika-config.xml
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/ooxml/tika-config-custom-date-override.xml b/tika-parsers/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/tika-config-custom-date-override.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/ooxml/tika-config-custom-date-override.xml
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/tika-config-custom-date-override.xml
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/tika-config-exclude-phonetic.xml b/tika-parsers/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/tika-config-exclude-phonetic.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/tika-config-exclude-phonetic.xml
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/tika-config-exclude-phonetic.xml
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/tika-config-extract-all-alternatives-msg.xml b/tika-parsers/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/tika-config-extract-all-alternatives-msg.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/tika-config-extract-all-alternatives-msg.xml
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/tika-config-extract-all-alternatives-msg.xml
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/tika-config-macros.xml b/tika-parsers/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/tika-config-macros.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/tika-config-macros.xml
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/tika-config-macros.xml
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/tika-config-sax-docx.xml b/tika-parsers/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/tika-config-sax-docx.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/tika-config-sax-docx.xml
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/tika-config-sax-docx.xml
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/Doc1_ole.doc b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/Doc1_ole.doc
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/Doc1_ole.doc
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/Doc1_ole.doc
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/EmbeddedDocument.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/EmbeddedDocument.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/EmbeddedDocument.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/EmbeddedDocument.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/EmbeddedOutlook.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/EmbeddedOutlook.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/EmbeddedOutlook.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/EmbeddedOutlook.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/EmbeddedPDF.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/EmbeddedPDF.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/EmbeddedPDF.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/EmbeddedPDF.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/NullHeader.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/NullHeader.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/NullHeader.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/NullHeader.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/chm/IMJPCL.CHM b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/chm/IMJPCL.CHM
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/chm/IMJPCL.CHM
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/chm/IMJPCL.CHM
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/chm/IMJPCLE.CHM b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/chm/IMJPCLE.CHM
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/chm/IMJPCLE.CHM
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/chm/IMJPCLE.CHM
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/chm/IMTCEN.CHM b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/chm/IMTCEN.CHM
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/chm/IMTCEN.CHM
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/chm/IMTCEN.CHM
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/chm/admin.chm b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/chm/admin.chm
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/chm/admin.chm
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/chm/admin.chm
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/chm/cmak_ops.CHM b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/chm/cmak_ops.CHM
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/chm/cmak_ops.CHM
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/chm/cmak_ops.CHM
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/chm/comexp.CHM b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/chm/comexp.CHM
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/chm/comexp.CHM
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/chm/comexp.CHM
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/chm/gpedit.CHM b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/chm/gpedit.CHM
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/chm/gpedit.CHM
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/chm/gpedit.CHM
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/chm/tcpip.CHM b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/chm/tcpip.CHM
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/chm/tcpip.CHM
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/chm/tcpip.CHM
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/chm/wmicontrol.CHM b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/chm/wmicontrol.CHM
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/chm/wmicontrol.CHM
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/chm/wmicontrol.CHM
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/footnotes.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/footnotes.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/footnotes.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/footnotes.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/headerPic.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/headerPic.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/headerPic.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/headerPic.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/jxl.xls b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/jxl.xls
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/jxl.xls
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/jxl.xls
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/pictures.ppt b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/pictures.ppt
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/pictures.ppt
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/pictures.ppt
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/protect.xlsx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/protect.xlsx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/protect.xlsx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/protect.xlsx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/protectedFile.xlsx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/protectedFile.xlsx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/protectedFile.xlsx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/protectedFile.xlsx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/protectedSheets.xlsx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/protectedSheets.xlsx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/protectedSheets.xlsx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/protectedSheets.xlsx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/test-columnar.xls b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/test-columnar.xls
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/test-columnar.xls
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/test-columnar.xls
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/test-columnar.xlsb b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/test-columnar.xlsb
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/test-columnar.xlsb
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/test-columnar.xlsb
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/test-columnar.xlsx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/test-columnar.xlsx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/test-columnar.xlsx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/test-columnar.xlsx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/test-outlook.msg b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/test-outlook.msg
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/test-outlook.msg
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/test-outlook.msg
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/test-outlook2003.msg b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/test-outlook2003.msg
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/test-outlook2003.msg
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/test-outlook2003.msg
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/test.doc b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/test.doc
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/test.doc
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/test.doc
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testACCESS.mdb b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testACCESS.mdb
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testACCESS.mdb
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testACCESS.mdb
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testAccess2.accdb b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testAccess2.accdb
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testAccess2.accdb
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testAccess2.accdb
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testAccess2_2000.mdb b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testAccess2_2000.mdb
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testAccess2_2000.mdb
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testAccess2_2000.mdb
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testAccess2_2002-2003.mdb b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testAccess2_2002-2003.mdb
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testAccess2_2002-2003.mdb
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testAccess2_2002-2003.mdb
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testAccess2_encrypted.accdb b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testAccess2_encrypted.accdb
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testAccess2_encrypted.accdb
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testAccess2_encrypted.accdb
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testAccess_V1997.mdb b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testAccess_V1997.mdb
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testAccess_V1997.mdb
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testAccess_V1997.mdb
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testBinControlWord.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testBinControlWord.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testBinControlWord.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testBinControlWord.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testChm.chm b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testChm.chm
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testChm.chm
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testChm.chm
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testChm2.chm b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testChm2.chm
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testChm2.chm
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testChm2.chm
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testChm3.chm b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testChm3.chm
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testChm3.chm
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testChm3.chm
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testChm_oom.chm b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testChm_oom.chm
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testChm_oom.chm
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testChm_oom.chm
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testComment.doc b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testComment.doc
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testComment.doc
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testComment.doc
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testComment.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testComment.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testComment.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testComment.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testComment.ppt b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testComment.ppt
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testComment.ppt
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testComment.ppt
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testComment.pptx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testComment.pptx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testComment.pptx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testComment.pptx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testComment.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testComment.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testComment.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testComment.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testComment.xls b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testComment.xls
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testComment.xls
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testComment.xls
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testComment.xlsx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testComment.xlsx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testComment.xlsx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testComment.xlsx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testControlCharacters.doc b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testControlCharacters.doc
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testControlCharacters.doc
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testControlCharacters.doc
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testDOCX_Thumbnail.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testDOCX_Thumbnail.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testDOCX_Thumbnail.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testDOCX_Thumbnail.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testDOTM.dotm b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testDOTM.dotm
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testDOTM.dotm
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testDOTM.dotm
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testDocumentLink.doc b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testDocumentLink.doc
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testDocumentLink.doc
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testDocumentLink.doc
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEMF.emf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEMF.emf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEMF.emf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEMF.emf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEMLX.emlx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEMLX.emlx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEMLX.emlx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEMLX.emlx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEML_embedded_xhtml_and_img.eml b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEML_embedded_xhtml_and_img.eml
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEML_embedded_xhtml_and_img.eml
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEML_embedded_xhtml_and_img.eml
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL-charts.xls b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL-charts.xls
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL-charts.xls
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL-charts.xls
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL-formats.xls b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL-formats.xls
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL-formats.xls
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL-formats.xls
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL-formats.xlsx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL-formats.xlsx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL-formats.xlsx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL-formats.xlsx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL.strict.xlsx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL.strict.xlsx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL.strict.xlsx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL.strict.xlsx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL.xls b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL.xls
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL.xls
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL.xls
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL.xlsb b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL.xlsb
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL.xlsb
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL.xlsb
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL.xlsx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL.xlsx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL.xlsx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL.xlsx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL2003.xml b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL2003.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL2003.xml
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL2003.xml
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_1img.xls b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_1img.xls
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_1img.xls
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_1img.xls
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_1img.xlsx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_1img.xlsx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_1img.xlsx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_1img.xlsx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_4.xls b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_4.xls
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_4.xls
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_4.xls
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_5.xls b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_5.xls
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_5.xls
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_5.xls
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_95.xls b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_95.xls
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_95.xls
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_95.xls
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_WORKBOOK_in_capitals.xls b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_WORKBOOK_in_capitals.xls
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_WORKBOOK_in_capitals.xls
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_WORKBOOK_in_capitals.xls
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_big_numbers.xls b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_big_numbers.xls
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_big_numbers.xls
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_big_numbers.xls
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_big_numbers.xlsx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_big_numbers.xlsx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_big_numbers.xlsx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_big_numbers.xlsx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_charts.xlsb b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_charts.xlsb
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_charts.xlsb
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_charts.xlsb
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_charts.xlsx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_charts.xlsx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_charts.xlsx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_charts.xlsx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_custom_props.xls b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_custom_props.xls
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_custom_props.xls
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_custom_props.xls
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_custom_props.xlsx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_custom_props.xlsx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_custom_props.xlsx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_custom_props.xlsx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_dateFormats.xls b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_dateFormats.xls
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_dateFormats.xls
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_dateFormats.xls
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_dateFormats.xlsx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_dateFormats.xlsx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_dateFormats.xlsx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_dateFormats.xlsx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_diagramData.xlsb b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_diagramData.xlsb
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_diagramData.xlsb
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_diagramData.xlsb
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_diagramData.xlsx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_diagramData.xlsx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_diagramData.xlsx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_diagramData.xlsx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_embeddedPDF_mac.xls b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_embeddedPDF_mac.xls
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_embeddedPDF_mac.xls
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_embeddedPDF_mac.xls
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_embeddedPDF_mac.xlsx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_embeddedPDF_mac.xlsx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_embeddedPDF_mac.xlsx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_embeddedPDF_mac.xlsx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_embeddedPDF_windows.xls b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_embeddedPDF_windows.xls
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_embeddedPDF_windows.xls
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_embeddedPDF_windows.xls
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_embeddedPDF_windows.xlsx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_embeddedPDF_windows.xlsx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_embeddedPDF_windows.xlsx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_embeddedPDF_windows.xlsx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_embeded.xls b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_embeded.xls
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_embeded.xls
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_embeded.xls
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_embeded.xlsx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_embeded.xlsx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_embeded.xlsx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_embeded.xlsx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_headers_footers.xls b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_headers_footers.xls
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_headers_footers.xls
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_headers_footers.xls
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_headers_footers.xlsx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_headers_footers.xlsx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_headers_footers.xlsx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_headers_footers.xlsx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_hyperlinks.xls b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_hyperlinks.xls
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_hyperlinks.xls
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_hyperlinks.xls
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_hyperlinks.xlsx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_hyperlinks.xlsx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_hyperlinks.xlsx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_hyperlinks.xlsx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_labels-govdocs-515858.xls b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_labels-govdocs-515858.xls
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_labels-govdocs-515858.xls
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_labels-govdocs-515858.xls
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_macro.xls b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_macro.xls
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_macro.xls
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_macro.xls
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_macro.xlsm b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_macro.xlsm
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_macro.xlsm
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_macro.xlsm
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_macro_enabled_template.xltm b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_macro_enabled_template.xltm
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_macro_enabled_template.xltm
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_macro_enabled_template.xltm
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_phonetic.xls b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_phonetic.xls
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_phonetic.xls
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_phonetic.xls
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_phonetic.xlsx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_phonetic.xlsx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_phonetic.xlsx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_phonetic.xlsx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_poi-61034.xlsx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_poi-61034.xlsx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_poi-61034.xlsx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_poi-61034.xlsx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_poi.xlsx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_poi.xlsx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_poi.xlsx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_poi.xlsx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_protected_passtika.xls b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_protected_passtika.xls
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_protected_passtika.xls
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_protected_passtika.xls
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_protected_passtika.xlsx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_protected_passtika.xlsx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_protected_passtika.xlsx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_protected_passtika.xlsx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_protected_passtika_2.xlsx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_protected_passtika_2.xlsx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_protected_passtika_2.xlsx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_protected_passtika_2.xlsx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_signed.xlsx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_signed.xlsx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_signed.xlsx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_signed.xlsx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_template.xlt b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_template.xlt
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_template.xlt
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_template.xlt
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_template.xltx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_template.xltx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_template.xltx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_template.xltx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_textbox.xls b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_textbox.xls
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_textbox.xls
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_textbox.xls
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_textbox.xlsx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_textbox.xlsx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_textbox.xlsx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_textbox.xlsx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_various.xlsb b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_various.xlsb
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_various.xlsb
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testEXCEL_various.xlsb
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testExcel_embeddedPDF.xls b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testExcel_embeddedPDF.xls
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testExcel_embeddedPDF.xls
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testExcel_embeddedPDF.xls
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testExcel_embeddedPDF.xlsx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testExcel_embeddedPDF.xlsx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testExcel_embeddedPDF.xlsx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testExcel_embeddedPDF.xlsx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testException1.doc b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testException1.doc
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testException1.doc
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testException1.doc
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testException2.doc b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testException2.doc
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testException2.doc
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testException2.doc
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testFontAfterBufferedText.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testFontAfterBufferedText.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testFontAfterBufferedText.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testFontAfterBufferedText.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testMSChart-govdocs-428996.ppt b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testMSChart-govdocs-428996.ppt
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testMSChart-govdocs-428996.ppt
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testMSChart-govdocs-428996.ppt
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testMSChart-govdocs-428996.pptx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testMSChart-govdocs-428996.pptx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testMSChart-govdocs-428996.pptx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testMSChart-govdocs-428996.pptx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testMSChart-govdocs-428996.xls b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testMSChart-govdocs-428996.xls
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testMSChart-govdocs-428996.xls
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testMSChart-govdocs-428996.xls
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testMSChart-govdocs-428996.xlsx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testMSChart-govdocs-428996.xlsx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testMSChart-govdocs-428996.xlsx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testMSChart-govdocs-428996.xlsx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testMSEquation-govdocs-863534.doc b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testMSEquation-govdocs-863534.doc
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testMSEquation-govdocs-863534.doc
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testMSEquation-govdocs-863534.doc
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG.msg b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG.msg
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG.msg
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG.msg
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG_Appointment.msg b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG_Appointment.msg
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG_Appointment.msg
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG_Appointment.msg
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG_Contact.msg b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG_Contact.msg
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG_Contact.msg
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG_Contact.msg
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG_Post.msg b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG_Post.msg
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG_Post.msg
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG_Post.msg
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG_StickyNote.msg b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG_StickyNote.msg
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG_StickyNote.msg
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG_StickyNote.msg
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG_Task.msg b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG_Task.msg
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG_Task.msg
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG_Task.msg
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG_att_doc.msg b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG_att_doc.msg
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG_att_doc.msg
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG_att_doc.msg
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG_att_msg.msg b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG_att_msg.msg
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG_att_msg.msg
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG_att_msg.msg
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG_chinese.msg b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG_chinese.msg
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG_chinese.msg
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG_chinese.msg
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG_forwarded.msg b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG_forwarded.msg
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG_forwarded.msg
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testMSG_forwarded.msg
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testMSOwnerFile b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testMSOwnerFile
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testMSOwnerFile
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testMSOwnerFile
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testOneNote.one b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testOneNote.one
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testOneNote.one
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testOneNote.one
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testOneNote1.one b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testOneNote1.one
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testOneNote1.one
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testOneNote1.one
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testOneNote2.one b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testOneNote2.one
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testOneNote2.one
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testOneNote2.one
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testOneNote2007OrEarlier1.one b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testOneNote2007OrEarlier1.one
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testOneNote2007OrEarlier1.one
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testOneNote2007OrEarlier1.one
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testOneNote2007OrEarlier2.one b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testOneNote2007OrEarlier2.one
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testOneNote2007OrEarlier2.one
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testOneNote2007OrEarlier2.one
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testOneNote2016.one b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testOneNote2016.one
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testOneNote2016.one
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testOneNote2016.one
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testOneNote3.one b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testOneNote3.one
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testOneNote3.one
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testOneNote3.one
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testOneNote4.one b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testOneNote4.one
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testOneNote4.one
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testOneNote4.one
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testOneNoteEmbeddedWordDoc.one b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testOneNoteEmbeddedWordDoc.one
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testOneNoteEmbeddedWordDoc.one
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testOneNoteEmbeddedWordDoc.one
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPM.ppm b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPM.ppm
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPM.ppm
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPM.ppm
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT.potm b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT.potm
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT.potm
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT.potm
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT.ppsm b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT.ppsm
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT.ppsm
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT.ppsm
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT.ppsx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT.ppsx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT.ppsx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT.ppsx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT.ppt b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT.ppt
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT.ppt
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT.ppt
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT.pptm b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT.pptm
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT.pptm
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT.pptm
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT.pptx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT.pptx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT.pptx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT.pptx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT.thmx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT.thmx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT.thmx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT.thmx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT.xps b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT.xps
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT.xps
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT.xps
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPTX_Thumbnail.pptx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPTX_Thumbnail.pptx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPTX_Thumbnail.pptx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPTX_Thumbnail.pptx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPTX_overlappingRelations.pptx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPTX_overlappingRelations.pptx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPTX_overlappingRelations.pptx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPTX_overlappingRelations.pptx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_2imgs.ppt b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_2imgs.ppt
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_2imgs.ppt
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_2imgs.ppt
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_2imgs.pptx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_2imgs.pptx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_2imgs.pptx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_2imgs.pptx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_EmbeddedPDF.ppt b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_EmbeddedPDF.ppt
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_EmbeddedPDF.ppt
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_EmbeddedPDF.ppt
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_EmbeddedPDF.pptx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_EmbeddedPDF.pptx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_EmbeddedPDF.pptx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_EmbeddedPDF.pptx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_autodate.ppt b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_autodate.ppt
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_autodate.ppt
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_autodate.ppt
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_autodate.pptx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_autodate.pptx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_autodate.pptx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_autodate.pptx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_charts.pptx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_charts.pptx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_charts.pptx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_charts.pptx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_comment.ppt b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_comment.ppt
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_comment.ppt
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_comment.ppt
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_comment.pptx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_comment.pptx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_comment.pptx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_comment.pptx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_custom_props.ppt b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_custom_props.ppt
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_custom_props.ppt
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_custom_props.ppt
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_custom_props.pptx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_custom_props.pptx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_custom_props.pptx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_custom_props.pptx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_diagramData.pptx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_diagramData.pptx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_diagramData.pptx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_diagramData.pptx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_embedded2.ppt b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_embedded2.ppt
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_embedded2.ppt
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_embedded2.ppt
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_embeddedMP3.pptx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_embeddedMP3.pptx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_embeddedMP3.pptx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_embeddedMP3.pptx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_embedded_two_slides.pptx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_embedded_two_slides.pptx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_embedded_two_slides.pptx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_embedded_two_slides.pptx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_embeded.ppt b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_embeded.ppt
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_embeded.ppt
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_embeded.ppt
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_embeded.pptx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_embeded.pptx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_embeded.pptx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_embeded.pptx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_groups.ppt b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_groups.ppt
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_groups.ppt
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_groups.ppt
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_groups.pptx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_groups.pptx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_groups.pptx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_groups.pptx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_macros.ppt b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_macros.ppt
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_macros.ppt
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_macros.ppt
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_macros.pptm b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_macros.pptm
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_macros.pptm
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_macros.pptm
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_masterFooter.ppt b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_masterFooter.ppt
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_masterFooter.ppt
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_masterFooter.ppt
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_masterFooter.pptx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_masterFooter.pptx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_masterFooter.pptx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_masterFooter.pptx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_masterText.ppt b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_masterText.ppt
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_masterText.ppt
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_masterText.ppt
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_masterText.pptx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_masterText.pptx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_masterText.pptx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_masterText.pptx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_masterText2.ppt b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_masterText2.ppt
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_masterText2.ppt
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_masterText2.ppt
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_masterText2.pptx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_masterText2.pptx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_masterText2.pptx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_masterText2.pptx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_oleWorkbook.ppt b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_oleWorkbook.ppt
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_oleWorkbook.ppt
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_oleWorkbook.ppt
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_oleWorkbook.pptx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_oleWorkbook.pptx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_oleWorkbook.pptx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_oleWorkbook.pptx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_protected_passtika.ppt b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_protected_passtika.ppt
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_protected_passtika.ppt
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_protected_passtika.ppt
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_protected_passtika.pptx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_protected_passtika.pptx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_protected_passtika.pptx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_protected_passtika.pptx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_signed.pptx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_signed.pptx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_signed.pptx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_signed.pptx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_skipBadCompressedObject.ppt b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_skipBadCompressedObject.ppt
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_skipBadCompressedObject.ppt
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_skipBadCompressedObject.ppt
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_various.ppt b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_various.ppt
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_various.ppt
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_various.ppt
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_various.pptx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_various.pptx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_various.pptx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_various.pptx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_various2.pptx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_various2.pptx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_various2.pptx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPPT_various2.pptx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPROJECT2003.mpp b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPROJECT2003.mpp
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPROJECT2003.mpp
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPROJECT2003.mpp
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPROJECT2007.mpp b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPROJECT2007.mpp
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPROJECT2007.mpp
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPROJECT2007.mpp
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPST.pst b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPST.pst
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPST.pst
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPST.pst
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPST_variousBodyTypes.pst b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPST_variousBodyTypes.pst
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPST_variousBodyTypes.pst
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPST_variousBodyTypes.pst
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPUBLISHER.pub b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPUBLISHER.pub
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testPUBLISHER.pub
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testPUBLISHER.pub
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTF-ms932.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTF-ms932.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTF-ms932.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTF-ms932.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTF.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTF.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTF.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTF.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFBoldItalic.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFBoldItalic.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFBoldItalic.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFBoldItalic.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFBoldPlain.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFBoldPlain.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFBoldPlain.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFBoldPlain.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFControls.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFControls.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFControls.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFControls.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFCorruptListOverride.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFCorruptListOverride.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFCorruptListOverride.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFCorruptListOverride.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFEmbeddedFiles.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFEmbeddedFiles.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFEmbeddedFiles.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFEmbeddedFiles.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFEmbeddedLink.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFEmbeddedLink.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFEmbeddedLink.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFEmbeddedLink.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFHexEscapeInsideWord.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFHexEscapeInsideWord.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFHexEscapeInsideWord.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFHexEscapeInsideWord.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFHyperlink.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFHyperlink.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFHyperlink.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFHyperlink.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFIgnoredControlWord.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFIgnoredControlWord.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFIgnoredControlWord.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFIgnoredControlWord.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFInvalidUnicode.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFInvalidUnicode.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFInvalidUnicode.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFInvalidUnicode.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFJapanese.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFJapanese.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFJapanese.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFJapanese.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFListLibreOffice.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFListLibreOffice.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFListLibreOffice.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFListLibreOffice.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFListMicrosoftWord.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFListMicrosoftWord.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFListMicrosoftWord.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFListMicrosoftWord.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFListOverride.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFListOverride.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFListOverride.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFListOverride.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFNewlines.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFNewlines.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFNewlines.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFNewlines.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFRegularImages.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFRegularImages.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFRegularImages.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFRegularImages.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFTIKA_1713.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFTIKA_1713.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFTIKA_1713.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFTIKA_1713.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFTIKA_2150.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFTIKA_2150.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFTIKA_2150.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFTIKA_2150.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFTIKA_2500.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFTIKA_2500.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFTIKA_2500.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFTIKA_2500.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFTIKA_2883.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFTIKA_2883.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFTIKA_2883.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFTIKA_2883.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFTIKA_2899.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFTIKA_2899.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFTIKA_2899.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFTIKA_2899.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFTableCellSeparation.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFTableCellSeparation.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFTableCellSeparation.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFTableCellSeparation.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFTableCellSeparation2.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFTableCellSeparation2.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFTableCellSeparation2.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFTableCellSeparation2.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFUmlautSpaces.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFUmlautSpaces.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFUmlautSpaces.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFUmlautSpaces.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFUmlautSpaces2.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFUmlautSpaces2.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFUmlautSpaces2.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFUmlautSpaces2.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFUnicodeGothic.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFUnicodeGothic.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFUnicodeGothic.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFUnicodeGothic.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFUnicodeUCNControlWordCharacterDoubling.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFUnicodeUCNControlWordCharacterDoubling.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFUnicodeUCNControlWordCharacterDoubling.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFUnicodeUCNControlWordCharacterDoubling.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFVarious.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFVarious.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFVarious.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFVarious.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFWindowsCodepage1250.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFWindowsCodepage1250.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFWindowsCodepage1250.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFWindowsCodepage1250.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFWithCurlyBraces.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFWithCurlyBraces.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFWithCurlyBraces.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFWithCurlyBraces.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFWord2010CzechCharacters.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFWord2010CzechCharacters.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFWord2010CzechCharacters.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFWord2010CzechCharacters.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFWordPadCzechCharacters.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFWordPadCzechCharacters.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFWordPadCzechCharacters.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFWordPadCzechCharacters.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTF_annotation_spacing.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTF_annotation_spacing.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTF_annotation_spacing.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testRTF_annotation_spacing.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testVISIO.vsd b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testVISIO.vsd
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testVISIO.vsd
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testVISIO.vsd
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testVISIO.vsdm b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testVISIO.vsdm
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testVISIO.vsdm
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testVISIO.vsdm
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testVISIO.vsdx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testVISIO.vsdx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testVISIO.vsdx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testVISIO.vsdx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testVISIO.vssm b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testVISIO.vssm
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testVISIO.vssm
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testVISIO.vssm
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testVISIO.vssx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testVISIO.vssx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testVISIO.vssx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testVISIO.vssx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testVISIO.vstm b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testVISIO.vstm
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testVISIO.vstm
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testVISIO.vstm
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testVISIO.vstx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testVISIO.vstx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testVISIO.vstx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testVISIO.vstx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWINMAIL.dat b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWINMAIL.dat
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWINMAIL.dat
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWINMAIL.dat
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWMF.wmf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWMF.wmf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWMF.wmf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWMF.wmf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWMF_charset.wmf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWMF_charset.wmf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWMF_charset.wmf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWMF_charset.wmf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD.doc b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD.doc
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD.doc
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD.doc
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD2003.xml b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD2003.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD2003.xml
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD2003.xml
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD6.doc b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD6.doc
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD6.doc
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD6.doc
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_1img.doc b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_1img.doc
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_1img.doc
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_1img.doc
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_1img.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_1img.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_1img.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_1img.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_2003ml.xml b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_2003ml.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_2003ml.xml
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_2003ml.xml
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_2006ml.doc b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_2006ml.doc
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_2006ml.doc
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_2006ml.doc
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_2006ml.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_2006ml.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_2006ml.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_2006ml.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_2006ml.xml b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_2006ml.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_2006ml.xml
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_2006ml.xml
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_3imgs.doc b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_3imgs.doc
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_3imgs.doc
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_3imgs.doc
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_3imgs.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_3imgs.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_3imgs.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_3imgs.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_boldHyperlink.doc b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_boldHyperlink.doc
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_boldHyperlink.doc
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_boldHyperlink.doc
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_boldHyperlink.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_boldHyperlink.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_boldHyperlink.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_boldHyperlink.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_bold_character_runs.doc b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_bold_character_runs.doc
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_bold_character_runs.doc
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_bold_character_runs.doc
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_bold_character_runs.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_bold_character_runs.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_bold_character_runs.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_bold_character_runs.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_bold_character_runs2.doc b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_bold_character_runs2.doc
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_bold_character_runs2.doc
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_bold_character_runs2.doc
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_bold_character_runs2.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_bold_character_runs2.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_bold_character_runs2.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_bold_character_runs2.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_charts.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_charts.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_charts.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_charts.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_closingSmartQInHyperLink.doc b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_closingSmartQInHyperLink.doc
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_closingSmartQInHyperLink.doc
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_closingSmartQInHyperLink.doc
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_custom_props.doc b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_custom_props.doc
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_custom_props.doc
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_custom_props.doc
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_custom_props.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_custom_props.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_custom_props.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_custom_props.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_diagramData.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_diagramData.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_diagramData.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_diagramData.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_docSecurity.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_docSecurity.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_docSecurity.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_docSecurity.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_embedded_pdf.doc b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_embedded_pdf.doc
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_embedded_pdf.doc
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_embedded_pdf.doc
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_embedded_pdf.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_embedded_pdf.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_embedded_pdf.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_embedded_pdf.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_embedded_pics.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_embedded_pics.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_embedded_pics.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_embedded_pics.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_embedded_rtf.doc b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_embedded_rtf.doc
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_embedded_rtf.doc
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_embedded_rtf.doc
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_embeded.doc b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_embeded.doc
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_embeded.doc
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_embeded.doc
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_embeded.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_embeded.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_embeded.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_embeded.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_header_hyperlink.doc b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_header_hyperlink.doc
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_header_hyperlink.doc
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_header_hyperlink.doc
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_italicsSurroundingHyperlink.doc b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_italicsSurroundingHyperlink.doc
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_italicsSurroundingHyperlink.doc
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_italicsSurroundingHyperlink.doc
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_macros.doc b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_macros.doc
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_macros.doc
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_macros.doc
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_macros.docm b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_macros.docm
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_macros.docm
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_macros.docm
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_missing_ooxml_bean1.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_missing_ooxml_bean1.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_missing_ooxml_bean1.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_missing_ooxml_bean1.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_missing_text.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_missing_text.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_missing_text.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_missing_text.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_multi_authors.doc b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_multi_authors.doc
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_multi_authors.doc
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_multi_authors.doc
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_multi_authors.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_multi_authors.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_multi_authors.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_multi_authors.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_no_format.doc b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_no_format.doc
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_no_format.doc
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_no_format.doc
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_no_format.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_no_format.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_no_format.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_no_format.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_null_style.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_null_style.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_null_style.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_null_style.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_numbered_list.doc b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_numbered_list.doc
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_numbered_list.doc
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_numbered_list.doc
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_numbered_list.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_numbered_list.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_numbered_list.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_numbered_list.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_override_list_numbering.doc b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_override_list_numbering.doc
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_override_list_numbering.doc
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_override_list_numbering.doc
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_override_list_numbering.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_override_list_numbering.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_override_list_numbering.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_override_list_numbering.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_phonetic.doc b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_phonetic.doc
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_phonetic.doc
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_phonetic.doc
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_phonetic.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_phonetic.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_phonetic.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_phonetic.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_protected_passtika.doc b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_protected_passtika.doc
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_protected_passtika.doc
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_protected_passtika.doc
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_protected_passtika.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_protected_passtika.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_protected_passtika.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_protected_passtika.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_sdtInTextBox.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_sdtInTextBox.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_sdtInTextBox.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_sdtInTextBox.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_signed.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_signed.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_signed.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_signed.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_specialControlCharacter1415.doc b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_specialControlCharacter1415.doc
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_specialControlCharacter1415.doc
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_specialControlCharacter1415.doc
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_tabular_symbol.doc b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_tabular_symbol.doc
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_tabular_symbol.doc
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_tabular_symbol.doc
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_template.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_template.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_template.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_template.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_template.dotx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_template.dotx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_template.dotx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_template.dotx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_text_box.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_text_box.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_text_box.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_text_box.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_totalTimeOutOfRange.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_totalTimeOutOfRange.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_totalTimeOutOfRange.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_totalTimeOutOfRange.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_truncated.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_truncated.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_truncated.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_truncated.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_various.doc b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_various.doc
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_various.doc
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_various.doc
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_various.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_various.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_various.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORD_various.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORKSSpreadsheet7.0.xlr b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORKSSpreadsheet7.0.xlr
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWORKSSpreadsheet7.0.xlr
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWORKSSpreadsheet7.0.xlr
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWordArt.pptx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWordArt.pptx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testWordArt.pptx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testWordArt.pptx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testXLSX_Thumbnail.xlsx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testXLSX_Thumbnail.xlsx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testXLSX_Thumbnail.xlsx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testXLSX_Thumbnail.xlsx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testXPS_various.xps b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testXPS_various.xps
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testXPS_various.xps
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testXPS_various.xps
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testZIP_corrupted_oom.zip b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testZIP_corrupted_oom.zip
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testZIP_corrupted_oom.zip
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testZIP_corrupted_oom.zip
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/test_TIKA-1251.doc b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/test_TIKA-1251.doc
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/test_TIKA-1251.doc
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/test_TIKA-1251.doc
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/test_embedded_zip.pptx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/test_embedded_zip.pptx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/test_embedded_zip.pptx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/test_embedded_zip.pptx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/test_list_override.rtf b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/test_list_override.rtf
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/test_list_override.rtf
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/test_list_override.rtf
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/test_recursive_embedded.doc b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/test_recursive_embedded.doc
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/test_recursive_embedded.doc
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/test_recursive_embedded.doc
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/test_recursive_embedded.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/test_recursive_embedded.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/test_recursive_embedded.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/test_recursive_embedded.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/test_recursive_embedded_npe.docx b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/test_recursive_embedded_npe.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/test_recursive_embedded_npe.docx
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/test_recursive_embedded_npe.docx
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testsolidworksAssembly2013SP2.SLDASM b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testsolidworksAssembly2013SP2.SLDASM
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testsolidworksAssembly2013SP2.SLDASM
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testsolidworksAssembly2013SP2.SLDASM
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testsolidworksAssembly2014SP0.SLDASM b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testsolidworksAssembly2014SP0.SLDASM
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testsolidworksAssembly2014SP0.SLDASM
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testsolidworksAssembly2014SP0.SLDASM
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testsolidworksDrawing2013SP2.SLDDRW b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testsolidworksDrawing2013SP2.SLDDRW
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testsolidworksDrawing2013SP2.SLDDRW
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testsolidworksDrawing2013SP2.SLDDRW
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testsolidworksDrawing2014SP0.SLDDRW b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testsolidworksDrawing2014SP0.SLDDRW
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testsolidworksDrawing2014SP0.SLDDRW
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testsolidworksDrawing2014SP0.SLDDRW
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testsolidworksPart2013SP2.SLDPRT b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testsolidworksPart2013SP2.SLDPRT
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testsolidworksPart2013SP2.SLDPRT
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testsolidworksPart2013SP2.SLDPRT
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testsolidworksPart2014SP0.SLDPRT b/tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testsolidworksPart2014SP0.SLDPRT
similarity index 100%
rename from tika-parser-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testsolidworksPart2014SP0.SLDPRT
rename to tika-parsers/tika-parser-microsoft-module/src/test/resources/test-documents/testsolidworksPart2014SP0.SLDPRT
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/pom.xml b/tika-parsers/tika-parser-miscoffice-module/pom.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/pom.xml
rename to tika-parsers/tika-parser-miscoffice-module/pom.xml
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/detect/ole/MiscOLEDetector.java b/tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/detect/ole/MiscOLEDetector.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/detect/ole/MiscOLEDetector.java
rename to tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/detect/ole/MiscOLEDetector.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dbf/DBFCell.java b/tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dbf/DBFCell.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dbf/DBFCell.java
rename to tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dbf/DBFCell.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dbf/DBFColumnHeader.java b/tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dbf/DBFColumnHeader.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dbf/DBFColumnHeader.java
rename to tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dbf/DBFColumnHeader.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dbf/DBFFileHeader.java b/tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dbf/DBFFileHeader.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dbf/DBFFileHeader.java
rename to tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dbf/DBFFileHeader.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dbf/DBFParser.java b/tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dbf/DBFParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dbf/DBFParser.java
rename to tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dbf/DBFParser.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dbf/DBFReader.java b/tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dbf/DBFReader.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dbf/DBFReader.java
rename to tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dbf/DBFReader.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dbf/DBFRow.java b/tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dbf/DBFRow.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dbf/DBFRow.java
rename to tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dbf/DBFRow.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dif/DIFContentHandler.java b/tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dif/DIFContentHandler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dif/DIFContentHandler.java
rename to tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dif/DIFContentHandler.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dif/DIFParser.java b/tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dif/DIFParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dif/DIFParser.java
rename to tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dif/DIFParser.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/epub/EpubContentParser.java b/tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/epub/EpubContentParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/epub/EpubContentParser.java
rename to tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/epub/EpubContentParser.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/epub/EpubParser.java b/tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/epub/EpubParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/epub/EpubParser.java
rename to tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/epub/EpubParser.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/hwp/HwpStreamReader.java b/tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/hwp/HwpStreamReader.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/hwp/HwpStreamReader.java
rename to tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/hwp/HwpStreamReader.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/hwp/HwpTextExtractorV5.java b/tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/hwp/HwpTextExtractorV5.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/hwp/HwpTextExtractorV5.java
rename to tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/hwp/HwpTextExtractorV5.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/hwp/HwpV5Parser.java b/tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/hwp/HwpV5Parser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/hwp/HwpV5Parser.java
rename to tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/hwp/HwpV5Parser.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/FlatOpenDocumentMacroHandler.java b/tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/FlatOpenDocumentMacroHandler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/FlatOpenDocumentMacroHandler.java
rename to tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/FlatOpenDocumentMacroHandler.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/FlatOpenDocumentParser.java b/tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/FlatOpenDocumentParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/FlatOpenDocumentParser.java
rename to tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/FlatOpenDocumentParser.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/NSNormalizerContentHandler.java b/tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/NSNormalizerContentHandler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/NSNormalizerContentHandler.java
rename to tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/NSNormalizerContentHandler.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/OpenDocumentBodyHandler.java b/tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/OpenDocumentBodyHandler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/OpenDocumentBodyHandler.java
rename to tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/OpenDocumentBodyHandler.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/OpenDocumentContentParser.java b/tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/OpenDocumentContentParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/OpenDocumentContentParser.java
rename to tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/OpenDocumentContentParser.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/OpenDocumentMacroHandler.java b/tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/OpenDocumentMacroHandler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/OpenDocumentMacroHandler.java
rename to tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/OpenDocumentMacroHandler.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/OpenDocumentMetaParser.java b/tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/OpenDocumentMetaParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/OpenDocumentMetaParser.java
rename to tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/OpenDocumentMetaParser.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/OpenDocumentParser.java b/tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/OpenDocumentParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/OpenDocumentParser.java
rename to tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/OpenDocumentParser.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/QPWTextExtractor.java b/tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/QPWTextExtractor.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/QPWTextExtractor.java
rename to tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/QPWTextExtractor.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/QuattroProParser.java b/tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/QuattroProParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/QuattroProParser.java
rename to tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/QuattroProParser.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WP5Charsets.java b/tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WP5Charsets.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WP5Charsets.java
rename to tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WP5Charsets.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WP5DocumentAreaExtractor.java b/tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WP5DocumentAreaExtractor.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WP5DocumentAreaExtractor.java
rename to tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WP5DocumentAreaExtractor.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WP6Charsets.java b/tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WP6Charsets.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WP6Charsets.java
rename to tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WP6Charsets.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WP6DocumentAreaExtractor.java b/tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WP6DocumentAreaExtractor.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WP6DocumentAreaExtractor.java
rename to tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WP6DocumentAreaExtractor.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WPDocumentAreaExtractor.java b/tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WPDocumentAreaExtractor.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WPDocumentAreaExtractor.java
rename to tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WPDocumentAreaExtractor.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WPInputStream.java b/tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WPInputStream.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WPInputStream.java
rename to tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WPInputStream.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WPPrefixArea.java b/tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WPPrefixArea.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WPPrefixArea.java
rename to tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WPPrefixArea.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WPPrefixAreaExtractor.java b/tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WPPrefixAreaExtractor.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WPPrefixAreaExtractor.java
rename to tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WPPrefixAreaExtractor.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WordPerfectParser.java b/tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WordPerfectParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WordPerfectParser.java
rename to tika-parsers/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/wordperfect/WordPerfectParser.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/resources/META-INF/services/org.apache.tika.detect.Detector b/tika-parsers/tika-parser-miscoffice-module/src/main/resources/META-INF/services/org.apache.tika.detect.Detector
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/main/resources/META-INF/services/org.apache.tika.detect.Detector
rename to tika-parsers/tika-parser-miscoffice-module/src/main/resources/META-INF/services/org.apache.tika.detect.Detector
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser b/tika-parsers/tika-parser-miscoffice-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
rename to tika-parsers/tika-parser-miscoffice-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/dbf/DBFParserTest.java b/tika-parsers/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/dbf/DBFParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/dbf/DBFParserTest.java
rename to tika-parsers/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/dbf/DBFParserTest.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/dif/DIFParserTest.java b/tika-parsers/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/dif/DIFParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/dif/DIFParserTest.java
rename to tika-parsers/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/dif/DIFParserTest.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/epub/EpubParserTest.java b/tika-parsers/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/epub/EpubParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/epub/EpubParserTest.java
rename to tika-parsers/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/epub/EpubParserTest.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/hwp/HwpV5ParserTest.java b/tika-parsers/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/hwp/HwpV5ParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/hwp/HwpV5ParserTest.java
rename to tika-parsers/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/hwp/HwpV5ParserTest.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/ibooks/iBooksParserTest.java b/tika-parsers/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/ibooks/iBooksParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/ibooks/iBooksParserTest.java
rename to tika-parsers/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/ibooks/iBooksParserTest.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java b/tika-parsers/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java
rename to tika-parsers/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/wordperfect/QuattroProTest.java b/tika-parsers/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/wordperfect/QuattroProTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/wordperfect/QuattroProTest.java
rename to tika-parsers/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/wordperfect/QuattroProTest.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/wordperfect/WPInputStreamTest.java b/tika-parsers/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/wordperfect/WPInputStreamTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/wordperfect/WPInputStreamTest.java
rename to tika-parsers/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/wordperfect/WPInputStreamTest.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/wordperfect/WordPerfectTest.java b/tika-parsers/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/wordperfect/WordPerfectTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/wordperfect/WordPerfectTest.java
rename to tika-parsers/tika-parser-miscoffice-module/src/test/java/org/apache/tika/parser/wordperfect/WordPerfectTest.java
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/org/apache/tika/parser/epub/tika-config.xml b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/org/apache/tika/parser/epub/tika-config.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/org/apache/tika/parser/epub/tika-config.xml
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/org/apache/tika/parser/epub/tika-config.xml
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/parser/odf/tika-config-macros.xml b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/org/apache/tika/parser/odf/tika-config-macros.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/parser/odf/tika-config-macros.xml
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/org/apache/tika/parser/odf/tika-config-macros.xml
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/org/apache/tika/parser/wordperfect/tika-config.xml b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/org/apache/tika/parser/wordperfect/tika-config.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/org/apache/tika/parser/wordperfect/tika-config.xml
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/org/apache/tika/parser/wordperfect/tika-config.xml
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/Zamora2010.dif b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/Zamora2010.dif
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/Zamora2010.dif
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/Zamora2010.dif
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testDBF.dbf b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testDBF.dbf
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testDBF.dbf
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testDBF.dbf
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testDBF_gb18030.dbf b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testDBF_gb18030.dbf
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testDBF_gb18030.dbf
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testDBF_gb18030.dbf
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testEPUB.epub b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testEPUB.epub
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testEPUB.epub
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testEPUB.epub
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testEPUB_xml_ext.epub b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testEPUB_xml_ext.epub
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testEPUB_xml_ext.epub
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testEPUB_xml_ext.epub
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testFooter.ods b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testFooter.ods
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testFooter.ods
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testFooter.ods
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testFooter.odt b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testFooter.odt
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testFooter.odt
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testFooter.odt
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testHWP-v5-dist.hwp b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testHWP-v5-dist.hwp
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testHWP-v5-dist.hwp
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testHWP-v5-dist.hwp
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testHWP-v5b.hwp b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testHWP-v5b.hwp
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testHWP-v5b.hwp
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testHWP-v5b.hwp
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testHWP_3.0.hwp b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testHWP_3.0.hwp
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testHWP_3.0.hwp
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testHWP_3.0.hwp
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testHWP_5.0.hwp b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testHWP_5.0.hwp
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testHWP_5.0.hwp
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testHWP_5.0.hwp
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testMasterFooter.odp b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testMasterFooter.odp
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testMasterFooter.odp
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testMasterFooter.odp
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testNPEOpenDocument.odt b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testNPEOpenDocument.odt
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testNPEOpenDocument.odt
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testNPEOpenDocument.odt
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testODFwithOOo3.odt b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testODFwithOOo3.odt
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testODFwithOOo3.odt
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testODFwithOOo3.odt
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testODPMacro.fodp b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testODPMacro.fodp
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testODPMacro.fodp
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testODPMacro.fodp
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testODPMacro.odp b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testODPMacro.odp
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testODPMacro.odp
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testODPMacro.odp
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testODP_NPE.odp b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testODP_NPE.odp
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testODP_NPE.odp
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testODP_NPE.odp
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testODSMacro.fods b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testODSMacro.fods
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testODSMacro.fods
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testODSMacro.fods
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testODSMacro.ods b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testODSMacro.ods
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testODSMacro.ods
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testODSMacro.ods
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testODT-TIKA-6000.odt b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testODT-TIKA-6000.odt
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testODT-TIKA-6000.odt
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testODT-TIKA-6000.odt
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testODTEmbedded.odt b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testODTEmbedded.odt
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testODTEmbedded.odt
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testODTEmbedded.odt
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testODTMacro.fodt b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testODTMacro.fodt
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testODTMacro.fodt
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testODTMacro.fodt
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testODTMacro.odt b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testODTMacro.odt
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testODTMacro.odt
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testODTMacro.odt
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testODTNoMeta.odt b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testODTNoMeta.odt
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testODTNoMeta.odt
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testODTNoMeta.odt
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testODTStyles2.odt b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testODTStyles2.odt
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testODTStyles2.odt
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testODTStyles2.odt
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testODTStyles3.odt b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testODTStyles3.odt
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testODTStyles3.odt
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testODTStyles3.odt
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testODTnotaZipFile.odt b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testODTnotaZipFile.odt
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testODTnotaZipFile.odt
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testODTnotaZipFile.odt
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testOpenOffice-autotext.bau b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testOpenOffice-autotext.bau
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testOpenOffice-autotext.bau
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testOpenOffice-autotext.bau
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testOpenOffice-extension.oxt b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testOpenOffice-extension.oxt
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testOpenOffice-extension.oxt
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testOpenOffice-extension.oxt
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testOpenOffice2.odf b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testOpenOffice2.odf
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testOpenOffice2.odf
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testOpenOffice2.odf
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testOpenOffice2.odt b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testOpenOffice2.odt
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testOpenOffice2.odt
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testOpenOffice2.odt
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testOpenOfficeInAZip.zip b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testOpenOfficeInAZip.zip
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testOpenOfficeInAZip.zip
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testOpenOfficeInAZip.zip
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testQUATTRO.qpw b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testQUATTRO.qpw
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testQUATTRO.qpw
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testQUATTRO.qpw
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testQUATTRO.wb3 b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testQUATTRO.wb3
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testQUATTRO.wb3
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testQUATTRO.wb3
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testQuattro.wb1 b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testQuattro.wb1
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testQuattro.wb1
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testQuattro.wb1
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testQuattro.wb2 b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testQuattro.wb2
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testQuattro.wb2
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testQuattro.wb2
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testQuattro.wq1 b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testQuattro.wq1
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testQuattro.wq1
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testQuattro.wq1
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testQuattro.wq2 b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testQuattro.wq2
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testQuattro.wq2
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testQuattro.wq2
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testStyles.odt b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testStyles.odt
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testStyles.odt
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testStyles.odt
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testWordPerfect.wpd b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testWordPerfect.wpd
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testWordPerfect.wpd
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testWordPerfect.wpd
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testWordPerfect_42.doc b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testWordPerfect_42.doc
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testWordPerfect_42.doc
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testWordPerfect_42.doc
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testWordPerfect_5_0.wp b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testWordPerfect_5_0.wp
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testWordPerfect_5_0.wp
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testWordPerfect_5_0.wp
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testWordPerfect_5_1.wp b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testWordPerfect_5_1.wp
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testWordPerfect_5_1.wp
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testWordPerfect_5_1.wp
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testiBooks.ibooks b/tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testiBooks.ibooks
similarity index 100%
rename from tika-parser-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testiBooks.ibooks
rename to tika-parsers/tika-parser-miscoffice-module/src/test/resources/test-documents/testiBooks.ibooks
diff --git a/tika-parser-modules/tika-parser-news-module/pom.xml b/tika-parsers/tika-parser-news-module/pom.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-news-module/pom.xml
rename to tika-parsers/tika-parser-news-module/pom.xml
diff --git a/tika-parser-modules/tika-parser-news-module/src/main/java/org/apache/tika/parser/feed/FeedParser.java b/tika-parsers/tika-parser-news-module/src/main/java/org/apache/tika/parser/feed/FeedParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-news-module/src/main/java/org/apache/tika/parser/feed/FeedParser.java
rename to tika-parsers/tika-parser-news-module/src/main/java/org/apache/tika/parser/feed/FeedParser.java
diff --git a/tika-parser-modules/tika-parser-news-module/src/main/java/org/apache/tika/parser/iptc/IptcAnpaParser.java b/tika-parsers/tika-parser-news-module/src/main/java/org/apache/tika/parser/iptc/IptcAnpaParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-news-module/src/main/java/org/apache/tika/parser/iptc/IptcAnpaParser.java
rename to tika-parsers/tika-parser-news-module/src/main/java/org/apache/tika/parser/iptc/IptcAnpaParser.java
diff --git a/tika-parser-modules/tika-parser-news-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser b/tika-parsers/tika-parser-news-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
similarity index 100%
rename from tika-parser-modules/tika-parser-news-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
rename to tika-parsers/tika-parser-news-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
diff --git a/tika-parser-modules/tika-parser-news-module/src/test/java/org/apache/tika/parser/feed/FeedParserTest.java b/tika-parsers/tika-parser-news-module/src/test/java/org/apache/tika/parser/feed/FeedParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-news-module/src/test/java/org/apache/tika/parser/feed/FeedParserTest.java
rename to tika-parsers/tika-parser-news-module/src/test/java/org/apache/tika/parser/feed/FeedParserTest.java
diff --git a/tika-parser-modules/tika-parser-news-module/src/test/resources/test-documents/rsstest_091.rss b/tika-parsers/tika-parser-news-module/src/test/resources/test-documents/rsstest_091.rss
similarity index 100%
rename from tika-parser-modules/tika-parser-news-module/src/test/resources/test-documents/rsstest_091.rss
rename to tika-parsers/tika-parser-news-module/src/test/resources/test-documents/rsstest_091.rss
diff --git a/tika-parser-modules/tika-parser-news-module/src/test/resources/test-documents/rsstest_20.rss b/tika-parsers/tika-parser-news-module/src/test/resources/test-documents/rsstest_20.rss
similarity index 100%
rename from tika-parser-modules/tika-parser-news-module/src/test/resources/test-documents/rsstest_20.rss
rename to tika-parsers/tika-parser-news-module/src/test/resources/test-documents/rsstest_20.rss
diff --git a/tika-parser-modules/tika-parser-news-module/src/test/resources/test-documents/testATOM.atom b/tika-parsers/tika-parser-news-module/src/test/resources/test-documents/testATOM.atom
similarity index 100%
rename from tika-parser-modules/tika-parser-news-module/src/test/resources/test-documents/testATOM.atom
rename to tika-parsers/tika-parser-news-module/src/test/resources/test-documents/testATOM.atom
diff --git a/tika-parser-modules/tika-parser-ocr-module/pom.xml b/tika-parsers/tika-parser-ocr-module/pom.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-ocr-module/pom.xml
rename to tika-parsers/tika-parser-ocr-module/pom.xml
diff --git a/tika-parser-modules/tika-parser-ocr-module/src/main/java/org/apache/tika/parser/ocr/TesseractOCRConfig.java b/tika-parsers/tika-parser-ocr-module/src/main/java/org/apache/tika/parser/ocr/TesseractOCRConfig.java
similarity index 100%
rename from tika-parser-modules/tika-parser-ocr-module/src/main/java/org/apache/tika/parser/ocr/TesseractOCRConfig.java
rename to tika-parsers/tika-parser-ocr-module/src/main/java/org/apache/tika/parser/ocr/TesseractOCRConfig.java
diff --git a/tika-parser-modules/tika-parser-ocr-module/src/main/java/org/apache/tika/parser/ocr/TesseractOCRParser.java b/tika-parsers/tika-parser-ocr-module/src/main/java/org/apache/tika/parser/ocr/TesseractOCRParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-ocr-module/src/main/java/org/apache/tika/parser/ocr/TesseractOCRParser.java
rename to tika-parsers/tika-parser-ocr-module/src/main/java/org/apache/tika/parser/ocr/TesseractOCRParser.java
diff --git a/tika-parser-modules/tika-parser-ocr-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser b/tika-parsers/tika-parser-ocr-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
similarity index 100%
rename from tika-parser-modules/tika-parser-ocr-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
rename to tika-parsers/tika-parser-ocr-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
diff --git a/tika-parser-modules/tika-parser-ocr-module/src/main/resources/org/apache/tika/parser/ocr/TesseractOCRConfig.properties b/tika-parsers/tika-parser-ocr-module/src/main/resources/org/apache/tika/parser/ocr/TesseractOCRConfig.properties
similarity index 100%
rename from tika-parser-modules/tika-parser-ocr-module/src/main/resources/org/apache/tika/parser/ocr/TesseractOCRConfig.properties
rename to tika-parsers/tika-parser-ocr-module/src/main/resources/org/apache/tika/parser/ocr/TesseractOCRConfig.properties
diff --git a/tika-parser-modules/tika-parser-ocr-module/src/main/resources/org/apache/tika/parser/ocr/rotation.py b/tika-parsers/tika-parser-ocr-module/src/main/resources/org/apache/tika/parser/ocr/rotation.py
similarity index 100%
rename from tika-parser-modules/tika-parser-ocr-module/src/main/resources/org/apache/tika/parser/ocr/rotation.py
rename to tika-parsers/tika-parser-ocr-module/src/main/resources/org/apache/tika/parser/ocr/rotation.py
diff --git a/tika-parser-modules/tika-parser-text-module/src/test/resources/test-properties/StringsConfig-full.properties b/tika-parsers/tika-parser-ocr-module/src/main/resources/test-properties/StringsConfig-full.properties
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/test/resources/test-properties/StringsConfig-full.properties
rename to tika-parsers/tika-parser-ocr-module/src/main/resources/test-properties/StringsConfig-full.properties
diff --git a/tika-parser-modules/tika-parser-text-module/src/test/resources/test-properties/StringsConfig-partial.properties b/tika-parsers/tika-parser-ocr-module/src/main/resources/test-properties/StringsConfig-partial.properties
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/test/resources/test-properties/StringsConfig-partial.properties
rename to tika-parsers/tika-parser-ocr-module/src/main/resources/test-properties/StringsConfig-partial.properties
diff --git a/tika-parser-modules/tika-parser-ocr-module/src/main/resources/test-properties/TesseractOCRConfig-full.properties b/tika-parsers/tika-parser-ocr-module/src/main/resources/test-properties/TesseractOCRConfig-full.properties
similarity index 100%
rename from tika-parser-modules/tika-parser-ocr-module/src/main/resources/test-properties/TesseractOCRConfig-full.properties
rename to tika-parsers/tika-parser-ocr-module/src/main/resources/test-properties/TesseractOCRConfig-full.properties
diff --git a/tika-parser-modules/tika-parser-ocr-module/src/main/resources/test-properties/TesseractOCRConfig-partial.properties b/tika-parsers/tika-parser-ocr-module/src/main/resources/test-properties/TesseractOCRConfig-partial.properties
similarity index 100%
rename from tika-parser-modules/tika-parser-ocr-module/src/main/resources/test-properties/TesseractOCRConfig-partial.properties
rename to tika-parsers/tika-parser-ocr-module/src/main/resources/test-properties/TesseractOCRConfig-partial.properties
diff --git a/tika-parser-modules/tika-parser-ocr-module/src/test/java/org/apache/tika/parser/ocr/TesseractOCRConfigTest.java b/tika-parsers/tika-parser-ocr-module/src/test/java/org/apache/tika/parser/ocr/TesseractOCRConfigTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-ocr-module/src/test/java/org/apache/tika/parser/ocr/TesseractOCRConfigTest.java
rename to tika-parsers/tika-parser-ocr-module/src/test/java/org/apache/tika/parser/ocr/TesseractOCRConfigTest.java
diff --git a/tika-parser-modules/tika-parser-ocr-module/src/test/java/org/apache/tika/parser/ocr/TesseractOCRParserTest.java b/tika-parsers/tika-parser-ocr-module/src/test/java/org/apache/tika/parser/ocr/TesseractOCRParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-ocr-module/src/test/java/org/apache/tika/parser/ocr/TesseractOCRParserTest.java
rename to tika-parsers/tika-parser-ocr-module/src/test/java/org/apache/tika/parser/ocr/TesseractOCRParserTest.java
diff --git a/tika-parser-modules/tika-parser-ocr-module/src/test/resources/org/apache/tika/config/TIKA-2705-tesseract.xml b/tika-parsers/tika-parser-ocr-module/src/test/resources/org/apache/tika/config/TIKA-2705-tesseract.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-ocr-module/src/test/resources/org/apache/tika/config/TIKA-2705-tesseract.xml
rename to tika-parsers/tika-parser-ocr-module/src/test/resources/org/apache/tika/config/TIKA-2705-tesseract.xml
diff --git a/tika-parser-modules/tika-parser-ocr-module/src/test/resources/test-documents/testOCR.docx b/tika-parsers/tika-parser-ocr-module/src/test/resources/test-documents/testOCR.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-ocr-module/src/test/resources/test-documents/testOCR.docx
rename to tika-parsers/tika-parser-ocr-module/src/test/resources/test-documents/testOCR.docx
diff --git a/tika-parser-modules/tika-parser-ocr-module/src/test/resources/test-documents/testOCR.jpg b/tika-parsers/tika-parser-ocr-module/src/test/resources/test-documents/testOCR.jpg
similarity index 100%
rename from tika-parser-modules/tika-parser-ocr-module/src/test/resources/test-documents/testOCR.jpg
rename to tika-parsers/tika-parser-ocr-module/src/test/resources/test-documents/testOCR.jpg
diff --git a/tika-parser-modules/tika-parser-ocr-module/src/test/resources/test-documents/testOCR.pptx b/tika-parsers/tika-parser-ocr-module/src/test/resources/test-documents/testOCR.pptx
similarity index 100%
rename from tika-parser-modules/tika-parser-ocr-module/src/test/resources/test-documents/testOCR.pptx
rename to tika-parsers/tika-parser-ocr-module/src/test/resources/test-documents/testOCR.pptx
diff --git a/tika-parser-modules/tika-parser-ocr-module/src/test/resources/test-documents/testOCR_spacing.png b/tika-parsers/tika-parser-ocr-module/src/test/resources/test-documents/testOCR_spacing.png
similarity index 100%
rename from tika-parser-modules/tika-parser-ocr-module/src/test/resources/test-documents/testOCR_spacing.png
rename to tika-parsers/tika-parser-ocr-module/src/test/resources/test-documents/testOCR_spacing.png
diff --git a/tika-parser-modules/tika-parser-pdf-module/pom.xml b/tika-parsers/tika-parser-pdf-module/pom.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/pom.xml
rename to tika-parsers/tika-parser-pdf-module/pom.xml
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/AbstractPDF2XHTML.java b/tika-parsers/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/AbstractPDF2XHTML.java
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/AbstractPDF2XHTML.java
rename to tika-parsers/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/AbstractPDF2XHTML.java
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/AccessChecker.java b/tika-parsers/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/AccessChecker.java
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/AccessChecker.java
rename to tika-parsers/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/AccessChecker.java
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/ImageGraphicsEngine.java b/tika-parsers/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/ImageGraphicsEngine.java
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/ImageGraphicsEngine.java
rename to tika-parsers/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/ImageGraphicsEngine.java
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/OCR2XHTML.java b/tika-parsers/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/OCR2XHTML.java
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/OCR2XHTML.java
rename to tika-parsers/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/OCR2XHTML.java
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/PDF2XHTML.java b/tika-parsers/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/PDF2XHTML.java
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/PDF2XHTML.java
rename to tika-parsers/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/PDF2XHTML.java
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/PDFEncodedStringDecoder.java b/tika-parsers/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/PDFEncodedStringDecoder.java
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/PDFEncodedStringDecoder.java
rename to tika-parsers/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/PDFEncodedStringDecoder.java
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/PDFMarkedContent2XHTML.java b/tika-parsers/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/PDFMarkedContent2XHTML.java
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/PDFMarkedContent2XHTML.java
rename to tika-parsers/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/PDFMarkedContent2XHTML.java
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/PDFParser.java b/tika-parsers/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/PDFParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/PDFParser.java
rename to tika-parsers/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/PDFParser.java
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/PDFParserConfig.java b/tika-parsers/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/PDFParserConfig.java
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/PDFParserConfig.java
rename to tika-parsers/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/PDFParserConfig.java
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/PDFPreflightParser.java b/tika-parsers/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/PDFPreflightParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/PDFPreflightParser.java
rename to tika-parsers/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/PDFPreflightParser.java
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/PDMetadataExtractor.java b/tika-parsers/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/PDMetadataExtractor.java
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/PDMetadataExtractor.java
rename to tika-parsers/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/PDMetadataExtractor.java
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/XFAExtractor.java b/tika-parsers/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/XFAExtractor.java
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/XFAExtractor.java
rename to tika-parsers/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/XFAExtractor.java
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser b/tika-parsers/tika-parser-pdf-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
rename to tika-parsers/tika-parser-pdf-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/main/resources/org/apache/tika/parser/pdf/PDFParser.properties b/tika-parsers/tika-parser-pdf-module/src/main/resources/org/apache/tika/parser/pdf/PDFParser.properties
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/main/resources/org/apache/tika/parser/pdf/PDFParser.properties
rename to tika-parsers/tika-parser-pdf-module/src/main/resources/org/apache/tika/parser/pdf/PDFParser.properties
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/AccessCheckerTest.java b/tika-parsers/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/AccessCheckerTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/AccessCheckerTest.java
rename to tika-parsers/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/AccessCheckerTest.java
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/PDFMarkedContent2XHTMLTest.java b/tika-parsers/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/PDFMarkedContent2XHTMLTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/PDFMarkedContent2XHTMLTest.java
rename to tika-parsers/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/PDFMarkedContent2XHTMLTest.java
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java b/tika-parsers/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
rename to tika-parsers/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/PDFPreflightParserTest.java b/tika-parsers/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/PDFPreflightParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/PDFPreflightParserTest.java
rename to tika-parsers/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/PDFPreflightParserTest.java
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/org/apache/tika/parser/pdf/tika-config-non-primitives.xml b/tika-parsers/tika-parser-pdf-module/src/test/resources/org/apache/tika/parser/pdf/tika-config-non-primitives.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/org/apache/tika/parser/pdf/tika-config-non-primitives.xml
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/org/apache/tika/parser/pdf/tika-config-non-primitives.xml
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/org/apache/tika/parser/pdf/tika-config.xml b/tika-parsers/tika-parser-pdf-module/src/test/resources/org/apache/tika/parser/pdf/tika-config.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/org/apache/tika/parser/pdf/tika-config.xml
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/org/apache/tika/parser/pdf/tika-config.xml
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/org/apache/tika/parser/pdf/tika-inline-config.xml b/tika-parsers/tika-parser-pdf-module/src/test/resources/org/apache/tika/parser/pdf/tika-inline-config.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/org/apache/tika/parser/pdf/tika-inline-config.xml
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/org/apache/tika/parser/pdf/tika-inline-config.xml
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/org/apache/tika/parser/pdf/tika-ocr-config.xml b/tika-parsers/tika-parser-pdf-module/src/test/resources/org/apache/tika/parser/pdf/tika-ocr-config.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/org/apache/tika/parser/pdf/tika-ocr-config.xml
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/org/apache/tika/parser/pdf/tika-ocr-config.xml
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/org/apache/tika/parser/pdf/tika-preflight-config.xml b/tika-parsers/tika-parser-pdf-module/src/test/resources/org/apache/tika/parser/pdf/tika-preflight-config.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/org/apache/tika/parser/pdf/tika-preflight-config.xml
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/org/apache/tika/parser/pdf/tika-preflight-config.xml
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/org/apache/tika/parser/pdf/tika-xml-profiler-config.xml b/tika-parsers/tika-parser-pdf-module/src/test/resources/org/apache/tika/parser/pdf/tika-xml-profiler-config.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/org/apache/tika/parser/pdf/tika-xml-profiler-config.xml
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/org/apache/tika/parser/pdf/tika-xml-profiler-config.xml
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testAnnotations.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testAnnotations.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testAnnotations.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testAnnotations.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testExtraSpaces.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testExtraSpaces.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testExtraSpaces.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testExtraSpaces.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testJournalParser.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testJournalParser.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testJournalParser.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testJournalParser.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testOCR.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testOCR.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testOCR.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testOCR.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testOptionalHyphen.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testOptionalHyphen.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testOptionalHyphen.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testOptionalHyphen.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testOverlappingText.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testOverlappingText.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testOverlappingText.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testOverlappingText.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF-custommetadata.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF-custommetadata.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF-custommetadata.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF-custommetadata.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDFEmbeddingAndEmbedded.docx b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDFEmbeddingAndEmbedded.docx
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDFEmbeddingAndEmbedded.docx
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDFEmbeddingAndEmbedded.docx
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDFFileEmbInAnnotation.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDFFileEmbInAnnotation.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDFFileEmbInAnnotation.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDFFileEmbInAnnotation.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDFFileEmbInAnnotation_noContents.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDFFileEmbInAnnotation_noContents.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDFFileEmbInAnnotation_noContents.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDFFileEmbInAnnotation_noContents.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDFPackage.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDFPackage.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDFPackage.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDFPackage.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDFTripleLangTitle.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDFTripleLangTitle.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDFTripleLangTitle.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDFTripleLangTitle.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDFTwoTextBoxes.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDFTwoTextBoxes.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDFTwoTextBoxes.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDFTwoTextBoxes.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDFVarious.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDFVarious.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDFVarious.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDFVarious.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_JBIG2.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_JBIG2.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_JBIG2.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_JBIG2.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_PDFEncodedStringInXMP.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_PDFEncodedStringInXMP.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_PDFEncodedStringInXMP.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_PDFEncodedStringInXMP.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_Version.10.x.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_Version.10.x.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_Version.10.x.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_Version.10.x.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_Version.11.x.PDFA-1b.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_Version.11.x.PDFA-1b.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_Version.11.x.PDFA-1b.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_Version.11.x.PDFA-1b.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_Version.4.x.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_Version.4.x.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_Version.4.x.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_Version.4.x.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_Version.5.x.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_Version.5.x.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_Version.5.x.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_Version.5.x.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_Version.6.x.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_Version.6.x.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_Version.6.x.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_Version.6.x.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_Version.7.x.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_Version.7.x.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_Version.7.x.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_Version.7.x.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_Version.8.x.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_Version.8.x.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_Version.8.x.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_Version.8.x.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_Version.9.x.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_Version.9.x.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_Version.9.x.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_Version.9.x.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_XFA_govdocs1_258578.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_XFA_govdocs1_258578.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_XFA_govdocs1_258578.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_XFA_govdocs1_258578.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_XMPBasicSchema.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_XMPBasicSchema.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_XMPBasicSchema.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_XMPBasicSchema.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_acroform3.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_acroform3.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_acroform3.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_acroform3.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_angles.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_angles.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_angles.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_angles.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_bad_page_303226.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_bad_page_303226.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_bad_page_303226.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_bad_page_303226.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_bom.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_bom.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_bom.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_bom.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_bookmarks.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_bookmarks.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_bookmarks.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_bookmarks.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_childAttachments.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_childAttachments.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_childAttachments.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_childAttachments.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_diffTitles.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_diffTitles.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_diffTitles.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_diffTitles.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_multiFormatEmbFiles.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_multiFormatEmbFiles.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_multiFormatEmbFiles.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_multiFormatEmbFiles.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_no_extract_no_accessibility_owner_empty.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_no_extract_no_accessibility_owner_empty.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_no_extract_no_accessibility_owner_empty.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_no_extract_no_accessibility_owner_empty.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_no_extract_no_accessibility_owner_user.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_no_extract_no_accessibility_owner_user.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_no_extract_no_accessibility_owner_user.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_no_extract_no_accessibility_owner_user.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_no_extract_yes_accessibility_owner_empty.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_no_extract_yes_accessibility_owner_empty.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_no_extract_yes_accessibility_owner_empty.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_no_extract_yes_accessibility_owner_empty.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_no_extract_yes_accessibility_owner_user.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_no_extract_yes_accessibility_owner_user.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_no_extract_yes_accessibility_owner_user.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_no_extract_yes_accessibility_owner_user.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_protected.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_protected.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_protected.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_protected.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_twoAuthors.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_twoAuthors.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_twoAuthors.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPDF_twoAuthors.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPageNumber.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPageNumber.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPageNumber.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPageNumber.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPopupAnnotation.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPopupAnnotation.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testPopupAnnotation.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testPopupAnnotation.pdf
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testStandardsExtractor.pdf b/tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testStandardsExtractor.pdf
similarity index 100%
rename from tika-parser-modules/tika-parser-pdf-module/src/test/resources/test-documents/testStandardsExtractor.pdf
rename to tika-parsers/tika-parser-pdf-module/src/test/resources/test-documents/testStandardsExtractor.pdf
diff --git a/tika-parser-modules/tika-parser-pkg-module/pom.xml b/tika-parsers/tika-parser-pkg-module/pom.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/pom.xml
rename to tika-parsers/tika-parser-pkg-module/pom.xml
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/main/java/org/apache/tika/parser/pkg/CompressorParser.java b/tika-parsers/tika-parser-pkg-module/src/main/java/org/apache/tika/parser/pkg/CompressorParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/main/java/org/apache/tika/parser/pkg/CompressorParser.java
rename to tika-parsers/tika-parser-pkg-module/src/main/java/org/apache/tika/parser/pkg/CompressorParser.java
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/main/java/org/apache/tika/parser/pkg/CompressorParserOptions.java b/tika-parsers/tika-parser-pkg-module/src/main/java/org/apache/tika/parser/pkg/CompressorParserOptions.java
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/main/java/org/apache/tika/parser/pkg/CompressorParserOptions.java
rename to tika-parsers/tika-parser-pkg-module/src/main/java/org/apache/tika/parser/pkg/CompressorParserOptions.java
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/main/java/org/apache/tika/parser/pkg/PackageParser.java b/tika-parsers/tika-parser-pkg-module/src/main/java/org/apache/tika/parser/pkg/PackageParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/main/java/org/apache/tika/parser/pkg/PackageParser.java
rename to tika-parsers/tika-parser-pkg-module/src/main/java/org/apache/tika/parser/pkg/PackageParser.java
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/main/java/org/apache/tika/parser/pkg/RarParser.java b/tika-parsers/tika-parser-pkg-module/src/main/java/org/apache/tika/parser/pkg/RarParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/main/java/org/apache/tika/parser/pkg/RarParser.java
rename to tika-parsers/tika-parser-pkg-module/src/main/java/org/apache/tika/parser/pkg/RarParser.java
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser b/tika-parsers/tika-parser-pkg-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
rename to tika-parsers/tika-parser-pkg-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/AbstractPkgTest.java b/tika-parsers/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/AbstractPkgTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/AbstractPkgTest.java
rename to tika-parsers/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/AbstractPkgTest.java
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java b/tika-parsers/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java
rename to tika-parsers/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java b/tika-parsers/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java
rename to tika-parsers/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/CompressParserTest.java b/tika-parsers/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/CompressParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/CompressParserTest.java
rename to tika-parsers/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/CompressParserTest.java
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/CompressorParserTest.java b/tika-parsers/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/CompressorParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/CompressorParserTest.java
rename to tika-parsers/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/CompressorParserTest.java
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java b/tika-parsers/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java
rename to tika-parsers/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/PackageParserTest.java b/tika-parsers/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/PackageParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/PackageParserTest.java
rename to tika-parsers/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/PackageParserTest.java
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java b/tika-parsers/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java
rename to tika-parsers/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java b/tika-parsers/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java
rename to tika-parsers/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java b/tika-parsers/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java
rename to tika-parsers/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java b/tika-parsers/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java
rename to tika-parsers/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/ZlibParserTest.java b/tika-parsers/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/ZlibParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/ZlibParserTest.java
rename to tika-parsers/tika-parser-pkg-module/src/test/java/org/apache/tika/parser/pkg/ZlibParserTest.java
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/org/apache/tika/parser/pkg/tika-config.xml b/tika-parsers/tika-parser-pkg-module/src/test/resources/org/apache/tika/parser/pkg/tika-config.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/org/apache/tika/parser/pkg/tika-config.xml
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/org/apache/tika/parser/pkg/tika-config.xml
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/TIKA-216.tgz b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/TIKA-216.tgz
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/TIKA-216.tgz
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/TIKA-216.tgz
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/droste.zip b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/droste.zip
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/droste.zip
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/droste.zip
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/full_encrypted.7z b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/full_encrypted.7z
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/full_encrypted.7z
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/full_encrypted.7z
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/moby.zip b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/moby.zip
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/moby.zip
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/moby.zip
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/quine.gz b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/quine.gz
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/quine.gz
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/quine.gz
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/test-documents-enc.rar b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/test-documents-enc.rar
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/test-documents-enc.rar
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/test-documents-enc.rar
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/test-documents-spanned.z01 b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/test-documents-spanned.z01
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/test-documents-spanned.z01
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/test-documents-spanned.z01
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/test-documents-spanned.zip b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/test-documents-spanned.zip
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/test-documents-spanned.zip
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/test-documents-spanned.zip
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.7z b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.7z
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.7z
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.7z
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.cab b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.cab
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.cab
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.cab
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.cpio b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.cpio
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.cpio
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.cpio
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.ddf b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.ddf
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.ddf
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.ddf
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.dmg b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.dmg
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.dmg
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.dmg
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.rar b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.rar
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.rar
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.rar
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.tar b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.tar
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.tar
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.tar
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.tar.Z b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.tar.Z
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.tar.Z
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.tar.Z
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.tbz2 b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.tbz2
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.tbz2
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.tbz2
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.tgz b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.tgz
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.tgz
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.tgz
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.zip b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.zip
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.zip
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/test-documents.zip
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/test-zip-of-zip.zip b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/test-zip-of-zip.zip
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/test-zip-of-zip.zip
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/test-zip-of-zip.zip
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/test7Z_protected_passTika.7z b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/test7Z_protected_passTika.7z
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/test7Z_protected_passTika.7z
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/test7Z_protected_passTika.7z
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/testARofSND.ar b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/testARofSND.ar
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/testARofSND.ar
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/testARofSND.ar
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/testARofText.ar b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/testARofText.ar
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/testARofText.ar
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/testARofText.ar
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/testBROTLI_compressed.br b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/testBROTLI_compressed.br
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/testBROTLI_compressed.br
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/testBROTLI_compressed.br
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/testEmbedded.zip b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/testEmbedded.zip
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/testEmbedded.zip
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/testEmbedded.zip
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/testJAR_with_HTML.jar b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/testJAR_with_HTML.jar
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/testJAR_with_HTML.jar
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/testJAR_with_HTML.jar
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/testJAR_with_PEHDR.jar b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/testJAR_with_PEHDR.jar
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/testJAR_with_PEHDR.jar
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/testJAR_with_PEHDR.jar
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/testLZ4-framed.lz4 b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/testLZ4-framed.lz4
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/testLZ4-framed.lz4
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/testLZ4-framed.lz4
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/testLZMA_oom b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/testLZMA_oom
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/testLZMA_oom
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/testLZMA_oom
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/testSVG.svg b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/testSVG.svg
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/testSVG.svg
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/testSVG.svg
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/testSVG.svgz b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/testSVG.svgz
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/testSVG.svgz
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/testSVG.svgz
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/testSnappy-framed.sz b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/testSnappy-framed.sz
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/testSnappy-framed.sz
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/testSnappy-framed.sz
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/testTXT.zlib b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/testTXT.zlib
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/testTXT.zlib
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/testTXT.zlib
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/testTXT.zlib0 b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/testTXT.zlib0
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/testTXT.zlib0
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/testTXT.zlib0
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/testTXT.zlib5 b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/testTXT.zlib5
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/testTXT.zlib5
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/testTXT.zlib5
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/testTXT.zlib9 b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/testTXT.zlib9
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/testTXT.zlib9
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/testTXT.zlib9
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/testZSTD.zstd b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/testZSTD.zstd
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/testZSTD.zstd
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/testZSTD.zstd
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/testZ_oom.Z b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/testZ_oom.Z
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/testZ_oom.Z
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/testZ_oom.Z
diff --git a/tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/testZipEncrypted.zip b/tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/testZipEncrypted.zip
similarity index 100%
rename from tika-parser-modules/tika-parser-pkg-module/src/test/resources/test-documents/testZipEncrypted.zip
rename to tika-parsers/tika-parser-pkg-module/src/test/resources/test-documents/testZipEncrypted.zip
diff --git a/tika-parser-modules/tika-parser-text-module/pom.xml b/tika-parsers/tika-parser-text-module/pom.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/pom.xml
rename to tika-parsers/tika-parser-text-module/pom.xml
diff --git a/tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/csv/CSVParams.java b/tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/csv/CSVParams.java
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/csv/CSVParams.java
rename to tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/csv/CSVParams.java
diff --git a/tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/csv/CSVResult.java b/tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/csv/CSVResult.java
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/csv/CSVResult.java
rename to tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/csv/CSVResult.java
diff --git a/tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/csv/CSVSniffer.java b/tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/csv/CSVSniffer.java
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/csv/CSVSniffer.java
rename to tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/csv/CSVSniffer.java
diff --git a/tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/csv/TextAndCSVParser.java b/tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/csv/TextAndCSVParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/csv/TextAndCSVParser.java
rename to tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/csv/TextAndCSVParser.java
diff --git a/tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/strings/FileConfig.java b/tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/strings/FileConfig.java
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/strings/FileConfig.java
rename to tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/strings/FileConfig.java
diff --git a/tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/strings/Latin1StringsParser.java b/tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/strings/Latin1StringsParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/strings/Latin1StringsParser.java
rename to tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/strings/Latin1StringsParser.java
diff --git a/tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/strings/StringsConfig.java b/tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/strings/StringsConfig.java
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/strings/StringsConfig.java
rename to tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/strings/StringsConfig.java
diff --git a/tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/strings/StringsEncoding.java b/tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/strings/StringsEncoding.java
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/strings/StringsEncoding.java
rename to tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/strings/StringsEncoding.java
diff --git a/tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/strings/StringsParser.java b/tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/strings/StringsParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/strings/StringsParser.java
rename to tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/strings/StringsParser.java
diff --git a/tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetDetector.java b/tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetDetector.java
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetDetector.java
rename to tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetDetector.java
diff --git a/tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetMatch.java b/tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetMatch.java
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetMatch.java
rename to tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetMatch.java
diff --git a/tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetRecog_2022.java b/tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetRecog_2022.java
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetRecog_2022.java
rename to tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetRecog_2022.java
diff --git a/tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetRecog_UTF8.java b/tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetRecog_UTF8.java
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetRecog_UTF8.java
rename to tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetRecog_UTF8.java
diff --git a/tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetRecog_Unicode.java b/tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetRecog_Unicode.java
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetRecog_Unicode.java
rename to tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetRecog_Unicode.java
diff --git a/tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetRecog_mbcs.java b/tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetRecog_mbcs.java
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetRecog_mbcs.java
rename to tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetRecog_mbcs.java
diff --git a/tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetRecog_sbcs.java b/tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetRecog_sbcs.java
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetRecog_sbcs.java
rename to tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetRecog_sbcs.java
diff --git a/tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetRecognizer.java b/tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetRecognizer.java
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetRecognizer.java
rename to tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetRecognizer.java
diff --git a/tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/Icu4jEncodingDetector.java b/tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/Icu4jEncodingDetector.java
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/Icu4jEncodingDetector.java
rename to tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/Icu4jEncodingDetector.java
diff --git a/tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/TXTParser.java b/tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/TXTParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/TXTParser.java
rename to tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/TXTParser.java
diff --git a/tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/UniversalEncodingDetector.java b/tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/UniversalEncodingDetector.java
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/UniversalEncodingDetector.java
rename to tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/UniversalEncodingDetector.java
diff --git a/tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/UniversalEncodingListener.java b/tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/UniversalEncodingListener.java
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/UniversalEncodingListener.java
rename to tika-parsers/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/UniversalEncodingListener.java
diff --git a/tika-parser-modules/tika-parser-text-module/src/main/resources/META-INF/services/org.apache.tika.detect.EncodingDetector b/tika-parsers/tika-parser-text-module/src/main/resources/META-INF/services/org.apache.tika.detect.EncodingDetector
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/main/resources/META-INF/services/org.apache.tika.detect.EncodingDetector
rename to tika-parsers/tika-parser-text-module/src/main/resources/META-INF/services/org.apache.tika.detect.EncodingDetector
diff --git a/tika-parser-modules/tika-parser-text-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser b/tika-parsers/tika-parser-text-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
rename to tika-parsers/tika-parser-text-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
diff --git a/tika-parser-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/csv/CSVSnifferTest.java b/tika-parsers/tika-parser-text-module/src/test/java/org/apache/tika/parser/csv/CSVSnifferTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/csv/CSVSnifferTest.java
rename to tika-parsers/tika-parser-text-module/src/test/java/org/apache/tika/parser/csv/CSVSnifferTest.java
diff --git a/tika-parser-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/csv/TextAndCSVParserTest.java b/tika-parsers/tika-parser-text-module/src/test/java/org/apache/tika/parser/csv/TextAndCSVParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/csv/TextAndCSVParserTest.java
rename to tika-parsers/tika-parser-text-module/src/test/java/org/apache/tika/parser/csv/TextAndCSVParserTest.java
diff --git a/tika-parser-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/strings/FileConfigTest.java b/tika-parsers/tika-parser-text-module/src/test/java/org/apache/tika/parser/strings/FileConfigTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/strings/FileConfigTest.java
rename to tika-parsers/tika-parser-text-module/src/test/java/org/apache/tika/parser/strings/FileConfigTest.java
diff --git a/tika-parser-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/strings/Latin1StringsParserTest.java b/tika-parsers/tika-parser-text-module/src/test/java/org/apache/tika/parser/strings/Latin1StringsParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/strings/Latin1StringsParserTest.java
rename to tika-parsers/tika-parser-text-module/src/test/java/org/apache/tika/parser/strings/Latin1StringsParserTest.java
diff --git a/tika-parser-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/strings/StringsConfigTest.java b/tika-parsers/tika-parser-text-module/src/test/java/org/apache/tika/parser/strings/StringsConfigTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/strings/StringsConfigTest.java
rename to tika-parsers/tika-parser-text-module/src/test/java/org/apache/tika/parser/strings/StringsConfigTest.java
diff --git a/tika-parser-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/strings/StringsParserTest.java b/tika-parsers/tika-parser-text-module/src/test/java/org/apache/tika/parser/strings/StringsParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/strings/StringsParserTest.java
rename to tika-parsers/tika-parser-text-module/src/test/java/org/apache/tika/parser/strings/StringsParserTest.java
diff --git a/tika-parser-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/txt/CharsetDetectorTest.java b/tika-parsers/tika-parser-text-module/src/test/java/org/apache/tika/parser/txt/CharsetDetectorTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/txt/CharsetDetectorTest.java
rename to tika-parsers/tika-parser-text-module/src/test/java/org/apache/tika/parser/txt/CharsetDetectorTest.java
diff --git a/tika-parser-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/txt/TXTParserTest.java b/tika-parsers/tika-parser-text-module/src/test/java/org/apache/tika/parser/txt/TXTParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/txt/TXTParserTest.java
rename to tika-parsers/tika-parser-text-module/src/test/java/org/apache/tika/parser/txt/TXTParserTest.java
diff --git a/tika-parser-modules/tika-parser-text-module/src/test/resources/org/apache/tika/parser/csv/tika-config.xml b/tika-parsers/tika-parser-text-module/src/test/resources/org/apache/tika/parser/csv/tika-config.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/test/resources/org/apache/tika/parser/csv/tika-config.xml
rename to tika-parsers/tika-parser-text-module/src/test/resources/org/apache/tika/parser/csv/tika-config.xml
diff --git a/tika-parser-modules/tika-parser-text-module/src/test/resources/test-documents/english.cp500.txt b/tika-parsers/tika-parser-text-module/src/test/resources/test-documents/english.cp500.txt
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/test/resources/test-documents/english.cp500.txt
rename to tika-parsers/tika-parser-text-module/src/test/resources/test-documents/english.cp500.txt
diff --git a/tika-parser-modules/tika-parser-text-module/src/test/resources/test-documents/multi-language.txt b/tika-parsers/tika-parser-text-module/src/test/resources/test-documents/multi-language.txt
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/test/resources/test-documents/multi-language.txt
rename to tika-parsers/tika-parser-text-module/src/test/resources/test-documents/multi-language.txt
diff --git a/tika-parser-modules/tika-parser-text-module/src/test/resources/test-documents/resume.html b/tika-parsers/tika-parser-text-module/src/test/resources/test-documents/resume.html
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/test/resources/test-documents/resume.html
rename to tika-parsers/tika-parser-text-module/src/test/resources/test-documents/resume.html
diff --git a/tika-parser-modules/tika-parser-text-module/src/test/resources/test-documents/russian.cp866.txt b/tika-parsers/tika-parser-text-module/src/test/resources/test-documents/russian.cp866.txt
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/test/resources/test-documents/russian.cp866.txt
rename to tika-parsers/tika-parser-text-module/src/test/resources/test-documents/russian.cp866.txt
diff --git a/tika-parser-modules/tika-parser-text-module/src/test/resources/test-documents/testOCTET_header.dbase3 b/tika-parsers/tika-parser-text-module/src/test/resources/test-documents/testOCTET_header.dbase3
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/test/resources/test-documents/testOCTET_header.dbase3
rename to tika-parsers/tika-parser-text-module/src/test/resources/test-documents/testOCTET_header.dbase3
diff --git a/tika-parser-modules/tika-parser-text-module/src/test/resources/test-documents/testTXT_win-1252.txt b/tika-parsers/tika-parser-text-module/src/test/resources/test-documents/testTXT_win-1252.txt
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/test/resources/test-documents/testTXT_win-1252.txt
rename to tika-parsers/tika-parser-text-module/src/test/resources/test-documents/testTXT_win-1252.txt
diff --git a/tika-parser-modules/tika-parser-text-module/src/test/resources/test-documents/testVCalendar.vcs b/tika-parsers/tika-parser-text-module/src/test/resources/test-documents/testVCalendar.vcs
similarity index 100%
rename from tika-parser-modules/tika-parser-text-module/src/test/resources/test-documents/testVCalendar.vcs
rename to tika-parsers/tika-parser-text-module/src/test/resources/test-documents/testVCalendar.vcs
diff --git a/tika-parser-modules/tika-parser-ocr-module/src/main/resources/test-properties/StringsConfig-full.properties b/tika-parsers/tika-parser-text-module/src/test/resources/test-properties/StringsConfig-full.properties
similarity index 100%
rename from tika-parser-modules/tika-parser-ocr-module/src/main/resources/test-properties/StringsConfig-full.properties
rename to tika-parsers/tika-parser-text-module/src/test/resources/test-properties/StringsConfig-full.properties
diff --git a/tika-parser-modules/tika-parser-ocr-module/src/main/resources/test-properties/StringsConfig-partial.properties b/tika-parsers/tika-parser-text-module/src/test/resources/test-properties/StringsConfig-partial.properties
similarity index 100%
rename from tika-parser-modules/tika-parser-ocr-module/src/main/resources/test-properties/StringsConfig-partial.properties
rename to tika-parsers/tika-parser-text-module/src/test/resources/test-properties/StringsConfig-partial.properties
diff --git a/tika-parser-modules/tika-parser-xml-module/pom.xml b/tika-parsers/tika-parser-xml-module/pom.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-xml-module/pom.xml
rename to tika-parsers/tika-parser-xml-module/pom.xml
diff --git a/tika-parser-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xliff/XLIFF12ContentHandler.java b/tika-parsers/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xliff/XLIFF12ContentHandler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xliff/XLIFF12ContentHandler.java
rename to tika-parsers/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xliff/XLIFF12ContentHandler.java
diff --git a/tika-parser-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xliff/XLIFF12Parser.java b/tika-parsers/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xliff/XLIFF12Parser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xliff/XLIFF12Parser.java
rename to tika-parsers/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xliff/XLIFF12Parser.java
diff --git a/tika-parser-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xliff/XLZParser.java b/tika-parsers/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xliff/XLZParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xliff/XLZParser.java
rename to tika-parsers/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xliff/XLZParser.java
diff --git a/tika-parser-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/AbstractMetadataHandler.java b/tika-parsers/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/AbstractMetadataHandler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/AbstractMetadataHandler.java
rename to tika-parsers/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/AbstractMetadataHandler.java
diff --git a/tika-parser-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/AttributeDependantMetadataHandler.java b/tika-parsers/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/AttributeDependantMetadataHandler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/AttributeDependantMetadataHandler.java
rename to tika-parsers/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/AttributeDependantMetadataHandler.java
diff --git a/tika-parser-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/AttributeMetadataHandler.java b/tika-parsers/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/AttributeMetadataHandler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/AttributeMetadataHandler.java
rename to tika-parsers/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/AttributeMetadataHandler.java
diff --git a/tika-parser-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/DcXMLParser.java b/tika-parsers/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/DcXMLParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/DcXMLParser.java
rename to tika-parsers/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/DcXMLParser.java
diff --git a/tika-parser-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/ElementMetadataHandler.java b/tika-parsers/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/ElementMetadataHandler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/ElementMetadataHandler.java
rename to tika-parsers/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/ElementMetadataHandler.java
diff --git a/tika-parser-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/FictionBookParser.java b/tika-parsers/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/FictionBookParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/FictionBookParser.java
rename to tika-parsers/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/FictionBookParser.java
diff --git a/tika-parser-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/MetadataHandler.java b/tika-parsers/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/MetadataHandler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/MetadataHandler.java
rename to tika-parsers/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/MetadataHandler.java
diff --git a/tika-parser-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/XMLParser.java b/tika-parsers/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/XMLParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/XMLParser.java
rename to tika-parsers/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/XMLParser.java
diff --git a/tika-parser-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/XMLProfiler.java b/tika-parsers/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/XMLProfiler.java
similarity index 100%
rename from tika-parser-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/XMLProfiler.java
rename to tika-parsers/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/XMLProfiler.java
diff --git a/tika-parser-modules/tika-parser-xml-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser b/tika-parsers/tika-parser-xml-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
similarity index 100%
rename from tika-parser-modules/tika-parser-xml-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
rename to tika-parsers/tika-parser-xml-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
diff --git a/tika-parser-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xliff/XLIFF12ParserTest.java b/tika-parsers/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xliff/XLIFF12ParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xliff/XLIFF12ParserTest.java
rename to tika-parsers/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xliff/XLIFF12ParserTest.java
diff --git a/tika-parser-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xliff/XLZParserTest.java b/tika-parsers/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xliff/XLZParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xliff/XLZParserTest.java
rename to tika-parsers/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xliff/XLZParserTest.java
diff --git a/tika-parser-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xml/DcXMLParserTest.java b/tika-parsers/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xml/DcXMLParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xml/DcXMLParserTest.java
rename to tika-parsers/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xml/DcXMLParserTest.java
diff --git a/tika-parser-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xml/EmptyAndDuplicateElementsXMLParserTest.java b/tika-parsers/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xml/EmptyAndDuplicateElementsXMLParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xml/EmptyAndDuplicateElementsXMLParserTest.java
rename to tika-parsers/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xml/EmptyAndDuplicateElementsXMLParserTest.java
diff --git a/tika-parser-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xml/FictionBookParserTest.java b/tika-parsers/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xml/FictionBookParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xml/FictionBookParserTest.java
rename to tika-parsers/tika-parser-xml-module/src/test/java/org/apache/tika/parser/xml/FictionBookParserTest.java
diff --git a/tika-parser-modules/tika-parser-xml-module/src/test/resources/test-documents/test.fb2 b/tika-parsers/tika-parser-xml-module/src/test/resources/test-documents/test.fb2
similarity index 100%
rename from tika-parser-modules/tika-parser-xml-module/src/test/resources/test-documents/test.fb2
rename to tika-parsers/tika-parser-xml-module/src/test/resources/test-documents/test.fb2
diff --git a/tika-parser-modules/tika-parser-xml-module/src/test/resources/test-documents/testXLIFF12.xlf b/tika-parsers/tika-parser-xml-module/src/test/resources/test-documents/testXLIFF12.xlf
similarity index 100%
rename from tika-parser-modules/tika-parser-xml-module/src/test/resources/test-documents/testXLIFF12.xlf
rename to tika-parsers/tika-parser-xml-module/src/test/resources/test-documents/testXLIFF12.xlf
diff --git a/tika-parser-modules/tika-parser-xml-module/src/test/resources/test-documents/testXLIFF12.xlz b/tika-parsers/tika-parser-xml-module/src/test/resources/test-documents/testXLIFF12.xlz
similarity index 100%
rename from tika-parser-modules/tika-parser-xml-module/src/test/resources/test-documents/testXLIFF12.xlz
rename to tika-parsers/tika-parser-xml-module/src/test/resources/test-documents/testXLIFF12.xlz
diff --git a/tika-parser-modules/tika-parser-xml-module/src/test/resources/test-documents/testXML.xml b/tika-parsers/tika-parser-xml-module/src/test/resources/test-documents/testXML.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-xml-module/src/test/resources/test-documents/testXML.xml
rename to tika-parsers/tika-parser-xml-module/src/test/resources/test-documents/testXML.xml
diff --git a/tika-parser-modules/tika-parser-xml-module/src/test/resources/test-documents/testXML2.xml b/tika-parsers/tika-parser-xml-module/src/test/resources/test-documents/testXML2.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-xml-module/src/test/resources/test-documents/testXML2.xml
rename to tika-parsers/tika-parser-xml-module/src/test/resources/test-documents/testXML2.xml
diff --git a/tika-parser-modules/tika-parser-xml-module/src/test/resources/test-documents/testXML3.xml b/tika-parsers/tika-parser-xml-module/src/test/resources/test-documents/testXML3.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-xml-module/src/test/resources/test-documents/testXML3.xml
rename to tika-parsers/tika-parser-xml-module/src/test/resources/test-documents/testXML3.xml
diff --git a/tika-parser-modules/tika-parser-xml-module/src/test/resources/test-documents/testXXE.xml b/tika-parsers/tika-parser-xml-module/src/test/resources/test-documents/testXXE.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-xml-module/src/test/resources/test-documents/testXXE.xml
rename to tika-parsers/tika-parser-xml-module/src/test/resources/test-documents/testXXE.xml
diff --git a/tika-parser-modules/tika-parser-xmp-commons/pom.xml b/tika-parsers/tika-parser-xmp-commons/pom.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-xmp-commons/pom.xml
rename to tika-parsers/tika-parser-xmp-commons/pom.xml
diff --git a/tika-parser-modules/tika-parser-xmp-commons/src/main/java/org/apache/tika/parser/xmp/JempboxExtractor.java b/tika-parsers/tika-parser-xmp-commons/src/main/java/org/apache/tika/parser/xmp/JempboxExtractor.java
similarity index 100%
rename from tika-parser-modules/tika-parser-xmp-commons/src/main/java/org/apache/tika/parser/xmp/JempboxExtractor.java
rename to tika-parsers/tika-parser-xmp-commons/src/main/java/org/apache/tika/parser/xmp/JempboxExtractor.java
diff --git a/tika-parser-modules/tika-parser-xmp-commons/src/main/java/org/apache/tika/parser/xmp/XMPPacketScanner.java b/tika-parsers/tika-parser-xmp-commons/src/main/java/org/apache/tika/parser/xmp/XMPPacketScanner.java
similarity index 100%
rename from tika-parser-modules/tika-parser-xmp-commons/src/main/java/org/apache/tika/parser/xmp/XMPPacketScanner.java
rename to tika-parsers/tika-parser-xmp-commons/src/main/java/org/apache/tika/parser/xmp/XMPPacketScanner.java
diff --git a/tika-parser-modules/tika-parser-xmp-commons/src/test/java/org/apache/tika/parser/xmp/JempboxExtractorTest.java b/tika-parsers/tika-parser-xmp-commons/src/test/java/org/apache/tika/parser/xmp/JempboxExtractorTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-xmp-commons/src/test/java/org/apache/tika/parser/xmp/JempboxExtractorTest.java
rename to tika-parsers/tika-parser-xmp-commons/src/test/java/org/apache/tika/parser/xmp/JempboxExtractorTest.java
diff --git a/tika-parser-modules/tika-parser-xmp-commons/src/test/resources/test-documents/testJPEG_commented.jpg b/tika-parsers/tika-parser-xmp-commons/src/test/resources/test-documents/testJPEG_commented.jpg
similarity index 100%
rename from tika-parser-modules/tika-parser-xmp-commons/src/test/resources/test-documents/testJPEG_commented.jpg
rename to tika-parsers/tika-parser-xmp-commons/src/test/resources/test-documents/testJPEG_commented.jpg
diff --git a/tika-parser-modules/tika-parser-xmp-commons/src/test/resources/test-documents/testJPEG_commented_pspcs2mac.jpg b/tika-parsers/tika-parser-xmp-commons/src/test/resources/test-documents/testJPEG_commented_pspcs2mac.jpg
similarity index 100%
rename from tika-parser-modules/tika-parser-xmp-commons/src/test/resources/test-documents/testJPEG_commented_pspcs2mac.jpg
rename to tika-parsers/tika-parser-xmp-commons/src/test/resources/test-documents/testJPEG_commented_pspcs2mac.jpg
diff --git a/tika-parser-modules/tika-parser-xmp-commons/src/test/resources/test-documents/testJPEG_commented_xnviewmp026.jpg b/tika-parsers/tika-parser-xmp-commons/src/test/resources/test-documents/testJPEG_commented_xnviewmp026.jpg
similarity index 100%
rename from tika-parser-modules/tika-parser-xmp-commons/src/test/resources/test-documents/testJPEG_commented_xnviewmp026.jpg
rename to tika-parsers/tika-parser-xmp-commons/src/test/resources/test-documents/testJPEG_commented_xnviewmp026.jpg
diff --git a/tika-parser-modules/tika-parser-xmp-commons/src/test/resources/test-documents/testXMP.xmp b/tika-parsers/tika-parser-xmp-commons/src/test/resources/test-documents/testXMP.xmp
similarity index 100%
rename from tika-parser-modules/tika-parser-xmp-commons/src/test/resources/test-documents/testXMP.xmp
rename to tika-parsers/tika-parser-xmp-commons/src/test/resources/test-documents/testXMP.xmp
diff --git a/tika-parser-modules/tika-parser-zip-commons/pom.xml b/tika-parsers/tika-parser-zip-commons/pom.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-zip-commons/pom.xml
rename to tika-parsers/tika-parser-zip-commons/pom.xml
diff --git a/tika-parser-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/CompressorConstants.java b/tika-parsers/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/CompressorConstants.java
similarity index 100%
rename from tika-parser-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/CompressorConstants.java
rename to tika-parsers/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/CompressorConstants.java
diff --git a/tika-parser-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/DefaultZipContainerDetector.java b/tika-parsers/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/DefaultZipContainerDetector.java
similarity index 100%
rename from tika-parser-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/DefaultZipContainerDetector.java
rename to tika-parsers/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/DefaultZipContainerDetector.java
diff --git a/tika-parser-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/DeprecatedStreamingZipContainerDetector.java b/tika-parsers/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/DeprecatedStreamingZipContainerDetector.java
similarity index 100%
rename from tika-parser-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/DeprecatedStreamingZipContainerDetector.java
rename to tika-parsers/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/DeprecatedStreamingZipContainerDetector.java
diff --git a/tika-parser-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/DeprecatedZipContainerDetector.java b/tika-parsers/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/DeprecatedZipContainerDetector.java
similarity index 100%
rename from tika-parser-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/DeprecatedZipContainerDetector.java
rename to tika-parsers/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/DeprecatedZipContainerDetector.java
diff --git a/tika-parser-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/IPADetector.java b/tika-parsers/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/IPADetector.java
similarity index 100%
rename from tika-parser-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/IPADetector.java
rename to tika-parsers/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/IPADetector.java
diff --git a/tika-parser-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/JarDetector.java b/tika-parsers/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/JarDetector.java
similarity index 100%
rename from tika-parser-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/JarDetector.java
rename to tika-parsers/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/JarDetector.java
diff --git a/tika-parser-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/KMZDetector.java b/tika-parsers/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/KMZDetector.java
similarity index 100%
rename from tika-parser-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/KMZDetector.java
rename to tika-parsers/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/KMZDetector.java
diff --git a/tika-parser-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/OpenDocumentDetector.java b/tika-parsers/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/OpenDocumentDetector.java
similarity index 100%
rename from tika-parser-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/OpenDocumentDetector.java
rename to tika-parsers/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/OpenDocumentDetector.java
diff --git a/tika-parser-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/PackageConstants.java b/tika-parsers/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/PackageConstants.java
similarity index 100%
rename from tika-parser-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/PackageConstants.java
rename to tika-parsers/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/PackageConstants.java
diff --git a/tika-parser-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/StarOfficeDetector.java b/tika-parsers/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/StarOfficeDetector.java
similarity index 100%
rename from tika-parser-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/StarOfficeDetector.java
rename to tika-parsers/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/StarOfficeDetector.java
diff --git a/tika-parser-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/StreamingDetectContext.java b/tika-parsers/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/StreamingDetectContext.java
similarity index 100%
rename from tika-parser-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/StreamingDetectContext.java
rename to tika-parsers/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/StreamingDetectContext.java
diff --git a/tika-parser-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/StreamingZipContainerDetector.java b/tika-parsers/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/StreamingZipContainerDetector.java
similarity index 100%
rename from tika-parser-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/StreamingZipContainerDetector.java
rename to tika-parsers/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/StreamingZipContainerDetector.java
diff --git a/tika-parser-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/ZipContainerDetector.java b/tika-parsers/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/ZipContainerDetector.java
similarity index 100%
rename from tika-parser-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/ZipContainerDetector.java
rename to tika-parsers/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/ZipContainerDetector.java
diff --git a/tika-parser-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/ZipContainerDetectorBase.java b/tika-parsers/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/ZipContainerDetectorBase.java
similarity index 100%
rename from tika-parser-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/ZipContainerDetectorBase.java
rename to tika-parsers/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/ZipContainerDetectorBase.java
diff --git a/tika-parser-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/zip/utils/ZipSalvager.java b/tika-parsers/tika-parser-zip-commons/src/main/java/org/apache/tika/zip/utils/ZipSalvager.java
similarity index 100%
rename from tika-parser-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/zip/utils/ZipSalvager.java
rename to tika-parsers/tika-parser-zip-commons/src/main/java/org/apache/tika/zip/utils/ZipSalvager.java
diff --git a/tika-parser-modules/tika-parser-zip-commons/src/main/resources/META-INF/services/org.apache.tika.detect.Detector b/tika-parsers/tika-parser-zip-commons/src/main/resources/META-INF/services/org.apache.tika.detect.Detector
similarity index 100%
rename from tika-parser-modules/tika-parser-zip-commons/src/main/resources/META-INF/services/org.apache.tika.detect.Detector
rename to tika-parsers/tika-parser-zip-commons/src/main/resources/META-INF/services/org.apache.tika.detect.Detector
diff --git a/tika-parser-modules/tika-parser-zip-commons/src/main/resources/META-INF/services/org.apache.tika.detect.zip.ZipContainerDetector b/tika-parsers/tika-parser-zip-commons/src/main/resources/META-INF/services/org.apache.tika.detect.zip.ZipContainerDetector
similarity index 100%
rename from tika-parser-modules/tika-parser-zip-commons/src/main/resources/META-INF/services/org.apache.tika.detect.zip.ZipContainerDetector
rename to tika-parsers/tika-parser-zip-commons/src/main/resources/META-INF/services/org.apache.tika.detect.zip.ZipContainerDetector
diff --git a/tika-parser-modules/tika-parser-zip-commons/src/test/java/org/apache/tika/detect/zip/ZipParserTest.java b/tika-parsers/tika-parser-zip-commons/src/test/java/org/apache/tika/detect/zip/ZipParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-zip-commons/src/test/java/org/apache/tika/detect/zip/ZipParserTest.java
rename to tika-parsers/tika-parser-zip-commons/src/test/java/org/apache/tika/detect/zip/ZipParserTest.java
diff --git a/tika-parser-modules/tika-parser-zip-commons/src/test/resources/test-documents/testJAR.jar b/tika-parsers/tika-parser-zip-commons/src/test/resources/test-documents/testJAR.jar
similarity index 100%
rename from tika-parser-modules/tika-parser-zip-commons/src/test/resources/test-documents/testJAR.jar
rename to tika-parsers/tika-parser-zip-commons/src/test/resources/test-documents/testJAR.jar
diff --git a/tika-parser-modules/tika-parser-zip-commons/src/test/resources/test-documents/testKMZ.kmz b/tika-parsers/tika-parser-zip-commons/src/test/resources/test-documents/testKMZ.kmz
similarity index 100%
rename from tika-parser-modules/tika-parser-zip-commons/src/test/resources/test-documents/testKMZ.kmz
rename to tika-parsers/tika-parser-zip-commons/src/test/resources/test-documents/testKMZ.kmz
diff --git a/tika-server/pom.xml b/tika-server/pom.xml
index b3dd1d0..f88379f 100644
--- a/tika-server/pom.xml
+++ b/tika-server/pom.xml
@@ -192,11 +192,6 @@
<createDependencyReducedPom>
false
</createDependencyReducedPom>
- <artifactSet>
- <excludes>
- <exclude>org.apache.tika:tika-parsers:jar:</exclude>
- </excludes>
- </artifactSet>
<filters>
<filter>
<artifact>*:*</artifact>