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 2025/11/24 19:03:35 UTC

(tika) branch main updated: TIKA-4543 -- simplify pipes modules (#2402)

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 81ad9af0f TIKA-4543 -- simplify pipes modules (#2402)
81ad9af0f is described below

commit 81ad9af0f25748f37a48e33a4e953eccffe57c75
Author: Tim Allison <ta...@apache.org>
AuthorDate: Mon Nov 24 14:03:30 2025 -0500

    TIKA-4543 -- simplify pipes modules (#2402)
---
 tika-app/pom.xml                                   |  16 +--
 tika-bom/pom.xml                                   |  16 +--
 tika-eval/tika-eval-app/pom.xml                    |   2 +-
 .../tika/eval/app/ExtractComparerRunner.java       |   2 +-
 .../apache/tika/eval/app/ExtractProfileRunner.java |   2 +-
 tika-grpc/pom.xml                                  |   4 +-
 .../tika-pipes-kafka-integration-tests/pom.xml     |  30 +----
 .../src/test/resources/tika-config-kafka.xml       |   2 +-
 .../pom.xml                                        |  34 +-----
 .../tika-pipes-s3-integration-tests/pom.xml        |  46 +------
 .../resources/tika-config-s3-integration-test.xml  |   2 +-
 .../src/test/resources/tika-config-s3ToFs.xml      |   2 +-
 .../src/test/resources/tika-config-s3Tos3.xml      |   2 +-
 .../tika-pipes-solr-integration-tests/pom.xml      |  21 +---
 .../src/test/resources/tika-config-solr-urls.xml   |   2 +-
 tika-pipes/pom.xml                                 |   9 +-
 tika-pipes/tika-async-cli/pom.xml                  |  34 +-----
 .../test/resources/configs/tika-config-broken.xml  |   2 +-
 .../src/main/resources/plugin.properties           |  21 ----
 .../src/main/resources/plugin.properties           |  21 ----
 .../tika/pipes/emitter/gcs/GCSEmitterPlugin.java   |  48 --------
 .../src/main/resources/plugin.properties           |  21 ----
 .../src/main/resources/plugin.properties           |  21 ----
 tika-pipes/tika-fetchers/pom.xml                   |  84 -------------
 .../tika-fetchers/tika-fetcher-az-blob/pom.xml     | 134 ---------------------
 .../pipes/fetcher/azblob/AZBlobFetcherPlugin.java  |  48 --------
 .../src/main/resources/plugin.properties           |  21 ----
 .../tika-fetchers/tika-fetcher-file-system/pom.xml | 125 -------------------
 .../pipes/fetcher/fs/FileSystemFetcherPlugin.java  |  49 --------
 .../src/main/resources/plugin.properties           |  21 ----
 tika-pipes/tika-fetchers/tika-fetcher-gcs/pom.xml  |  75 ------------
 .../src/test/resources/tika-config-gcs.xml         |  26 ----
 .../src/main/assembly/assembly.xml                 |  55 ---------
 .../src/main/resources/plugin.properties           |  22 ----
 tika-pipes/tika-fetchers/tika-fetcher-s3/pom.xml   | 132 --------------------
 .../tika-fetcher-s3/src/main/assembly/assembly.xml |  55 ---------
 .../tika/pipes/fetcher/s3/S3FetcherPlugin.java     |  48 --------
 .../src/test/resources/tika-config-s3.xml          |  27 -----
 tika-pipes/tika-httpclient-commons/pom.xml         |   1 -
 .../test/resources/configs/tika-config-broken.xml  |   2 +-
 .../apache/tika/config/pipes-iterator-config.xml   |   2 +-
 .../tika/config/pipes-iterator-multiple-config.xml |   4 +-
 tika-pipes/tika-pipes-integration-tests/pom.xml    |  16 +--
 .../test/resources/configs/tika-config-broken.xml  |   2 +-
 .../tika-pipes-iterator-commons/pom.xml            |  24 +++-
 .../pipes/pipesiterator/PipesIteratorBase.java     |   0
 tika-pipes/tika-pipes-iterators/pom.xml            | 104 ----------------
 .../tika-pipes-iterator-az-blob/pom.xml            | 115 ------------------
 .../src/main/assembly/assembly.xml                 |  55 ---------
 .../azblob/AZBlobPipesIteratorPlugin.java          |  48 --------
 .../src/main/resources/plugin.properties           |  21 ----
 .../src/main/assembly/assembly.xml                 |  55 ---------
 .../src/main/resources/plugin.properties           |  21 ----
 .../tika-pipes-iterator-file-system/pom.xml        | 119 ------------------
 .../src/main/assembly/assembly.xml                 |  55 ---------
 .../fs/FileSystemPipesIteratorPlugin.java          |  49 --------
 .../src/main/resources/plugin.properties           |  21 ----
 .../tika-pipes-iterator-gcs/pom.xml                | 115 ------------------
 .../src/main/assembly/assembly.xml                 |  55 ---------
 .../pipesiterator/gcs/GCSPipesIteratorPlugin.java  |  48 --------
 .../src/main/resources/plugin.properties           |  21 ----
 .../tika-pipes-iterator-jdbc/pom.xml               | 116 ------------------
 .../src/main/assembly/assembly.xml                 |  55 ---------
 .../jdbc/JDBCPipesIteratorPlugin.java              |  48 --------
 .../src/main/resources/plugin.properties           |  21 ----
 .../src/main/assembly/assembly.xml                 |  55 ---------
 .../src/main/resources/plugin.properties           |  21 ----
 .../tika-pipes-iterator-kafka/pom.xml              | 127 -------------------
 .../src/main/assembly/assembly.xml                 |  55 ---------
 .../kafka/KafkaPipesIteratorPlugin.java            |  48 --------
 .../src/main/resources/plugin.properties           |  21 ----
 .../tika-pipes-iterator-s3/pom.xml                 | 125 -------------------
 .../src/main/assembly/assembly.xml                 |  55 ---------
 .../pipesiterator/s3/S3PipesIteratorPlugin.java    |  48 --------
 .../src/main/resources/plugin.properties           |  21 ----
 .../src/test/resources/log4j2.xml                  |  32 -----
 .../tika-pipes-iterator-solr/pom.xml               | 130 --------------------
 .../src/main/assembly/assembly.xml                 |  55 ---------
 .../solr/SolrPipesIteratorPlugin.java              |  48 --------
 .../src/main/resources/plugin.properties           |  21 ----
 .../{tika-emitters => tika-pipes-plugins}/pom.xml  |  31 +++--
 .../tika-pipes-az-blob}/pom.xml                    |   9 +-
 .../src/main/assembly/assembly.xml                 |   0
 .../tika/pipes/emitter/azblob/AZBlobEmitter.java   |   0
 .../pipes/emitter/azblob/AZBlobEmitterConfig.java  |   0
 .../pipes/emitter/azblob/AZBlobEmitterFactory.java |   0
 .../tika/pipes/fetcher/azblob/AZBlobFetcher.java   |   0
 .../pipes/fetcher/azblob/AZBlobFetcherFactory.java |   0
 .../fetcher/azblob/config/AZBlobFetcherConfig.java |   0
 .../iterator}/azblob/AZBlobPipesIterator.java      |   2 +-
 .../azblob/AZBlobPipesIteratorConfig.java          |   2 +-
 .../azblob/AZBlobPipesIteratorFactory.java         |   2 +-
 .../pipes/plugin/azblob/AZBlobPipesPlugin.java}    |   8 +-
 .../src/main/resources/plugin.properties           |   8 +-
 .../pipes/emitter/azblob/TestAZBlobEmitter.java    |   0
 .../pipes/fetcher/azblob/TestAZBlobFetcher.java    |   0
 .../iterator}/azblob/TestAZBlobPipesIterator.java  |   7 +-
 .../config/tika-config-az-blob-fetcher.xml}        |   0
 .../test/resources/config/tika-config-az-blob.xml  |   0
 .../tika-pipes-csv}/pom.xml                        |   9 +-
 .../tika-pipes-csv}/src/main/assembly/assembly.xml |   0
 .../tika/pipes/iterator}/csv/CSVPipesIterator.java |   2 +-
 .../iterator}/csv/CSVPipesIteratorConfig.java      |   2 +-
 .../iterator}/csv/CSVPipesIteratorFactory.java     |   2 +-
 .../iterator}/filelist/FileListPipesIterator.java  |   2 +-
 .../tika/pipes/plugin/csv/CSVPipesPlugin.java}     |   8 +-
 .../src/main/resources/plugin.properties           |   8 +-
 .../pipes/iterator/csv}/TestCSVPipesIterator.java  |   2 +-
 .../filelist/FileListPipesIteratorTest.java        |   2 +-
 .../src/test/resources/test-simple.csv             |   0
 .../tika-pipes-file-system}/pom.xml                |  15 ++-
 .../src/main/assembly/assembly.xml                 |   0
 .../tika/pipes/emitter/fs/FileSystemEmitter.java   |   0
 .../pipes/emitter/fs/FileSystemEmitterConfig.java  |   0
 .../pipes/emitter/fs/FileSystemEmitterFactory.java |   0
 .../tika/pipes/fetcher/fs/FileSystemFetcher.java   |   0
 .../pipes/fetcher/fs/FileSystemFetcherConfig.java  |   0
 .../pipes/fetcher/fs/FileSystemFetcherFactory.java |   0
 .../iterator}/fs/FileSystemPipesIterator.java      |   2 +-
 .../fs/FileSystemPipesIteratorConfig.java          |   2 +-
 .../fs/FileSystemPipesIteratorFactory.java         |   2 +-
 .../pipes/plugin/fs/FileSystemPipesPlugin.java}    |   8 +-
 .../tika/pipes/reporter}/fs/AsyncStatus.java       |   2 +-
 .../reporter}/fs/FileSystemReporterConfig.java     |   2 +-
 .../reporter}/fs/FileSystemReporterFactory.java    |   2 +-
 .../reporter}/fs/FileSystemStatusReporter.java     |   2 +-
 .../src/main/resources/plugin.properties           |   8 +-
 .../pipes/fetcher/fs/FileSystemFetcherTest.java    |   0
 .../fs/config/FileSystemFetcherConfigTest.java     |   0
 .../iterator}/fs/FileSystemPipesIteratorTest.java  |   2 +-
 .../reporter}/fs/TestFileSystemStatusReporter.java |   3 +-
 .../tika-pipes-gcs}/pom.xml                        |  14 +--
 .../tika-pipes-gcs}/src/main/assembly/assembly.xml |   0
 .../apache/tika/pipes/emitter/gcs/GCSEmitter.java  |   0
 .../tika/pipes/emitter/gcs/GCSEmitterConfig.java   |   0
 .../tika/pipes/emitter/gcs/GCSEmitterFactory.java  |   0
 .../apache/tika/pipes/fetcher/gcs/GCSFetcher.java  |   0
 .../tika/pipes/fetcher/gcs/GCSFetcherFactory.java  |   0
 .../pipes/fetcher/gcs/config/GCSFetcherConfig.java |   0
 .../tika/pipes/iterator}/gcs/GCSPipesIterator.java |   2 +-
 .../iterator}/gcs/GCSPipesIteratorConfig.java      |   2 +-
 .../iterator}/gcs/GCSPipesIteratorFactory.java     |   2 +-
 .../tika/pipes/plugin/gcs/GCSPipesPlugin.java}     |   8 +-
 .../src/main/resources/plugin.properties           |   6 +-
 .../tika/pipes/emitter/gcs/TestGCSEmitter.java     |   0
 .../tika/pipes/fetcher/gcs}/TestGCSFetcher.java    |   3 +-
 .../pipes/iterator}/gcs/TestGCSPipesIterator.java  |   2 +-
 .../src/test/resources/config/tika-config-gcs.xml  |   0
 .../src/test/resources/log4j.properties            |   0
 .../tika-pipes-http}/pom.xml                       |  21 +---
 .../src/main/assembly/assembly.xml                 |   0
 .../tika/pipes/fetcher/http/HttpFetcher.java       |   0
 .../pipes/fetcher/http/HttpFetcherFactory.java     |   0
 .../fetcher/http/config/HttpFetcherConfig.java     |   0
 .../pipes/fetcher/http/config/HttpHeaders.java     |   0
 .../tika/pipes/fetcher/http/jwt/JwtCreds.java      |   0
 .../tika/pipes/fetcher/http/jwt/JwtGenerator.java  |   0
 .../pipes/fetcher/http/jwt/JwtPrivateKeyCreds.java |   0
 .../pipes/fetcher/http/jwt/JwtSecretCreds.java     |   0
 .../tika/pipes/plugin/http/HttpPipesPlugin.java}   |   8 +-
 .../src/main/resources/plugin.properties           |   8 +-
 .../tika/pipes/fetcher/http/HttpFetcherTest.java   |   0
 .../pipes/fetcher/http/config/HttpHeadersTest.java |   0
 .../pipes/fetcher/http/jwt/JwtGeneratorTest.java   |   0
 .../test/resources/configs/tika-config-http.json   |   0
 .../test/resources/configs/tika-config-http.xml    |   0
 .../tika-pipes-jdbc}/pom.xml                       |  14 ++-
 .../src/main/assembly/assembly.xml                 |   0
 .../tika/pipes/emitter/jdbc/JDBCEmitter.java       |   0
 .../tika/pipes/emitter/jdbc/JDBCEmitterConfig.java |   0
 .../pipes/emitter/jdbc/JDBCEmitterFactory.java     |   0
 .../pipes/iterator}/jdbc/JDBCPipesIterator.java    |   2 +-
 .../iterator}/jdbc/JDBCPipesIteratorConfig.java    |   2 +-
 .../iterator}/jdbc/JDBCPipesIteratorFactory.java   |   2 +-
 .../tika/pipes/plugin/jdbc/JDBCPipesPlugin.java}   |   8 +-
 .../pipes/reporter}/jdbc/JDBCPipesReporter.java    |   2 +-
 .../reporter}/jdbc/JDBCPipesReporterConfig.java    |   2 +-
 .../reporter}/jdbc/JDBCPipesReporterFactory.java   |   2 +-
 .../src/main/resources/plugin.properties           |   8 +-
 .../tika/pipes/emitter/jdbc/JDBCEmitterTest.java   |   0
 .../iterator}/jdbc/TestJDBCPipesIterator.java      |   3 +-
 .../reporter}/jdbc/TestJDBCPipesReporter.java      |   2 +-
 .../tika-config-jdbc-emitter-attachments.xml       |   0
 .../tika-config-jdbc-emitter-existing-table.xml    |   0
 .../tika-config-jdbc-emitter-multivalued.xml       |   0
 .../configs/tika-config-jdbc-emitter-trunc.xml     |   0
 .../resources/configs/tika-config-jdbc-emitter.xml |   0
 .../tika-pipes-jdbc}/src/test/resources/log4j2.xml |   0
 .../tika-pipes-json}/pom.xml                       |   9 +-
 .../src/main/assembly/assembly.xml                 |   0
 .../pipesiterator/json/JsonPipesIterator.java      |   0
 .../json/JsonPipesIteratorConfig.java              |   0
 .../json/JsonPipesIteratorFactory.java             |   0
 .../apache/tika/pipes/plugin/JsonPipesPlugin.java} |   8 +-
 .../src/main/resources/plugin.properties           |   8 +-
 .../pipesiterator/json/TestJsonPipesIterator.java  |   0
 .../test-documents/test-with-embedded-bytes.json   |   0
 .../src/test/resources/test-documents/test.json    |   0
 .../tika-pipes-kafka}/pom.xml                      |  12 +-
 .../src/main/assembly/assembly.xml                 |   0
 .../tika/pipes/emitter/kafka/KafkaEmitter.java     |   0
 .../pipes/emitter/kafka/KafkaEmitterConfig.java    |   0
 .../pipes/emitter/kafka/KafkaEmitterFactory.java   |   0
 .../pipes/iterator}/kafka/KafkaPipesIterator.java  |   2 +-
 .../iterator}/kafka/KafkaPipesIteratorConfig.java  |   2 +-
 .../iterator}/kafka/KafkaPipesIteratorFactory.java |   2 +-
 .../tika/pipes/plugin/kafka/KafkaPipesPlugin.java} |   8 +-
 .../src/main/resources/plugin.properties           |   9 +-
 .../iterator}/kafka/TestKafkaPipesIterator.java    |   2 +-
 .../src/test/resources/log4j2.xml                  |   0
 .../tika-pipes-microsoft-graph}/pom.xml            |   8 +-
 .../src/main/assembly/assembly.xml                 |   0
 .../microsoftgraph/MicrosoftGraphFetcher.java      |   0
 .../MicrosoftGraphFetcherFactory.java              |   0
 .../config/AadCredentialConfigBase.java            |   0
 .../Client2CertificateCredentialsConfig.java       |   0
 .../config/ClientCertificateCredentialsConfig.java |   0
 .../config/ClientSecretCredentialsConfig.java      |   0
 .../config/MicrosoftGraphFetcherConfig.java        |   0
 .../microsoftgraph/MicrosoftGraphPipesPlugin.java} |   8 +-
 .../src/main/resources/plugin.properties           |   9 +-
 .../microsoftgraph/MicrosoftGraphFetcherTest.java  |   0
 .../src/test/resources/log4j2.xml                  |   0
 .../tika-pipes-opensearch}/pom.xml                 |  25 ++--
 .../src/main/assembly/assembly.xml                 |   0
 .../pipes/emitter/opensearch/HttpClientConfig.java |   0
 .../pipes/emitter/opensearch/JsonResponse.java     |   0
 .../pipes/emitter/opensearch/OpenSearchClient.java |   0
 .../emitter/opensearch/OpenSearchEmitter.java      |   0
 .../opensearch/OpenSearchEmitterConfig.java        |   0
 .../opensearch/OpenSearchEmitterFactory.java       |   0
 .../plugin/opensearch/OpenSearchPipesPlugin.java}  |   8 +-
 .../reporter}/opensearch/HttpClientConfig.java     |   2 +-
 .../pipes/reporter}/opensearch/JsonResponse.java   |   2 +-
 .../reporter}/opensearch/OpenSearchClient.java     |   2 +-
 .../opensearch/OpenSearchPipesReporter.java        |   2 +-
 .../opensearch/OpenSearchReporterConfig.java       |   2 +-
 .../opensearch/OpenSearchReporterFactory.java      |   2 +-
 .../src/main/resources/plugin.properties           |   8 +-
 .../emitter/opensearch/OpenSearchClientTest.java   |   0
 .../test/resources/tika-config-simple-emitter.xml  |   0
 .../tika-pipes-s3}/pom.xml                         |  11 +-
 .../tika-pipes-s3}/src/main/assembly/assembly.xml  |   0
 .../apache/tika/pipes/emitter/s3/S3Emitter.java    |   0
 .../tika/pipes/emitter/s3/S3EmitterConfig.java     |   0
 .../tika/pipes/emitter/s3/S3EmitterFactory.java    |   0
 .../apache/tika/pipes/fetcher/s3/S3Fetcher.java    |   0
 .../tika/pipes/fetcher/s3/S3FetcherFactory.java    |   0
 .../pipes/fetcher/s3/config/S3FetcherConfig.java   |   0
 .../tika/pipes/iterator}/s3/S3PipesIterator.java   |   2 +-
 .../pipes/iterator}/s3/S3PipesIteratorConfig.java  |   2 +-
 .../pipes/iterator}/s3/S3PipesIteratorFactory.java |   2 +-
 .../tika/pipes/plugin/s3/S3PipesPlugin.java}       |   8 +-
 .../src/main/resources/plugin.properties           |   9 +-
 .../TestS3Fetcher.java                             |   0
 .../pipes/iterator}/s3/TestS3PipesIterator.java    |   2 +-
 .../org/apache/tika/pipes/iterator/s3}/log4j2.xml  |   0
 .../tika-pipes-solr}/pom.xml                       |  11 +-
 .../src/main/assembly/assembly.xml                 |   0
 .../tika/pipes/emitter/solr/SolrEmitter.java       |   0
 .../tika/pipes/emitter/solr/SolrEmitterConfig.java |   0
 .../pipes/emitter/solr/SolrEmitterFactory.java     |   0
 .../pipes/iterator}/solr/SolrPipesIterator.java    |   2 +-
 .../iterator}/solr/SolrPipesIteratorConfig.java    |   2 +-
 .../iterator}/solr/SolrPipesIteratorFactory.java   |   2 +-
 .../tika/pipes/plugin/solr/SolrPipesPlugin.java}   |   8 +-
 .../src/main/resources/plugin.properties           |   9 +-
 .../pipes/emitter/solr/SolrEmitterDevTest.java     |   0
 .../tika-pipes-solr}/src/test/resources/log4j2.xml |   0
 .../test/resources/tika-config-simple-emitter.xml  |   0
 .../tika-pipes-reporter-commons/pom.xml            |  23 +++-
 .../tika/pipes/reporters/PipesReporterBase.java    |   0
 tika-pipes/tika-pipes-reporters/pom.xml            |  82 -------------
 .../tika-pipes-reporter-fs-status/pom.xml          | 110 -----------------
 .../src/main/assembly/assembly.xml                 |  67 -----------
 .../reporters/fs/FileSystemReporterPlugin.java     |  49 --------
 .../src/main/resources/plugin.properties           |  21 ----
 .../tika-pipes-reporter-jdbc/pom.xml               | 123 -------------------
 .../src/main/assembly/assembly.xml                 |  67 -----------
 .../pipes/reporters/jdbc/JDBCReporterPlugin.java   |  49 --------
 .../src/main/resources/plugin.properties           |  21 ----
 .../tika-pipes-reporter-opensearch/pom.xml         | 116 ------------------
 .../src/main/assembly/assembly.xml                 |  55 ---------
 .../opensearch/OpenSearchReporterPlugin.java       |  49 --------
 .../src/main/resources/plugin.properties           |  21 ----
 .../resources/tika-config-simple-fs-emitter.xml    |   2 +-
 tika-server/tika-server-core/pom.xml               |   9 +-
 tika-server/tika-server-standard/pom.xml           |   9 +-
 288 files changed, 349 insertions(+), 4350 deletions(-)

diff --git a/tika-app/pom.xml b/tika-app/pom.xml
index e397c065a..c5a694d51 100644
--- a/tika-app/pom.xml
+++ b/tika-app/pom.xml
@@ -148,21 +148,7 @@
               <artifactItems>
                 <artifactItem>
                   <groupId>org.apache.tika</groupId>
-                  <artifactId>tika-fetcher-file-system</artifactId>
-                  <version>${project.version}</version>
-                  <type>zip</type>
-                  <overWrite>true</overWrite>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>org.apache.tika</groupId>
-                  <artifactId>tika-emitter-file-system</artifactId>
-                  <version>${project.version}</version>
-                  <type>zip</type>
-                  <overWrite>true</overWrite>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>org.apache.tika</groupId>
-                  <artifactId>tika-pipes-iterator-file-system</artifactId>
+                  <artifactId>tika-pipes-file-system</artifactId>
                   <version>${project.version}</version>
                   <type>zip</type>
                   <overWrite>true</overWrite>
diff --git a/tika-bom/pom.xml b/tika-bom/pom.xml
index f37a5aed7..93d827e8a 100644
--- a/tika-bom/pom.xml
+++ b/tika-bom/pom.xml
@@ -305,32 +305,32 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tika</groupId>
-        <artifactId>tika-emitter-gcs</artifactId>
+        <artifactId>tika-pipes-gcs</artifactId>
         <version>4.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tika</groupId>
-        <artifactId>tika-emitter-jdbc</artifactId>
+        <artifactId>tika-pipes-jdbc</artifactId>
         <version>4.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tika</groupId>
-        <artifactId>tika-emitter-kafka</artifactId>
+        <artifactId>tika-pipes-kafka</artifactId>
         <version>4.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tika</groupId>
-        <artifactId>tika-emitter-opensearch</artifactId>
+        <artifactId>tika-pipes-opensearch</artifactId>
         <version>4.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tika</groupId>
-        <artifactId>tika-emitter-s3</artifactId>
+        <artifactId>tika-pipes-s3</artifactId>
         <version>4.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tika</groupId>
-        <artifactId>tika-emitter-solr</artifactId>
+        <artifactId>tika-pipes-solr</artifactId>
         <version>4.0.0-SNAPSHOT</version>
       </dependency>
 
@@ -341,7 +341,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tika</groupId>
-        <artifactId>tika-fetcher-http</artifactId>
+        <artifactId>tika-pipes-http</artifactId>
         <version>4.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
@@ -352,7 +352,7 @@
 
       <dependency>
         <groupId>org.apache.tika</groupId>
-        <artifactId>tika-pipes-iterator-csv</artifactId>
+        <artifactId>tika-pipes-csv</artifactId>
         <version>4.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
diff --git a/tika-eval/tika-eval-app/pom.xml b/tika-eval/tika-eval-app/pom.xml
index 65f5389c2..dba9c7a9c 100644
--- a/tika-eval/tika-eval-app/pom.xml
+++ b/tika-eval/tika-eval-app/pom.xml
@@ -37,7 +37,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tika</groupId>
-      <artifactId>tika-pipes-iterator-file-system</artifactId>
+      <artifactId>tika-pipes-file-system</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/ExtractComparerRunner.java b/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/ExtractComparerRunner.java
index 401cdcf3d..9e3d7fe4b 100644
--- a/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/ExtractComparerRunner.java
+++ b/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/ExtractComparerRunner.java
@@ -61,7 +61,7 @@ import org.apache.tika.mime.MimeTypes;
 import org.apache.tika.pipes.api.FetchEmitTuple;
 import org.apache.tika.pipes.api.pipesiterator.PipesIterator;
 import org.apache.tika.pipes.core.pipesiterator.CallablePipesIterator;
-import org.apache.tika.pipes.pipesiterator.fs.FileSystemPipesIterator;
+import org.apache.tika.pipes.iterator.fs.FileSystemPipesIterator;
 import org.apache.tika.plugins.ExtensionConfig;
 
 public class ExtractComparerRunner {
diff --git a/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/ExtractProfileRunner.java b/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/ExtractProfileRunner.java
index c38fef5e5..def728b9e 100644
--- a/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/ExtractProfileRunner.java
+++ b/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/ExtractProfileRunner.java
@@ -61,7 +61,7 @@ import org.apache.tika.mime.MimeTypes;
 import org.apache.tika.pipes.api.FetchEmitTuple;
 import org.apache.tika.pipes.api.pipesiterator.PipesIterator;
 import org.apache.tika.pipes.core.pipesiterator.CallablePipesIterator;
-import org.apache.tika.pipes.pipesiterator.fs.FileSystemPipesIterator;
+import org.apache.tika.pipes.iterator.fs.FileSystemPipesIterator;
 import org.apache.tika.plugins.ExtensionConfig;
 
 public class ExtractProfileRunner {
diff --git a/tika-grpc/pom.xml b/tika-grpc/pom.xml
index a83a889d2..fd4141737 100644
--- a/tika-grpc/pom.xml
+++ b/tika-grpc/pom.xml
@@ -220,12 +220,12 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tika</groupId>
-      <artifactId>tika-fetcher-http</artifactId>
+      <artifactId>tika-pipes-http</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.tika</groupId>
-      <artifactId>tika-fetcher-file-system</artifactId>
+      <artifactId>tika-pipes-file-system</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/tika-integration-tests/tika-pipes-kafka-integration-tests/pom.xml b/tika-integration-tests/tika-pipes-kafka-integration-tests/pom.xml
index 84288e914..588c8afc0 100644
--- a/tika-integration-tests/tika-pipes-kafka-integration-tests/pom.xml
+++ b/tika-integration-tests/tika-pipes-kafka-integration-tests/pom.xml
@@ -52,33 +52,20 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>tika-pipes-iterator-kafka</artifactId>
+      <artifactId>tika-pipes-kafka</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>tika-pipes-iterator-kafka</artifactId>
+      <artifactId>tika-pipes-file-system</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
       <type>zip</type>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>tika-fetcher-file-system</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-      <type>zip</type>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>tika-emitter-kafka</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>tika-emitter-kafka</artifactId>
+      <artifactId>tika-pipes-kafka</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
       <type>zip</type>
@@ -123,21 +110,14 @@
               <artifactItems>
                 <artifactItem>
                   <groupId>org.apache.tika</groupId>
-                  <artifactId>tika-fetcher-file-system</artifactId>
-                  <version>${project.version}</version>
-                  <type>zip</type>
-                  <overWrite>true</overWrite>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>org.apache.tika</groupId>
-                  <artifactId>tika-emitter-kafka</artifactId>
+                  <artifactId>tika-pipes-file-system</artifactId>
                   <version>${project.version}</version>
                   <type>zip</type>
                   <overWrite>true</overWrite>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.tika</groupId>
-                  <artifactId>tika-pipes-iterator-kafka</artifactId>
+                  <artifactId>tika-pipes-kafka</artifactId>
                   <version>${project.version}</version>
                   <type>zip</type>
                   <overWrite>true</overWrite>
diff --git a/tika-integration-tests/tika-pipes-kafka-integration-tests/src/test/resources/tika-config-kafka.xml b/tika-integration-tests/tika-pipes-kafka-integration-tests/src/test/resources/tika-config-kafka.xml
index 68d517cbb..5e655a6b8 100644
--- a/tika-integration-tests/tika-pipes-kafka-integration-tests/src/test/resources/tika-config-kafka.xml
+++ b/tika-integration-tests/tika-pipes-kafka-integration-tests/src/test/resources/tika-config-kafka.xml
@@ -104,7 +104,7 @@
       </params>
     </emitter>
   </emitters>
-  <pipesIterator class="org.apache.tika.pipes.pipesiterator.kafka.KafkaPipesIterator">
+  <pipesIterator class="org.apache.tika.pipes.iterator.kafka.KafkaPipesIterator">
     <params>
       <topic>{PIPE_ITERATOR_TOPIC}</topic>
       <bootstrapServers>{BOOTSTRAP_SERVERS}</bootstrapServers>
diff --git a/tika-integration-tests/tika-pipes-opensearch-integration-tests/pom.xml b/tika-integration-tests/tika-pipes-opensearch-integration-tests/pom.xml
index 26a19ad7f..2ab1acebf 100644
--- a/tika-integration-tests/tika-pipes-opensearch-integration-tests/pom.xml
+++ b/tika-integration-tests/tika-pipes-opensearch-integration-tests/pom.xml
@@ -37,29 +37,17 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>tika-fetcher-file-system</artifactId>
+      <artifactId>tika-pipes-file-system</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
       <type>zip</type>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>tika-pipes-iterator-file-system</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-      <type>zip</type>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>tika-emitter-opensearch</artifactId>
+      <artifactId>tika-pipes-opensearch</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>tika-pipes-reporter-opensearch</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>tika-core</artifactId>
@@ -109,28 +97,14 @@
           <artifactItems>
             <artifactItem>
               <groupId>org.apache.tika</groupId>
-              <artifactId>tika-fetcher-file-system</artifactId>
-              <version>${project.version}</version>
-              <type>zip</type>
-              <overWrite>true</overWrite>
-            </artifactItem>
-            <artifactItem>
-              <groupId>org.apache.tika</groupId>
-              <artifactId>tika-emitter-opensearch</artifactId>
-              <version>${project.version}</version>
-              <type>zip</type>
-              <overWrite>true</overWrite>
-            </artifactItem>
-            <artifactItem>
-              <groupId>org.apache.tika</groupId>
-              <artifactId>tika-pipes-reporter-opensearch</artifactId>
+              <artifactId>tika-pipes-file-system</artifactId>
               <version>${project.version}</version>
               <type>zip</type>
               <overWrite>true</overWrite>
             </artifactItem>
             <artifactItem>
               <groupId>org.apache.tika</groupId>
-              <artifactId>tika-pipes-iterator-file-system</artifactId>
+              <artifactId>tika-pipes-opensearch</artifactId>
               <version>${project.version}</version>
               <type>zip</type>
               <overWrite>true</overWrite>
diff --git a/tika-integration-tests/tika-pipes-s3-integration-tests/pom.xml b/tika-integration-tests/tika-pipes-s3-integration-tests/pom.xml
index c09e48330..05a783ec6 100644
--- a/tika-integration-tests/tika-pipes-s3-integration-tests/pom.xml
+++ b/tika-integration-tests/tika-pipes-s3-integration-tests/pom.xml
@@ -37,39 +37,13 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>tika-fetcher-s3</artifactId>
+      <artifactId>tika-pipes-s3</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>tika-fetcher-s3</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-      <type>zip</type>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>tika-pipes-iterator-s3</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>tika-pipes-iterator-s3</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-      <type>zip</type>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>tika-emitter-s3</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>tika-emitter-s3</artifactId>
+      <artifactId>tika-pipes-s3</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
       <type>zip</type>
@@ -129,21 +103,7 @@
               <artifactItems>
                 <artifactItem>
                   <groupId>org.apache.tika</groupId>
-                  <artifactId>tika-fetcher-s3</artifactId>
-                  <version>${project.version}</version>
-                  <type>zip</type>
-                  <overWrite>true</overWrite>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>org.apache.tika</groupId>
-                  <artifactId>tika-emitter-s3</artifactId>
-                  <version>${project.version}</version>
-                  <type>zip</type>
-                  <overWrite>true</overWrite>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>org.apache.tika</groupId>
-                  <artifactId>tika-pipes-iterator-s3</artifactId>
+                  <artifactId>tika-pipes-s3</artifactId>
                   <version>${project.version}</version>
                   <type>zip</type>
                   <overWrite>true</overWrite>
diff --git a/tika-integration-tests/tika-pipes-s3-integration-tests/src/test/resources/tika-config-s3-integration-test.xml b/tika-integration-tests/tika-pipes-s3-integration-tests/src/test/resources/tika-config-s3-integration-test.xml
index 8ef6cab29..9c2ea8e54 100644
--- a/tika-integration-tests/tika-pipes-s3-integration-tests/src/test/resources/tika-config-s3-integration-test.xml
+++ b/tika-integration-tests/tika-pipes-s3-integration-tests/src/test/resources/tika-config-s3-integration-test.xml
@@ -90,7 +90,7 @@
       <throttleSeconds>30,120,600,1200</throttleSeconds>
     </fetcher>
   </fetchers>
-  <pipesIterator class="org.apache.tika.pipes.pipesiterator.s3.S3PipesIterator">
+  <pipesIterator class="org.apache.tika.pipes.iterator.S3PipesIterator">
     <emitterName>s3e</emitterName>
     <fetcherName>s3f</fetcherName>
     <region>{REGION}</region>
diff --git a/tika-integration-tests/tika-pipes-s3-integration-tests/src/test/resources/tika-config-s3ToFs.xml b/tika-integration-tests/tika-pipes-s3-integration-tests/src/test/resources/tika-config-s3ToFs.xml
index 425482146..b02906f5d 100644
--- a/tika-integration-tests/tika-pipes-s3-integration-tests/src/test/resources/tika-config-s3ToFs.xml
+++ b/tika-integration-tests/tika-pipes-s3-integration-tests/src/test/resources/tika-config-s3ToFs.xml
@@ -27,7 +27,7 @@
       <credentialsProvider>profile</credentialsProvider>
     </fetcher>
   </fetchers>
-  <pipesIterator class="org.apache.tika.pipes.pipesiterator.s3.S3PipesIterator">
+  <pipesIterator class="org.apache.tika.pipes.iterator.S3PipesIterator">
     <fetcherName>s3f</fetcherName>
     <bucket><!-- fill in here --></bucket>
     <region>us-east-1</region>
diff --git a/tika-integration-tests/tika-pipes-s3-integration-tests/src/test/resources/tika-config-s3Tos3.xml b/tika-integration-tests/tika-pipes-s3-integration-tests/src/test/resources/tika-config-s3Tos3.xml
index 11b5b9aba..fc30a5663 100644
--- a/tika-integration-tests/tika-pipes-s3-integration-tests/src/test/resources/tika-config-s3Tos3.xml
+++ b/tika-integration-tests/tika-pipes-s3-integration-tests/src/test/resources/tika-config-s3Tos3.xml
@@ -27,7 +27,7 @@
       <credentialsProvider>profile</credentialsProvider>
     </fetcher>
   </fetchers>
-  <pipesIterator class="org.apache.tika.pipes.pipesiterator.s3.S3PipesIterator">
+  <pipesIterator class="org.apache.tika.pipes.iterator.S3PipesIterator">
     <fetcherName>s3f</fetcherName>
     <region>us-east-1</region>
     <bucket><!-- fill in here --></bucket>
diff --git a/tika-integration-tests/tika-pipes-solr-integration-tests/pom.xml b/tika-integration-tests/tika-pipes-solr-integration-tests/pom.xml
index 05c8b94c4..be2574f42 100644
--- a/tika-integration-tests/tika-pipes-solr-integration-tests/pom.xml
+++ b/tika-integration-tests/tika-pipes-solr-integration-tests/pom.xml
@@ -41,23 +41,17 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>tika-pipes-iterator-solr</artifactId>
+      <artifactId>tika-pipes-solr</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>tika-fetcher-file-system</artifactId>
+      <artifactId>tika-pipes-file-system</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
       <type>zip</type>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>tika-emitter-solr</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>tika-core</artifactId>
@@ -113,21 +107,14 @@
               <artifactItems>
                 <artifactItem>
                   <groupId>org.apache.tika</groupId>
-                  <artifactId>tika-fetcher-file-system</artifactId>
-                  <version>${project.version}</version>
-                  <type>zip</type>
-                  <overWrite>true</overWrite>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>org.apache.tika</groupId>
-                  <artifactId>tika-emitter-solr</artifactId>
+                  <artifactId>tika-pipes-file-system</artifactId>
                   <version>${project.version}</version>
                   <type>zip</type>
                   <overWrite>true</overWrite>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.tika</groupId>
-                  <artifactId>tika-pipes-iterator-solr</artifactId>
+                  <artifactId>tika-pipes-solr</artifactId>
                   <version>${project.version}</version>
                   <type>zip</type>
                   <overWrite>true</overWrite>
diff --git a/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/resources/tika-config-solr-urls.xml b/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/resources/tika-config-solr-urls.xml
index 3345ab487..3423de325 100644
--- a/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/resources/tika-config-solr-urls.xml
+++ b/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/resources/tika-config-solr-urls.xml
@@ -100,7 +100,7 @@
       <basePath>/path/to/extracts</basePath>
     </emitter>
   </emitters>
-  <pipesIterator class="org.apache.tika.pipes.pipesiterator.solr.SolrPipesIterator">
+  <pipesIterator class="org.apache.tika.pipes.emitter.solr.SolrPipesIterator">
     <solrCollection>testcol</solrCollection>
     {SOLR_CONNECTION}
     <idField>id</idField>
diff --git a/tika-pipes/pom.xml b/tika-pipes/pom.xml
index 14dfc8dbc..42d0c8d9b 100644
--- a/tika-pipes/pom.xml
+++ b/tika-pipes/pom.xml
@@ -33,12 +33,11 @@
     <module>tika-pipes-api</module>
     <module>tika-pipes-core</module>
     <module>tika-httpclient-commons</module>
-    <module>tika-fetchers</module>
-    <module>tika-emitters</module>
-    <module>tika-pipes-iterators</module>
-    <module>tika-pipes-reporters</module>
-    <module>tika-pipes-integration-tests</module>
+    <module>tika-pipes-reporter-commons</module>
+    <module>tika-pipes-iterator-commons</module>
+    <module>tika-pipes-plugins</module>
     <module>tika-async-cli</module>
+    <module>tika-pipes-integration-tests</module>
   </modules>
   <dependencies>
     <dependency>
diff --git a/tika-pipes/tika-async-cli/pom.xml b/tika-pipes/tika-async-cli/pom.xml
index 76b7052f9..4102f46d6 100644
--- a/tika-pipes/tika-async-cli/pom.xml
+++ b/tika-pipes/tika-async-cli/pom.xml
@@ -44,27 +44,11 @@
     <!-- tests -->
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>tika-fetcher-file-system</artifactId>
+      <artifactId>tika-pipes-file-system</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
       <type>zip</type>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>tika-emitter-file-system</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-      <type>zip</type>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>tika-pipes-iterator-file-system</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-      <type>zip</type>
-    </dependency>
-
-
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>tika-core</artifactId>
@@ -101,21 +85,7 @@
           <artifactItems>
             <artifactItem>
               <groupId>org.apache.tika</groupId>
-              <artifactId>tika-fetcher-file-system</artifactId>
-              <version>${project.version}</version>
-              <type>zip</type>
-              <overWrite>true</overWrite>
-            </artifactItem>
-            <artifactItem>
-              <groupId>org.apache.tika</groupId>
-              <artifactId>tika-emitter-file-system</artifactId>
-              <version>${project.version}</version>
-              <type>zip</type>
-              <overWrite>true</overWrite>
-            </artifactItem>
-            <artifactItem>
-              <groupId>org.apache.tika</groupId>
-              <artifactId>tika-pipes-iterator-file-system</artifactId>
+              <artifactId>tika-pipes-file-system</artifactId>
               <version>${project.version}</version>
               <type>zip</type>
               <overWrite>true</overWrite>
diff --git a/tika-pipes/tika-async-cli/src/test/resources/configs/tika-config-broken.xml b/tika-pipes/tika-async-cli/src/test/resources/configs/tika-config-broken.xml
index 5d2170c45..bd845d7e8 100644
--- a/tika-pipes/tika-async-cli/src/test/resources/configs/tika-config-broken.xml
+++ b/tika-pipes/tika-async-cli/src/test/resources/configs/tika-config-broken.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <properties>
-  <pipesIterato class="org.apache.tika.pipes.pipesiterator.fs.FileSystemPipesIterator">
+  <pipesIterato class="org.apache.tika.pipes.iterator.fs.FileSystemPipesIterator">
     <fetcheName>fs</fetcheName>
     <basePath>basePath</basePath>
   </pipesIterato>
diff --git a/tika-pipes/tika-emitters/tika-emitter-az-blob/src/main/resources/plugin.properties b/tika-pipes/tika-emitters/tika-emitter-az-blob/src/main/resources/plugin.properties
deleted file mode 100644
index b4080d9bc..000000000
--- a/tika-pipes/tika-emitters/tika-emitter-az-blob/src/main/resources/plugin.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# 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.
-
-plugin.id=az-blob-emitter
-plugin.class=org.apache.tika.pipes.emitter.azblob.AZBlobEmitterPlugin
-plugin.version=4.0.0-SNAPSHOT
-plugin.provider=Azure Blob Storage Emitter
-plugin.description=Capable of emitting to Azure Blob Storage
diff --git a/tika-pipes/tika-emitters/tika-emitter-file-system/src/main/resources/plugin.properties b/tika-pipes/tika-emitters/tika-emitter-file-system/src/main/resources/plugin.properties
deleted file mode 100644
index a85876524..000000000
--- a/tika-pipes/tika-emitters/tika-emitter-file-system/src/main/resources/plugin.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# 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.
-
-plugin.id=file-system-emitter
-plugin.class=org.apache.tika.pipes.emitter.fs.FileSystemEmitterPlugin
-plugin.version=4.0.0-SNAPSHOT
-plugin.provider=Local File System Emitter
-plugin.description=Capable of emitting the local file system
diff --git a/tika-pipes/tika-emitters/tika-emitter-gcs/src/main/java/org/apache/tika/pipes/emitter/gcs/GCSEmitterPlugin.java b/tika-pipes/tika-emitters/tika-emitter-gcs/src/main/java/org/apache/tika/pipes/emitter/gcs/GCSEmitterPlugin.java
deleted file mode 100644
index d68a718aa..000000000
--- a/tika-pipes/tika-emitters/tika-emitter-gcs/src/main/java/org/apache/tika/pipes/emitter/gcs/GCSEmitterPlugin.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tika.pipes.emitter.gcs;
-
-import org.pf4j.Plugin;
-import org.pf4j.PluginWrapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class GCSEmitterPlugin extends Plugin {
-    private static final Logger LOG = LoggerFactory.getLogger(GCSEmitterPlugin.class);
-
-    public GCSEmitterPlugin(PluginWrapper wrapper) {
-        super(wrapper);
-    }
-
-    @Override
-    public void start() {
-        LOG.info("Starting GCS Emitter Plugin");
-        super.start();
-    }
-
-    @Override
-    public void stop() {
-        LOG.info("Stopping GCS Emitter Plugin");
-        super.stop();
-    }
-
-    @Override
-    public void delete() {
-        LOG.info("Deleting GCS Emitter Plugin");
-        super.delete();
-    }
-}
diff --git a/tika-pipes/tika-emitters/tika-emitter-kafka/src/main/resources/plugin.properties b/tika-pipes/tika-emitters/tika-emitter-kafka/src/main/resources/plugin.properties
deleted file mode 100644
index 4bbbcaf33..000000000
--- a/tika-pipes/tika-emitters/tika-emitter-kafka/src/main/resources/plugin.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# 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.
-
-plugin.id=kafka-emitter
-plugin.class=org.apache.tika.pipes.emitter.kafka.KafkaEmitterPlugin
-plugin.version=4.0.0-SNAPSHOT
-plugin.provider=Apache Kafka Emitter
-plugin.description=Capable of emitting to Apache Kafka topics
diff --git a/tika-pipes/tika-emitters/tika-emitter-opensearch/src/main/resources/plugin.properties b/tika-pipes/tika-emitters/tika-emitter-opensearch/src/main/resources/plugin.properties
deleted file mode 100644
index 29ab46e97..000000000
--- a/tika-pipes/tika-emitters/tika-emitter-opensearch/src/main/resources/plugin.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# 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.
-
-plugin.id=opensearch-emitter
-plugin.class=org.apache.tika.pipes.emitter.opensearch.OpenSearchEmitterPlugin
-plugin.version=4.0.0-SNAPSHOT
-plugin.provider=OpenSearch emitter
-plugin.description=Capable of emitting to OpenSearch
diff --git a/tika-pipes/tika-fetchers/pom.xml b/tika-pipes/tika-fetchers/pom.xml
deleted file mode 100644
index 7231fc790..000000000
--- a/tika-pipes/tika-fetchers/pom.xml
+++ /dev/null
@@ -1,84 +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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <groupId>org.apache.tika</groupId>
-    <artifactId>tika-pipes</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>tika-fetchers</artifactId>
-  <name>Apache Tika fetchers</name>
-  <url>https://tika.apache.org/</url>
-  <packaging>pom</packaging>
-
-  <modules>
-    <module>tika-fetcher-file-system</module>
-    <module>tika-fetcher-http</module>
-    <module>tika-fetcher-s3</module>
-    <module>tika-fetcher-gcs</module>
-    <module>tika-fetcher-az-blob</module>
-    <module>tika-fetcher-microsoft-graph</module>
-  </modules>
-  <properties>
-    <!-- Override below properties in each plugin's pom.xml -->
-    <plugin.id/>
-    <plugin.class/>
-    <plugin.version/>
-    <plugin.provider/>
-    <plugin.dependencies/>
-  </properties>
-  <dependencies>
-    <dependency>
-      <groupId>org.pf4j</groupId>
-      <artifactId>pf4j</artifactId>
-      <!-- !!! VERY IMPORTANT -->
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tika</groupId>
-      <artifactId>tika-pipes-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tika</groupId>
-      <artifactId>tika-core</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tika</groupId>
-      <artifactId>tika-plugins-core</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j2-impl</artifactId>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-  <scm>
-    <tag>3.0.0-rc1</tag>
-  </scm>
-</project>
\ No newline at end of file
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-az-blob/pom.xml b/tika-pipes/tika-fetchers/tika-fetcher-az-blob/pom.xml
deleted file mode 100644
index 691069397..000000000
--- a/tika-pipes/tika-fetchers/tika-fetcher-az-blob/pom.xml
+++ /dev/null
@@ -1,134 +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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <artifactId>tika-fetchers</artifactId>
-    <groupId>org.apache.tika</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>tika-fetcher-az-blob</artifactId>
-  <name>Apache Tika Azure Blob fetcher</name>
-
-  <properties>
-    <!-- Never include the core artifacts in your plugin lib directory. If you do, it will cause the classloading
-     to get messed up when finding your plugins. -->
-    <plugin.excluded.artifactIds>tika-core,tika-pipes-api,tika-serialization,tika-plugins-core</plugin.excluded.artifactIds>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>tika-pipes-api</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.azure</groupId>
-      <artifactId>azure-storage-blob</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>tika-core</artifactId>
-      <version>${project.version}</version>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>tika-serialization</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </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.pipes.fetcher.azblob</Automatic-Module-Name>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>3.6.1</version>
-        <executions>
-          <execution>
-            <id>copy-dependencies</id>
-            <phase>package</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/lib</outputDirectory>
-              <includeScope>runtime</includeScope>
-              <excludeArtifactIds>${plugin.excluded.artifactIds}</excludeArtifactIds>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>3.4.2</version>
-        <configuration>
-          <archive>
-            <manifestEntries>
-              <manifestEntries>
-                <Automatic-Module-Name>org.apache.tika.pipes.fetcher.azblob</Automatic-Module-Name>
-              </manifestEntries>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/assembly.xml</descriptor>
-          </descriptors>
-          <appendAssemblyId>false</appendAssemblyId>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <scm>
-    <tag>3.0.0-rc1</tag>
-  </scm>
-</project>
\ No newline at end of file
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-az-blob/src/main/java/org/apache/tika/pipes/fetcher/azblob/AZBlobFetcherPlugin.java b/tika-pipes/tika-fetchers/tika-fetcher-az-blob/src/main/java/org/apache/tika/pipes/fetcher/azblob/AZBlobFetcherPlugin.java
deleted file mode 100644
index 384902007..000000000
--- a/tika-pipes/tika-fetchers/tika-fetcher-az-blob/src/main/java/org/apache/tika/pipes/fetcher/azblob/AZBlobFetcherPlugin.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tika.pipes.fetcher.azblob;
-
-import org.pf4j.Plugin;
-import org.pf4j.PluginWrapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class AZBlobFetcherPlugin extends Plugin {
-    private static final Logger LOG = LoggerFactory.getLogger(AZBlobFetcherPlugin.class);
-
-    public AZBlobFetcherPlugin(PluginWrapper wrapper) {
-        super(wrapper);
-    }
-
-    @Override
-    public void start() {
-        LOG.info("Starting Azure Blob Fetcher Plugin");
-        super.start();
-    }
-
-    @Override
-    public void stop() {
-        LOG.info("Stopping Azure Blob Fetcher Plugin");
-        super.stop();
-    }
-
-    @Override
-    public void delete() {
-        LOG.info("Deleting Azure Blob Fetcher Plugin");
-        super.delete();
-    }
-}
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-az-blob/src/main/resources/plugin.properties b/tika-pipes/tika-fetchers/tika-fetcher-az-blob/src/main/resources/plugin.properties
deleted file mode 100644
index 4cfb4b8f2..000000000
--- a/tika-pipes/tika-fetchers/tika-fetcher-az-blob/src/main/resources/plugin.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# 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.
-
-plugin.id=az-blob-fetcher
-plugin.class=org.apache.tika.pipes.fetcher.azblob.AZBlobFetcherPlugin
-plugin.version=4.0.0-SNAPSHOT
-plugin.provider=Azure Blob Fetcher
-plugin.description=Capable of fetching files from Azure Blob Storage
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-file-system/pom.xml b/tika-pipes/tika-fetchers/tika-fetcher-file-system/pom.xml
deleted file mode 100644
index d1facc952..000000000
--- a/tika-pipes/tika-fetchers/tika-fetcher-file-system/pom.xml
+++ /dev/null
@@ -1,125 +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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <artifactId>tika-fetchers</artifactId>
-    <groupId>org.apache.tika</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>tika-fetcher-file-system</artifactId>
-  <name>Apache Tika file system fetcher</name>
-  <properties>
-    <plugin.id>file-system-fetcher</plugin.id>
-    <plugin.class>org.apache.tika.pipes.fetcher.fs.FileSystemFetcherPlugin</plugin.class>
-    <plugin.version>4.0.0-SNAPSHOT</plugin.version>
-    <plugin.provider>Local File System Fetcher</plugin.provider>
-    <plugin.dependencies />
-    <!-- Never include the core artifacts in your plugin lib directory. If you do, it will cause the classloading
-     to get messed up when finding your plugins. -->
-    <plugin.excluded.artifactIds>tika-core,tika-pipes-api,tika-serialization,tika-plugins-core</plugin.excluded.artifactIds>
-    <plugin.excluded.groupIds>org.apache.logging.log4j,org.slf4j</plugin.excluded.groupIds>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>tika-pipes-api</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>tika-core</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>3.6.1</version>
-        <executions>
-          <execution>
-            <id>copy-dependencies</id>
-            <phase>package</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/lib</outputDirectory>
-              <includeScope>runtime</includeScope>
-              <excludeArtifactIds>${plugin.excluded.artifactIds}</excludeArtifactIds>
-              <excludeGroupIds>${plugin.excluded.groupIds}</excludeGroupIds>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>3.4.2</version>
-        <configuration>
-          <archive>
-            <manifestEntries>
-              <Automatic-Module-Name>org.apache.tika.pipes.fetcher.fs</Automatic-Module-Name>
-            </manifestEntries>
-            <manifestEntries>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/assembly.xml</descriptor>
-          </descriptors>
-          <appendAssemblyId>false</appendAssemblyId>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-        <annotationProcessors>
-          <annotationProcessor>org.pf4j.processor.ExtensionAnnotationProcessor</annotationProcessor>
-        </annotationProcessors>
-      </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <scm>
-    <tag>3.0.0-rc1</tag>
-  </scm>
-</project>
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-file-system/src/main/java/org/apache/tika/pipes/fetcher/fs/FileSystemFetcherPlugin.java b/tika-pipes/tika-fetchers/tika-fetcher-file-system/src/main/java/org/apache/tika/pipes/fetcher/fs/FileSystemFetcherPlugin.java
deleted file mode 100644
index f6a457e0a..000000000
--- a/tika-pipes/tika-fetchers/tika-fetcher-file-system/src/main/java/org/apache/tika/pipes/fetcher/fs/FileSystemFetcherPlugin.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tika.pipes.fetcher.fs;
-
-import org.pf4j.Plugin;
-import org.pf4j.PluginWrapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class FileSystemFetcherPlugin extends Plugin {
-    private static final Logger LOG = LoggerFactory.getLogger(FileSystemFetcherPlugin.class);
-
-    public FileSystemFetcherPlugin(PluginWrapper wrapper) {
-        super(wrapper);
-    }
-
-    @Override
-    public void start() {
-        LOG.info("Starting");
-        super.start();
-    }
-
-    @Override
-    public void stop() {
-        LOG.info("Stopping");
-        super.stop();
-    }
-
-    @Override
-    public void delete() {
-        LOG.info("Deleting");
-        super.delete();
-    }
-
-}
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-file-system/src/main/resources/plugin.properties b/tika-pipes/tika-fetchers/tika-fetcher-file-system/src/main/resources/plugin.properties
deleted file mode 100644
index a317ce137..000000000
--- a/tika-pipes/tika-fetchers/tika-fetcher-file-system/src/main/resources/plugin.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# 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.
-
-plugin.id=file-system-fetcher
-plugin.class=org.apache.tika.pipes.fetcher.fs.FileSystemFetcherPlugin
-plugin.version=4.0.0-SNAPSHOT
-plugin.provider=Local File System Fetcher
-plugin.description=Capable of emitting the local file system
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-gcs/pom.xml b/tika-pipes/tika-fetchers/tika-fetcher-gcs/pom.xml
deleted file mode 100644
index e4befeef3..000000000
--- a/tika-pipes/tika-fetchers/tika-fetcher-gcs/pom.xml
+++ /dev/null
@@ -1,75 +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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>tika-fetchers</artifactId>
-        <groupId>org.apache.tika</groupId>
-        <version>4.0.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>tika-fetcher-gcs</artifactId>
-    <name>Apache Tika Google Cloud Storage fetcher</name>
-
-    <properties>
-        <!-- Never include the core artifacts in your plugin lib directory. If you do, it will cause the classloading
-         to get messed up when finding your plugins. -->
-        <plugin.excluded.artifactIds>tika-core,tika-pipes-api,tika-serialization,tika-plugins-core</plugin.excluded.artifactIds>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>tika-pipes-api</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>tika-core</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.google.cloud</groupId>
-            <artifactId>google-cloud-storage</artifactId>
-        </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.pipes.fetcher.gcs</Automatic-Module-Name>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-  <scm>
-    <tag>3.0.0-rc1</tag>
-  </scm>
-</project>
\ No newline at end of file
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-gcs/src/test/resources/tika-config-gcs.xml b/tika-pipes/tika-fetchers/tika-fetcher-gcs/src/test/resources/tika-config-gcs.xml
deleted file mode 100644
index 7e9ba6817..000000000
--- a/tika-pipes/tika-fetchers/tika-fetcher-gcs/src/test/resources/tika-config-gcs.xml
+++ /dev/null
@@ -1,26 +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.
--->
-<properties>
-  <fetchers>
-    <fetcher class="org.apache.tika.pipes.fetcher.gcs.GCSFetcher">
-      <name>gcs</name>
-      <projectId>My First Project</projectId>
-      <bucket>tika-tallison-test-bucket</bucket>
-    </fetcher>
-  </fetchers>
-</properties>
\ No newline at end of file
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-microsoft-graph/src/main/assembly/assembly.xml b/tika-pipes/tika-fetchers/tika-fetcher-microsoft-graph/src/main/assembly/assembly.xml
deleted file mode 100644
index ea0f8b4a1..000000000
--- a/tika-pipes/tika-fetchers/tika-fetcher-microsoft-graph/src/main/assembly/assembly.xml
+++ /dev/null
@@ -1,55 +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.
--->
-<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
-          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0
-                              http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-  <id>dependencies-zip</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <directory>${project.build.directory}/lib</directory>
-      <outputDirectory>/lib</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.directory}</directory>
-      <outputDirectory>/lib</outputDirectory>
-      <includes>
-        <include>${project.artifactId}-${project.version}.jar</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.directory}</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>classes/META-INF/extensions.idx</include>
-        <include>classes/META-INF/MANIFEST.MF</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.basedir}/src/main/resources</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>plugin.properties</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</assembly>
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-microsoft-graph/src/main/resources/plugin.properties b/tika-pipes/tika-fetchers/tika-fetcher-microsoft-graph/src/main/resources/plugin.properties
deleted file mode 100644
index e098a475b..000000000
--- a/tika-pipes/tika-fetchers/tika-fetcher-microsoft-graph/src/main/resources/plugin.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# 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.
-
-plugin.id=microsoft-graph-fetcher
-plugin.class=org.apache.tika.pipes.fetchers.microsoftgraph.MicrosoftGraphFetcherPlugin
-plugin.version=4.0.0-SNAPSHOT
-plugin.provider=Microsoft Graph Fetcher
-plugin.description=Capable of fetching files from Microsoft Graph API
-
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-s3/pom.xml b/tika-pipes/tika-fetchers/tika-fetcher-s3/pom.xml
deleted file mode 100644
index 1b5a333da..000000000
--- a/tika-pipes/tika-fetchers/tika-fetcher-s3/pom.xml
+++ /dev/null
@@ -1,132 +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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <artifactId>tika-fetchers</artifactId>
-    <groupId>org.apache.tika</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>tika-fetcher-s3</artifactId>
-  <name>Apache Tika S3 fetcher</name>
-
-  <properties>
-    <plugin.excluded.artifactIds>tika-core,tika-pipes-api,tika-serialization,tika-plugins-core
-    </plugin.excluded.artifactIds>
-    <plugin.excluded.groupIds>org.apache.logging.log4j,org.slf4j</plugin.excluded.groupIds>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j2-impl</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>tika-pipes-api</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>tika-core</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>software.amazon.awssdk</groupId>
-      <artifactId>s3</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>software.amazon.awssdk</groupId>
-      <artifactId>apache-client</artifactId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>3.6.1</version>
-        <executions>
-          <execution>
-            <id>copy-dependencies</id>
-            <phase>package</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/lib</outputDirectory>
-              <includeScope>runtime</includeScope>
-              <excludeArtifactIds>${plugin.excluded.artifactIds}</excludeArtifactIds>
-              <excludeGroupIds>${plugin.excluded.groupIds}</excludeGroupIds>
-            </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.pipes.fetcher.s3</Automatic-Module-Name>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/assembly.xml</descriptor>
-          </descriptors>
-          <appendAssemblyId>false</appendAssemblyId>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <annotationProcessors>
-            <annotationProcessor>org.pf4j.processor.ExtensionAnnotationProcessor</annotationProcessor>
-          </annotationProcessors>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <scm>
-    <tag>3.0.0-rc1</tag>
-  </scm>
-</project>
\ No newline at end of file
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-s3/src/main/assembly/assembly.xml b/tika-pipes/tika-fetchers/tika-fetcher-s3/src/main/assembly/assembly.xml
deleted file mode 100644
index ea0f8b4a1..000000000
--- a/tika-pipes/tika-fetchers/tika-fetcher-s3/src/main/assembly/assembly.xml
+++ /dev/null
@@ -1,55 +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.
--->
-<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
-          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0
-                              http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-  <id>dependencies-zip</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <directory>${project.build.directory}/lib</directory>
-      <outputDirectory>/lib</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.directory}</directory>
-      <outputDirectory>/lib</outputDirectory>
-      <includes>
-        <include>${project.artifactId}-${project.version}.jar</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.directory}</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>classes/META-INF/extensions.idx</include>
-        <include>classes/META-INF/MANIFEST.MF</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.basedir}/src/main/resources</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>plugin.properties</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</assembly>
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-s3/src/main/java/org/apache/tika/pipes/fetcher/s3/S3FetcherPlugin.java b/tika-pipes/tika-fetchers/tika-fetcher-s3/src/main/java/org/apache/tika/pipes/fetcher/s3/S3FetcherPlugin.java
deleted file mode 100644
index c9ec0a5db..000000000
--- a/tika-pipes/tika-fetchers/tika-fetcher-s3/src/main/java/org/apache/tika/pipes/fetcher/s3/S3FetcherPlugin.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tika.pipes.fetcher.s3;
-
-import org.pf4j.Plugin;
-import org.pf4j.PluginWrapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class S3FetcherPlugin extends Plugin {
-    private static final Logger LOG = LoggerFactory.getLogger(S3FetcherPlugin.class);
-
-    public S3FetcherPlugin(PluginWrapper wrapper) {
-        super(wrapper);
-    }
-
-    @Override
-    public void start() {
-        LOG.info("Starting S3 Fetcher Plugin");
-        super.start();
-    }
-
-    @Override
-    public void stop() {
-        LOG.info("Stopping S3 Fetcher Plugin");
-        super.stop();
-    }
-
-    @Override
-    public void delete() {
-        LOG.info("Deleting S3 Fetcher Plugin");
-        super.delete();
-    }
-}
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-s3/src/test/resources/tika-config-s3.xml b/tika-pipes/tika-fetchers/tika-fetcher-s3/src/test/resources/tika-config-s3.xml
deleted file mode 100644
index aa3166536..000000000
--- a/tika-pipes/tika-fetchers/tika-fetcher-s3/src/test/resources/tika-config-s3.xml
+++ /dev/null
@@ -1,27 +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.
--->
-<properties>
-  <fetchers>
-    <fetcher class="org.apache.tika.pipes.fetcher.s3.S3Fetcher">
-      <name>s3</name>
-      <region>us-east-1</region>
-      <profile>my_profile</profile>
-      <credentialsProvider>profile</credentialsProvider>
-    </fetcher>
-  </fetchers>
-</properties>
\ No newline at end of file
diff --git a/tika-pipes/tika-httpclient-commons/pom.xml b/tika-pipes/tika-httpclient-commons/pom.xml
index d59ad985e..3a86354a5 100644
--- a/tika-pipes/tika-httpclient-commons/pom.xml
+++ b/tika-pipes/tika-httpclient-commons/pom.xml
@@ -22,7 +22,6 @@
     <artifactId>tika-pipes</artifactId>
     <groupId>org.apache.tika</groupId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/tika-pipes/tika-pipes-core/src/test/resources/configs/tika-config-broken.xml b/tika-pipes/tika-pipes-core/src/test/resources/configs/tika-config-broken.xml
index 112f40725..e56fedc70 100644
--- a/tika-pipes/tika-pipes-core/src/test/resources/configs/tika-config-broken.xml
+++ b/tika-pipes/tika-pipes-core/src/test/resources/configs/tika-config-broken.xml
@@ -25,7 +25,7 @@
       <profile><!-- fill in here --></profile>
     </fetcher>
   </fetchers>
-  <pipesIterator class="org.apache.tika.pipes.pipesiterator.fs.FileSystemPipesIterator">
+  <pipesIterator class="org.apache.tika.pipes.iterator.fs.FileSystemPipesIterator">
     <fetcherId>fs</fetcherId>
     <basePath>basePath</basePath>
   </pipesIterator>
diff --git a/tika-pipes/tika-pipes-core/src/test/resources/org/apache/tika/config/pipes-iterator-config.xml b/tika-pipes/tika-pipes-core/src/test/resources/org/apache/tika/config/pipes-iterator-config.xml
index b613ca631..9ff4e1d53 100644
--- a/tika-pipes/tika-pipes-core/src/test/resources/org/apache/tika/config/pipes-iterator-config.xml
+++ b/tika-pipes/tika-pipes-core/src/test/resources/org/apache/tika/config/pipes-iterator-config.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <properties>
-  <pipesIterator class="org.apache.tika.pipes.pipesiterator.fs.FileSystemPipesIterator">
+  <pipesIterator class="org.apache.tika.pipes.iterator.fs.FileSystemPipesIterator">
     <params>
       <fetcherId>fsf1</fetcherId>
       <emitterId>fse1</emitterId>
diff --git a/tika-pipes/tika-pipes-core/src/test/resources/org/apache/tika/config/pipes-iterator-multiple-config.xml b/tika-pipes/tika-pipes-core/src/test/resources/org/apache/tika/config/pipes-iterator-multiple-config.xml
index 1fdc64ccd..fc23cdaa8 100644
--- a/tika-pipes/tika-pipes-core/src/test/resources/org/apache/tika/config/pipes-iterator-multiple-config.xml
+++ b/tika-pipes/tika-pipes-core/src/test/resources/org/apache/tika/config/pipes-iterator-multiple-config.xml
@@ -16,14 +16,14 @@
   limitations under the License.
 -->
 <properties>
-  <pipesIterator class="org.apache.tika.pipes.pipesiterator.fs.FileSystemPipesIterator">
+  <pipesIterator class="org.apache.tika.pipes.iterator.fs.FileSystemPipesIterator">
     <params>
       <fetcherId>fsf1</fetcherId>
       <emitterId>fse1</emitterId>
       <basePath>/my/base/path1</basePath>
     </params>
   </pipesIterator>
-  <pipesIterator class="org.apache.tika.pipes.pipesiterator.fs.FileSystemPipesIterator">
+  <pipesIterator class="org.apache.tika.pipes.iterator.fs.FileSystemPipesIterator">
     <params>
       <fetcherId>fsf2</fetcherId>
       <emitterId>fse2</emitterId>
diff --git a/tika-pipes/tika-pipes-integration-tests/pom.xml b/tika-pipes/tika-pipes-integration-tests/pom.xml
index 3f2c89588..f1b987ddc 100644
--- a/tika-pipes/tika-pipes-integration-tests/pom.xml
+++ b/tika-pipes/tika-pipes-integration-tests/pom.xml
@@ -96,21 +96,7 @@
               <artifactItems>
                 <artifactItem>
                   <groupId>org.apache.tika</groupId>
-                  <artifactId>tika-fetcher-file-system</artifactId>
-                  <version>${project.version}</version>
-                  <type>zip</type>
-                  <overWrite>true</overWrite>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>org.apache.tika</groupId>
-                  <artifactId>tika-emitter-file-system</artifactId>
-                  <version>${project.version}</version>
-                  <type>zip</type>
-                  <overWrite>true</overWrite>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>org.apache.tika</groupId>
-                  <artifactId>tika-fetcher-http</artifactId>
+                  <artifactId>tika-pipes-file-system</artifactId>
                   <version>${project.version}</version>
                   <type>zip</type>
                   <overWrite>true</overWrite>
diff --git a/tika-pipes/tika-pipes-integration-tests/src/test/resources/configs/tika-config-broken.xml b/tika-pipes/tika-pipes-integration-tests/src/test/resources/configs/tika-config-broken.xml
index 5ee379e6f..0999d638a 100644
--- a/tika-pipes/tika-pipes-integration-tests/src/test/resources/configs/tika-config-broken.xml
+++ b/tika-pipes/tika-pipes-integration-tests/src/test/resources/configs/tika-config-broken.xml
@@ -25,7 +25,7 @@
       <profile><!-- fill in here --></profile>
     </fetcher>
   </fetchers>
-  <pipesIterator class="org.apache.tika.pipes.pipesiterator.fs.FileSystemPipesIterator">
+  <pipesIterator class="org.apache.tika.pipes.iterator.fs.FileSystemPipesIterator">
     <fetcherName>fs</fetcherName>
     <basePath>basePath</basePath>
   </pipesIterator>
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-commons/pom.xml b/tika-pipes/tika-pipes-iterator-commons/pom.xml
similarity index 66%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-commons/pom.xml
rename to tika-pipes/tika-pipes-iterator-commons/pom.xml
index 30b2cfa7e..dac49830d 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-commons/pom.xml
+++ b/tika-pipes/tika-pipes-iterator-commons/pom.xml
@@ -20,9 +20,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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.apache.tika</groupId>
-    <artifactId>tika-pipes-iterators</artifactId>
+    <artifactId>tika-pipes</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -31,4 +30,25 @@
   <name>Apache Tika Pipes iterators - base</name>
   <url>https://tika.apache.org/</url>
 
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>tika-core</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>tika-pipes-api</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>tika-plugins-core</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+
+  </dependencies>
 </project>
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-commons/src/main/java/org/apache/tika/pipes/pipesiterator/PipesIteratorBase.java b/tika-pipes/tika-pipes-iterator-commons/src/main/java/org/apache/tika/pipes/pipesiterator/PipesIteratorBase.java
similarity index 100%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-commons/src/main/java/org/apache/tika/pipes/pipesiterator/PipesIteratorBase.java
rename to tika-pipes/tika-pipes-iterator-commons/src/main/java/org/apache/tika/pipes/pipesiterator/PipesIteratorBase.java
diff --git a/tika-pipes/tika-pipes-iterators/pom.xml b/tika-pipes/tika-pipes-iterators/pom.xml
deleted file mode 100644
index 5e4c80b5a..000000000
--- a/tika-pipes/tika-pipes-iterators/pom.xml
+++ /dev/null
@@ -1,104 +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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <groupId>org.apache.tika</groupId>
-    <artifactId>tika-pipes</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>tika-pipes-iterators</artifactId>
-  <name>Apache Tika Pipes Iterators</name>
-  <url>https://tika.apache.org/</url>
-  <packaging>pom</packaging>
-
-  <!-- see also org.apache.tika.pipes.pipesiterator.fs.FileSystemIterator
-       in tika-core if you want a file system directory crawler -->
-  <modules>
-    <module>tika-pipes-iterator-commons</module>
-    <module>tika-pipes-iterator-file-system</module>
-    <module>tika-pipes-iterator-csv</module>
-    <module>tika-pipes-iterator-json</module>
-    <module>tika-pipes-iterator-jdbc</module>
-    <module>tika-pipes-iterator-s3</module>
-    <module>tika-pipes-iterator-kafka</module>
-    <module>tika-pipes-iterator-solr</module>
-    <module>tika-pipes-iterator-gcs</module>
-    <module>tika-pipes-iterator-az-blob</module>
-  </modules>
-
-  <properties>
-    <!-- Override below properties in each plugin's pom.xml -->
-    <plugin.id/>
-    <plugin.class/>
-    <plugin.version/>
-    <plugin.provider/>
-    <plugin.dependencies/>
-  </properties>
-  <dependencies>
-    <dependency>
-      <groupId>org.pf4j</groupId>
-      <artifactId>pf4j</artifactId>
-      <!-- !!! VERY IMPORTANT -->
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tika</groupId>
-      <artifactId>tika-pipes-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tika</groupId>
-      <artifactId>tika-core</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tika</groupId>
-      <artifactId>tika-plugins-core</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j2-impl</artifactId>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.rat</groupId>
-        <artifactId>apache-rat-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>tika-pipes-iterator-csv/src/test/resources/test-simple.csv</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <scm>
-    <tag>3.0.0-rc1</tag>
-  </scm>
-</project>
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-az-blob/pom.xml b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-az-blob/pom.xml
deleted file mode 100644
index 47d9682ff..000000000
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-az-blob/pom.xml
+++ /dev/null
@@ -1,115 +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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <groupId>org.apache.tika</groupId>
-    <artifactId>tika-pipes-iterators</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>tika-pipes-iterator-az-blob</artifactId>
-
-  <name>Apache Tika Pipes Iterator - Azure Blob Storage</name>
-  <url>https://tika.apache.org/</url>
-  <properties>
-    <plugin.excluded.artifactIds>tika-core,tika-pipes-api,tika-serialization,tika-plugins-core,tika-pipes-iterator-commons</plugin.excluded.artifactIds>
-    <plugin.excluded.groupIds>org.apache.logging.log4j,org.slf4j</plugin.excluded.groupIds>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>tika-pipes-iterator-commons</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.azure</groupId>
-      <artifactId>azure-storage-blob</artifactId>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>3.6.1</version>
-        <executions>
-          <execution>
-            <id>copy-dependencies</id>
-            <phase>package</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/lib</outputDirectory>
-              <includeScope>runtime</includeScope>
-              <excludeArtifactIds>${plugin.excluded.artifactIds}</excludeArtifactIds>
-              <excludeGroupIds>${plugin.excluded.groupIds}</excludeGroupIds>
-            </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.pipes.fetcher.azblob</Automatic-Module-Name>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/assembly.xml</descriptor>
-          </descriptors>
-          <appendAssemblyId>false</appendAssemblyId>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <annotationProcessors>
-            <annotationProcessor>org.pf4j.processor.ExtensionAnnotationProcessor</annotationProcessor>
-          </annotationProcessors>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <scm>
-    <tag>3.0.0-rc1</tag>
-  </scm>
-</project>
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-az-blob/src/main/assembly/assembly.xml b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-az-blob/src/main/assembly/assembly.xml
deleted file mode 100644
index ea0f8b4a1..000000000
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-az-blob/src/main/assembly/assembly.xml
+++ /dev/null
@@ -1,55 +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.
--->
-<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
-          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0
-                              http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-  <id>dependencies-zip</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <directory>${project.build.directory}/lib</directory>
-      <outputDirectory>/lib</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.directory}</directory>
-      <outputDirectory>/lib</outputDirectory>
-      <includes>
-        <include>${project.artifactId}-${project.version}.jar</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.directory}</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>classes/META-INF/extensions.idx</include>
-        <include>classes/META-INF/MANIFEST.MF</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.basedir}/src/main/resources</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>plugin.properties</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</assembly>
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-az-blob/src/main/java/org/apache/tika/pipes/pipesiterator/azblob/AZBlobPipesIteratorPlugin.java b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-az-blob/src/main/java/org/apache/tika/pipes/pipesiterator/azblob/AZBlobPipesIteratorPlugin.java
deleted file mode 100644
index af350c26c..000000000
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-az-blob/src/main/java/org/apache/tika/pipes/pipesiterator/azblob/AZBlobPipesIteratorPlugin.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tika.pipes.pipesiterator.azblob;
-
-import org.pf4j.Plugin;
-import org.pf4j.PluginWrapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class AZBlobPipesIteratorPlugin extends Plugin {
-    private static final Logger LOG = LoggerFactory.getLogger(AZBlobPipesIteratorPlugin.class);
-
-    public AZBlobPipesIteratorPlugin(PluginWrapper wrapper) {
-        super(wrapper);
-    }
-
-    @Override
-    public void start() {
-        LOG.info("Starting Azure Blob Pipes Iterator Plugin");
-        super.start();
-    }
-
-    @Override
-    public void stop() {
-        LOG.info("Stopping Azure Blob Pipes Iterator Plugin");
-        super.stop();
-    }
-
-    @Override
-    public void delete() {
-        LOG.info("Deleting Azure Blob Pipes Iterator Plugin");
-        super.delete();
-    }
-}
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-az-blob/src/main/resources/plugin.properties b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-az-blob/src/main/resources/plugin.properties
deleted file mode 100644
index acb245b1e..000000000
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-az-blob/src/main/resources/plugin.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# 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.
-
-plugin.id=az-blob-pipes-iterator
-plugin.class=org.apache.tika.pipes.pipesiterator.azblob.AZBlobPipesIteratorPlugin
-plugin.version=4.0.0-SNAPSHOT
-plugin.provider=Azure Blob Storage Pipes Iterator
-plugin.description=Capable of iterating over Azure Blob Storage containers
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/src/main/assembly/assembly.xml b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/src/main/assembly/assembly.xml
deleted file mode 100644
index ea0f8b4a1..000000000
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/src/main/assembly/assembly.xml
+++ /dev/null
@@ -1,55 +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.
--->
-<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
-          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0
-                              http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-  <id>dependencies-zip</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <directory>${project.build.directory}/lib</directory>
-      <outputDirectory>/lib</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.directory}</directory>
-      <outputDirectory>/lib</outputDirectory>
-      <includes>
-        <include>${project.artifactId}-${project.version}.jar</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.directory}</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>classes/META-INF/extensions.idx</include>
-        <include>classes/META-INF/MANIFEST.MF</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.basedir}/src/main/resources</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>plugin.properties</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</assembly>
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/src/main/resources/plugin.properties b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/src/main/resources/plugin.properties
deleted file mode 100644
index c5d3f6411..000000000
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/src/main/resources/plugin.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# 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.
-
-plugin.id=csv-pipes-iterator
-plugin.class=org.apache.tika.pipes.pipesiterator.csv.CSVPipesIteratorPlugin
-plugin.version=4.0.0-SNAPSHOT
-plugin.provider=CSV Pipes Iterator
-plugin.description=Capable of iterating over CSV files
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-file-system/pom.xml b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-file-system/pom.xml
deleted file mode 100644
index 7571857fc..000000000
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-file-system/pom.xml
+++ /dev/null
@@ -1,119 +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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <groupId>org.apache.tika</groupId>
-    <artifactId>tika-pipes-iterators</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>tika-pipes-iterator-file-system</artifactId>
-
-  <name>Apache Tika Pipes Iterator - file system</name>
-  <url>https://tika.apache.org/</url>
-  <properties>
-    <plugin.id>file-system-pipes-iterator</plugin.id>
-    <plugin.class>org.apache.tika.pipes.pipesiterator.fs.FileSystemPipesIteratorPlugin</plugin.class>
-    <plugin.version>4.0.0-SNAPSHOT</plugin.version>
-    <plugin.provider>File system pipes iterator</plugin.provider>
-    <plugin.dependencies />
-    <!-- Never include the core artifacts in your plugin lib directory. If you do, it will cause the classloading
-     to get messed up when finding your plugins. -->
-    <plugin.excluded.artifactIds>tika-core,tika-pipes-api,tika-serialization,tika-plugins-core,tika-pipes-iterator-commons</plugin.excluded.artifactIds>
-    <plugin.excluded.groupIds>org.apache.logging.log4j,org.slf4j</plugin.excluded.groupIds>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>tika-pipes-iterator-commons</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>3.6.1</version>
-        <executions>
-          <execution>
-            <id>copy-dependencies</id>
-            <phase>package</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/lib</outputDirectory>
-              <includeScope>runtime</includeScope>
-              <excludeArtifactIds>${plugin.excluded.artifactIds}</excludeArtifactIds>
-              <excludeGroupIds>${plugin.excluded.groupIds}</excludeGroupIds>
-            </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.pipes.pipesiterator.fs</Automatic-Module-Name>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/assembly.xml</descriptor>
-          </descriptors>
-          <appendAssemblyId>false</appendAssemblyId>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <annotationProcessors>
-            <annotationProcessor>org.pf4j.processor.ExtensionAnnotationProcessor</annotationProcessor>
-          </annotationProcessors>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <scm>
-    <tag>3.0.0-rc1</tag>
-  </scm>
-</project>
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-file-system/src/main/assembly/assembly.xml b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-file-system/src/main/assembly/assembly.xml
deleted file mode 100644
index ea0f8b4a1..000000000
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-file-system/src/main/assembly/assembly.xml
+++ /dev/null
@@ -1,55 +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.
--->
-<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
-          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0
-                              http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-  <id>dependencies-zip</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <directory>${project.build.directory}/lib</directory>
-      <outputDirectory>/lib</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.directory}</directory>
-      <outputDirectory>/lib</outputDirectory>
-      <includes>
-        <include>${project.artifactId}-${project.version}.jar</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.directory}</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>classes/META-INF/extensions.idx</include>
-        <include>classes/META-INF/MANIFEST.MF</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.basedir}/src/main/resources</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>plugin.properties</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</assembly>
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-file-system/src/main/java/org/apache/tika/pipes/pipesiterator/fs/FileSystemPipesIteratorPlugin.java b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-file-system/src/main/java/org/apache/tika/pipes/pipesiterator/fs/FileSystemPipesIteratorPlugin.java
deleted file mode 100644
index 486def5a9..000000000
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-file-system/src/main/java/org/apache/tika/pipes/pipesiterator/fs/FileSystemPipesIteratorPlugin.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tika.pipes.pipesiterator.fs;
-
-import org.pf4j.Plugin;
-import org.pf4j.PluginWrapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class FileSystemPipesIteratorPlugin extends Plugin {
-    private static final Logger LOG = LoggerFactory.getLogger(FileSystemPipesIteratorPlugin.class);
-
-    public FileSystemPipesIteratorPlugin(PluginWrapper wrapper) {
-        super(wrapper);
-    }
-
-    @Override
-    public void start() {
-        LOG.info("Starting");
-        super.start();
-    }
-
-    @Override
-    public void stop() {
-        LOG.info("Stopping");
-        super.stop();
-    }
-
-    @Override
-    public void delete() {
-        LOG.info("Deleting");
-        super.delete();
-    }
-
-}
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-file-system/src/main/resources/plugin.properties b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-file-system/src/main/resources/plugin.properties
deleted file mode 100644
index 71c66a751..000000000
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-file-system/src/main/resources/plugin.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# 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.
-
-plugin.id=file-system-pipes-iterator
-plugin.class=org.apache.tika.pipes.pipesiterator.fs.FileSystemPipesIteratorPlugin
-plugin.version=4.0.0-SNAPSHOT
-plugin.provider=Local File System Fetcher
-plugin.description=Capable of emitting the local file system
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-gcs/pom.xml b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-gcs/pom.xml
deleted file mode 100644
index b182d2f75..000000000
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-gcs/pom.xml
+++ /dev/null
@@ -1,115 +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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <groupId>org.apache.tika</groupId>
-    <artifactId>tika-pipes-iterators</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>tika-pipes-iterator-gcs</artifactId>
-
-  <name>Apache Tika Pipes Iterator - Google Cloud Storage</name>
-  <url>https://tika.apache.org/</url>
-  <properties>
-    <plugin.excluded.artifactIds>tika-core,tika-pipes-api,tika-serialization,tika-plugins-core,tika-pipes-iterator-commons</plugin.excluded.artifactIds>
-    <plugin.excluded.groupIds>org.apache.logging.log4j,org.slf4j</plugin.excluded.groupIds>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>tika-pipes-iterator-commons</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.cloud</groupId>
-      <artifactId>google-cloud-storage</artifactId>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>3.6.1</version>
-        <executions>
-          <execution>
-            <id>copy-dependencies</id>
-            <phase>package</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/lib</outputDirectory>
-              <includeScope>runtime</includeScope>
-              <excludeArtifactIds>${plugin.excluded.artifactIds}</excludeArtifactIds>
-              <excludeGroupIds>${plugin.excluded.groupIds}</excludeGroupIds>
-            </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.pipes.pipesiterator.gcs</Automatic-Module-Name>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/assembly.xml</descriptor>
-          </descriptors>
-          <appendAssemblyId>false</appendAssemblyId>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <annotationProcessors>
-            <annotationProcessor>org.pf4j.processor.ExtensionAnnotationProcessor</annotationProcessor>
-          </annotationProcessors>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <scm>
-    <tag>3.0.0-rc1</tag>
-  </scm>
-</project>
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-gcs/src/main/assembly/assembly.xml b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-gcs/src/main/assembly/assembly.xml
deleted file mode 100644
index ea0f8b4a1..000000000
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-gcs/src/main/assembly/assembly.xml
+++ /dev/null
@@ -1,55 +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.
--->
-<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
-          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0
-                              http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-  <id>dependencies-zip</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <directory>${project.build.directory}/lib</directory>
-      <outputDirectory>/lib</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.directory}</directory>
-      <outputDirectory>/lib</outputDirectory>
-      <includes>
-        <include>${project.artifactId}-${project.version}.jar</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.directory}</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>classes/META-INF/extensions.idx</include>
-        <include>classes/META-INF/MANIFEST.MF</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.basedir}/src/main/resources</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>plugin.properties</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</assembly>
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-gcs/src/main/java/org/apache/tika/pipes/pipesiterator/gcs/GCSPipesIteratorPlugin.java b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-gcs/src/main/java/org/apache/tika/pipes/pipesiterator/gcs/GCSPipesIteratorPlugin.java
deleted file mode 100644
index cedab6017..000000000
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-gcs/src/main/java/org/apache/tika/pipes/pipesiterator/gcs/GCSPipesIteratorPlugin.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tika.pipes.pipesiterator.gcs;
-
-import org.pf4j.Plugin;
-import org.pf4j.PluginWrapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class GCSPipesIteratorPlugin extends Plugin {
-    private static final Logger LOG = LoggerFactory.getLogger(GCSPipesIteratorPlugin.class);
-
-    public GCSPipesIteratorPlugin(PluginWrapper wrapper) {
-        super(wrapper);
-    }
-
-    @Override
-    public void start() {
-        LOG.info("Starting GCS Pipes Iterator Plugin");
-        super.start();
-    }
-
-    @Override
-    public void stop() {
-        LOG.info("Stopping GCS Pipes Iterator Plugin");
-        super.stop();
-    }
-
-    @Override
-    public void delete() {
-        LOG.info("Deleting GCS Pipes Iterator Plugin");
-        super.delete();
-    }
-}
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-gcs/src/main/resources/plugin.properties b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-gcs/src/main/resources/plugin.properties
deleted file mode 100644
index d0338d830..000000000
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-gcs/src/main/resources/plugin.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# 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.
-
-plugin.id=gcs-pipes-iterator
-plugin.class=org.apache.tika.pipes.pipesiterator.gcs.GCSPipesIteratorPlugin
-plugin.version=4.0.0-SNAPSHOT
-plugin.provider=GCS Pipes Iterator
-plugin.description=Capable of iterating over Google Cloud Storage buckets
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/pom.xml b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/pom.xml
deleted file mode 100644
index 40d22cc11..000000000
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/pom.xml
+++ /dev/null
@@ -1,116 +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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <groupId>org.apache.tika</groupId>
-    <artifactId>tika-pipes-iterators</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>tika-pipes-iterator-jdbc</artifactId>
-
-  <name>Apache Tika Pipes Iterator - JDBC</name>
-  <url>https://tika.apache.org/</url>
-  <properties>
-    <plugin.excluded.artifactIds>tika-core,tika-pipes-api,tika-serialization,tika-plugins-core,tika-pipes-iterator-commons</plugin.excluded.artifactIds>
-    <plugin.excluded.groupIds>org.apache.logging.log4j,org.slf4j</plugin.excluded.groupIds>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>tika-pipes-iterator-commons</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.h2database</groupId>
-      <artifactId>h2</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>3.6.1</version>
-        <executions>
-          <execution>
-            <id>copy-dependencies</id>
-            <phase>package</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/lib</outputDirectory>
-              <includeScope>runtime</includeScope>
-              <excludeArtifactIds>${plugin.excluded.artifactIds}</excludeArtifactIds>
-              <excludeGroupIds>${plugin.excluded.groupIds}</excludeGroupIds>
-            </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.pipes.pipesiterator.jdbc</Automatic-Module-Name>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/assembly.xml</descriptor>
-          </descriptors>
-          <appendAssemblyId>false</appendAssemblyId>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <annotationProcessors>
-            <annotationProcessor>org.pf4j.processor.ExtensionAnnotationProcessor</annotationProcessor>
-          </annotationProcessors>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <scm>
-    <tag>3.0.0-rc1</tag>
-  </scm>
-</project>
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/src/main/assembly/assembly.xml b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/src/main/assembly/assembly.xml
deleted file mode 100644
index ea0f8b4a1..000000000
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/src/main/assembly/assembly.xml
+++ /dev/null
@@ -1,55 +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.
--->
-<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
-          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0
-                              http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-  <id>dependencies-zip</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <directory>${project.build.directory}/lib</directory>
-      <outputDirectory>/lib</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.directory}</directory>
-      <outputDirectory>/lib</outputDirectory>
-      <includes>
-        <include>${project.artifactId}-${project.version}.jar</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.directory}</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>classes/META-INF/extensions.idx</include>
-        <include>classes/META-INF/MANIFEST.MF</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.basedir}/src/main/resources</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>plugin.properties</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</assembly>
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/src/main/java/org/apache/tika/pipes/pipesiterator/jdbc/JDBCPipesIteratorPlugin.java b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/src/main/java/org/apache/tika/pipes/pipesiterator/jdbc/JDBCPipesIteratorPlugin.java
deleted file mode 100644
index 0635550da..000000000
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/src/main/java/org/apache/tika/pipes/pipesiterator/jdbc/JDBCPipesIteratorPlugin.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tika.pipes.pipesiterator.jdbc;
-
-import org.pf4j.Plugin;
-import org.pf4j.PluginWrapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class JDBCPipesIteratorPlugin extends Plugin {
-    private static final Logger LOG = LoggerFactory.getLogger(JDBCPipesIteratorPlugin.class);
-
-    public JDBCPipesIteratorPlugin(PluginWrapper wrapper) {
-        super(wrapper);
-    }
-
-    @Override
-    public void start() {
-        LOG.info("Starting JDBC Pipes Iterator Plugin");
-        super.start();
-    }
-
-    @Override
-    public void stop() {
-        LOG.info("Stopping JDBC Pipes Iterator Plugin");
-        super.stop();
-    }
-
-    @Override
-    public void delete() {
-        LOG.info("Deleting JDBC Pipes Iterator Plugin");
-        super.delete();
-    }
-}
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/src/main/resources/plugin.properties b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/src/main/resources/plugin.properties
deleted file mode 100644
index 0aac1b93a..000000000
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/src/main/resources/plugin.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# 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.
-
-plugin.id=jdbc-pipes-iterator
-plugin.class=org.apache.tika.pipes.pipesiterator.jdbc.JDBCPipesIteratorPlugin
-plugin.version=4.0.0-SNAPSHOT
-plugin.provider=JDBC Pipes Iterator
-plugin.description=Capable of iterating over JDBC result sets
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-json/src/main/assembly/assembly.xml b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-json/src/main/assembly/assembly.xml
deleted file mode 100644
index ea0f8b4a1..000000000
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-json/src/main/assembly/assembly.xml
+++ /dev/null
@@ -1,55 +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.
--->
-<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
-          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0
-                              http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-  <id>dependencies-zip</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <directory>${project.build.directory}/lib</directory>
-      <outputDirectory>/lib</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.directory}</directory>
-      <outputDirectory>/lib</outputDirectory>
-      <includes>
-        <include>${project.artifactId}-${project.version}.jar</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.directory}</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>classes/META-INF/extensions.idx</include>
-        <include>classes/META-INF/MANIFEST.MF</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.basedir}/src/main/resources</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>plugin.properties</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</assembly>
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-json/src/main/resources/plugin.properties b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-json/src/main/resources/plugin.properties
deleted file mode 100644
index c2836e25a..000000000
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-json/src/main/resources/plugin.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# 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.
-
-plugin.id=json-pipes-iterator
-plugin.class=org.apache.tika.pipes.pipesiterator.json.JsonPipesIteratorPlugin
-plugin.version=4.0.0-SNAPSHOT
-plugin.provider=JSON Pipes Iterator
-plugin.description=Capable of iterating over JSON files with FetchEmitTuple entries
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-kafka/pom.xml b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-kafka/pom.xml
deleted file mode 100644
index 90ee34cb6..000000000
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-kafka/pom.xml
+++ /dev/null
@@ -1,127 +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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <groupId>org.apache.tika</groupId>
-    <artifactId>tika-pipes-iterators</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>tika-pipes-iterator-kafka</artifactId>
-
-  <name>Apache Tika Pipes Iterator - Kafka</name>
-  <url>https://tika.apache.org/</url>
-
-  <properties>
-    <!-- You want to make sure you don't load competing dependencies in your plugin or your classloading is going
-     to get messed up when finding your plugins. -->
-    <plugin.excluded.artifactIds>tika-core,tika-pipes-api,tika-serialization,tika-plugins-core,tika-pipes-iterator-commons</plugin.excluded.artifactIds>
-    <plugin.excluded.groupIds>org.apache.kafka,org.apache.logging.log4j,org.slf4j</plugin.excluded.groupIds>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>tika-pipes-iterator-commons</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.kafka</groupId>
-      <artifactId>kafka-clients</artifactId>
-      <version>${kafka.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j2-impl</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>3.6.1</version>
-        <executions>
-          <execution>
-            <id>copy-dependencies</id>
-            <phase>package</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/lib</outputDirectory>
-              <includeScope>runtime</includeScope>
-              <excludeArtifactIds>${plugin.excluded.artifactIds}</excludeArtifactIds>
-              <excludeGroupIds>${plugin.excluded.groupIds}</excludeGroupIds>
-            </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.pipes.pipesiterator.kafka</Automatic-Module-Name>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/assembly.xml</descriptor>
-          </descriptors>
-          <appendAssemblyId>false</appendAssemblyId>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <annotationProcessors>
-            <annotationProcessor>org.pf4j.processor.ExtensionAnnotationProcessor</annotationProcessor>
-          </annotationProcessors>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <scm>
-    <tag>3.0.0-rc1</tag>
-  </scm>
-</project>
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-kafka/src/main/assembly/assembly.xml b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-kafka/src/main/assembly/assembly.xml
deleted file mode 100644
index ea0f8b4a1..000000000
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-kafka/src/main/assembly/assembly.xml
+++ /dev/null
@@ -1,55 +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.
--->
-<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
-          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0
-                              http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-  <id>dependencies-zip</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <directory>${project.build.directory}/lib</directory>
-      <outputDirectory>/lib</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.directory}</directory>
-      <outputDirectory>/lib</outputDirectory>
-      <includes>
-        <include>${project.artifactId}-${project.version}.jar</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.directory}</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>classes/META-INF/extensions.idx</include>
-        <include>classes/META-INF/MANIFEST.MF</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.basedir}/src/main/resources</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>plugin.properties</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</assembly>
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-kafka/src/main/java/org/apache/tika/pipes/pipesiterator/kafka/KafkaPipesIteratorPlugin.java b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-kafka/src/main/java/org/apache/tika/pipes/pipesiterator/kafka/KafkaPipesIteratorPlugin.java
deleted file mode 100644
index 728fb2634..000000000
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-kafka/src/main/java/org/apache/tika/pipes/pipesiterator/kafka/KafkaPipesIteratorPlugin.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tika.pipes.pipesiterator.kafka;
-
-import org.pf4j.Plugin;
-import org.pf4j.PluginWrapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class KafkaPipesIteratorPlugin extends Plugin {
-    private static final Logger LOG = LoggerFactory.getLogger(KafkaPipesIteratorPlugin.class);
-
-    public KafkaPipesIteratorPlugin(PluginWrapper wrapper) {
-        super(wrapper);
-    }
-
-    @Override
-    public void start() {
-        LOG.info("Starting Kafka Pipes Iterator Plugin");
-        super.start();
-    }
-
-    @Override
-    public void stop() {
-        LOG.info("Stopping Kafka Pipes Iterator Plugin");
-        super.stop();
-    }
-
-    @Override
-    public void delete() {
-        LOG.info("Deleting Kafka Pipes Iterator Plugin");
-        super.delete();
-    }
-}
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-kafka/src/main/resources/plugin.properties b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-kafka/src/main/resources/plugin.properties
deleted file mode 100644
index e387e88f5..000000000
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-kafka/src/main/resources/plugin.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# 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.
-
-plugin.id=kafka-pipes-iterator
-plugin.class=org.apache.tika.pipes.pipesiterator.kafka.KafkaPipesIteratorPlugin
-plugin.version=4.0.0-SNAPSHOT
-plugin.provider=Apache Kafka Pipes Iterator
-plugin.description=Capable of iterating over Apache Kafka topics
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/pom.xml b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/pom.xml
deleted file mode 100644
index 16036e060..000000000
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/pom.xml
+++ /dev/null
@@ -1,125 +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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <groupId>org.apache.tika</groupId>
-    <artifactId>tika-pipes-iterators</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>tika-pipes-iterator-s3</artifactId>
-
-  <name>Apache Tika Pipes Iterator - S3</name>
-  <url>https://tika.apache.org/</url>
-
-  <properties>
-    <plugin.excluded.artifactIds>tika-core,tika-pipes-api,tika-serialization,tika-plugins-core,tika-pipes-iterator-commons</plugin.excluded.artifactIds>
-    <plugin.excluded.groupIds>org.apache.logging.log4j,org.slf4j</plugin.excluded.groupIds>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>tika-pipes-iterator-commons</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>software.amazon.awssdk</groupId>
-      <artifactId>s3</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>software.amazon.awssdk</groupId>
-      <artifactId>apache-client</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j2-impl</artifactId>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>3.6.1</version>
-        <executions>
-          <execution>
-            <id>copy-dependencies</id>
-            <phase>package</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/lib</outputDirectory>
-              <includeScope>runtime</includeScope>
-              <excludeArtifactIds>${plugin.excluded.artifactIds}</excludeArtifactIds>
-              <excludeGroupIds>${plugin.excluded.groupIds}</excludeGroupIds>
-            </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.pipes.pipesiterator.s3</Automatic-Module-Name>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/assembly.xml</descriptor>
-          </descriptors>
-          <appendAssemblyId>false</appendAssemblyId>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <annotationProcessors>
-            <annotationProcessor>org.pf4j.processor.ExtensionAnnotationProcessor</annotationProcessor>
-          </annotationProcessors>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <scm>
-    <tag>3.0.0-rc1</tag>
-  </scm>
-</project>
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/src/main/assembly/assembly.xml b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/src/main/assembly/assembly.xml
deleted file mode 100644
index ea0f8b4a1..000000000
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/src/main/assembly/assembly.xml
+++ /dev/null
@@ -1,55 +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.
--->
-<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
-          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0
-                              http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-  <id>dependencies-zip</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <directory>${project.build.directory}/lib</directory>
-      <outputDirectory>/lib</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.directory}</directory>
-      <outputDirectory>/lib</outputDirectory>
-      <includes>
-        <include>${project.artifactId}-${project.version}.jar</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.directory}</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>classes/META-INF/extensions.idx</include>
-        <include>classes/META-INF/MANIFEST.MF</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.basedir}/src/main/resources</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>plugin.properties</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</assembly>
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/src/main/java/org/apache/tika/pipes/pipesiterator/s3/S3PipesIteratorPlugin.java b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/src/main/java/org/apache/tika/pipes/pipesiterator/s3/S3PipesIteratorPlugin.java
deleted file mode 100644
index ed90ce12f..000000000
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/src/main/java/org/apache/tika/pipes/pipesiterator/s3/S3PipesIteratorPlugin.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tika.pipes.pipesiterator.s3;
-
-import org.pf4j.Plugin;
-import org.pf4j.PluginWrapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class S3PipesIteratorPlugin extends Plugin {
-    private static final Logger LOG = LoggerFactory.getLogger(S3PipesIteratorPlugin.class);
-
-    public S3PipesIteratorPlugin(PluginWrapper wrapper) {
-        super(wrapper);
-    }
-
-    @Override
-    public void start() {
-        LOG.info("Starting S3 Pipes Iterator Plugin");
-        super.start();
-    }
-
-    @Override
-    public void stop() {
-        LOG.info("Stopping S3 Pipes Iterator Plugin");
-        super.stop();
-    }
-
-    @Override
-    public void delete() {
-        LOG.info("Deleting S3 Pipes Iterator Plugin");
-        super.delete();
-    }
-}
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/src/main/resources/plugin.properties b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/src/main/resources/plugin.properties
deleted file mode 100644
index f3c176ddf..000000000
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/src/main/resources/plugin.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# 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.
-
-plugin.id=s3-pipes-iterator
-plugin.class=org.apache.tika.pipes.pipesiterator.s3.S3PipesIteratorPlugin
-plugin.version=4.0.0-SNAPSHOT
-plugin.provider=S3 Pipes Iterator
-plugin.description=Capable of iterating over AWS S3 buckets
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/src/test/resources/log4j2.xml b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/src/test/resources/log4j2.xml
deleted file mode 100644
index c88e66e99..000000000
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/src/test/resources/log4j2.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-
-<!--
-  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.
--->
-<Configuration status="WARN">
-  <Appenders>
-    <Console name="Console" target="SYSTEM_ERR">
-      <PatternLayout pattern="%-5p [%t] %d{HH:mm:ss,SSS} %c %m%n"/>
-    </Console>
-  </Appenders>
-  <Loggers>
-    <Root level="info">
-      <AppenderRef ref="Console"/>
-    </Root>
-  </Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-solr/pom.xml b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-solr/pom.xml
deleted file mode 100644
index dac13ddcf..000000000
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-solr/pom.xml
+++ /dev/null
@@ -1,130 +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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <groupId>org.apache.tika</groupId>
-    <artifactId>tika-pipes-iterators</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>tika-pipes-iterator-solr</artifactId>
-
-  <name>Apache Tika Pipes Iterator - Solr</name>
-  <url>https://tika.apache.org/</url>
-
-  <properties>
-    <!-- You want to make sure you don't load competing dependencies in your plugin or your classloading is going
-     to get messed up when finding your plugins. -->
-    <plugin.excluded.artifactIds>tika-core,tika-pipes-api,tika-serialization,tika-plugins-core,tika-httpclient-commons,tika-pipes-iterator-commons</plugin.excluded.artifactIds>
-    <plugin.excluded.groupIds>org.apache.httpcomponents,org.apache.httpcomponents.client5,org.apache.httpcomponents.core5,org.apache.logging.log4j,org.slf4j</plugin.excluded.groupIds>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>tika-pipes-iterator-commons</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.solr</groupId>
-      <artifactId>solr-solrj</artifactId>
-      <version>${solrj.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>tika-httpclient-commons</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <!-- Override runtime scope from solr-solrj to make available at compile time -->
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>3.6.1</version>
-        <executions>
-          <execution>
-            <id>copy-dependencies</id>
-            <phase>package</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/lib</outputDirectory>
-              <includeScope>runtime</includeScope>
-              <excludeArtifactIds>${plugin.excluded.artifactIds}</excludeArtifactIds>
-              <excludeGroupIds>${plugin.excluded.groupIds}</excludeGroupIds>
-            </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.pipes.pipesiterator.solr</Automatic-Module-Name>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/assembly.xml</descriptor>
-          </descriptors>
-          <appendAssemblyId>false</appendAssemblyId>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <annotationProcessors>
-            <annotationProcessor>org.pf4j.processor.ExtensionAnnotationProcessor</annotationProcessor>
-          </annotationProcessors>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <scm>
-    <tag>3.0.0-rc1</tag>
-  </scm>
-</project>
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-solr/src/main/assembly/assembly.xml b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-solr/src/main/assembly/assembly.xml
deleted file mode 100644
index ea0f8b4a1..000000000
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-solr/src/main/assembly/assembly.xml
+++ /dev/null
@@ -1,55 +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.
--->
-<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
-          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0
-                              http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-  <id>dependencies-zip</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <directory>${project.build.directory}/lib</directory>
-      <outputDirectory>/lib</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.directory}</directory>
-      <outputDirectory>/lib</outputDirectory>
-      <includes>
-        <include>${project.artifactId}-${project.version}.jar</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.directory}</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>classes/META-INF/extensions.idx</include>
-        <include>classes/META-INF/MANIFEST.MF</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.basedir}/src/main/resources</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>plugin.properties</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</assembly>
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-solr/src/main/java/org/apache/tika/pipes/pipesiterator/solr/SolrPipesIteratorPlugin.java b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-solr/src/main/java/org/apache/tika/pipes/pipesiterator/solr/SolrPipesIteratorPlugin.java
deleted file mode 100644
index c9d20ed35..000000000
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-solr/src/main/java/org/apache/tika/pipes/pipesiterator/solr/SolrPipesIteratorPlugin.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tika.pipes.pipesiterator.solr;
-
-import org.pf4j.Plugin;
-import org.pf4j.PluginWrapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class SolrPipesIteratorPlugin extends Plugin {
-    private static final Logger LOG = LoggerFactory.getLogger(SolrPipesIteratorPlugin.class);
-
-    public SolrPipesIteratorPlugin(PluginWrapper wrapper) {
-        super(wrapper);
-    }
-
-    @Override
-    public void start() {
-        LOG.info("Starting Solr Pipes Iterator Plugin");
-        super.start();
-    }
-
-    @Override
-    public void stop() {
-        LOG.info("Stopping Solr Pipes Iterator Plugin");
-        super.stop();
-    }
-
-    @Override
-    public void delete() {
-        LOG.info("Deleting Solr Pipes Iterator Plugin");
-        super.delete();
-    }
-}
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-solr/src/main/resources/plugin.properties b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-solr/src/main/resources/plugin.properties
deleted file mode 100644
index 99198d9be..000000000
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-solr/src/main/resources/plugin.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# 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.
-
-plugin.id=solr-pipes-iterator
-plugin.class=org.apache.tika.pipes.pipesiterator.solr.SolrPipesIteratorPlugin
-plugin.version=4.0.0-SNAPSHOT
-plugin.provider=Solr Pipes Iterator
-plugin.description=Capable of iterating over Solr query results
diff --git a/tika-pipes/tika-emitters/pom.xml b/tika-pipes/tika-pipes-plugins/pom.xml
similarity index 77%
rename from tika-pipes/tika-emitters/pom.xml
rename to tika-pipes/tika-pipes-plugins/pom.xml
index b1ffc1db7..527cce7fc 100644
--- a/tika-pipes/tika-emitters/pom.xml
+++ b/tika-pipes/tika-pipes-plugins/pom.xml
@@ -26,20 +26,24 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>tika-emitters</artifactId>
+  <artifactId>tika-pipes-plugins</artifactId>
   <name>Apache Tika emitters</name>
   <url>https://tika.apache.org/</url>
   <packaging>pom</packaging>
 
   <modules>
-    <module>tika-emitter-file-system</module>
-    <module>tika-emitter-s3</module>
-    <module>tika-emitter-kafka</module>
-    <module>tika-emitter-solr</module>
-    <module>tika-emitter-opensearch</module>
-    <module>tika-emitter-jdbc</module>
-    <module>tika-emitter-gcs</module>
-    <module>tika-emitter-az-blob</module>
+    <module>tika-pipes-az-blob</module>
+    <module>tika-pipes-csv</module>
+    <module>tika-pipes-file-system</module>
+    <module>tika-pipes-gcs</module>
+    <module>tika-pipes-http</module>
+    <module>tika-pipes-jdbc</module>
+    <module>tika-pipes-json</module>
+    <module>tika-pipes-kafka</module>
+    <module>tika-pipes-microsoft-graph</module>
+    <module>tika-pipes-opensearch</module>
+    <module>tika-pipes-s3</module>
+    <module>tika-pipes-solr</module>
   </modules>
 
   <dependencies>
@@ -55,7 +59,7 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.tika</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>tika-core</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
@@ -66,6 +70,13 @@
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.tika</groupId>
+      <artifactId>tika-core</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+      <type>test-jar</type>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/tika-pipes/tika-emitters/tika-emitter-az-blob/pom.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/pom.xml
similarity index 95%
rename from tika-pipes/tika-emitters/tika-emitter-az-blob/pom.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/pom.xml
index 09525ada6..2c1184d4a 100644
--- a/tika-pipes/tika-emitters/tika-emitter-az-blob/pom.xml
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/pom.xml
@@ -19,14 +19,14 @@
 -->
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
-    <artifactId>tika-emitters</artifactId>
+    <artifactId>tika-pipes-plugins</artifactId>
     <groupId>org.apache.tika</groupId>
     <version>4.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>tika-emitter-az-blob</artifactId>
-  <name>Apache Tika Azure blob</name>
+  <artifactId>tika-pipes-az-blob</artifactId>
+  <name>Apache Tika Pipes Azure Blob</name>
   <packaging>jar</packaging>
 
   <properties>
@@ -45,9 +45,8 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>tika-core</artifactId>
+      <artifactId>tika-pipes-iterator-commons</artifactId>
       <version>${project.version}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/tika-pipes/tika-emitters/tika-emitter-az-blob/src/main/assembly/assembly.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/main/assembly/assembly.xml
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-az-blob/src/main/assembly/assembly.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/main/assembly/assembly.xml
diff --git a/tika-pipes/tika-emitters/tika-emitter-az-blob/src/main/java/org/apache/tika/pipes/emitter/azblob/AZBlobEmitter.java b/tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/main/java/org/apache/tika/pipes/emitter/azblob/AZBlobEmitter.java
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-az-blob/src/main/java/org/apache/tika/pipes/emitter/azblob/AZBlobEmitter.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/main/java/org/apache/tika/pipes/emitter/azblob/AZBlobEmitter.java
diff --git a/tika-pipes/tika-emitters/tika-emitter-az-blob/src/main/java/org/apache/tika/pipes/emitter/azblob/AZBlobEmitterConfig.java b/tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/main/java/org/apache/tika/pipes/emitter/azblob/AZBlobEmitterConfig.java
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-az-blob/src/main/java/org/apache/tika/pipes/emitter/azblob/AZBlobEmitterConfig.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/main/java/org/apache/tika/pipes/emitter/azblob/AZBlobEmitterConfig.java
diff --git a/tika-pipes/tika-emitters/tika-emitter-az-blob/src/main/java/org/apache/tika/pipes/emitter/azblob/AZBlobEmitterFactory.java b/tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/main/java/org/apache/tika/pipes/emitter/azblob/AZBlobEmitterFactory.java
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-az-blob/src/main/java/org/apache/tika/pipes/emitter/azblob/AZBlobEmitterFactory.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/main/java/org/apache/tika/pipes/emitter/azblob/AZBlobEmitterFactory.java
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-az-blob/src/main/java/org/apache/tika/pipes/fetcher/azblob/AZBlobFetcher.java b/tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/main/java/org/apache/tika/pipes/fetcher/azblob/AZBlobFetcher.java
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-az-blob/src/main/java/org/apache/tika/pipes/fetcher/azblob/AZBlobFetcher.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/main/java/org/apache/tika/pipes/fetcher/azblob/AZBlobFetcher.java
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-az-blob/src/main/java/org/apache/tika/pipes/fetcher/azblob/AZBlobFetcherFactory.java b/tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/main/java/org/apache/tika/pipes/fetcher/azblob/AZBlobFetcherFactory.java
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-az-blob/src/main/java/org/apache/tika/pipes/fetcher/azblob/AZBlobFetcherFactory.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/main/java/org/apache/tika/pipes/fetcher/azblob/AZBlobFetcherFactory.java
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-az-blob/src/main/java/org/apache/tika/pipes/fetcher/azblob/config/AZBlobFetcherConfig.java b/tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/main/java/org/apache/tika/pipes/fetcher/azblob/config/AZBlobFetcherConfig.java
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-az-blob/src/main/java/org/apache/tika/pipes/fetcher/azblob/config/AZBlobFetcherConfig.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/main/java/org/apache/tika/pipes/fetcher/azblob/config/AZBlobFetcherConfig.java
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-az-blob/src/main/java/org/apache/tika/pipes/pipesiterator/azblob/AZBlobPipesIterator.java b/tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/main/java/org/apache/tika/pipes/iterator/azblob/AZBlobPipesIterator.java
similarity index 99%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-az-blob/src/main/java/org/apache/tika/pipes/pipesiterator/azblob/AZBlobPipesIterator.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/main/java/org/apache/tika/pipes/iterator/azblob/AZBlobPipesIterator.java
index 2d3b0c12b..9b34b0881 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-az-blob/src/main/java/org/apache/tika/pipes/pipesiterator/azblob/AZBlobPipesIterator.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/main/java/org/apache/tika/pipes/iterator/azblob/AZBlobPipesIterator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.pipesiterator.azblob;
+package org.apache.tika.pipes.iterator.azblob;
 
 import static org.apache.tika.config.TikaConfig.mustNotBeEmpty;
 
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-az-blob/src/main/java/org/apache/tika/pipes/pipesiterator/azblob/AZBlobPipesIteratorConfig.java b/tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/main/java/org/apache/tika/pipes/iterator/azblob/AZBlobPipesIteratorConfig.java
similarity index 98%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-az-blob/src/main/java/org/apache/tika/pipes/pipesiterator/azblob/AZBlobPipesIteratorConfig.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/main/java/org/apache/tika/pipes/iterator/azblob/AZBlobPipesIteratorConfig.java
index dd4295df6..068ff3460 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-az-blob/src/main/java/org/apache/tika/pipes/pipesiterator/azblob/AZBlobPipesIteratorConfig.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/main/java/org/apache/tika/pipes/iterator/azblob/AZBlobPipesIteratorConfig.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.pipesiterator.azblob;
+package org.apache.tika.pipes.iterator.azblob;
 
 import java.util.Objects;
 
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-az-blob/src/main/java/org/apache/tika/pipes/pipesiterator/azblob/AZBlobPipesIteratorFactory.java b/tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/main/java/org/apache/tika/pipes/iterator/azblob/AZBlobPipesIteratorFactory.java
similarity index 97%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-az-blob/src/main/java/org/apache/tika/pipes/pipesiterator/azblob/AZBlobPipesIteratorFactory.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/main/java/org/apache/tika/pipes/iterator/azblob/AZBlobPipesIteratorFactory.java
index 56ad3b764..16f2f2b3e 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-az-blob/src/main/java/org/apache/tika/pipes/pipesiterator/azblob/AZBlobPipesIteratorFactory.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/main/java/org/apache/tika/pipes/iterator/azblob/AZBlobPipesIteratorFactory.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.pipesiterator.azblob;
+package org.apache.tika.pipes.iterator.azblob;
 
 import java.io.IOException;
 
diff --git a/tika-pipes/tika-emitters/tika-emitter-az-blob/src/main/java/org/apache/tika/pipes/emitter/azblob/AZBlobEmitterPlugin.java b/tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/main/java/org/apache/tika/pipes/plugin/azblob/AZBlobPipesPlugin.java
similarity index 88%
rename from tika-pipes/tika-emitters/tika-emitter-az-blob/src/main/java/org/apache/tika/pipes/emitter/azblob/AZBlobEmitterPlugin.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/main/java/org/apache/tika/pipes/plugin/azblob/AZBlobPipesPlugin.java
index 9f2fdf5f8..abeb1d103 100644
--- a/tika-pipes/tika-emitters/tika-emitter-az-blob/src/main/java/org/apache/tika/pipes/emitter/azblob/AZBlobEmitterPlugin.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/main/java/org/apache/tika/pipes/plugin/azblob/AZBlobPipesPlugin.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.emitter.azblob;
+package org.apache.tika.pipes.plugin.azblob;
 
 import org.pf4j.Plugin;
 import org.pf4j.PluginWrapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class AZBlobEmitterPlugin extends Plugin {
-    private static final Logger LOG = LoggerFactory.getLogger(AZBlobEmitterPlugin.class);
+public class AZBlobPipesPlugin extends Plugin {
+    private static final Logger LOG = LoggerFactory.getLogger(AZBlobPipesPlugin.class);
 
-    public AZBlobEmitterPlugin(PluginWrapper wrapper) {
+    public AZBlobPipesPlugin(PluginWrapper wrapper) {
         super(wrapper);
     }
 
diff --git a/tika-pipes/tika-emitters/tika-emitter-solr/src/main/resources/plugin.properties b/tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/main/resources/plugin.properties
similarity index 81%
rename from tika-pipes/tika-emitters/tika-emitter-solr/src/main/resources/plugin.properties
rename to tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/main/resources/plugin.properties
index b45385375..a841b807e 100644
--- a/tika-pipes/tika-emitters/tika-emitter-solr/src/main/resources/plugin.properties
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/main/resources/plugin.properties
@@ -14,8 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-plugin.id=solr-emitter
-plugin.class=org.apache.tika.pipes.emitter.solr.SolrEmitterPlugin
+plugin.id=tika-pipes-az-blob-plugin
+plugin.class=org.apache.tika.pipes.plugin.azblob.AZBlobPipesPlugin
 plugin.version=4.0.0-SNAPSHOT
-plugin.provider=Apache Solr Emitter
-plugin.description=Capable of emitting to Apache Solr
+plugin.provider=Apache Tika
+plugin.description=Pipes for Azure Blob Storage
diff --git a/tika-pipes/tika-emitters/tika-emitter-az-blob/src/test/java/org/apache/tika/pipes/emitter/azblob/TestAZBlobEmitter.java b/tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/test/java/org/apache/tika/pipes/emitter/azblob/TestAZBlobEmitter.java
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-az-blob/src/test/java/org/apache/tika/pipes/emitter/azblob/TestAZBlobEmitter.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/test/java/org/apache/tika/pipes/emitter/azblob/TestAZBlobEmitter.java
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-az-blob/src/test/java/org/apache/tika/pipes/fetcher/azblob/TestAZBlobFetcher.java b/tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/test/java/org/apache/tika/pipes/fetcher/azblob/TestAZBlobFetcher.java
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-az-blob/src/test/java/org/apache/tika/pipes/fetcher/azblob/TestAZBlobFetcher.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/test/java/org/apache/tika/pipes/fetcher/azblob/TestAZBlobFetcher.java
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-az-blob/src/test/java/org/apache/tika/pipes/pipesiterator/azblob/TestAZBlobPipesIterator.java b/tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/test/java/org/apache/tika/pipes/iterator/azblob/TestAZBlobPipesIterator.java
similarity index 96%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-az-blob/src/test/java/org/apache/tika/pipes/pipesiterator/azblob/TestAZBlobPipesIterator.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/test/java/org/apache/tika/pipes/iterator/azblob/TestAZBlobPipesIterator.java
index fa64c3270..298b16ebc 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-az-blob/src/test/java/org/apache/tika/pipes/pipesiterator/azblob/TestAZBlobPipesIterator.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/test/java/org/apache/tika/pipes/iterator/azblob/TestAZBlobPipesIterator.java
@@ -14,9 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.pipesiterator.azblob;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
+package org.apache.tika.pipes.iterator.azblob;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -30,6 +28,7 @@ import java.util.concurrent.TimeUnit;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
@@ -86,7 +85,7 @@ public class TestAZBlobPipesIterator {
         } finally {
             es.shutdownNow();
         }
-        assertEquals(1, completed);
+        Assertions.assertEquals(1, completed);
 
     }
 
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-az-blob/src/test/resources/tika-config-az-blob.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/test/resources/config/tika-config-az-blob-fetcher.xml
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-az-blob/src/test/resources/tika-config-az-blob.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/test/resources/config/tika-config-az-blob-fetcher.xml
diff --git a/tika-pipes/tika-emitters/tika-emitter-az-blob/src/test/resources/config/tika-config-az-blob.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/test/resources/config/tika-config-az-blob.xml
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-az-blob/src/test/resources/config/tika-config-az-blob.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/test/resources/config/tika-config-az-blob.xml
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/pom.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-csv/pom.xml
similarity index 93%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/pom.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-csv/pom.xml
index 96a05e116..acf738f0c 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/pom.xml
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-csv/pom.xml
@@ -20,15 +20,14 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.apache.tika</groupId>
-    <artifactId>tika-pipes-iterators</artifactId>
+    <artifactId>tika-pipes-plugins</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>tika-pipes-iterator-csv</artifactId>
+  <artifactId>tika-pipes-csv</artifactId>
 
-  <name>Apache Tika Pipes Iterator - CSV</name>
+  <name>Apache Tika Pipes CSV</name>
   <url>https://tika.apache.org/</url>
   <properties>
     <plugin.excluded.artifactIds>tika-core,tika-pipes-api,tika-serialization,tika-plugins-core,tika-pipes-iterator-commons</plugin.excluded.artifactIds>
@@ -70,7 +69,7 @@
               <goal>copy-dependencies</goal>
             </goals>
             <configuration>
-              <outputDirectory>${project.build.directory}/lib</outputDirectory>
+              <outputDirectory>target/lib</outputDirectory>
               <includeScope>runtime</includeScope>
               <excludeArtifactIds>${plugin.excluded.artifactIds}</excludeArtifactIds>
               <excludeGroupIds>${plugin.excluded.groupIds}</excludeGroupIds>
diff --git a/tika-pipes/tika-emitters/tika-emitter-file-system/src/main/assembly/assembly.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-csv/src/main/assembly/assembly.xml
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-file-system/src/main/assembly/assembly.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-csv/src/main/assembly/assembly.xml
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/src/main/java/org/apache/tika/pipes/pipesiterator/csv/CSVPipesIterator.java b/tika-pipes/tika-pipes-plugins/tika-pipes-csv/src/main/java/org/apache/tika/pipes/iterator/csv/CSVPipesIterator.java
similarity index 99%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/src/main/java/org/apache/tika/pipes/pipesiterator/csv/CSVPipesIterator.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-csv/src/main/java/org/apache/tika/pipes/iterator/csv/CSVPipesIterator.java
index c1614cbe4..f747e9219 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/src/main/java/org/apache/tika/pipes/pipesiterator/csv/CSVPipesIterator.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-csv/src/main/java/org/apache/tika/pipes/iterator/csv/CSVPipesIterator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.pipesiterator.csv;
+package org.apache.tika.pipes.iterator.csv;
 
 import java.io.IOException;
 import java.io.Reader;
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/src/main/java/org/apache/tika/pipes/pipesiterator/csv/CSVPipesIteratorConfig.java b/tika-pipes/tika-pipes-plugins/tika-pipes-csv/src/main/java/org/apache/tika/pipes/iterator/csv/CSVPipesIteratorConfig.java
similarity index 98%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/src/main/java/org/apache/tika/pipes/pipesiterator/csv/CSVPipesIteratorConfig.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-csv/src/main/java/org/apache/tika/pipes/iterator/csv/CSVPipesIteratorConfig.java
index 5a8d0513a..46bee035e 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/src/main/java/org/apache/tika/pipes/pipesiterator/csv/CSVPipesIteratorConfig.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-csv/src/main/java/org/apache/tika/pipes/iterator/csv/CSVPipesIteratorConfig.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.pipesiterator.csv;
+package org.apache.tika.pipes.iterator.csv;
 
 import java.nio.file.Path;
 import java.util.Objects;
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/src/main/java/org/apache/tika/pipes/pipesiterator/csv/CSVPipesIteratorFactory.java b/tika-pipes/tika-pipes-plugins/tika-pipes-csv/src/main/java/org/apache/tika/pipes/iterator/csv/CSVPipesIteratorFactory.java
similarity index 97%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/src/main/java/org/apache/tika/pipes/pipesiterator/csv/CSVPipesIteratorFactory.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-csv/src/main/java/org/apache/tika/pipes/iterator/csv/CSVPipesIteratorFactory.java
index 879d2d310..c052ce03a 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/src/main/java/org/apache/tika/pipes/pipesiterator/csv/CSVPipesIteratorFactory.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-csv/src/main/java/org/apache/tika/pipes/iterator/csv/CSVPipesIteratorFactory.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.pipesiterator.csv;
+package org.apache.tika.pipes.iterator.csv;
 
 import java.io.IOException;
 
diff --git a/tika-pipes/tika-pipes-core/src/main/java/org/apache/tika/pipes/pipesiterator/filelist/FileListPipesIterator.java b/tika-pipes/tika-pipes-plugins/tika-pipes-csv/src/main/java/org/apache/tika/pipes/iterator/filelist/FileListPipesIterator.java
similarity index 98%
rename from tika-pipes/tika-pipes-core/src/main/java/org/apache/tika/pipes/pipesiterator/filelist/FileListPipesIterator.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-csv/src/main/java/org/apache/tika/pipes/iterator/filelist/FileListPipesIterator.java
index ef0f6ab96..fe4102ec7 100644
--- a/tika-pipes/tika-pipes-core/src/main/java/org/apache/tika/pipes/pipesiterator/filelist/FileListPipesIterator.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-csv/src/main/java/org/apache/tika/pipes/iterator/filelist/FileListPipesIterator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.pipesiterator.filelist;
+package org.apache.tika.pipes.iterator.filelist;
 
 /**
  * Reads a list of file names/relative paths from a UTF-8 file.
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/src/main/java/org/apache/tika/pipes/pipesiterator/csv/CSVPipesIteratorPlugin.java b/tika-pipes/tika-pipes-plugins/tika-pipes-csv/src/main/java/org/apache/tika/pipes/plugin/csv/CSVPipesPlugin.java
similarity index 87%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/src/main/java/org/apache/tika/pipes/pipesiterator/csv/CSVPipesIteratorPlugin.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-csv/src/main/java/org/apache/tika/pipes/plugin/csv/CSVPipesPlugin.java
index 4bc0291ba..f0d456edf 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/src/main/java/org/apache/tika/pipes/pipesiterator/csv/CSVPipesIteratorPlugin.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-csv/src/main/java/org/apache/tika/pipes/plugin/csv/CSVPipesPlugin.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.pipesiterator.csv;
+package org.apache.tika.pipes.plugin.csv;
 
 import org.pf4j.Plugin;
 import org.pf4j.PluginWrapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class CSVPipesIteratorPlugin extends Plugin {
-    private static final Logger LOG = LoggerFactory.getLogger(CSVPipesIteratorPlugin.class);
+public class CSVPipesPlugin extends Plugin {
+    private static final Logger LOG = LoggerFactory.getLogger(CSVPipesPlugin.class);
 
-    public CSVPipesIteratorPlugin(PluginWrapper wrapper) {
+    public CSVPipesPlugin(PluginWrapper wrapper) {
         super(wrapper);
     }
 
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-http/src/main/resources/plugin.properties b/tika-pipes/tika-pipes-plugins/tika-pipes-csv/src/main/resources/plugin.properties
similarity index 82%
copy from tika-pipes/tika-fetchers/tika-fetcher-http/src/main/resources/plugin.properties
copy to tika-pipes/tika-pipes-plugins/tika-pipes-csv/src/main/resources/plugin.properties
index 19a6666d4..baf12262d 100644
--- a/tika-pipes/tika-fetchers/tika-fetcher-http/src/main/resources/plugin.properties
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-csv/src/main/resources/plugin.properties
@@ -14,8 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-plugin.id=http-fetcher
-plugin.class=org.apache.tika.pipes.fetcher.http.HttpFetcherPlugin
+plugin.id=tika-pipes-csv-plugin
+plugin.class=org.apache.tika.pipes.plugin.csv.CSVPipesPlugin
 plugin.version=4.0.0-SNAPSHOT
-plugin.provider=Http Fetcher
-plugin.description=Capable of fetching from http
+plugin.provider=Apache Tika
+plugin.description=Pipes for csv
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/src/test/java/TestCSVPipesIterator.java b/tika-pipes/tika-pipes-plugins/tika-pipes-csv/src/test/java/org/apache/tika/pipes/iterator/csv/TestCSVPipesIterator.java
similarity index 98%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/src/test/java/TestCSVPipesIterator.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-csv/src/test/java/org/apache/tika/pipes/iterator/csv/TestCSVPipesIterator.java
index 6dc4523f5..d423119e9 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/src/test/java/TestCSVPipesIterator.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-csv/src/test/java/org/apache/tika/pipes/iterator/csv/TestCSVPipesIterator.java
@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package org.apache.tika.pipes.iterator.csv;
 
 import static org.apache.tika.pipes.pipesiterator.PipesIteratorBase.COMPLETED_SEMAPHORE;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -36,7 +37,6 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.junit.jupiter.api.Test;
 
 import org.apache.tika.pipes.api.FetchEmitTuple;
-import org.apache.tika.pipes.pipesiterator.csv.CSVPipesIterator;
 import org.apache.tika.plugins.ExtensionConfig;
 
 public class TestCSVPipesIterator {
diff --git a/tika-pipes/tika-pipes-core/src/test/java/org/apache/tika/pipes/core/pipesiterator/filelist/FileListPipesIteratorTest.java b/tika-pipes/tika-pipes-plugins/tika-pipes-csv/src/test/java/org/apache/tika/pipes/iterator/filelist/FileListPipesIteratorTest.java
similarity index 97%
rename from tika-pipes/tika-pipes-core/src/test/java/org/apache/tika/pipes/core/pipesiterator/filelist/FileListPipesIteratorTest.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-csv/src/test/java/org/apache/tika/pipes/iterator/filelist/FileListPipesIteratorTest.java
index f80e0d0d2..97335523f 100644
--- a/tika-pipes/tika-pipes-core/src/test/java/org/apache/tika/pipes/core/pipesiterator/filelist/FileListPipesIteratorTest.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-csv/src/test/java/org/apache/tika/pipes/iterator/filelist/FileListPipesIteratorTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.core.pipesiterator.filelist;
+package org.apache.tika.pipes.iterator.filelist;
 
 public class FileListPipesIteratorTest {
 /*
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/src/test/resources/test-simple.csv b/tika-pipes/tika-pipes-plugins/tika-pipes-csv/src/test/resources/test-simple.csv
similarity index 100%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/src/test/resources/test-simple.csv
rename to tika-pipes/tika-pipes-plugins/tika-pipes-csv/src/test/resources/test-simple.csv
diff --git a/tika-pipes/tika-emitters/tika-emitter-file-system/pom.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-file-system/pom.xml
similarity index 90%
rename from tika-pipes/tika-emitters/tika-emitter-file-system/pom.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-file-system/pom.xml
index a7ca0dc02..3237682f7 100644
--- a/tika-pipes/tika-emitters/tika-emitter-file-system/pom.xml
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-file-system/pom.xml
@@ -19,14 +19,14 @@
 -->
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
-    <artifactId>tika-emitters</artifactId>
+    <artifactId>tika-pipes-plugins</artifactId>
     <groupId>org.apache.tika</groupId>
     <version>4.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>tika-emitter-file-system</artifactId>
-  <name>Apache Tika file system emitter</name>
+  <artifactId>tika-pipes-file-system</artifactId>
+  <name>Apache Tika Pipes File System</name>
   <properties>
     <!-- Never include the core artifacts in your plugin lib directory. If you do, it will cause the classloading
      to get messed up when finding your plugins. -->
@@ -34,6 +34,11 @@
     <plugin.excluded.groupIds>org.apache.logging.log4j,org.slf4j</plugin.excluded.groupIds>
   </properties>
   <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>tika-pipes-iterator-commons</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>tika-pipes-api</artifactId>
@@ -51,6 +56,10 @@
       <artifactId>jackson-databind</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-jsr310</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-slf4j2-impl</artifactId>
diff --git a/tika-pipes/tika-emitters/tika-emitter-kafka/src/main/assembly/assembly.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/assembly/assembly.xml
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-kafka/src/main/assembly/assembly.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/assembly/assembly.xml
diff --git a/tika-pipes/tika-emitters/tika-emitter-file-system/src/main/java/org/apache/tika/pipes/emitter/fs/FileSystemEmitter.java b/tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/emitter/fs/FileSystemEmitter.java
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-file-system/src/main/java/org/apache/tika/pipes/emitter/fs/FileSystemEmitter.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/emitter/fs/FileSystemEmitter.java
diff --git a/tika-pipes/tika-emitters/tika-emitter-file-system/src/main/java/org/apache/tika/pipes/emitter/fs/FileSystemEmitterConfig.java b/tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/emitter/fs/FileSystemEmitterConfig.java
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-file-system/src/main/java/org/apache/tika/pipes/emitter/fs/FileSystemEmitterConfig.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/emitter/fs/FileSystemEmitterConfig.java
diff --git a/tika-pipes/tika-emitters/tika-emitter-file-system/src/main/java/org/apache/tika/pipes/emitter/fs/FileSystemEmitterFactory.java b/tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/emitter/fs/FileSystemEmitterFactory.java
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-file-system/src/main/java/org/apache/tika/pipes/emitter/fs/FileSystemEmitterFactory.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/emitter/fs/FileSystemEmitterFactory.java
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-file-system/src/main/java/org/apache/tika/pipes/fetcher/fs/FileSystemFetcher.java b/tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/fetcher/fs/FileSystemFetcher.java
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-file-system/src/main/java/org/apache/tika/pipes/fetcher/fs/FileSystemFetcher.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/fetcher/fs/FileSystemFetcher.java
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-file-system/src/main/java/org/apache/tika/pipes/fetcher/fs/FileSystemFetcherConfig.java b/tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/fetcher/fs/FileSystemFetcherConfig.java
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-file-system/src/main/java/org/apache/tika/pipes/fetcher/fs/FileSystemFetcherConfig.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/fetcher/fs/FileSystemFetcherConfig.java
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-file-system/src/main/java/org/apache/tika/pipes/fetcher/fs/FileSystemFetcherFactory.java b/tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/fetcher/fs/FileSystemFetcherFactory.java
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-file-system/src/main/java/org/apache/tika/pipes/fetcher/fs/FileSystemFetcherFactory.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/fetcher/fs/FileSystemFetcherFactory.java
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-file-system/src/main/java/org/apache/tika/pipes/pipesiterator/fs/FileSystemPipesIterator.java b/tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/iterator/fs/FileSystemPipesIterator.java
similarity index 99%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-file-system/src/main/java/org/apache/tika/pipes/pipesiterator/fs/FileSystemPipesIterator.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/iterator/fs/FileSystemPipesIterator.java
index 612dd3cee..b193352c7 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-file-system/src/main/java/org/apache/tika/pipes/pipesiterator/fs/FileSystemPipesIterator.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/iterator/fs/FileSystemPipesIterator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.pipesiterator.fs;
+package org.apache.tika.pipes.iterator.fs;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-file-system/src/main/java/org/apache/tika/pipes/pipesiterator/fs/FileSystemPipesIteratorConfig.java b/tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/iterator/fs/FileSystemPipesIteratorConfig.java
similarity index 98%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-file-system/src/main/java/org/apache/tika/pipes/pipesiterator/fs/FileSystemPipesIteratorConfig.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/iterator/fs/FileSystemPipesIteratorConfig.java
index 615f7b240..0648620fc 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-file-system/src/main/java/org/apache/tika/pipes/pipesiterator/fs/FileSystemPipesIteratorConfig.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/iterator/fs/FileSystemPipesIteratorConfig.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.pipesiterator.fs;
+package org.apache.tika.pipes.iterator.fs;
 
 import java.nio.file.Path;
 import java.util.Objects;
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-file-system/src/main/java/org/apache/tika/pipes/pipesiterator/fs/FileSystemPipesIteratorFactory.java b/tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/iterator/fs/FileSystemPipesIteratorFactory.java
similarity index 97%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-file-system/src/main/java/org/apache/tika/pipes/pipesiterator/fs/FileSystemPipesIteratorFactory.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/iterator/fs/FileSystemPipesIteratorFactory.java
index 4924a7f15..91df67eb4 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-file-system/src/main/java/org/apache/tika/pipes/pipesiterator/fs/FileSystemPipesIteratorFactory.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/iterator/fs/FileSystemPipesIteratorFactory.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.pipesiterator.fs;
+package org.apache.tika.pipes.iterator.fs;
 
 import java.io.IOException;
 
diff --git a/tika-pipes/tika-emitters/tika-emitter-file-system/src/main/java/org/apache/tika/pipes/emitter/fs/FileSystemEmitterPlugin.java b/tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/plugin/fs/FileSystemPipesPlugin.java
similarity index 87%
rename from tika-pipes/tika-emitters/tika-emitter-file-system/src/main/java/org/apache/tika/pipes/emitter/fs/FileSystemEmitterPlugin.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/plugin/fs/FileSystemPipesPlugin.java
index e8bec02a5..c71b7856b 100644
--- a/tika-pipes/tika-emitters/tika-emitter-file-system/src/main/java/org/apache/tika/pipes/emitter/fs/FileSystemEmitterPlugin.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/plugin/fs/FileSystemPipesPlugin.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.emitter.fs;
+package org.apache.tika.pipes.plugin.fs;
 
 import org.pf4j.Plugin;
 import org.pf4j.PluginWrapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class FileSystemEmitterPlugin extends Plugin {
-    private static final Logger LOG = LoggerFactory.getLogger(FileSystemEmitterPlugin.class);
+public class FileSystemPipesPlugin extends Plugin {
+    private static final Logger LOG = LoggerFactory.getLogger(FileSystemPipesPlugin.class);
 
-    public FileSystemEmitterPlugin(PluginWrapper wrapper) {
+    public FileSystemPipesPlugin(PluginWrapper wrapper) {
         super(wrapper);
     }
 
diff --git a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-fs-status/src/main/java/org/apache/tika/pipes/reporters/fs/AsyncStatus.java b/tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/reporter/fs/AsyncStatus.java
similarity index 98%
rename from tika-pipes/tika-pipes-reporters/tika-pipes-reporter-fs-status/src/main/java/org/apache/tika/pipes/reporters/fs/AsyncStatus.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/reporter/fs/AsyncStatus.java
index b98ddec83..7b8ab5db2 100644
--- a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-fs-status/src/main/java/org/apache/tika/pipes/reporters/fs/AsyncStatus.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/reporter/fs/AsyncStatus.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.reporters.fs;
+package org.apache.tika.pipes.reporter.fs;
 
 import java.time.Instant;
 import java.util.HashMap;
diff --git a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-fs-status/src/main/java/org/apache/tika/pipes/reporters/fs/FileSystemReporterConfig.java b/tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/reporter/fs/FileSystemReporterConfig.java
similarity index 97%
rename from tika-pipes/tika-pipes-reporters/tika-pipes-reporter-fs-status/src/main/java/org/apache/tika/pipes/reporters/fs/FileSystemReporterConfig.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/reporter/fs/FileSystemReporterConfig.java
index 93e4ffd11..816c8c9c8 100644
--- a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-fs-status/src/main/java/org/apache/tika/pipes/reporters/fs/FileSystemReporterConfig.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/reporter/fs/FileSystemReporterConfig.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.reporters.fs;
+package org.apache.tika.pipes.reporter.fs;
 
 import java.io.Serializable;
 import java.nio.file.Path;
diff --git a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-fs-status/src/main/java/org/apache/tika/pipes/reporters/fs/FileSystemReporterFactory.java b/tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/reporter/fs/FileSystemReporterFactory.java
similarity index 97%
rename from tika-pipes/tika-pipes-reporters/tika-pipes-reporter-fs-status/src/main/java/org/apache/tika/pipes/reporters/fs/FileSystemReporterFactory.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/reporter/fs/FileSystemReporterFactory.java
index a5d3736a4..88e397644 100644
--- a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-fs-status/src/main/java/org/apache/tika/pipes/reporters/fs/FileSystemReporterFactory.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/reporter/fs/FileSystemReporterFactory.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.reporters.fs;
+package org.apache.tika.pipes.reporter.fs;
 
 import java.io.IOException;
 
diff --git a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-fs-status/src/main/java/org/apache/tika/pipes/reporters/fs/FileSystemStatusReporter.java b/tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/reporter/fs/FileSystemStatusReporter.java
similarity index 99%
rename from tika-pipes/tika-pipes-reporters/tika-pipes-reporter-fs-status/src/main/java/org/apache/tika/pipes/reporters/fs/FileSystemStatusReporter.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/reporter/fs/FileSystemStatusReporter.java
index 9f42f81fd..195ec83ac 100644
--- a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-fs-status/src/main/java/org/apache/tika/pipes/reporters/fs/FileSystemStatusReporter.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/reporter/fs/FileSystemStatusReporter.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.reporters.fs;
+package org.apache.tika.pipes.reporter.fs;
 
 import java.io.IOException;
 import java.io.Writer;
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-http/src/main/resources/plugin.properties b/tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/resources/plugin.properties
similarity index 81%
copy from tika-pipes/tika-fetchers/tika-fetcher-http/src/main/resources/plugin.properties
copy to tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/resources/plugin.properties
index 19a6666d4..48160a274 100644
--- a/tika-pipes/tika-fetchers/tika-fetcher-http/src/main/resources/plugin.properties
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/resources/plugin.properties
@@ -14,8 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-plugin.id=http-fetcher
-plugin.class=org.apache.tika.pipes.fetcher.http.HttpFetcherPlugin
+plugin.id=tika-pipes-file-system-plugin
+plugin.class=org.apache.tika.pipes.plugin.fs.FileSystemPipesPlugin
 plugin.version=4.0.0-SNAPSHOT
-plugin.provider=Http Fetcher
-plugin.description=Capable of fetching from http
+plugin.provider=Apache Tika
+plugin.description=Pipes for the filesystem
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-file-system/src/test/java/org/apache/tika/pipes/fetcher/fs/FileSystemFetcherTest.java b/tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/test/java/org/apache/tika/pipes/fetcher/fs/FileSystemFetcherTest.java
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-file-system/src/test/java/org/apache/tika/pipes/fetcher/fs/FileSystemFetcherTest.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/test/java/org/apache/tika/pipes/fetcher/fs/FileSystemFetcherTest.java
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-file-system/src/test/java/org/apache/tika/pipes/fetcher/fs/config/FileSystemFetcherConfigTest.java b/tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/test/java/org/apache/tika/pipes/fetcher/fs/config/FileSystemFetcherConfigTest.java
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-file-system/src/test/java/org/apache/tika/pipes/fetcher/fs/config/FileSystemFetcherConfigTest.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/test/java/org/apache/tika/pipes/fetcher/fs/config/FileSystemFetcherConfigTest.java
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-file-system/src/test/java/org/apache/tika/pipes/pipesiterator/fs/FileSystemPipesIteratorTest.java b/tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/test/java/org/apache/tika/pipes/iterator/fs/FileSystemPipesIteratorTest.java
similarity index 98%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-file-system/src/test/java/org/apache/tika/pipes/pipesiterator/fs/FileSystemPipesIteratorTest.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/test/java/org/apache/tika/pipes/iterator/fs/FileSystemPipesIteratorTest.java
index c7ead9ff2..64bd2079a 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-file-system/src/test/java/org/apache/tika/pipes/pipesiterator/fs/FileSystemPipesIteratorTest.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/test/java/org/apache/tika/pipes/iterator/fs/FileSystemPipesIteratorTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.pipesiterator.fs;
+package org.apache.tika.pipes.iterator.fs;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-fs-status/src/test/java/org/apache/tika/pipes/reporters/fs/TestFileSystemStatusReporter.java b/tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/test/java/org/apache/tika/pipes/reporter/fs/TestFileSystemStatusReporter.java
similarity index 98%
rename from tika-pipes/tika-pipes-reporters/tika-pipes-reporter-fs-status/src/test/java/org/apache/tika/pipes/reporters/fs/TestFileSystemStatusReporter.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/test/java/org/apache/tika/pipes/reporter/fs/TestFileSystemStatusReporter.java
index b27711ef5..88f79dda2 100644
--- a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-fs-status/src/test/java/org/apache/tika/pipes/reporters/fs/TestFileSystemStatusReporter.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/test/java/org/apache/tika/pipes/reporter/fs/TestFileSystemStatusReporter.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.reporters.fs;
+package org.apache.tika.pipes.reporter.fs;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -44,6 +44,7 @@ import org.apache.tika.pipes.api.PipesResult;
 import org.apache.tika.pipes.api.pipesiterator.PipesIterator;
 import org.apache.tika.pipes.api.pipesiterator.TotalCountResult;
 import org.apache.tika.pipes.api.reporter.PipesReporter;
+import org.apache.tika.pipes.reporter.fs.AsyncStatus;
 import org.apache.tika.plugins.ExtensionConfig;
 
 public class TestFileSystemStatusReporter {
diff --git a/tika-pipes/tika-emitters/tika-emitter-gcs/pom.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-gcs/pom.xml
similarity index 90%
rename from tika-pipes/tika-emitters/tika-emitter-gcs/pom.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-gcs/pom.xml
index ed3d2f9ab..04ef0b864 100644
--- a/tika-pipes/tika-emitters/tika-emitter-gcs/pom.xml
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-gcs/pom.xml
@@ -19,22 +19,17 @@
 -->
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
-    <artifactId>tika-emitters</artifactId>
+    <artifactId>tika-pipes-plugins</artifactId>
     <groupId>org.apache.tika</groupId>
     <version>4.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>tika-emitter-gcs</artifactId>
-  <name>Apache Tika GCS emitter</name>
+  <artifactId>tika-pipes-gcs</artifactId>
+  <name>Apache Tika Pipes GCS</name>
   <packaging>jar</packaging>
 
   <properties>
-    <plugin.id>tika-emitter-gcs</plugin.id>
-    <plugin.class>org.apache.tika.pipes.emitter.gcs.GCSEmitterPlugin</plugin.class>
-    <plugin.version>${project.version}</plugin.version>
-    <plugin.provider>Apache Tika</plugin.provider>
-    <plugin.dependencies/>
     <!-- You want to make sure you don't load competing dependencies in your plugin or your classloading is going
      to get messed up when finding your plugins. -->
     <plugin.excluded.artifactIds>tika-core,tika-pipes-api,tika-serialization,tika-plugins-core</plugin.excluded.artifactIds>
@@ -50,9 +45,8 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>tika-core</artifactId>
+      <artifactId>tika-pipes-iterator-commons</artifactId>
       <version>${project.version}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/tika-pipes/tika-emitters/tika-emitter-gcs/src/main/assembly/assembly.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/main/assembly/assembly.xml
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-gcs/src/main/assembly/assembly.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/main/assembly/assembly.xml
diff --git a/tika-pipes/tika-emitters/tika-emitter-gcs/src/main/java/org/apache/tika/pipes/emitter/gcs/GCSEmitter.java b/tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/main/java/org/apache/tika/pipes/emitter/gcs/GCSEmitter.java
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-gcs/src/main/java/org/apache/tika/pipes/emitter/gcs/GCSEmitter.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/main/java/org/apache/tika/pipes/emitter/gcs/GCSEmitter.java
diff --git a/tika-pipes/tika-emitters/tika-emitter-gcs/src/main/java/org/apache/tika/pipes/emitter/gcs/GCSEmitterConfig.java b/tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/main/java/org/apache/tika/pipes/emitter/gcs/GCSEmitterConfig.java
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-gcs/src/main/java/org/apache/tika/pipes/emitter/gcs/GCSEmitterConfig.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/main/java/org/apache/tika/pipes/emitter/gcs/GCSEmitterConfig.java
diff --git a/tika-pipes/tika-emitters/tika-emitter-gcs/src/main/java/org/apache/tika/pipes/emitter/gcs/GCSEmitterFactory.java b/tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/main/java/org/apache/tika/pipes/emitter/gcs/GCSEmitterFactory.java
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-gcs/src/main/java/org/apache/tika/pipes/emitter/gcs/GCSEmitterFactory.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/main/java/org/apache/tika/pipes/emitter/gcs/GCSEmitterFactory.java
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-gcs/src/main/java/org/apache/tika/pipes/fetcher/gcs/GCSFetcher.java b/tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/main/java/org/apache/tika/pipes/fetcher/gcs/GCSFetcher.java
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-gcs/src/main/java/org/apache/tika/pipes/fetcher/gcs/GCSFetcher.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/main/java/org/apache/tika/pipes/fetcher/gcs/GCSFetcher.java
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-gcs/src/main/java/org/apache/tika/pipes/fetcher/gcs/GCSFetcherFactory.java b/tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/main/java/org/apache/tika/pipes/fetcher/gcs/GCSFetcherFactory.java
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-gcs/src/main/java/org/apache/tika/pipes/fetcher/gcs/GCSFetcherFactory.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/main/java/org/apache/tika/pipes/fetcher/gcs/GCSFetcherFactory.java
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-gcs/src/main/java/org/apache/tika/pipes/fetcher/gcs/config/GCSFetcherConfig.java b/tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/main/java/org/apache/tika/pipes/fetcher/gcs/config/GCSFetcherConfig.java
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-gcs/src/main/java/org/apache/tika/pipes/fetcher/gcs/config/GCSFetcherConfig.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/main/java/org/apache/tika/pipes/fetcher/gcs/config/GCSFetcherConfig.java
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-gcs/src/main/java/org/apache/tika/pipes/pipesiterator/gcs/GCSPipesIterator.java b/tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/main/java/org/apache/tika/pipes/iterator/gcs/GCSPipesIterator.java
similarity index 98%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-gcs/src/main/java/org/apache/tika/pipes/pipesiterator/gcs/GCSPipesIterator.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/main/java/org/apache/tika/pipes/iterator/gcs/GCSPipesIterator.java
index 9f4ed1309..7e341f5de 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-gcs/src/main/java/org/apache/tika/pipes/pipesiterator/gcs/GCSPipesIterator.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/main/java/org/apache/tika/pipes/iterator/gcs/GCSPipesIterator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.pipesiterator.gcs;
+package org.apache.tika.pipes.iterator.gcs;
 
 import java.io.IOException;
 import java.util.concurrent.TimeoutException;
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-gcs/src/main/java/org/apache/tika/pipes/pipesiterator/gcs/GCSPipesIteratorConfig.java b/tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/main/java/org/apache/tika/pipes/iterator/gcs/GCSPipesIteratorConfig.java
similarity index 98%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-gcs/src/main/java/org/apache/tika/pipes/pipesiterator/gcs/GCSPipesIteratorConfig.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/main/java/org/apache/tika/pipes/iterator/gcs/GCSPipesIteratorConfig.java
index 74581b819..f4c4f1690 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-gcs/src/main/java/org/apache/tika/pipes/pipesiterator/gcs/GCSPipesIteratorConfig.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/main/java/org/apache/tika/pipes/iterator/gcs/GCSPipesIteratorConfig.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.pipesiterator.gcs;
+package org.apache.tika.pipes.iterator.gcs;
 
 import java.util.Objects;
 
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-gcs/src/main/java/org/apache/tika/pipes/pipesiterator/gcs/GCSPipesIteratorFactory.java b/tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/main/java/org/apache/tika/pipes/iterator/gcs/GCSPipesIteratorFactory.java
similarity index 97%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-gcs/src/main/java/org/apache/tika/pipes/pipesiterator/gcs/GCSPipesIteratorFactory.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/main/java/org/apache/tika/pipes/iterator/gcs/GCSPipesIteratorFactory.java
index f10d00af5..cba8c1833 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-gcs/src/main/java/org/apache/tika/pipes/pipesiterator/gcs/GCSPipesIteratorFactory.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/main/java/org/apache/tika/pipes/iterator/gcs/GCSPipesIteratorFactory.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.pipesiterator.gcs;
+package org.apache.tika.pipes.iterator.gcs;
 
 import java.io.IOException;
 
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-gcs/src/main/java/org/apache/tika/pipes/fetcher/gcs/GCSFetcherPlugin.java b/tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/main/java/org/apache/tika/pipes/plugin/gcs/GCSPipesPlugin.java
similarity index 89%
rename from tika-pipes/tika-fetchers/tika-fetcher-gcs/src/main/java/org/apache/tika/pipes/fetcher/gcs/GCSFetcherPlugin.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/main/java/org/apache/tika/pipes/plugin/gcs/GCSPipesPlugin.java
index 06f1448b6..7078eef8c 100644
--- a/tika-pipes/tika-fetchers/tika-fetcher-gcs/src/main/java/org/apache/tika/pipes/fetcher/gcs/GCSFetcherPlugin.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/main/java/org/apache/tika/pipes/plugin/gcs/GCSPipesPlugin.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.fetcher.gcs;
+package org.apache.tika.pipes.plugin.gcs;
 
 import org.pf4j.Plugin;
 import org.pf4j.PluginWrapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class GCSFetcherPlugin extends Plugin {
-    private static final Logger LOG = LoggerFactory.getLogger(GCSFetcherPlugin.class);
+public class GCSPipesPlugin extends Plugin {
+    private static final Logger LOG = LoggerFactory.getLogger(GCSPipesPlugin.class);
 
-    public GCSFetcherPlugin(PluginWrapper wrapper) {
+    public GCSPipesPlugin(PluginWrapper wrapper) {
         super(wrapper);
     }
 
diff --git a/tika-pipes/tika-emitters/tika-emitter-gcs/src/main/resources/plugin.properties b/tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/main/resources/plugin.properties
similarity index 87%
rename from tika-pipes/tika-emitters/tika-emitter-gcs/src/main/resources/plugin.properties
rename to tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/main/resources/plugin.properties
index 32029e811..fa83efcfb 100644
--- a/tika-pipes/tika-emitters/tika-emitter-gcs/src/main/resources/plugin.properties
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/main/resources/plugin.properties
@@ -14,8 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-plugin.id=gcs-emitter
+plugin.id=tika-pipes-gcs-plugin
 plugin.class=org.apache.tika.pipes.emitter.gcs.GCSEmitterPlugin
 plugin.version=4.0.0-SNAPSHOT
-plugin.provider=Google Cloud Storage Emitter
-plugin.description=Capable of emitting to Google Cloud Storage
+plugin.provider=Apache Tika
+plugin.description=Pipes for the Google Cloud Storage
diff --git a/tika-pipes/tika-emitters/tika-emitter-gcs/src/test/java/org/apache/tika/pipes/emitter/gcs/TestGCSEmitter.java b/tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/test/java/org/apache/tika/pipes/emitter/gcs/TestGCSEmitter.java
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-gcs/src/test/java/org/apache/tika/pipes/emitter/gcs/TestGCSEmitter.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/test/java/org/apache/tika/pipes/emitter/gcs/TestGCSEmitter.java
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-gcs/src/test/java/org/apache/tika/pipes/fetcher/s3/TestGCSFetcher.java b/tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/test/java/org/apache/tika/pipes/fetcher/gcs/TestGCSFetcher.java
similarity index 96%
rename from tika-pipes/tika-fetchers/tika-fetcher-gcs/src/test/java/org/apache/tika/pipes/fetcher/s3/TestGCSFetcher.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/test/java/org/apache/tika/pipes/fetcher/gcs/TestGCSFetcher.java
index f227037b3..f8ca2acb3 100644
--- a/tika-pipes/tika-fetchers/tika-fetcher-gcs/src/test/java/org/apache/tika/pipes/fetcher/s3/TestGCSFetcher.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/test/java/org/apache/tika/pipes/fetcher/gcs/TestGCSFetcher.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.fetcher.s3;
+package org.apache.tika.pipes.fetcher.gcs;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -32,7 +32,6 @@ import org.junit.jupiter.api.io.TempDir;
 
 import org.apache.tika.metadata.Metadata;
 import org.apache.tika.parser.ParseContext;
-import org.apache.tika.pipes.fetcher.gcs.GCSFetcher;
 import org.apache.tika.plugins.ExtensionConfig;
 
 @Disabled("write actual unit tests")
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-gcs/src/test/java/org/apache/tika/pipes/pipesiterator/gcs/TestGCSPipesIterator.java b/tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/test/java/org/apache/tika/pipes/iterator/gcs/TestGCSPipesIterator.java
similarity index 98%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-gcs/src/test/java/org/apache/tika/pipes/pipesiterator/gcs/TestGCSPipesIterator.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/test/java/org/apache/tika/pipes/iterator/gcs/TestGCSPipesIterator.java
index d759489ae..a8f2310b7 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-gcs/src/test/java/org/apache/tika/pipes/pipesiterator/gcs/TestGCSPipesIterator.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/test/java/org/apache/tika/pipes/iterator/gcs/TestGCSPipesIterator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.pipesiterator.gcs;
+package org.apache.tika.pipes.iterator.gcs;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/tika-pipes/tika-emitters/tika-emitter-gcs/src/test/resources/config/tika-config-gcs.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/test/resources/config/tika-config-gcs.xml
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-gcs/src/test/resources/config/tika-config-gcs.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/test/resources/config/tika-config-gcs.xml
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-gcs/src/test/resources/log4j.properties b/tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/test/resources/log4j.properties
similarity index 100%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-gcs/src/test/resources/log4j.properties
rename to tika-pipes/tika-pipes-plugins/tika-pipes-gcs/src/test/resources/log4j.properties
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-http/pom.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-http/pom.xml
similarity index 89%
rename from tika-pipes/tika-fetchers/tika-fetcher-http/pom.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-http/pom.xml
index 3eaba79b2..1157724af 100644
--- a/tika-pipes/tika-fetchers/tika-fetcher-http/pom.xml
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-http/pom.xml
@@ -20,14 +20,14 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
-    <artifactId>tika-fetchers</artifactId>
+    <artifactId>tika-pipes-plugins</artifactId>
     <groupId>org.apache.tika</groupId>
     <version>4.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>tika-fetcher-http</artifactId>
-  <name>Apache Tika http fetcher</name>
+  <artifactId>tika-pipes-http</artifactId>
+  <name>Apache Tika Pipes HTTP</name>
   <properties>
     <!-- Never include the core artifacts in your plugin lib directory. If you do, it will cause the classloading
       to get messed up when finding your plugins. -->
@@ -47,12 +47,6 @@
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>tika-core</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>tika-httpclient-commons</artifactId>
@@ -74,13 +68,6 @@
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>tika-core</artifactId>
-      <version>${project.version}</version>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
@@ -108,7 +95,7 @@
               <goal>copy-dependencies</goal>
             </goals>
             <configuration>
-              <outputDirectory>${project.build.directory}/lib</outputDirectory>
+              <outputDirectory>target/lib</outputDirectory>
               <includeScope>runtime</includeScope>
               <excludeArtifactIds>${plugin.excluded.artifactIds}</excludeArtifactIds>
               <excludeGroupIds>${plugin.excluded.groupIds}</excludeGroupIds>
diff --git a/tika-pipes/tika-emitters/tika-emitter-opensearch/src/main/assembly/assembly.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-http/src/main/assembly/assembly.xml
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-opensearch/src/main/assembly/assembly.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-http/src/main/assembly/assembly.xml
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-http/src/main/java/org/apache/tika/pipes/fetcher/http/HttpFetcher.java b/tika-pipes/tika-pipes-plugins/tika-pipes-http/src/main/java/org/apache/tika/pipes/fetcher/http/HttpFetcher.java
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-http/src/main/java/org/apache/tika/pipes/fetcher/http/HttpFetcher.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-http/src/main/java/org/apache/tika/pipes/fetcher/http/HttpFetcher.java
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-http/src/main/java/org/apache/tika/pipes/fetcher/http/HttpFetcherFactory.java b/tika-pipes/tika-pipes-plugins/tika-pipes-http/src/main/java/org/apache/tika/pipes/fetcher/http/HttpFetcherFactory.java
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-http/src/main/java/org/apache/tika/pipes/fetcher/http/HttpFetcherFactory.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-http/src/main/java/org/apache/tika/pipes/fetcher/http/HttpFetcherFactory.java
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-http/src/main/java/org/apache/tika/pipes/fetcher/http/config/HttpFetcherConfig.java b/tika-pipes/tika-pipes-plugins/tika-pipes-http/src/main/java/org/apache/tika/pipes/fetcher/http/config/HttpFetcherConfig.java
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-http/src/main/java/org/apache/tika/pipes/fetcher/http/config/HttpFetcherConfig.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-http/src/main/java/org/apache/tika/pipes/fetcher/http/config/HttpFetcherConfig.java
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-http/src/main/java/org/apache/tika/pipes/fetcher/http/config/HttpHeaders.java b/tika-pipes/tika-pipes-plugins/tika-pipes-http/src/main/java/org/apache/tika/pipes/fetcher/http/config/HttpHeaders.java
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-http/src/main/java/org/apache/tika/pipes/fetcher/http/config/HttpHeaders.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-http/src/main/java/org/apache/tika/pipes/fetcher/http/config/HttpHeaders.java
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-http/src/main/java/org/apache/tika/pipes/fetcher/http/jwt/JwtCreds.java b/tika-pipes/tika-pipes-plugins/tika-pipes-http/src/main/java/org/apache/tika/pipes/fetcher/http/jwt/JwtCreds.java
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-http/src/main/java/org/apache/tika/pipes/fetcher/http/jwt/JwtCreds.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-http/src/main/java/org/apache/tika/pipes/fetcher/http/jwt/JwtCreds.java
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-http/src/main/java/org/apache/tika/pipes/fetcher/http/jwt/JwtGenerator.java b/tika-pipes/tika-pipes-plugins/tika-pipes-http/src/main/java/org/apache/tika/pipes/fetcher/http/jwt/JwtGenerator.java
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-http/src/main/java/org/apache/tika/pipes/fetcher/http/jwt/JwtGenerator.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-http/src/main/java/org/apache/tika/pipes/fetcher/http/jwt/JwtGenerator.java
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-http/src/main/java/org/apache/tika/pipes/fetcher/http/jwt/JwtPrivateKeyCreds.java b/tika-pipes/tika-pipes-plugins/tika-pipes-http/src/main/java/org/apache/tika/pipes/fetcher/http/jwt/JwtPrivateKeyCreds.java
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-http/src/main/java/org/apache/tika/pipes/fetcher/http/jwt/JwtPrivateKeyCreds.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-http/src/main/java/org/apache/tika/pipes/fetcher/http/jwt/JwtPrivateKeyCreds.java
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-http/src/main/java/org/apache/tika/pipes/fetcher/http/jwt/JwtSecretCreds.java b/tika-pipes/tika-pipes-plugins/tika-pipes-http/src/main/java/org/apache/tika/pipes/fetcher/http/jwt/JwtSecretCreds.java
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-http/src/main/java/org/apache/tika/pipes/fetcher/http/jwt/JwtSecretCreds.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-http/src/main/java/org/apache/tika/pipes/fetcher/http/jwt/JwtSecretCreds.java
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-http/src/main/java/org/apache/tika/pipes/fetcher/http/HttpFetcherPlugin.java b/tika-pipes/tika-pipes-plugins/tika-pipes-http/src/main/java/org/apache/tika/pipes/plugin/http/HttpPipesPlugin.java
similarity index 88%
rename from tika-pipes/tika-fetchers/tika-fetcher-http/src/main/java/org/apache/tika/pipes/fetcher/http/HttpFetcherPlugin.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-http/src/main/java/org/apache/tika/pipes/plugin/http/HttpPipesPlugin.java
index ac12dc8a7..1d1ad6881 100644
--- a/tika-pipes/tika-fetchers/tika-fetcher-http/src/main/java/org/apache/tika/pipes/fetcher/http/HttpFetcherPlugin.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-http/src/main/java/org/apache/tika/pipes/plugin/http/HttpPipesPlugin.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.fetcher.http;
+package org.apache.tika.pipes.plugin.http;
 
 import org.pf4j.Plugin;
 import org.pf4j.PluginWrapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class HttpFetcherPlugin extends Plugin {
-    private static final Logger LOG = LoggerFactory.getLogger(HttpFetcherPlugin.class);
+public class HttpPipesPlugin extends Plugin {
+    private static final Logger LOG = LoggerFactory.getLogger(HttpPipesPlugin.class);
 
-    public HttpFetcherPlugin(PluginWrapper wrapper) {
+    public HttpPipesPlugin(PluginWrapper wrapper) {
         super(wrapper);
     }
 
diff --git a/tika-pipes/tika-emitters/tika-emitter-s3/src/main/resources/plugin.properties b/tika-pipes/tika-pipes-plugins/tika-pipes-http/src/main/resources/plugin.properties
similarity index 82%
rename from tika-pipes/tika-emitters/tika-emitter-s3/src/main/resources/plugin.properties
rename to tika-pipes/tika-pipes-plugins/tika-pipes-http/src/main/resources/plugin.properties
index 8fd980ec8..8bf6adee4 100644
--- a/tika-pipes/tika-emitters/tika-emitter-s3/src/main/resources/plugin.properties
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-http/src/main/resources/plugin.properties
@@ -14,8 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-plugin.id=s3-emitter
-plugin.class=org.apache.tika.pipes.emitter.s3.S3EmitterPlugin
+plugin.id=tika-pipes-http-plugin
+plugin.class=org.apache.tika.pipes.plugin.http.HttpFetcherPlugin
 plugin.version=4.0.0-SNAPSHOT
-plugin.provider=Amazon S3 Emitter
-plugin.description=Capable of emitting to Amazon S3
+plugin.provider=Apache Tika
+plugin.description=Pipes for http
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-http/src/test/java/org/apache/tika/pipes/fetcher/http/HttpFetcherTest.java b/tika-pipes/tika-pipes-plugins/tika-pipes-http/src/test/java/org/apache/tika/pipes/fetcher/http/HttpFetcherTest.java
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-http/src/test/java/org/apache/tika/pipes/fetcher/http/HttpFetcherTest.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-http/src/test/java/org/apache/tika/pipes/fetcher/http/HttpFetcherTest.java
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-http/src/test/java/org/apache/tika/pipes/fetcher/http/config/HttpHeadersTest.java b/tika-pipes/tika-pipes-plugins/tika-pipes-http/src/test/java/org/apache/tika/pipes/fetcher/http/config/HttpHeadersTest.java
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-http/src/test/java/org/apache/tika/pipes/fetcher/http/config/HttpHeadersTest.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-http/src/test/java/org/apache/tika/pipes/fetcher/http/config/HttpHeadersTest.java
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-http/src/test/java/org/apache/tika/pipes/fetcher/http/jwt/JwtGeneratorTest.java b/tika-pipes/tika-pipes-plugins/tika-pipes-http/src/test/java/org/apache/tika/pipes/fetcher/http/jwt/JwtGeneratorTest.java
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-http/src/test/java/org/apache/tika/pipes/fetcher/http/jwt/JwtGeneratorTest.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-http/src/test/java/org/apache/tika/pipes/fetcher/http/jwt/JwtGeneratorTest.java
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-http/src/test/resources/configs/tika-config-http.json b/tika-pipes/tika-pipes-plugins/tika-pipes-http/src/test/resources/configs/tika-config-http.json
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-http/src/test/resources/configs/tika-config-http.json
rename to tika-pipes/tika-pipes-plugins/tika-pipes-http/src/test/resources/configs/tika-config-http.json
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-http/src/test/resources/configs/tika-config-http.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-http/src/test/resources/configs/tika-config-http.xml
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-http/src/test/resources/configs/tika-config-http.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-http/src/test/resources/configs/tika-config-http.xml
diff --git a/tika-pipes/tika-emitters/tika-emitter-jdbc/pom.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/pom.xml
similarity index 92%
rename from tika-pipes/tika-emitters/tika-emitter-jdbc/pom.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/pom.xml
index 2555252d7..55a0aef27 100644
--- a/tika-pipes/tika-emitters/tika-emitter-jdbc/pom.xml
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/pom.xml
@@ -19,14 +19,14 @@
 -->
 <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-emitters</artifactId>
+    <artifactId>tika-pipes-plugins</artifactId>
     <groupId>org.apache.tika</groupId>
     <version>4.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>tika-emitter-jdbc</artifactId>
-  <name>Apache Tika jdbc emitter</name>
+  <artifactId>tika-pipes-jdbc</artifactId>
+  <name>Apache Tika Pipes JDBC</name>
   <packaging>jar</packaging>
 
   <properties>
@@ -45,9 +45,13 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>tika-core</artifactId>
+      <artifactId>tika-pipes-iterator-commons</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>tika-pipes-reporter-commons</artifactId>
       <version>${project.version}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.h2database</groupId>
diff --git a/tika-pipes/tika-emitters/tika-emitter-jdbc/src/main/assembly/assembly.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/main/assembly/assembly.xml
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-jdbc/src/main/assembly/assembly.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/main/assembly/assembly.xml
diff --git a/tika-pipes/tika-emitters/tika-emitter-jdbc/src/main/java/org/apache/tika/pipes/emitter/jdbc/JDBCEmitter.java b/tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/main/java/org/apache/tika/pipes/emitter/jdbc/JDBCEmitter.java
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-jdbc/src/main/java/org/apache/tika/pipes/emitter/jdbc/JDBCEmitter.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/main/java/org/apache/tika/pipes/emitter/jdbc/JDBCEmitter.java
diff --git a/tika-pipes/tika-emitters/tika-emitter-jdbc/src/main/java/org/apache/tika/pipes/emitter/jdbc/JDBCEmitterConfig.java b/tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/main/java/org/apache/tika/pipes/emitter/jdbc/JDBCEmitterConfig.java
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-jdbc/src/main/java/org/apache/tika/pipes/emitter/jdbc/JDBCEmitterConfig.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/main/java/org/apache/tika/pipes/emitter/jdbc/JDBCEmitterConfig.java
diff --git a/tika-pipes/tika-emitters/tika-emitter-jdbc/src/main/java/org/apache/tika/pipes/emitter/jdbc/JDBCEmitterFactory.java b/tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/main/java/org/apache/tika/pipes/emitter/jdbc/JDBCEmitterFactory.java
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-jdbc/src/main/java/org/apache/tika/pipes/emitter/jdbc/JDBCEmitterFactory.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/main/java/org/apache/tika/pipes/emitter/jdbc/JDBCEmitterFactory.java
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/src/main/java/org/apache/tika/pipes/pipesiterator/jdbc/JDBCPipesIterator.java b/tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/main/java/org/apache/tika/pipes/iterator/jdbc/JDBCPipesIterator.java
similarity index 99%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/src/main/java/org/apache/tika/pipes/pipesiterator/jdbc/JDBCPipesIterator.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/main/java/org/apache/tika/pipes/iterator/jdbc/JDBCPipesIterator.java
index 8939a02e3..c465b4e8f 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/src/main/java/org/apache/tika/pipes/pipesiterator/jdbc/JDBCPipesIterator.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/main/java/org/apache/tika/pipes/iterator/jdbc/JDBCPipesIterator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.pipesiterator.jdbc;
+package org.apache.tika.pipes.iterator.jdbc;
 
 import java.io.IOException;
 import java.sql.Connection;
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/src/main/java/org/apache/tika/pipes/pipesiterator/jdbc/JDBCPipesIteratorConfig.java b/tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/main/java/org/apache/tika/pipes/iterator/jdbc/JDBCPipesIteratorConfig.java
similarity index 98%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/src/main/java/org/apache/tika/pipes/pipesiterator/jdbc/JDBCPipesIteratorConfig.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/main/java/org/apache/tika/pipes/iterator/jdbc/JDBCPipesIteratorConfig.java
index dfc2700d0..5cdfa0a70 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/src/main/java/org/apache/tika/pipes/pipesiterator/jdbc/JDBCPipesIteratorConfig.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/main/java/org/apache/tika/pipes/iterator/jdbc/JDBCPipesIteratorConfig.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.pipesiterator.jdbc;
+package org.apache.tika.pipes.iterator.jdbc;
 
 import java.util.Objects;
 
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/src/main/java/org/apache/tika/pipes/pipesiterator/jdbc/JDBCPipesIteratorFactory.java b/tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/main/java/org/apache/tika/pipes/iterator/jdbc/JDBCPipesIteratorFactory.java
similarity index 97%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/src/main/java/org/apache/tika/pipes/pipesiterator/jdbc/JDBCPipesIteratorFactory.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/main/java/org/apache/tika/pipes/iterator/jdbc/JDBCPipesIteratorFactory.java
index ad7941cc8..d805cf468 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/src/main/java/org/apache/tika/pipes/pipesiterator/jdbc/JDBCPipesIteratorFactory.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/main/java/org/apache/tika/pipes/iterator/jdbc/JDBCPipesIteratorFactory.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.pipesiterator.jdbc;
+package org.apache.tika.pipes.iterator.jdbc;
 
 import java.io.IOException;
 
diff --git a/tika-pipes/tika-emitters/tika-emitter-jdbc/src/main/java/org/apache/tika/pipes/emitter/jdbc/JDBCEmitterPlugin.java b/tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/main/java/org/apache/tika/pipes/plugin/jdbc/JDBCPipesPlugin.java
similarity index 88%
rename from tika-pipes/tika-emitters/tika-emitter-jdbc/src/main/java/org/apache/tika/pipes/emitter/jdbc/JDBCEmitterPlugin.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/main/java/org/apache/tika/pipes/plugin/jdbc/JDBCPipesPlugin.java
index fb55f3e7b..eaa235bb0 100644
--- a/tika-pipes/tika-emitters/tika-emitter-jdbc/src/main/java/org/apache/tika/pipes/emitter/jdbc/JDBCEmitterPlugin.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/main/java/org/apache/tika/pipes/plugin/jdbc/JDBCPipesPlugin.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.emitter.jdbc;
+package org.apache.tika.pipes.plugin.jdbc;
 
 import org.pf4j.Plugin;
 import org.pf4j.PluginWrapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class JDBCEmitterPlugin extends Plugin {
-    private static final Logger LOG = LoggerFactory.getLogger(JDBCEmitterPlugin.class);
+public class JDBCPipesPlugin extends Plugin {
+    private static final Logger LOG = LoggerFactory.getLogger(JDBCPipesPlugin.class);
 
-    public JDBCEmitterPlugin(PluginWrapper wrapper) {
+    public JDBCPipesPlugin(PluginWrapper wrapper) {
         super(wrapper);
     }
 
diff --git a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-jdbc/src/main/java/org/apache/tika/pipes/reporters/jdbc/JDBCPipesReporter.java b/tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/main/java/org/apache/tika/pipes/reporter/jdbc/JDBCPipesReporter.java
similarity index 99%
rename from tika-pipes/tika-pipes-reporters/tika-pipes-reporter-jdbc/src/main/java/org/apache/tika/pipes/reporters/jdbc/JDBCPipesReporter.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/main/java/org/apache/tika/pipes/reporter/jdbc/JDBCPipesReporter.java
index e00f10329..80e226add 100644
--- a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-jdbc/src/main/java/org/apache/tika/pipes/reporters/jdbc/JDBCPipesReporter.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/main/java/org/apache/tika/pipes/reporter/jdbc/JDBCPipesReporter.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.reporters.jdbc;
+package org.apache.tika.pipes.reporter.jdbc;
 
 import java.io.IOException;
 import java.sql.Connection;
diff --git a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-jdbc/src/main/java/org/apache/tika/pipes/reporters/jdbc/JDBCPipesReporterConfig.java b/tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/main/java/org/apache/tika/pipes/reporter/jdbc/JDBCPipesReporterConfig.java
similarity index 98%
rename from tika-pipes/tika-pipes-reporters/tika-pipes-reporter-jdbc/src/main/java/org/apache/tika/pipes/reporters/jdbc/JDBCPipesReporterConfig.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/main/java/org/apache/tika/pipes/reporter/jdbc/JDBCPipesReporterConfig.java
index c6f935de1..4c329b0fc 100644
--- a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-jdbc/src/main/java/org/apache/tika/pipes/reporters/jdbc/JDBCPipesReporterConfig.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/main/java/org/apache/tika/pipes/reporter/jdbc/JDBCPipesReporterConfig.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.reporters.jdbc;
+package org.apache.tika.pipes.reporter.jdbc;
 
 import java.util.List;
 import java.util.Set;
diff --git a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-jdbc/src/main/java/org/apache/tika/pipes/reporters/jdbc/JDBCPipesReporterFactory.java b/tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/main/java/org/apache/tika/pipes/reporter/jdbc/JDBCPipesReporterFactory.java
similarity index 97%
rename from tika-pipes/tika-pipes-reporters/tika-pipes-reporter-jdbc/src/main/java/org/apache/tika/pipes/reporters/jdbc/JDBCPipesReporterFactory.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/main/java/org/apache/tika/pipes/reporter/jdbc/JDBCPipesReporterFactory.java
index e56e5e4c4..a883ddaed 100644
--- a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-jdbc/src/main/java/org/apache/tika/pipes/reporters/jdbc/JDBCPipesReporterFactory.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/main/java/org/apache/tika/pipes/reporter/jdbc/JDBCPipesReporterFactory.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.reporters.jdbc;
+package org.apache.tika.pipes.reporter.jdbc;
 
 import java.io.IOException;
 
diff --git a/tika-pipes/tika-emitters/tika-emitter-jdbc/src/main/resources/plugin.properties b/tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/main/resources/plugin.properties
similarity index 82%
rename from tika-pipes/tika-emitters/tika-emitter-jdbc/src/main/resources/plugin.properties
rename to tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/main/resources/plugin.properties
index 2c7bcaca7..cd7362b6e 100644
--- a/tika-pipes/tika-emitters/tika-emitter-jdbc/src/main/resources/plugin.properties
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/main/resources/plugin.properties
@@ -14,8 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-plugin.id=jdbc-emitter
-plugin.class=org.apache.tika.pipes.emitter.jdbc.JDBCEmitterPlugin
+plugin.id=tika-pipes-jdbc-plugin
+plugin.class=org.apache.tika.pipes.plugin.jdbc.JDBCPipesPlugin
 plugin.version=4.0.0-SNAPSHOT
-plugin.provider=JDBC Emitter
-plugin.description=Capable of emitting to JDBC databases
+plugin.provider=Apache Tika
+plugin.description=Pipes for jdbc
diff --git a/tika-pipes/tika-emitters/tika-emitter-jdbc/src/test/java/org/apache/tika/pipes/emitter/jdbc/JDBCEmitterTest.java b/tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/test/java/org/apache/tika/pipes/emitter/jdbc/JDBCEmitterTest.java
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-jdbc/src/test/java/org/apache/tika/pipes/emitter/jdbc/JDBCEmitterTest.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/test/java/org/apache/tika/pipes/emitter/jdbc/JDBCEmitterTest.java
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/src/test/java/org/apache/tika/pipes/pipesiterator/jdbc/TestJDBCPipesIterator.java b/tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/test/java/org/apache/tika/pipes/iterator/jdbc/TestJDBCPipesIterator.java
similarity index 99%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/src/test/java/org/apache/tika/pipes/pipesiterator/jdbc/TestJDBCPipesIterator.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/test/java/org/apache/tika/pipes/iterator/jdbc/TestJDBCPipesIterator.java
index ffaa31d8e..30aac2d57 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/src/test/java/org/apache/tika/pipes/pipesiterator/jdbc/TestJDBCPipesIterator.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/test/java/org/apache/tika/pipes/iterator/jdbc/TestJDBCPipesIterator.java
@@ -14,7 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.pipesiterator.jdbc;
+package org.apache.tika.pipes.iterator.jdbc;
+
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
diff --git a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-jdbc/src/test/java/org/apache/tika/pipes/reporters/jdbc/TestJDBCPipesReporter.java b/tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/test/java/org/apache/tika/pipes/reporter/jdbc/TestJDBCPipesReporter.java
similarity index 99%
rename from tika-pipes/tika-pipes-reporters/tika-pipes-reporter-jdbc/src/test/java/org/apache/tika/pipes/reporters/jdbc/TestJDBCPipesReporter.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/test/java/org/apache/tika/pipes/reporter/jdbc/TestJDBCPipesReporter.java
index ad8b90787..da276f6b7 100644
--- a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-jdbc/src/test/java/org/apache/tika/pipes/reporters/jdbc/TestJDBCPipesReporter.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/test/java/org/apache/tika/pipes/reporter/jdbc/TestJDBCPipesReporter.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.reporters.jdbc;
+package org.apache.tika.pipes.reporter.jdbc;
 
 import static org.apache.tika.pipes.api.PipesResult.STATUS.PARSE_SUCCESS;
 import static org.apache.tika.pipes.api.PipesResult.STATUS.PARSE_SUCCESS_WITH_EXCEPTION;
diff --git a/tika-pipes/tika-emitters/tika-emitter-jdbc/src/test/resources/configs/tika-config-jdbc-emitter-attachments.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/test/resources/configs/tika-config-jdbc-emitter-attachments.xml
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-jdbc/src/test/resources/configs/tika-config-jdbc-emitter-attachments.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/test/resources/configs/tika-config-jdbc-emitter-attachments.xml
diff --git a/tika-pipes/tika-emitters/tika-emitter-jdbc/src/test/resources/configs/tika-config-jdbc-emitter-existing-table.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/test/resources/configs/tika-config-jdbc-emitter-existing-table.xml
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-jdbc/src/test/resources/configs/tika-config-jdbc-emitter-existing-table.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/test/resources/configs/tika-config-jdbc-emitter-existing-table.xml
diff --git a/tika-pipes/tika-emitters/tika-emitter-jdbc/src/test/resources/configs/tika-config-jdbc-emitter-multivalued.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/test/resources/configs/tika-config-jdbc-emitter-multivalued.xml
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-jdbc/src/test/resources/configs/tika-config-jdbc-emitter-multivalued.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/test/resources/configs/tika-config-jdbc-emitter-multivalued.xml
diff --git a/tika-pipes/tika-emitters/tika-emitter-jdbc/src/test/resources/configs/tika-config-jdbc-emitter-trunc.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/test/resources/configs/tika-config-jdbc-emitter-trunc.xml
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-jdbc/src/test/resources/configs/tika-config-jdbc-emitter-trunc.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/test/resources/configs/tika-config-jdbc-emitter-trunc.xml
diff --git a/tika-pipes/tika-emitters/tika-emitter-jdbc/src/test/resources/configs/tika-config-jdbc-emitter.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/test/resources/configs/tika-config-jdbc-emitter.xml
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-jdbc/src/test/resources/configs/tika-config-jdbc-emitter.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/test/resources/configs/tika-config-jdbc-emitter.xml
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/src/test/resources/log4j2.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/test/resources/log4j2.xml
similarity index 100%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-jdbc/src/test/resources/log4j2.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-jdbc/src/test/resources/log4j2.xml
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-json/pom.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-json/pom.xml
similarity index 93%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-json/pom.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-json/pom.xml
index 8cfca50dd..2cddce62c 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-json/pom.xml
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-json/pom.xml
@@ -20,15 +20,14 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.apache.tika</groupId>
-    <artifactId>tika-pipes-iterators</artifactId>
+    <artifactId>tika-pipes-plugins</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>tika-pipes-iterator-json</artifactId>
+  <artifactId>tika-pipes-json</artifactId>
 
-  <name>Apache Tika Pipes Iterator - json</name>
+  <name>Apache Tika Pipes JSON</name>
   <url>https://tika.apache.org/</url>
 
   <properties>
@@ -72,7 +71,7 @@
               <goal>copy-dependencies</goal>
             </goals>
             <configuration>
-              <outputDirectory>${project.build.directory}/lib</outputDirectory>
+              <outputDirectory>target/lib</outputDirectory>
               <includeScope>runtime</includeScope>
               <excludeArtifactIds>${plugin.excluded.artifactIds}</excludeArtifactIds>
               <excludeGroupIds>${plugin.excluded.groupIds}</excludeGroupIds>
diff --git a/tika-pipes/tika-emitters/tika-emitter-s3/src/main/assembly/assembly.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-json/src/main/assembly/assembly.xml
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-s3/src/main/assembly/assembly.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-json/src/main/assembly/assembly.xml
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-json/src/main/java/org/apache/tika/pipes/pipesiterator/json/JsonPipesIterator.java b/tika-pipes/tika-pipes-plugins/tika-pipes-json/src/main/java/org/apache/tika/pipes/pipesiterator/json/JsonPipesIterator.java
similarity index 100%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-json/src/main/java/org/apache/tika/pipes/pipesiterator/json/JsonPipesIterator.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-json/src/main/java/org/apache/tika/pipes/pipesiterator/json/JsonPipesIterator.java
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-json/src/main/java/org/apache/tika/pipes/pipesiterator/json/JsonPipesIteratorConfig.java b/tika-pipes/tika-pipes-plugins/tika-pipes-json/src/main/java/org/apache/tika/pipes/pipesiterator/json/JsonPipesIteratorConfig.java
similarity index 100%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-json/src/main/java/org/apache/tika/pipes/pipesiterator/json/JsonPipesIteratorConfig.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-json/src/main/java/org/apache/tika/pipes/pipesiterator/json/JsonPipesIteratorConfig.java
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-json/src/main/java/org/apache/tika/pipes/pipesiterator/json/JsonPipesIteratorFactory.java b/tika-pipes/tika-pipes-plugins/tika-pipes-json/src/main/java/org/apache/tika/pipes/pipesiterator/json/JsonPipesIteratorFactory.java
similarity index 100%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-json/src/main/java/org/apache/tika/pipes/pipesiterator/json/JsonPipesIteratorFactory.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-json/src/main/java/org/apache/tika/pipes/pipesiterator/json/JsonPipesIteratorFactory.java
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-json/src/main/java/org/apache/tika/pipes/pipesiterator/json/JsonPipesIteratorPlugin.java b/tika-pipes/tika-pipes-plugins/tika-pipes-json/src/main/java/org/apache/tika/pipes/plugin/JsonPipesPlugin.java
similarity index 87%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-json/src/main/java/org/apache/tika/pipes/pipesiterator/json/JsonPipesIteratorPlugin.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-json/src/main/java/org/apache/tika/pipes/plugin/JsonPipesPlugin.java
index 796b2c9af..2992368a2 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-json/src/main/java/org/apache/tika/pipes/pipesiterator/json/JsonPipesIteratorPlugin.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-json/src/main/java/org/apache/tika/pipes/plugin/JsonPipesPlugin.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.pipesiterator.json;
+package org.apache.tika.pipes.plugin;
 
 import org.pf4j.Plugin;
 import org.pf4j.PluginWrapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class JsonPipesIteratorPlugin extends Plugin {
-    private static final Logger LOG = LoggerFactory.getLogger(JsonPipesIteratorPlugin.class);
+public class JsonPipesPlugin extends Plugin {
+    private static final Logger LOG = LoggerFactory.getLogger(JsonPipesPlugin.class);
 
-    public JsonPipesIteratorPlugin(PluginWrapper wrapper) {
+    public JsonPipesPlugin(PluginWrapper wrapper) {
         super(wrapper);
     }
 
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-http/src/main/resources/plugin.properties b/tika-pipes/tika-pipes-plugins/tika-pipes-json/src/main/resources/plugin.properties
similarity index 82%
copy from tika-pipes/tika-fetchers/tika-fetcher-http/src/main/resources/plugin.properties
copy to tika-pipes/tika-pipes-plugins/tika-pipes-json/src/main/resources/plugin.properties
index 19a6666d4..c979d6b36 100644
--- a/tika-pipes/tika-fetchers/tika-fetcher-http/src/main/resources/plugin.properties
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-json/src/main/resources/plugin.properties
@@ -14,8 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-plugin.id=http-fetcher
-plugin.class=org.apache.tika.pipes.fetcher.http.HttpFetcherPlugin
+plugin.id=tika-pipes-json-plugin
+plugin.class=org.apache.tika.pipes.plugin.JsonPipesPlugin
 plugin.version=4.0.0-SNAPSHOT
-plugin.provider=Http Fetcher
-plugin.description=Capable of fetching from http
+plugin.provider=Apache Tika
+plugin.description=Pipes for json
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-json/src/test/java/org/apache/tika/pipes/pipesiterator/json/TestJsonPipesIterator.java b/tika-pipes/tika-pipes-plugins/tika-pipes-json/src/test/java/org/apache/tika/pipes/pipesiterator/json/TestJsonPipesIterator.java
similarity index 100%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-json/src/test/java/org/apache/tika/pipes/pipesiterator/json/TestJsonPipesIterator.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-json/src/test/java/org/apache/tika/pipes/pipesiterator/json/TestJsonPipesIterator.java
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-json/src/test/resources/test-documents/test-with-embedded-bytes.json b/tika-pipes/tika-pipes-plugins/tika-pipes-json/src/test/resources/test-documents/test-with-embedded-bytes.json
similarity index 100%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-json/src/test/resources/test-documents/test-with-embedded-bytes.json
rename to tika-pipes/tika-pipes-plugins/tika-pipes-json/src/test/resources/test-documents/test-with-embedded-bytes.json
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-json/src/test/resources/test-documents/test.json b/tika-pipes/tika-pipes-plugins/tika-pipes-json/src/test/resources/test-documents/test.json
similarity index 100%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-json/src/test/resources/test-documents/test.json
rename to tika-pipes/tika-pipes-plugins/tika-pipes-json/src/test/resources/test-documents/test.json
diff --git a/tika-pipes/tika-emitters/tika-emitter-kafka/pom.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-kafka/pom.xml
similarity index 93%
rename from tika-pipes/tika-emitters/tika-emitter-kafka/pom.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-kafka/pom.xml
index de84db686..daccecc2e 100644
--- a/tika-pipes/tika-emitters/tika-emitter-kafka/pom.xml
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-kafka/pom.xml
@@ -19,14 +19,14 @@
 -->
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
-    <artifactId>tika-emitters</artifactId>
+    <artifactId>tika-pipes-plugins</artifactId>
     <groupId>org.apache.tika</groupId>
     <version>4.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>tika-emitter-kafka</artifactId>
-  <name>Apache Tika Kafka emitter</name>
+  <artifactId>tika-pipes-kafka</artifactId>
+  <name>Apache Tika Pipes Kafka</name>
 
   <properties>
     <!-- Never include the core artifacts in your plugin lib directory. If you do, it will cause the classloading
@@ -42,7 +42,11 @@
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
-
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>tika-pipes-iterator-commons</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
diff --git a/tika-pipes/tika-emitters/tika-emitter-solr/src/main/assembly/assembly.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-kafka/src/main/assembly/assembly.xml
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-solr/src/main/assembly/assembly.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-kafka/src/main/assembly/assembly.xml
diff --git a/tika-pipes/tika-emitters/tika-emitter-kafka/src/main/java/org/apache/tika/pipes/emitter/kafka/KafkaEmitter.java b/tika-pipes/tika-pipes-plugins/tika-pipes-kafka/src/main/java/org/apache/tika/pipes/emitter/kafka/KafkaEmitter.java
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-kafka/src/main/java/org/apache/tika/pipes/emitter/kafka/KafkaEmitter.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-kafka/src/main/java/org/apache/tika/pipes/emitter/kafka/KafkaEmitter.java
diff --git a/tika-pipes/tika-emitters/tika-emitter-kafka/src/main/java/org/apache/tika/pipes/emitter/kafka/KafkaEmitterConfig.java b/tika-pipes/tika-pipes-plugins/tika-pipes-kafka/src/main/java/org/apache/tika/pipes/emitter/kafka/KafkaEmitterConfig.java
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-kafka/src/main/java/org/apache/tika/pipes/emitter/kafka/KafkaEmitterConfig.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-kafka/src/main/java/org/apache/tika/pipes/emitter/kafka/KafkaEmitterConfig.java
diff --git a/tika-pipes/tika-emitters/tika-emitter-kafka/src/main/java/org/apache/tika/pipes/emitter/kafka/KafkaEmitterFactory.java b/tika-pipes/tika-pipes-plugins/tika-pipes-kafka/src/main/java/org/apache/tika/pipes/emitter/kafka/KafkaEmitterFactory.java
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-kafka/src/main/java/org/apache/tika/pipes/emitter/kafka/KafkaEmitterFactory.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-kafka/src/main/java/org/apache/tika/pipes/emitter/kafka/KafkaEmitterFactory.java
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-kafka/src/main/java/org/apache/tika/pipes/pipesiterator/kafka/KafkaPipesIterator.java b/tika-pipes/tika-pipes-plugins/tika-pipes-kafka/src/main/java/org/apache/tika/pipes/iterator/kafka/KafkaPipesIterator.java
similarity index 99%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-kafka/src/main/java/org/apache/tika/pipes/pipesiterator/kafka/KafkaPipesIterator.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-kafka/src/main/java/org/apache/tika/pipes/iterator/kafka/KafkaPipesIterator.java
index 13bf16421..716149dc7 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-kafka/src/main/java/org/apache/tika/pipes/pipesiterator/kafka/KafkaPipesIterator.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-kafka/src/main/java/org/apache/tika/pipes/iterator/kafka/KafkaPipesIterator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.pipesiterator.kafka;
+package org.apache.tika.pipes.iterator.kafka;
 
 import java.io.IOException;
 import java.time.Duration;
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-kafka/src/main/java/org/apache/tika/pipes/pipesiterator/kafka/KafkaPipesIteratorConfig.java b/tika-pipes/tika-pipes-plugins/tika-pipes-kafka/src/main/java/org/apache/tika/pipes/iterator/kafka/KafkaPipesIteratorConfig.java
similarity index 98%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-kafka/src/main/java/org/apache/tika/pipes/pipesiterator/kafka/KafkaPipesIteratorConfig.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-kafka/src/main/java/org/apache/tika/pipes/iterator/kafka/KafkaPipesIteratorConfig.java
index 323368e6f..53675ac23 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-kafka/src/main/java/org/apache/tika/pipes/pipesiterator/kafka/KafkaPipesIteratorConfig.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-kafka/src/main/java/org/apache/tika/pipes/iterator/kafka/KafkaPipesIteratorConfig.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.pipesiterator.kafka;
+package org.apache.tika.pipes.iterator.kafka;
 
 import java.util.Objects;
 
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-kafka/src/main/java/org/apache/tika/pipes/pipesiterator/kafka/KafkaPipesIteratorFactory.java b/tika-pipes/tika-pipes-plugins/tika-pipes-kafka/src/main/java/org/apache/tika/pipes/iterator/kafka/KafkaPipesIteratorFactory.java
similarity index 97%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-kafka/src/main/java/org/apache/tika/pipes/pipesiterator/kafka/KafkaPipesIteratorFactory.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-kafka/src/main/java/org/apache/tika/pipes/iterator/kafka/KafkaPipesIteratorFactory.java
index 5f7ce4434..4698e2033 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-kafka/src/main/java/org/apache/tika/pipes/pipesiterator/kafka/KafkaPipesIteratorFactory.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-kafka/src/main/java/org/apache/tika/pipes/iterator/kafka/KafkaPipesIteratorFactory.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.pipesiterator.kafka;
+package org.apache.tika.pipes.iterator.kafka;
 
 import java.io.IOException;
 
diff --git a/tika-pipes/tika-emitters/tika-emitter-kafka/src/main/java/org/apache/tika/pipes/emitter/kafka/KafkaEmitterPlugin.java b/tika-pipes/tika-pipes-plugins/tika-pipes-kafka/src/main/java/org/apache/tika/pipes/plugin/kafka/KafkaPipesPlugin.java
similarity index 88%
rename from tika-pipes/tika-emitters/tika-emitter-kafka/src/main/java/org/apache/tika/pipes/emitter/kafka/KafkaEmitterPlugin.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-kafka/src/main/java/org/apache/tika/pipes/plugin/kafka/KafkaPipesPlugin.java
index 57c5cb27a..c726816bb 100644
--- a/tika-pipes/tika-emitters/tika-emitter-kafka/src/main/java/org/apache/tika/pipes/emitter/kafka/KafkaEmitterPlugin.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-kafka/src/main/java/org/apache/tika/pipes/plugin/kafka/KafkaPipesPlugin.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.emitter.kafka;
+package org.apache.tika.pipes.plugin.kafka;
 
 import org.pf4j.Plugin;
 import org.pf4j.PluginWrapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class KafkaEmitterPlugin extends Plugin {
-    private static final Logger LOG = LoggerFactory.getLogger(KafkaEmitterPlugin.class);
+public class KafkaPipesPlugin extends Plugin {
+    private static final Logger LOG = LoggerFactory.getLogger(KafkaPipesPlugin.class);
 
-    public KafkaEmitterPlugin(PluginWrapper wrapper) {
+    public KafkaPipesPlugin(PluginWrapper wrapper) {
         super(wrapper);
     }
 
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-s3/src/main/resources/plugin.properties b/tika-pipes/tika-pipes-plugins/tika-pipes-kafka/src/main/resources/plugin.properties
similarity index 82%
copy from tika-pipes/tika-fetchers/tika-fetcher-s3/src/main/resources/plugin.properties
copy to tika-pipes/tika-pipes-plugins/tika-pipes-kafka/src/main/resources/plugin.properties
index 64452ca7d..d314f8f48 100644
--- a/tika-pipes/tika-fetchers/tika-fetcher-s3/src/main/resources/plugin.properties
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-kafka/src/main/resources/plugin.properties
@@ -14,9 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-plugin.id=s3-fetcher
-plugin.class=org.apache.tika.pipes.fetcher.s3.S3FetcherPlugin
+plugin.id=tika-pipes-kafka-plugin
+plugin.class=org.apache.tika.pipes.plugin.kafka.KafkaPipesPlugin
 plugin.version=4.0.0-SNAPSHOT
-plugin.provider=S3 Fetcher
-plugin.description=Capable of fetching files from Amazon S3
-
+plugin.provider=Apache Tika
+plugin.description=Pipes for kafka
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-kafka/src/test/java/org/apache/tika/pipes/pipesiterator/kafka/TestKafkaPipesIterator.java b/tika-pipes/tika-pipes-plugins/tika-pipes-kafka/src/test/java/org/apache/tika/pipes/iterator/kafka/TestKafkaPipesIterator.java
similarity index 98%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-kafka/src/test/java/org/apache/tika/pipes/pipesiterator/kafka/TestKafkaPipesIterator.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-kafka/src/test/java/org/apache/tika/pipes/iterator/kafka/TestKafkaPipesIterator.java
index 26be328d0..f71c0b4db 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-kafka/src/test/java/org/apache/tika/pipes/pipesiterator/kafka/TestKafkaPipesIterator.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-kafka/src/test/java/org/apache/tika/pipes/iterator/kafka/TestKafkaPipesIterator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.pipesiterator.kafka;
+package org.apache.tika.pipes.iterator.kafka;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-microsoft-graph/src/test/resources/log4j2.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-kafka/src/test/resources/log4j2.xml
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-microsoft-graph/src/test/resources/log4j2.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-kafka/src/test/resources/log4j2.xml
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-microsoft-graph/pom.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-microsoft-graph/pom.xml
similarity index 97%
rename from tika-pipes/tika-fetchers/tika-fetcher-microsoft-graph/pom.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-microsoft-graph/pom.xml
index efe44f54f..a3b7cc6c4 100644
--- a/tika-pipes/tika-fetchers/tika-fetcher-microsoft-graph/pom.xml
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-microsoft-graph/pom.xml
@@ -19,14 +19,14 @@
 -->
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
-    <artifactId>tika-fetchers</artifactId>
+    <artifactId>tika-pipes-plugins</artifactId>
     <groupId>org.apache.tika</groupId>
     <version>4.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>tika-fetcher-microsoft-graph</artifactId>
-  <name>Apache Tika Microsoft Graph Pipes Fetcher</name>
+  <artifactId>tika-pipes-microsoft-graph</artifactId>
+  <name>Apache Tika Pipes Microsoft Graph</name>
 
   <properties>
     <microsoft-graph.version>6.57.0</microsoft-graph.version>
@@ -159,7 +159,7 @@
               <goal>copy-dependencies</goal>
             </goals>
             <configuration>
-              <outputDirectory>${project.build.directory}/lib</outputDirectory>
+              <outputDirectory>target/lib</outputDirectory>
               <includeScope>runtime</includeScope>
               <excludeArtifactIds>${plugin.excluded.artifactIds}</excludeArtifactIds>
               <excludeGroupIds>${plugin.excluded.groupIds}</excludeGroupIds>
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-az-blob/src/main/assembly/assembly.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-microsoft-graph/src/main/assembly/assembly.xml
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-az-blob/src/main/assembly/assembly.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-microsoft-graph/src/main/assembly/assembly.xml
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-microsoft-graph/src/main/java/org/apache/tika/pipes/fetchers/microsoftgraph/MicrosoftGraphFetcher.java b/tika-pipes/tika-pipes-plugins/tika-pipes-microsoft-graph/src/main/java/org/apache/tika/pipes/fetchers/microsoftgraph/MicrosoftGraphFetcher.java
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-microsoft-graph/src/main/java/org/apache/tika/pipes/fetchers/microsoftgraph/MicrosoftGraphFetcher.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-microsoft-graph/src/main/java/org/apache/tika/pipes/fetchers/microsoftgraph/MicrosoftGraphFetcher.java
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-microsoft-graph/src/main/java/org/apache/tika/pipes/fetchers/microsoftgraph/MicrosoftGraphFetcherFactory.java b/tika-pipes/tika-pipes-plugins/tika-pipes-microsoft-graph/src/main/java/org/apache/tika/pipes/fetchers/microsoftgraph/MicrosoftGraphFetcherFactory.java
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-microsoft-graph/src/main/java/org/apache/tika/pipes/fetchers/microsoftgraph/MicrosoftGraphFetcherFactory.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-microsoft-graph/src/main/java/org/apache/tika/pipes/fetchers/microsoftgraph/MicrosoftGraphFetcherFactory.java
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-microsoft-graph/src/main/java/org/apache/tika/pipes/fetchers/microsoftgraph/config/AadCredentialConfigBase.java b/tika-pipes/tika-pipes-plugins/tika-pipes-microsoft-graph/src/main/java/org/apache/tika/pipes/fetchers/microsoftgraph/config/AadCredentialConfigBase.java
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-microsoft-graph/src/main/java/org/apache/tika/pipes/fetchers/microsoftgraph/config/AadCredentialConfigBase.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-microsoft-graph/src/main/java/org/apache/tika/pipes/fetchers/microsoftgraph/config/AadCredentialConfigBase.java
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-microsoft-graph/src/main/java/org/apache/tika/pipes/fetchers/microsoftgraph/config/Client2CertificateCredentialsConfig.java b/tika-pipes/tika-pipes-plugins/tika-pipes-microsoft-graph/src/main/java/org/apache/tika/pipes/fetchers/microsoftgraph/config/Client2CertificateCredentialsConfig.java
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-microsoft-graph/src/main/java/org/apache/tika/pipes/fetchers/microsoftgraph/config/Client2CertificateCredentialsConfig.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-microsoft-graph/src/main/java/org/apache/tika/pipes/fetchers/microsoftgraph/config/Client2CertificateCredentialsConfig.java
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-microsoft-graph/src/main/java/org/apache/tika/pipes/fetchers/microsoftgraph/config/ClientCertificateCredentialsConfig.java b/tika-pipes/tika-pipes-plugins/tika-pipes-microsoft-graph/src/main/java/org/apache/tika/pipes/fetchers/microsoftgraph/config/ClientCertificateCredentialsConfig.java
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-microsoft-graph/src/main/java/org/apache/tika/pipes/fetchers/microsoftgraph/config/ClientCertificateCredentialsConfig.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-microsoft-graph/src/main/java/org/apache/tika/pipes/fetchers/microsoftgraph/config/ClientCertificateCredentialsConfig.java
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-microsoft-graph/src/main/java/org/apache/tika/pipes/fetchers/microsoftgraph/config/ClientSecretCredentialsConfig.java b/tika-pipes/tika-pipes-plugins/tika-pipes-microsoft-graph/src/main/java/org/apache/tika/pipes/fetchers/microsoftgraph/config/ClientSecretCredentialsConfig.java
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-microsoft-graph/src/main/java/org/apache/tika/pipes/fetchers/microsoftgraph/config/ClientSecretCredentialsConfig.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-microsoft-graph/src/main/java/org/apache/tika/pipes/fetchers/microsoftgraph/config/ClientSecretCredentialsConfig.java
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-microsoft-graph/src/main/java/org/apache/tika/pipes/fetchers/microsoftgraph/config/MicrosoftGraphFetcherConfig.java b/tika-pipes/tika-pipes-plugins/tika-pipes-microsoft-graph/src/main/java/org/apache/tika/pipes/fetchers/microsoftgraph/config/MicrosoftGraphFetcherConfig.java
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-microsoft-graph/src/main/java/org/apache/tika/pipes/fetchers/microsoftgraph/config/MicrosoftGraphFetcherConfig.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-microsoft-graph/src/main/java/org/apache/tika/pipes/fetchers/microsoftgraph/config/MicrosoftGraphFetcherConfig.java
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-microsoft-graph/src/main/java/org/apache/tika/pipes/fetchers/microsoftgraph/MicrosoftGraphFetcherPlugin.java b/tika-pipes/tika-pipes-plugins/tika-pipes-microsoft-graph/src/main/java/org/apache/tika/pipes/plugin/microsoftgraph/MicrosoftGraphPipesPlugin.java
similarity index 86%
rename from tika-pipes/tika-fetchers/tika-fetcher-microsoft-graph/src/main/java/org/apache/tika/pipes/fetchers/microsoftgraph/MicrosoftGraphFetcherPlugin.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-microsoft-graph/src/main/java/org/apache/tika/pipes/plugin/microsoftgraph/MicrosoftGraphPipesPlugin.java
index 89002b6fb..2e609dce6 100644
--- a/tika-pipes/tika-fetchers/tika-fetcher-microsoft-graph/src/main/java/org/apache/tika/pipes/fetchers/microsoftgraph/MicrosoftGraphFetcherPlugin.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-microsoft-graph/src/main/java/org/apache/tika/pipes/plugin/microsoftgraph/MicrosoftGraphPipesPlugin.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.fetchers.microsoftgraph;
+package org.apache.tika.pipes.plugin.microsoftgraph;
 
 import org.pf4j.Plugin;
 import org.pf4j.PluginWrapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class MicrosoftGraphFetcherPlugin extends Plugin {
-    private static final Logger LOG = LoggerFactory.getLogger(MicrosoftGraphFetcherPlugin.class);
+public class MicrosoftGraphPipesPlugin extends Plugin {
+    private static final Logger LOG = LoggerFactory.getLogger(MicrosoftGraphPipesPlugin.class);
 
-    public MicrosoftGraphFetcherPlugin(PluginWrapper wrapper) {
+    public MicrosoftGraphPipesPlugin(PluginWrapper wrapper) {
         super(wrapper);
     }
 
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-gcs/src/main/resources/plugin.properties b/tika-pipes/tika-pipes-plugins/tika-pipes-microsoft-graph/src/main/resources/plugin.properties
similarity index 84%
rename from tika-pipes/tika-fetchers/tika-fetcher-gcs/src/main/resources/plugin.properties
rename to tika-pipes/tika-pipes-plugins/tika-pipes-microsoft-graph/src/main/resources/plugin.properties
index e220dd802..21409f89e 100644
--- a/tika-pipes/tika-fetchers/tika-fetcher-gcs/src/main/resources/plugin.properties
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-microsoft-graph/src/main/resources/plugin.properties
@@ -14,8 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-plugin.id=gcs-fetcher
-plugin.class=org.apache.tika.pipes.fetcher.gcs.GCSFetcherPlugin
+plugin.id=tika-pipes-microsoftgraph-plugin
+plugin.class=org.apache.tika.pipes.plugin.microsoftgraph.MicrosoftGraphPipesPlugin
 plugin.version=4.0.0-SNAPSHOT
-plugin.provider=GCS Fetcher
-plugin.description=Capable of fetching files from Google Cloud Storage
+plugin.provider=Apache Tika
+plugin.description=Pipes for MicrosoftGraph
+
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-microsoft-graph/src/test/java/org/apache/tika/pipes/fetchers/microsoftgraph/MicrosoftGraphFetcherTest.java b/tika-pipes/tika-pipes-plugins/tika-pipes-microsoft-graph/src/test/java/org/apache/tika/pipes/fetchers/microsoftgraph/MicrosoftGraphFetcherTest.java
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-microsoft-graph/src/test/java/org/apache/tika/pipes/fetchers/microsoftgraph/MicrosoftGraphFetcherTest.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-microsoft-graph/src/test/java/org/apache/tika/pipes/fetchers/microsoftgraph/MicrosoftGraphFetcherTest.java
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-az-blob/src/test/resources/log4j2.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-microsoft-graph/src/test/resources/log4j2.xml
similarity index 100%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-az-blob/src/test/resources/log4j2.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-microsoft-graph/src/test/resources/log4j2.xml
diff --git a/tika-pipes/tika-emitters/tika-emitter-opensearch/pom.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/pom.xml
similarity index 90%
rename from tika-pipes/tika-emitters/tika-emitter-opensearch/pom.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/pom.xml
index 001378481..818e46bff 100644
--- a/tika-pipes/tika-emitters/tika-emitter-opensearch/pom.xml
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/pom.xml
@@ -19,14 +19,14 @@
 -->
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
-    <artifactId>tika-emitters</artifactId>
+    <artifactId>tika-pipes-plugins</artifactId>
     <groupId>org.apache.tika</groupId>
     <version>4.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>tika-emitter-opensearch</artifactId>
-  <name>Apache Tika OpenSearch emitter</name>
+  <artifactId>tika-pipes-opensearch</artifactId>
+  <name>Apache Tika Pipes OpenSearch</name>
   <properties>
     <!-- Never include the core artifacts in your plugin lib directory. If you do, it will cause the classloading
      to get messed up when finding your plugins. -->
@@ -41,6 +41,16 @@
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>tika-pipes-iterator-commons</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>tika-pipes-reporter-commons</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>tika-httpclient-commons</artifactId>
@@ -54,13 +64,6 @@
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-http</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>tika-core</artifactId>
-      <version>${project.version}</version>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>
@@ -93,7 +96,7 @@
             <manifestEntries>
               <Plugin-Id>opensearch-emitter</Plugin-Id>
               <Plugin-Version>${project.version}</Plugin-Version>
-              <Plugin-Class>org.apache.tika.pipes.emitter.opensearch.OpenSearchEmitterPlugin</Plugin-Class>
+              <Plugin-Class>org.apache.tika.pipes.plugin.OpenSearchPipesPlugin</Plugin-Class>
               <Plugin-Provider>OpenSearch Emitter</Plugin-Provider>
               <Plugin-Description>OpenSearch emitter</Plugin-Description>
               <!--              <Plugin-Requires>1.0.0</Plugin-Requires> -->
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-file-system/src/main/assembly/assembly.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/assembly/assembly.xml
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-file-system/src/main/assembly/assembly.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/assembly/assembly.xml
diff --git a/tika-pipes/tika-emitters/tika-emitter-opensearch/src/main/java/org/apache/tika/pipes/emitter/opensearch/HttpClientConfig.java b/tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/java/org/apache/tika/pipes/emitter/opensearch/HttpClientConfig.java
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-opensearch/src/main/java/org/apache/tika/pipes/emitter/opensearch/HttpClientConfig.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/java/org/apache/tika/pipes/emitter/opensearch/HttpClientConfig.java
diff --git a/tika-pipes/tika-emitters/tika-emitter-opensearch/src/main/java/org/apache/tika/pipes/emitter/opensearch/JsonResponse.java b/tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/java/org/apache/tika/pipes/emitter/opensearch/JsonResponse.java
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-opensearch/src/main/java/org/apache/tika/pipes/emitter/opensearch/JsonResponse.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/java/org/apache/tika/pipes/emitter/opensearch/JsonResponse.java
diff --git a/tika-pipes/tika-emitters/tika-emitter-opensearch/src/main/java/org/apache/tika/pipes/emitter/opensearch/OpenSearchClient.java b/tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/java/org/apache/tika/pipes/emitter/opensearch/OpenSearchClient.java
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-opensearch/src/main/java/org/apache/tika/pipes/emitter/opensearch/OpenSearchClient.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/java/org/apache/tika/pipes/emitter/opensearch/OpenSearchClient.java
diff --git a/tika-pipes/tika-emitters/tika-emitter-opensearch/src/main/java/org/apache/tika/pipes/emitter/opensearch/OpenSearchEmitter.java b/tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/java/org/apache/tika/pipes/emitter/opensearch/OpenSearchEmitter.java
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-opensearch/src/main/java/org/apache/tika/pipes/emitter/opensearch/OpenSearchEmitter.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/java/org/apache/tika/pipes/emitter/opensearch/OpenSearchEmitter.java
diff --git a/tika-pipes/tika-emitters/tika-emitter-opensearch/src/main/java/org/apache/tika/pipes/emitter/opensearch/OpenSearchEmitterConfig.java b/tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/java/org/apache/tika/pipes/emitter/opensearch/OpenSearchEmitterConfig.java
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-opensearch/src/main/java/org/apache/tika/pipes/emitter/opensearch/OpenSearchEmitterConfig.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/java/org/apache/tika/pipes/emitter/opensearch/OpenSearchEmitterConfig.java
diff --git a/tika-pipes/tika-emitters/tika-emitter-opensearch/src/main/java/org/apache/tika/pipes/emitter/opensearch/OpenSearchEmitterFactory.java b/tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/java/org/apache/tika/pipes/emitter/opensearch/OpenSearchEmitterFactory.java
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-opensearch/src/main/java/org/apache/tika/pipes/emitter/opensearch/OpenSearchEmitterFactory.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/java/org/apache/tika/pipes/emitter/opensearch/OpenSearchEmitterFactory.java
diff --git a/tika-pipes/tika-emitters/tika-emitter-opensearch/src/main/java/org/apache/tika/pipes/emitter/opensearch/OpenSearchEmitterPlugin.java b/tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/java/org/apache/tika/pipes/plugin/opensearch/OpenSearchPipesPlugin.java
similarity index 87%
rename from tika-pipes/tika-emitters/tika-emitter-opensearch/src/main/java/org/apache/tika/pipes/emitter/opensearch/OpenSearchEmitterPlugin.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/java/org/apache/tika/pipes/plugin/opensearch/OpenSearchPipesPlugin.java
index 3b07102bf..6df853505 100644
--- a/tika-pipes/tika-emitters/tika-emitter-opensearch/src/main/java/org/apache/tika/pipes/emitter/opensearch/OpenSearchEmitterPlugin.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/java/org/apache/tika/pipes/plugin/opensearch/OpenSearchPipesPlugin.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.emitter.opensearch;
+package org.apache.tika.pipes.plugin.opensearch;
 
 import org.pf4j.Plugin;
 import org.pf4j.PluginWrapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class OpenSearchEmitterPlugin extends Plugin {
-    private static final Logger LOG = LoggerFactory.getLogger(OpenSearchEmitterPlugin.class);
+public class OpenSearchPipesPlugin extends Plugin {
+    private static final Logger LOG = LoggerFactory.getLogger(OpenSearchPipesPlugin.class);
 
-    public OpenSearchEmitterPlugin(PluginWrapper wrapper) {
+    public OpenSearchPipesPlugin(PluginWrapper wrapper) {
         super(wrapper);
     }
 
diff --git a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-opensearch/src/main/java/org/apache/tika/pipes/reporters/opensearch/HttpClientConfig.java b/tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/java/org/apache/tika/pipes/reporter/opensearch/HttpClientConfig.java
similarity index 96%
rename from tika-pipes/tika-pipes-reporters/tika-pipes-reporter-opensearch/src/main/java/org/apache/tika/pipes/reporters/opensearch/HttpClientConfig.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/java/org/apache/tika/pipes/reporter/opensearch/HttpClientConfig.java
index 158602de4..a6bd2c81b 100644
--- a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-opensearch/src/main/java/org/apache/tika/pipes/reporters/opensearch/HttpClientConfig.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/java/org/apache/tika/pipes/reporter/opensearch/HttpClientConfig.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.reporters.opensearch;
+package org.apache.tika.pipes.reporter.opensearch;
 
 import java.io.IOException;
 
diff --git a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-opensearch/src/main/java/org/apache/tika/pipes/reporters/opensearch/JsonResponse.java b/tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/java/org/apache/tika/pipes/reporter/opensearch/JsonResponse.java
similarity index 96%
rename from tika-pipes/tika-pipes-reporters/tika-pipes-reporter-opensearch/src/main/java/org/apache/tika/pipes/reporters/opensearch/JsonResponse.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/java/org/apache/tika/pipes/reporter/opensearch/JsonResponse.java
index 761e93b7f..ebf43da22 100644
--- a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-opensearch/src/main/java/org/apache/tika/pipes/reporters/opensearch/JsonResponse.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/java/org/apache/tika/pipes/reporter/opensearch/JsonResponse.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.reporters.opensearch;
+package org.apache.tika.pipes.reporter.opensearch;
 
 
 import com.fasterxml.jackson.databind.JsonNode;
diff --git a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-opensearch/src/main/java/org/apache/tika/pipes/reporters/opensearch/OpenSearchClient.java b/tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/java/org/apache/tika/pipes/reporter/opensearch/OpenSearchClient.java
similarity index 99%
rename from tika-pipes/tika-pipes-reporters/tika-pipes-reporter-opensearch/src/main/java/org/apache/tika/pipes/reporters/opensearch/OpenSearchClient.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/java/org/apache/tika/pipes/reporter/opensearch/OpenSearchClient.java
index 639ff16bf..ab6676112 100644
--- a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-opensearch/src/main/java/org/apache/tika/pipes/reporters/opensearch/OpenSearchClient.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/java/org/apache/tika/pipes/reporter/opensearch/OpenSearchClient.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.reporters.opensearch;
+package org.apache.tika.pipes.reporter.opensearch;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-opensearch/src/main/java/org/apache/tika/pipes/reporters/opensearch/OpenSearchPipesReporter.java b/tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/java/org/apache/tika/pipes/reporter/opensearch/OpenSearchPipesReporter.java
similarity index 99%
rename from tika-pipes/tika-pipes-reporters/tika-pipes-reporter-opensearch/src/main/java/org/apache/tika/pipes/reporters/opensearch/OpenSearchPipesReporter.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/java/org/apache/tika/pipes/reporter/opensearch/OpenSearchPipesReporter.java
index b4e7d82eb..8b77fadc7 100644
--- a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-opensearch/src/main/java/org/apache/tika/pipes/reporters/opensearch/OpenSearchPipesReporter.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/java/org/apache/tika/pipes/reporter/opensearch/OpenSearchPipesReporter.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.reporters.opensearch;
+package org.apache.tika.pipes.reporter.opensearch;
 
 import java.io.IOException;
 
diff --git a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-opensearch/src/main/java/org/apache/tika/pipes/reporters/opensearch/OpenSearchReporterConfig.java b/tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/java/org/apache/tika/pipes/reporter/opensearch/OpenSearchReporterConfig.java
similarity index 97%
rename from tika-pipes/tika-pipes-reporters/tika-pipes-reporter-opensearch/src/main/java/org/apache/tika/pipes/reporters/opensearch/OpenSearchReporterConfig.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/java/org/apache/tika/pipes/reporter/opensearch/OpenSearchReporterConfig.java
index cf68e1469..a787fc301 100644
--- a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-opensearch/src/main/java/org/apache/tika/pipes/reporters/opensearch/OpenSearchReporterConfig.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/java/org/apache/tika/pipes/reporter/opensearch/OpenSearchReporterConfig.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.reporters.opensearch;
+package org.apache.tika.pipes.reporter.opensearch;
 
 import java.util.Set;
 
diff --git a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-opensearch/src/main/java/org/apache/tika/pipes/reporters/opensearch/OpenSearchReporterFactory.java b/tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/java/org/apache/tika/pipes/reporter/opensearch/OpenSearchReporterFactory.java
similarity index 97%
rename from tika-pipes/tika-pipes-reporters/tika-pipes-reporter-opensearch/src/main/java/org/apache/tika/pipes/reporters/opensearch/OpenSearchReporterFactory.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/java/org/apache/tika/pipes/reporter/opensearch/OpenSearchReporterFactory.java
index 4c6e2319b..1a6a83c64 100644
--- a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-opensearch/src/main/java/org/apache/tika/pipes/reporters/opensearch/OpenSearchReporterFactory.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/java/org/apache/tika/pipes/reporter/opensearch/OpenSearchReporterFactory.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.reporters.opensearch;
+package org.apache.tika.pipes.reporter.opensearch;
 
 import java.io.IOException;
 
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-s3/src/main/resources/plugin.properties b/tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/resources/plugin.properties
similarity index 81%
rename from tika-pipes/tika-fetchers/tika-fetcher-s3/src/main/resources/plugin.properties
rename to tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/resources/plugin.properties
index 64452ca7d..1e47ea66c 100644
--- a/tika-pipes/tika-fetchers/tika-fetcher-s3/src/main/resources/plugin.properties
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/main/resources/plugin.properties
@@ -14,9 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-plugin.id=s3-fetcher
-plugin.class=org.apache.tika.pipes.fetcher.s3.S3FetcherPlugin
+plugin.id=tika-pipes-opensearch-plugin
+plugin.class=org.apache.tika.pipes.plugin.opensearch.OpenSearchPipesPlugin
 plugin.version=4.0.0-SNAPSHOT
-plugin.provider=S3 Fetcher
-plugin.description=Capable of fetching files from Amazon S3
+plugin.provider=Apache Tika
+plugin.description=Pipes for OpenSearch
 
diff --git a/tika-pipes/tika-emitters/tika-emitter-opensearch/src/test/java/org/apache/tika/pipes/emitter/opensearch/OpenSearchClientTest.java b/tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/test/java/org/apache/tika/pipes/emitter/opensearch/OpenSearchClientTest.java
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-opensearch/src/test/java/org/apache/tika/pipes/emitter/opensearch/OpenSearchClientTest.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/test/java/org/apache/tika/pipes/emitter/opensearch/OpenSearchClientTest.java
diff --git a/tika-pipes/tika-emitters/tika-emitter-opensearch/src/test/resources/tika-config-simple-emitter.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/test/resources/tika-config-simple-emitter.xml
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-opensearch/src/test/resources/tika-config-simple-emitter.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-opensearch/src/test/resources/tika-config-simple-emitter.xml
diff --git a/tika-pipes/tika-emitters/tika-emitter-s3/pom.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-s3/pom.xml
similarity index 93%
rename from tika-pipes/tika-emitters/tika-emitter-s3/pom.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-s3/pom.xml
index e5b29c2f6..7a6099e5e 100644
--- a/tika-pipes/tika-emitters/tika-emitter-s3/pom.xml
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-s3/pom.xml
@@ -19,14 +19,14 @@
 -->
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
-    <artifactId>tika-emitters</artifactId>
+    <artifactId>tika-pipes-plugins</artifactId>
     <groupId>org.apache.tika</groupId>
     <version>4.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>tika-emitter-s3</artifactId>
-  <name>Apache Tika S3 emitter</name>
+  <artifactId>tika-pipes-s3</artifactId>
+  <name>Apache Tika Pipes S3</name>
 
   <properties>
     <!-- Never include the core artifacts in your plugin lib directory. If you do, it will cause the classloading
@@ -42,6 +42,11 @@
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>tika-pipes-iterator-commons</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>tika-serialization</artifactId>
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-gcs/src/main/assembly/assembly.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-s3/src/main/assembly/assembly.xml
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-gcs/src/main/assembly/assembly.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-s3/src/main/assembly/assembly.xml
diff --git a/tika-pipes/tika-emitters/tika-emitter-s3/src/main/java/org/apache/tika/pipes/emitter/s3/S3Emitter.java b/tika-pipes/tika-pipes-plugins/tika-pipes-s3/src/main/java/org/apache/tika/pipes/emitter/s3/S3Emitter.java
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-s3/src/main/java/org/apache/tika/pipes/emitter/s3/S3Emitter.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-s3/src/main/java/org/apache/tika/pipes/emitter/s3/S3Emitter.java
diff --git a/tika-pipes/tika-emitters/tika-emitter-s3/src/main/java/org/apache/tika/pipes/emitter/s3/S3EmitterConfig.java b/tika-pipes/tika-pipes-plugins/tika-pipes-s3/src/main/java/org/apache/tika/pipes/emitter/s3/S3EmitterConfig.java
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-s3/src/main/java/org/apache/tika/pipes/emitter/s3/S3EmitterConfig.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-s3/src/main/java/org/apache/tika/pipes/emitter/s3/S3EmitterConfig.java
diff --git a/tika-pipes/tika-emitters/tika-emitter-s3/src/main/java/org/apache/tika/pipes/emitter/s3/S3EmitterFactory.java b/tika-pipes/tika-pipes-plugins/tika-pipes-s3/src/main/java/org/apache/tika/pipes/emitter/s3/S3EmitterFactory.java
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-s3/src/main/java/org/apache/tika/pipes/emitter/s3/S3EmitterFactory.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-s3/src/main/java/org/apache/tika/pipes/emitter/s3/S3EmitterFactory.java
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-s3/src/main/java/org/apache/tika/pipes/fetcher/s3/S3Fetcher.java b/tika-pipes/tika-pipes-plugins/tika-pipes-s3/src/main/java/org/apache/tika/pipes/fetcher/s3/S3Fetcher.java
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-s3/src/main/java/org/apache/tika/pipes/fetcher/s3/S3Fetcher.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-s3/src/main/java/org/apache/tika/pipes/fetcher/s3/S3Fetcher.java
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-s3/src/main/java/org/apache/tika/pipes/fetcher/s3/S3FetcherFactory.java b/tika-pipes/tika-pipes-plugins/tika-pipes-s3/src/main/java/org/apache/tika/pipes/fetcher/s3/S3FetcherFactory.java
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-s3/src/main/java/org/apache/tika/pipes/fetcher/s3/S3FetcherFactory.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-s3/src/main/java/org/apache/tika/pipes/fetcher/s3/S3FetcherFactory.java
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-s3/src/main/java/org/apache/tika/pipes/fetcher/s3/config/S3FetcherConfig.java b/tika-pipes/tika-pipes-plugins/tika-pipes-s3/src/main/java/org/apache/tika/pipes/fetcher/s3/config/S3FetcherConfig.java
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-s3/src/main/java/org/apache/tika/pipes/fetcher/s3/config/S3FetcherConfig.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-s3/src/main/java/org/apache/tika/pipes/fetcher/s3/config/S3FetcherConfig.java
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/src/main/java/org/apache/tika/pipes/pipesiterator/s3/S3PipesIterator.java b/tika-pipes/tika-pipes-plugins/tika-pipes-s3/src/main/java/org/apache/tika/pipes/iterator/s3/S3PipesIterator.java
similarity index 99%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/src/main/java/org/apache/tika/pipes/pipesiterator/s3/S3PipesIterator.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-s3/src/main/java/org/apache/tika/pipes/iterator/s3/S3PipesIterator.java
index ecb7c7af9..4a982e844 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/src/main/java/org/apache/tika/pipes/pipesiterator/s3/S3PipesIterator.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-s3/src/main/java/org/apache/tika/pipes/iterator/s3/S3PipesIterator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.pipesiterator.s3;
+package org.apache.tika.pipes.iterator.s3;
 
 import java.io.IOException;
 import java.net.URI;
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/src/main/java/org/apache/tika/pipes/pipesiterator/s3/S3PipesIteratorConfig.java b/tika-pipes/tika-pipes-plugins/tika-pipes-s3/src/main/java/org/apache/tika/pipes/iterator/s3/S3PipesIteratorConfig.java
similarity index 99%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/src/main/java/org/apache/tika/pipes/pipesiterator/s3/S3PipesIteratorConfig.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-s3/src/main/java/org/apache/tika/pipes/iterator/s3/S3PipesIteratorConfig.java
index d8107f95c..dc4bd12c2 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/src/main/java/org/apache/tika/pipes/pipesiterator/s3/S3PipesIteratorConfig.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-s3/src/main/java/org/apache/tika/pipes/iterator/s3/S3PipesIteratorConfig.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.pipesiterator.s3;
+package org.apache.tika.pipes.iterator.s3;
 
 import java.util.Objects;
 
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/src/main/java/org/apache/tika/pipes/pipesiterator/s3/S3PipesIteratorFactory.java b/tika-pipes/tika-pipes-plugins/tika-pipes-s3/src/main/java/org/apache/tika/pipes/iterator/s3/S3PipesIteratorFactory.java
similarity index 97%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/src/main/java/org/apache/tika/pipes/pipesiterator/s3/S3PipesIteratorFactory.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-s3/src/main/java/org/apache/tika/pipes/iterator/s3/S3PipesIteratorFactory.java
index 1fe1570e7..05aa62132 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/src/main/java/org/apache/tika/pipes/pipesiterator/s3/S3PipesIteratorFactory.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-s3/src/main/java/org/apache/tika/pipes/iterator/s3/S3PipesIteratorFactory.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.pipesiterator.s3;
+package org.apache.tika.pipes.iterator.s3;
 
 import java.io.IOException;
 
diff --git a/tika-pipes/tika-emitters/tika-emitter-s3/src/main/java/org/apache/tika/pipes/emitter/s3/S3EmitterPlugin.java b/tika-pipes/tika-pipes-plugins/tika-pipes-s3/src/main/java/org/apache/tika/pipes/plugin/s3/S3PipesPlugin.java
similarity index 89%
rename from tika-pipes/tika-emitters/tika-emitter-s3/src/main/java/org/apache/tika/pipes/emitter/s3/S3EmitterPlugin.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-s3/src/main/java/org/apache/tika/pipes/plugin/s3/S3PipesPlugin.java
index 22e9b43a2..78bbdaebc 100644
--- a/tika-pipes/tika-emitters/tika-emitter-s3/src/main/java/org/apache/tika/pipes/emitter/s3/S3EmitterPlugin.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-s3/src/main/java/org/apache/tika/pipes/plugin/s3/S3PipesPlugin.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.emitter.s3;
+package org.apache.tika.pipes.plugin.s3;
 
 import org.pf4j.Plugin;
 import org.pf4j.PluginWrapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class S3EmitterPlugin extends Plugin {
-    private static final Logger LOG = LoggerFactory.getLogger(S3EmitterPlugin.class);
+public class S3PipesPlugin extends Plugin {
+    private static final Logger LOG = LoggerFactory.getLogger(S3PipesPlugin.class);
 
-    public S3EmitterPlugin(PluginWrapper wrapper) {
+    public S3PipesPlugin(PluginWrapper wrapper) {
         super(wrapper);
     }
 
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-http/src/main/resources/plugin.properties b/tika-pipes/tika-pipes-plugins/tika-pipes-s3/src/main/resources/plugin.properties
similarity index 82%
copy from tika-pipes/tika-fetchers/tika-fetcher-http/src/main/resources/plugin.properties
copy to tika-pipes/tika-pipes-plugins/tika-pipes-s3/src/main/resources/plugin.properties
index 19a6666d4..e4e554789 100644
--- a/tika-pipes/tika-fetchers/tika-fetcher-http/src/main/resources/plugin.properties
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-s3/src/main/resources/plugin.properties
@@ -14,8 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-plugin.id=http-fetcher
-plugin.class=org.apache.tika.pipes.fetcher.http.HttpFetcherPlugin
+plugin.id=tika-pipes-s3-plugin
+plugin.class=org.apache.tika.pipes.plugin.s3.S3PipesPlugin
 plugin.version=4.0.0-SNAPSHOT
-plugin.provider=Http Fetcher
-plugin.description=Capable of fetching from http
+plugin.provider=Apache Tika
+plugin.description=Pipes for s3
+
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-s3/src/test/java/org/apache/tika/pipes/fetcher/s3/TestS3Fetcher.java b/tika-pipes/tika-pipes-plugins/tika-pipes-s3/src/test/java/org.apache.tika.pipes.fetcher.s3/TestS3Fetcher.java
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-s3/src/test/java/org/apache/tika/pipes/fetcher/s3/TestS3Fetcher.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-s3/src/test/java/org.apache.tika.pipes.fetcher.s3/TestS3Fetcher.java
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/src/test/java/org/apache/tika/pipes/pipesiterator/s3/TestS3PipesIterator.java b/tika-pipes/tika-pipes-plugins/tika-pipes-s3/src/test/java/org/apache/tika/pipes/iterator/s3/TestS3PipesIterator.java
similarity index 98%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/src/test/java/org/apache/tika/pipes/pipesiterator/s3/TestS3PipesIterator.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-s3/src/test/java/org/apache/tika/pipes/iterator/s3/TestS3PipesIterator.java
index d2bd20d32..d840fc295 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/src/test/java/org/apache/tika/pipes/pipesiterator/s3/TestS3PipesIterator.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-s3/src/test/java/org/apache/tika/pipes/iterator/s3/TestS3PipesIterator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.pipesiterator.s3;
+package org.apache.tika.pipes.iterator.s3;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-kafka/src/test/resources/log4j2.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-s3/src/test/java/org/apache/tika/pipes/iterator/s3/log4j2.xml
similarity index 100%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-kafka/src/test/resources/log4j2.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-s3/src/test/java/org/apache/tika/pipes/iterator/s3/log4j2.xml
diff --git a/tika-pipes/tika-emitters/tika-emitter-solr/pom.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-solr/pom.xml
similarity index 94%
rename from tika-pipes/tika-emitters/tika-emitter-solr/pom.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-solr/pom.xml
index 4fcb6c5ff..c33b1dcdc 100644
--- a/tika-pipes/tika-emitters/tika-emitter-solr/pom.xml
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-solr/pom.xml
@@ -19,14 +19,14 @@
 -->
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
-    <artifactId>tika-emitters</artifactId>
+    <artifactId>tika-pipes-plugins</artifactId>
     <groupId>org.apache.tika</groupId>
     <version>4.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>tika-emitter-solr</artifactId>
-  <name>Apache Tika Apache Solr emitter</name>
+  <artifactId>tika-pipes-solr</artifactId>
+  <name>Apache Tika Pipes Apache Solr</name>
   <packaging>jar</packaging>
 
   <properties>
@@ -37,6 +37,11 @@
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>tika-pipes-iterator-commons</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>tika-pipes-api</artifactId>
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-http/src/main/assembly/assembly.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-solr/src/main/assembly/assembly.xml
similarity index 100%
rename from tika-pipes/tika-fetchers/tika-fetcher-http/src/main/assembly/assembly.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-solr/src/main/assembly/assembly.xml
diff --git a/tika-pipes/tika-emitters/tika-emitter-solr/src/main/java/org/apache/tika/pipes/emitter/solr/SolrEmitter.java b/tika-pipes/tika-pipes-plugins/tika-pipes-solr/src/main/java/org/apache/tika/pipes/emitter/solr/SolrEmitter.java
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-solr/src/main/java/org/apache/tika/pipes/emitter/solr/SolrEmitter.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-solr/src/main/java/org/apache/tika/pipes/emitter/solr/SolrEmitter.java
diff --git a/tika-pipes/tika-emitters/tika-emitter-solr/src/main/java/org/apache/tika/pipes/emitter/solr/SolrEmitterConfig.java b/tika-pipes/tika-pipes-plugins/tika-pipes-solr/src/main/java/org/apache/tika/pipes/emitter/solr/SolrEmitterConfig.java
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-solr/src/main/java/org/apache/tika/pipes/emitter/solr/SolrEmitterConfig.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-solr/src/main/java/org/apache/tika/pipes/emitter/solr/SolrEmitterConfig.java
diff --git a/tika-pipes/tika-emitters/tika-emitter-solr/src/main/java/org/apache/tika/pipes/emitter/solr/SolrEmitterFactory.java b/tika-pipes/tika-pipes-plugins/tika-pipes-solr/src/main/java/org/apache/tika/pipes/emitter/solr/SolrEmitterFactory.java
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-solr/src/main/java/org/apache/tika/pipes/emitter/solr/SolrEmitterFactory.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-solr/src/main/java/org/apache/tika/pipes/emitter/solr/SolrEmitterFactory.java
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-solr/src/main/java/org/apache/tika/pipes/pipesiterator/solr/SolrPipesIterator.java b/tika-pipes/tika-pipes-plugins/tika-pipes-solr/src/main/java/org/apache/tika/pipes/iterator/solr/SolrPipesIterator.java
similarity index 99%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-solr/src/main/java/org/apache/tika/pipes/pipesiterator/solr/SolrPipesIterator.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-solr/src/main/java/org/apache/tika/pipes/iterator/solr/SolrPipesIterator.java
index 7cf5d5096..f851bcdf8 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-solr/src/main/java/org/apache/tika/pipes/pipesiterator/solr/SolrPipesIterator.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-solr/src/main/java/org/apache/tika/pipes/iterator/solr/SolrPipesIterator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.pipesiterator.solr;
+package org.apache.tika.pipes.iterator.solr;
 
 import java.io.IOException;
 import java.util.Collections;
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-solr/src/main/java/org/apache/tika/pipes/pipesiterator/solr/SolrPipesIteratorConfig.java b/tika-pipes/tika-pipes-plugins/tika-pipes-solr/src/main/java/org/apache/tika/pipes/iterator/solr/SolrPipesIteratorConfig.java
similarity index 99%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-solr/src/main/java/org/apache/tika/pipes/pipesiterator/solr/SolrPipesIteratorConfig.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-solr/src/main/java/org/apache/tika/pipes/iterator/solr/SolrPipesIteratorConfig.java
index 6def8f719..60211ed9a 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-solr/src/main/java/org/apache/tika/pipes/pipesiterator/solr/SolrPipesIteratorConfig.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-solr/src/main/java/org/apache/tika/pipes/iterator/solr/SolrPipesIteratorConfig.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.pipesiterator.solr;
+package org.apache.tika.pipes.iterator.solr;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-solr/src/main/java/org/apache/tika/pipes/pipesiterator/solr/SolrPipesIteratorFactory.java b/tika-pipes/tika-pipes-plugins/tika-pipes-solr/src/main/java/org/apache/tika/pipes/iterator/solr/SolrPipesIteratorFactory.java
similarity index 97%
rename from tika-pipes/tika-pipes-iterators/tika-pipes-iterator-solr/src/main/java/org/apache/tika/pipes/pipesiterator/solr/SolrPipesIteratorFactory.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-solr/src/main/java/org/apache/tika/pipes/iterator/solr/SolrPipesIteratorFactory.java
index b0c0125b0..f822e2c68 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-solr/src/main/java/org/apache/tika/pipes/pipesiterator/solr/SolrPipesIteratorFactory.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-solr/src/main/java/org/apache/tika/pipes/iterator/solr/SolrPipesIteratorFactory.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.pipesiterator.solr;
+package org.apache.tika.pipes.iterator.solr;
 
 import java.io.IOException;
 
diff --git a/tika-pipes/tika-emitters/tika-emitter-solr/src/main/java/org/apache/tika/pipes/emitter/solr/SolrEmitterPlugin.java b/tika-pipes/tika-pipes-plugins/tika-pipes-solr/src/main/java/org/apache/tika/pipes/plugin/solr/SolrPipesPlugin.java
similarity index 88%
rename from tika-pipes/tika-emitters/tika-emitter-solr/src/main/java/org/apache/tika/pipes/emitter/solr/SolrEmitterPlugin.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-solr/src/main/java/org/apache/tika/pipes/plugin/solr/SolrPipesPlugin.java
index f14624b44..94ff9f7f3 100644
--- a/tika-pipes/tika-emitters/tika-emitter-solr/src/main/java/org/apache/tika/pipes/emitter/solr/SolrEmitterPlugin.java
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-solr/src/main/java/org/apache/tika/pipes/plugin/solr/SolrPipesPlugin.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tika.pipes.emitter.solr;
+package org.apache.tika.pipes.plugin.solr;
 
 import org.pf4j.Plugin;
 import org.pf4j.PluginWrapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class SolrEmitterPlugin extends Plugin {
-    private static final Logger LOG = LoggerFactory.getLogger(SolrEmitterPlugin.class);
+public class SolrPipesPlugin extends Plugin {
+    private static final Logger LOG = LoggerFactory.getLogger(SolrPipesPlugin.class);
 
-    public SolrEmitterPlugin(PluginWrapper wrapper) {
+    public SolrPipesPlugin(PluginWrapper wrapper) {
         super(wrapper);
     }
 
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-http/src/main/resources/plugin.properties b/tika-pipes/tika-pipes-plugins/tika-pipes-solr/src/main/resources/plugin.properties
similarity index 82%
rename from tika-pipes/tika-fetchers/tika-fetcher-http/src/main/resources/plugin.properties
rename to tika-pipes/tika-pipes-plugins/tika-pipes-solr/src/main/resources/plugin.properties
index 19a6666d4..fd08f5a80 100644
--- a/tika-pipes/tika-fetchers/tika-fetcher-http/src/main/resources/plugin.properties
+++ b/tika-pipes/tika-pipes-plugins/tika-pipes-solr/src/main/resources/plugin.properties
@@ -14,8 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-plugin.id=http-fetcher
-plugin.class=org.apache.tika.pipes.fetcher.http.HttpFetcherPlugin
+plugin.id=tika-pipes-solr-plugin
+plugin.class=org.apache.tika.pipes.plugin.solr.SolrPipesPlugin
 plugin.version=4.0.0-SNAPSHOT
-plugin.provider=Http Fetcher
-plugin.description=Capable of fetching from http
+plugin.provider=Apache Tika
+plugin.description=Pipes for Apache Solr
+
diff --git a/tika-pipes/tika-emitters/tika-emitter-solr/src/test/java/org/apache/tika/pipes/emitter/solr/SolrEmitterDevTest.java b/tika-pipes/tika-pipes-plugins/tika-pipes-solr/src/test/java/org/apache/tika/pipes/emitter/solr/SolrEmitterDevTest.java
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-solr/src/test/java/org/apache/tika/pipes/emitter/solr/SolrEmitterDevTest.java
rename to tika-pipes/tika-pipes-plugins/tika-pipes-solr/src/test/java/org/apache/tika/pipes/emitter/solr/SolrEmitterDevTest.java
diff --git a/tika-pipes/tika-emitters/tika-emitter-solr/src/test/resources/log4j2.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-solr/src/test/resources/log4j2.xml
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-solr/src/test/resources/log4j2.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-solr/src/test/resources/log4j2.xml
diff --git a/tika-pipes/tika-emitters/tika-emitter-solr/src/test/resources/tika-config-simple-emitter.xml b/tika-pipes/tika-pipes-plugins/tika-pipes-solr/src/test/resources/tika-config-simple-emitter.xml
similarity index 100%
rename from tika-pipes/tika-emitters/tika-emitter-solr/src/test/resources/tika-config-simple-emitter.xml
rename to tika-pipes/tika-pipes-plugins/tika-pipes-solr/src/test/resources/tika-config-simple-emitter.xml
diff --git a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-commons/pom.xml b/tika-pipes/tika-pipes-reporter-commons/pom.xml
similarity index 66%
rename from tika-pipes/tika-pipes-reporters/tika-pipes-reporter-commons/pom.xml
rename to tika-pipes/tika-pipes-reporter-commons/pom.xml
index 63f62b31c..6cabaebc2 100644
--- a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-commons/pom.xml
+++ b/tika-pipes/tika-pipes-reporter-commons/pom.xml
@@ -20,9 +20,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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.apache.tika</groupId>
-    <artifactId>tika-pipes-reporters</artifactId>
+    <artifactId>tika-pipes</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -31,4 +30,24 @@
   <name>Apache Tika Pipes Reporter - base</name>
   <url>https://tika.apache.org/</url>
 
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.tika</groupId>
+      <artifactId>tika-pipes-api</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>tika-core</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tika</groupId>
+      <artifactId>tika-plugins-core</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
 </project>
diff --git a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-commons/src/main/java/org/apache/tika/pipes/reporters/PipesReporterBase.java b/tika-pipes/tika-pipes-reporter-commons/src/main/java/org/apache/tika/pipes/reporters/PipesReporterBase.java
similarity index 100%
rename from tika-pipes/tika-pipes-reporters/tika-pipes-reporter-commons/src/main/java/org/apache/tika/pipes/reporters/PipesReporterBase.java
rename to tika-pipes/tika-pipes-reporter-commons/src/main/java/org/apache/tika/pipes/reporters/PipesReporterBase.java
diff --git a/tika-pipes/tika-pipes-reporters/pom.xml b/tika-pipes/tika-pipes-reporters/pom.xml
deleted file mode 100644
index d347ac80b..000000000
--- a/tika-pipes/tika-pipes-reporters/pom.xml
+++ /dev/null
@@ -1,82 +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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <groupId>org.apache.tika</groupId>
-    <artifactId>tika-pipes</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>tika-pipes-reporters</artifactId>
-  <name>Apache Tika Pipes Reporters</name>
-  <url>https://tika.apache.org/</url>
-  <packaging>pom</packaging>
-
-  <modules>
-    <module>tika-pipes-reporter-commons</module>
-    <module>tika-pipes-reporter-fs-status</module>
-    <module>tika-pipes-reporter-jdbc</module>
-    <module>tika-pipes-reporter-opensearch</module>
-  </modules>
-
-  <properties>
-    <!-- Override below properties in each plugin's pom.xml -->
-    <plugin.id/>
-    <plugin.class/>
-    <plugin.version/>
-    <plugin.provider/>
-    <plugin.dependencies/>
-  </properties>
-  <dependencies>
-    <dependency>
-      <groupId>org.pf4j</groupId>
-      <artifactId>pf4j</artifactId>
-      <!-- !!! VERY IMPORTANT -->
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tika</groupId>
-      <artifactId>tika-pipes-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tika</groupId>
-      <artifactId>tika-core</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tika</groupId>
-      <artifactId>tika-plugins-core</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j2-impl</artifactId>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-  <scm>
-    <tag>3.0.0-rc1</tag>
-  </scm>
-</project>
diff --git a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-fs-status/pom.xml b/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-fs-status/pom.xml
deleted file mode 100644
index a4f523505..000000000
--- a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-fs-status/pom.xml
+++ /dev/null
@@ -1,110 +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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <groupId>org.apache.tika</groupId>
-    <artifactId>tika-pipes-reporters</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>tika-pipes-reporter-fs-status</artifactId>
-
-  <name>Apache Tika Pipes Reporter - FileSystem Status Reporter</name>
-  <url>https://tika.apache.org/</url>
-  <properties>
-    <plugin.excluded.artifactIds>tika-core,tika-pipes-api,tika-serialization,tika-plugins-core</plugin.excluded.artifactIds>
-    <plugin.excluded.groupIds>org.apache.logging.log4j,org.slf4j</plugin.excluded.groupIds>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.fasterxml.jackson.datatype</groupId>
-      <artifactId>jackson-datatype-jsr310</artifactId>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>3.6.1</version>
-        <executions>
-          <execution>
-            <id>copy-dependencies</id>
-            <phase>package</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/lib</outputDirectory>
-              <includeScope>runtime</includeScope>
-              <excludeArtifactIds>${plugin.excluded.artifactIds}</excludeArtifactIds>
-              <excludeGroupIds>${plugin.excluded.groupIds}</excludeGroupIds>
-            </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.pipes.reporters.fs</Automatic-Module-Name>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/assembly.xml</descriptor>
-          </descriptors>
-          <appendAssemblyId>false</appendAssemblyId>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <annotationProcessors>
-            <annotationProcessor>org.pf4j.processor.ExtensionAnnotationProcessor</annotationProcessor>
-          </annotationProcessors>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <scm>
-    <tag>3.0.0-rc1</tag>
-  </scm>
-</project>
diff --git a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-fs-status/src/main/assembly/assembly.xml b/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-fs-status/src/main/assembly/assembly.xml
deleted file mode 100644
index 890cfd8cf..000000000
--- a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-fs-status/src/main/assembly/assembly.xml
+++ /dev/null
@@ -1,67 +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.
--->
-<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
-          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0
-                              http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-  <id>dependencies-zip</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <directory>${project.build.directory}/lib</directory>
-      <outputDirectory>/lib</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.directory}</directory>
-      <outputDirectory>/lib</outputDirectory>
-      <includes>
-        <include>${project.artifactId}-${project.version}.jar</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.directory}</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>classes/META-INF/extensions.idx</include>
-        <include>classes/META-INF/MANIFEST.MF</include>
-      </includes>
-    </fileSet>
-    <!-- this is a bit of a hack. There has to be a better solution. -->
-    <!-- this one is for pf4j -->
-    <fileSet>
-      <directory>${project.basedir}/src/main/resources</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>plugin.properties</include>
-      </includes>
-    </fileSet>
-    <!-- this one is for the application so that the extension can read its pluginId, when in zip mode
-      we don't need this for jar mode
-    -->
-    <fileSet>
-      <directory>${project.basedir}/src/main/resources</directory>
-      <outputDirectory>/classes</outputDirectory>
-      <includes>
-        <include>plugin.properties</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</assembly>
diff --git a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-fs-status/src/main/java/org/apache/tika/pipes/reporters/fs/FileSystemReporterPlugin.java b/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-fs-status/src/main/java/org/apache/tika/pipes/reporters/fs/FileSystemReporterPlugin.java
deleted file mode 100644
index c1f4fb274..000000000
--- a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-fs-status/src/main/java/org/apache/tika/pipes/reporters/fs/FileSystemReporterPlugin.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tika.pipes.reporters.fs;
-
-import org.pf4j.Plugin;
-import org.pf4j.PluginWrapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class FileSystemReporterPlugin extends Plugin {
-    private static final Logger LOG = LoggerFactory.getLogger(FileSystemReporterPlugin.class);
-
-    public FileSystemReporterPlugin(PluginWrapper wrapper) {
-        super(wrapper);
-    }
-
-    @Override
-    public void start() {
-        LOG.info("Starting");
-        super.start();
-    }
-
-    @Override
-    public void stop() {
-        LOG.info("Stopping");
-        super.stop();
-    }
-
-    @Override
-    public void delete() {
-        LOG.info("Deleting");
-        super.delete();
-    }
-
-}
diff --git a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-fs-status/src/main/resources/plugin.properties b/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-fs-status/src/main/resources/plugin.properties
deleted file mode 100644
index f8979b577..000000000
--- a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-fs-status/src/main/resources/plugin.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# 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.
-
-plugin.id=fs-status-reporter
-plugin.class=org.apache.tika.pipes.reporters.fs.FileSystemReporterPlugin
-plugin.version=4.0.0-SNAPSHOT
-plugin.provider=FileSystemReporterPlugin
-plugin.description=Capable of reporting status to a file system
diff --git a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-jdbc/pom.xml b/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-jdbc/pom.xml
deleted file mode 100644
index 82287a2c7..000000000
--- a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-jdbc/pom.xml
+++ /dev/null
@@ -1,123 +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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <groupId>org.apache.tika</groupId>
-    <artifactId>tika-pipes-reporters</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>tika-pipes-reporter-jdbc</artifactId>
-
-  <name>Apache Tika Pipes Reporter - JDBC Pipes Reporter</name>
-  <url>https://tika.apache.org/</url>
-  <properties>
-    <plugin.excluded.artifactIds>tika-core,tika-pipes-api,tika-serialization,tika-plugins-core</plugin.excluded.artifactIds>
-    <plugin.excluded.groupIds>org.apache.logging.log4j,org.slf4j</plugin.excluded.groupIds>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.tika</groupId>
-      <artifactId>tika-pipes-reporter-commons</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>tika-pipes-core</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.h2database</groupId>
-      <artifactId>h2</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>3.6.1</version>
-        <executions>
-          <execution>
-            <id>copy-dependencies</id>
-            <phase>package</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/lib</outputDirectory>
-              <includeScope>runtime</includeScope>
-              <excludeArtifactIds>${plugin.excluded.artifactIds}</excludeArtifactIds>
-              <excludeGroupIds>${plugin.excluded.groupIds}</excludeGroupIds>
-            </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.pipes.reporters.jdbc</Automatic-Module-Name>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/assembly.xml</descriptor>
-          </descriptors>
-          <appendAssemblyId>false</appendAssemblyId>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <annotationProcessors>
-            <annotationProcessor>org.pf4j.processor.ExtensionAnnotationProcessor</annotationProcessor>
-          </annotationProcessors>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <scm>
-    <tag>3.0.0-rc1</tag>
-  </scm>
-</project>
diff --git a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-jdbc/src/main/assembly/assembly.xml b/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-jdbc/src/main/assembly/assembly.xml
deleted file mode 100644
index 890cfd8cf..000000000
--- a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-jdbc/src/main/assembly/assembly.xml
+++ /dev/null
@@ -1,67 +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.
--->
-<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
-          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0
-                              http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-  <id>dependencies-zip</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <directory>${project.build.directory}/lib</directory>
-      <outputDirectory>/lib</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.directory}</directory>
-      <outputDirectory>/lib</outputDirectory>
-      <includes>
-        <include>${project.artifactId}-${project.version}.jar</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.directory}</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>classes/META-INF/extensions.idx</include>
-        <include>classes/META-INF/MANIFEST.MF</include>
-      </includes>
-    </fileSet>
-    <!-- this is a bit of a hack. There has to be a better solution. -->
-    <!-- this one is for pf4j -->
-    <fileSet>
-      <directory>${project.basedir}/src/main/resources</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>plugin.properties</include>
-      </includes>
-    </fileSet>
-    <!-- this one is for the application so that the extension can read its pluginId, when in zip mode
-      we don't need this for jar mode
-    -->
-    <fileSet>
-      <directory>${project.basedir}/src/main/resources</directory>
-      <outputDirectory>/classes</outputDirectory>
-      <includes>
-        <include>plugin.properties</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</assembly>
diff --git a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-jdbc/src/main/java/org/apache/tika/pipes/reporters/jdbc/JDBCReporterPlugin.java b/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-jdbc/src/main/java/org/apache/tika/pipes/reporters/jdbc/JDBCReporterPlugin.java
deleted file mode 100644
index d9ed7b9cd..000000000
--- a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-jdbc/src/main/java/org/apache/tika/pipes/reporters/jdbc/JDBCReporterPlugin.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tika.pipes.reporters.jdbc;
-
-import org.pf4j.Plugin;
-import org.pf4j.PluginWrapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class JDBCReporterPlugin extends Plugin {
-    private static final Logger LOG = LoggerFactory.getLogger(JDBCReporterPlugin.class);
-
-    public JDBCReporterPlugin(PluginWrapper wrapper) {
-        super(wrapper);
-    }
-
-    @Override
-    public void start() {
-        LOG.info("Starting");
-        super.start();
-    }
-
-    @Override
-    public void stop() {
-        LOG.info("Stopping");
-        super.stop();
-    }
-
-    @Override
-    public void delete() {
-        LOG.info("Deleting");
-        super.delete();
-    }
-
-}
diff --git a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-jdbc/src/main/resources/plugin.properties b/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-jdbc/src/main/resources/plugin.properties
deleted file mode 100644
index 4406e2e38..000000000
--- a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-jdbc/src/main/resources/plugin.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# 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.
-
-plugin.id=jdbc-reporter
-plugin.class=org.apache.tika.pipes.reporters.fs.FileSystemReporterPlugin
-plugin.version=4.0.0-SNAPSHOT
-plugin.provider=FileSystemReporterPlugin
-plugin.description=Capable of reporting status to a file system
diff --git a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-opensearch/pom.xml b/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-opensearch/pom.xml
deleted file mode 100644
index 59537e355..000000000
--- a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-opensearch/pom.xml
+++ /dev/null
@@ -1,116 +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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <groupId>org.apache.tika</groupId>
-    <artifactId>tika-pipes-reporters</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>tika-pipes-reporter-opensearch</artifactId>
-
-  <name>Apache Tika Pipes Reporter - OpenSearch</name>
-  <url>https://tika.apache.org/</url>
-  <properties>
-    <plugin.excluded.artifactIds>tika-core,tika-pipes-api,tika-serialization,tika-plugins-core</plugin.excluded.artifactIds>
-    <plugin.excluded.groupIds>org.apache.logging.log4j,org.slf4j</plugin.excluded.groupIds>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.tika</groupId>
-      <artifactId>tika-pipes-reporter-commons</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>tika-httpclient-commons</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>3.6.1</version>
-        <executions>
-          <execution>
-            <id>copy-dependencies</id>
-            <phase>package</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/lib</outputDirectory>
-              <includeScope>runtime</includeScope>
-              <excludeArtifactIds>${plugin.excluded.artifactIds}</excludeArtifactIds>
-              <excludeGroupIds>${plugin.excluded.groupIds}</excludeGroupIds>
-            </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.pipes.reporters.opensearch</Automatic-Module-Name>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/assembly.xml</descriptor>
-          </descriptors>
-          <appendAssemblyId>false</appendAssemblyId>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <annotationProcessors>
-            <annotationProcessor>org.pf4j.processor.ExtensionAnnotationProcessor</annotationProcessor>
-          </annotationProcessors>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <scm>
-    <tag>3.0.0-rc1</tag>
-  </scm>
-</project>
diff --git a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-opensearch/src/main/assembly/assembly.xml b/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-opensearch/src/main/assembly/assembly.xml
deleted file mode 100644
index ea0f8b4a1..000000000
--- a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-opensearch/src/main/assembly/assembly.xml
+++ /dev/null
@@ -1,55 +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.
--->
-<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
-          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0
-                              http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-  <id>dependencies-zip</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <directory>${project.build.directory}/lib</directory>
-      <outputDirectory>/lib</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.directory}</directory>
-      <outputDirectory>/lib</outputDirectory>
-      <includes>
-        <include>${project.artifactId}-${project.version}.jar</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.directory}</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>classes/META-INF/extensions.idx</include>
-        <include>classes/META-INF/MANIFEST.MF</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.basedir}/src/main/resources</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>plugin.properties</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</assembly>
diff --git a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-opensearch/src/main/java/org/apache/tika/pipes/reporters/opensearch/OpenSearchReporterPlugin.java b/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-opensearch/src/main/java/org/apache/tika/pipes/reporters/opensearch/OpenSearchReporterPlugin.java
deleted file mode 100644
index 21fa72e9e..000000000
--- a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-opensearch/src/main/java/org/apache/tika/pipes/reporters/opensearch/OpenSearchReporterPlugin.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tika.pipes.reporters.opensearch;
-
-import org.pf4j.Plugin;
-import org.pf4j.PluginWrapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class OpenSearchReporterPlugin extends Plugin {
-    private static final Logger LOG = LoggerFactory.getLogger(OpenSearchReporterPlugin.class);
-
-    public OpenSearchReporterPlugin(PluginWrapper wrapper) {
-        super(wrapper);
-    }
-
-    @Override
-    public void start() {
-        LOG.info("Starting");
-        super.start();
-    }
-
-    @Override
-    public void stop() {
-        LOG.info("Stopping");
-        super.stop();
-    }
-
-    @Override
-    public void delete() {
-        LOG.info("Deleting");
-        super.delete();
-    }
-
-}
diff --git a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-opensearch/src/main/resources/plugin.properties b/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-opensearch/src/main/resources/plugin.properties
deleted file mode 100644
index 782986ba2..000000000
--- a/tika-pipes/tika-pipes-reporters/tika-pipes-reporter-opensearch/src/main/resources/plugin.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# 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.
-
-plugin.id=opensearch-pipes-reporter
-plugin.class=org.apache.tika.pipes.reporters.opensearch.OpenSearchReporterPlugin
-plugin.version=4.0.0-SNAPSHOT
-plugin.provider=OpenSearch pipes reporter
-plugin.description=Capable of reporting status to an opensearch instance
diff --git a/tika-server/tika-server-client/src/test/resources/tika-config-simple-fs-emitter.xml b/tika-server/tika-server-client/src/test/resources/tika-config-simple-fs-emitter.xml
index d4dc04613..6be4fc0f8 100644
--- a/tika-server/tika-server-client/src/test/resources/tika-config-simple-fs-emitter.xml
+++ b/tika-server/tika-server-client/src/test/resources/tika-config-simple-fs-emitter.xml
@@ -24,7 +24,7 @@
       <parser-exclude class="org.apache.tika.parser.ocr.TesseractOCRParser"/>
     </parser>
   </parsers>
-  <pipesIterator class="org.apache.tika.pipes.pipesiterator.fs.FileSystemPipesIterator">
+  <pipesIterator class="org.apache.tika.pipes.iterator.fs.FileSystemPipesIterator">
     <params>
       <fetcherId>fs</fetcherId>
       <emitterName>fs</emitterName>
diff --git a/tika-server/tika-server-core/pom.xml b/tika-server/tika-server-core/pom.xml
index c414bf4e8..7ba082fb2 100644
--- a/tika-server/tika-server-core/pom.xml
+++ b/tika-server/tika-server-core/pom.xml
@@ -151,14 +151,7 @@
               <artifactItems>
                 <artifactItem>
                   <groupId>org.apache.tika</groupId>
-                  <artifactId>tika-fetcher-file-system</artifactId>
-                  <version>${project.version}</version>
-                  <type>zip</type>
-                  <overWrite>true</overWrite>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>org.apache.tika</groupId>
-                  <artifactId>tika-emitter-file-system</artifactId>
+                  <artifactId>tika-pipes-file-system</artifactId>
                   <version>${project.version}</version>
                   <type>zip</type>
                   <overWrite>true</overWrite>
diff --git a/tika-server/tika-server-standard/pom.xml b/tika-server/tika-server-standard/pom.xml
index b754ae3d7..873fdd099 100644
--- a/tika-server/tika-server-standard/pom.xml
+++ b/tika-server/tika-server-standard/pom.xml
@@ -129,14 +129,7 @@
               <artifactItems>
                 <artifactItem>
                   <groupId>org.apache.tika</groupId>
-                  <artifactId>tika-fetcher-file-system</artifactId>
-                  <version>${project.version}</version>
-                  <type>zip</type>
-                  <overWrite>true</overWrite>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>org.apache.tika</groupId>
-                  <artifactId>tika-emitter-file-system</artifactId>
+                  <artifactId>tika-pipes-file-system</artifactId>
                   <version>${project.version}</version>
                   <type>zip</type>
                   <overWrite>true</overWrite>