You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2023/06/02 19:42:01 UTC

[streampipes] branch 1651-integrate-all-experimental-flink-pipeline-elements-into-a-single-module updated: Move all experimental Flink extensions to experimental-flink module (#1651)

This is an automated email from the ASF dual-hosted git repository.

riemer pushed a commit to branch 1651-integrate-all-experimental-flink-pipeline-elements-into-a-single-module
in repository https://gitbox.apache.org/repos/asf/streampipes.git


The following commit(s) were added to refs/heads/1651-integrate-all-experimental-flink-pipeline-elements-into-a-single-module by this push:
     new 28cdd4060 Move all experimental Flink extensions to experimental-flink module (#1651)
28cdd4060 is described below

commit 28cdd4060a1cb70c581ef29602e6ad3fefa42df1
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Fri Jun 2 21:41:38 2023 +0200

    Move all experimental Flink extensions to experimental-flink module (#1651)
---
 .github/workflows/build.yml                        |   6 +-
 .../all_pipeline_elements_flink.xml                |   4 +-
 streampipes-extensions/pom.xml                     |  10 +-
 .../pom.xml                                        | 131 -----------------
 .../pe/flink/AllFlinkPipelineElementsInit.java     |  73 ----------
 .../Dockerfile                                     |   0
 .../development/env                                |   0
 .../pom.xml                                        |  50 ++++---
 .../java}/boilerpipe/BoilerpipeDocumentSource.java |  22 ++-
 .../main/java}/boilerpipe/BoilerpipeExtractor.java |  22 ++-
 .../main/java}/boilerpipe/BoilerpipeFilter.java    |  22 ++-
 .../src/main/java}/boilerpipe/BoilerpipeInput.java |  22 ++-
 .../boilerpipe/BoilerpipeProcessingException.java  |  20 ++-
 .../boilerpipe/conditions/TextBlockCondition.java  |  24 +++-
 .../src/main/java}/boilerpipe/document/Image.java  |  20 ++-
 .../main/java}/boilerpipe/document/TextBlock.java  |  22 ++-
 .../java}/boilerpipe/document/TextDocument.java    |  20 ++-
 .../document/TextDocumentStatistics.java           |  20 ++-
 .../java/boilerpipe/document/package-info.java}    |   7 +-
 .../boilerpipe/estimators/SimpleEstimator.java     |  28 +++-
 .../boilerpipe/extractors/ArticleExtractor.java    |  46 ++++--
 .../extractors/ArticleSentencesExtractor.java      |  28 +++-
 .../boilerpipe/extractors/CanolaExtractor.java     |  30 +++-
 .../boilerpipe/extractors/CommonExtractors.java    |  22 ++-
 .../boilerpipe/extractors/DefaultExtractor.java    |  30 +++-
 .../java}/boilerpipe/extractors/ExtractorBase.java |  30 +++-
 .../extractors/KeepEverythingExtractor.java        |  26 +++-
 .../KeepEverythingWithMinKWordsExtractor.java      |  30 +++-
 .../extractors/LargestContentExtractor.java        |  30 +++-
 .../extractors/NumWordsRulesExtractor.java         |  26 +++-
 .../java/boilerpipe/extractors/package-info.java}  |   7 +-
 .../boilerpipe/filters/debug/PrintDebugFilter.java |  26 +++-
 .../filters/english/DensityRulesClassifier.java    |  28 +++-
 .../filters/english/HeuristicFilterBase.java       |  22 ++-
 .../english/IgnoreBlocksAfterContentFilter.java    |  30 +++-
 .../IgnoreBlocksAfterContentFromEndFilter.java     |  30 +++-
 .../english/KeepLargestFulltextBlockFilter.java    |  32 ++++-
 .../filters/english/MinFulltextWordsFilter.java    |  28 +++-
 .../filters/english/NumWordsRulesClassifier.java   |  28 +++-
 .../filters/english/TerminatingBlocksFinder.java   |  30 +++-
 .../boilerpipe/filters/english/package-info.java}  |  15 +-
 .../heuristics/AddPrecedingLabelsFilter.java       |  28 +++-
 .../filters/heuristics/ArticleMetadataFilter.java  |  30 +++-
 .../filters/heuristics/BlockProximityFusion.java   |  28 +++-
 .../filters/heuristics/ContentFusion.java          |  30 +++-
 .../heuristics/DocumentTitleMatchClassifier.java   |  30 +++-
 .../heuristics/ExpandTitleToContentFilter.java     |  30 +++-
 .../filters/heuristics/KeepLargestBlockFilter.java |  30 +++-
 .../boilerpipe/filters/heuristics/LabelFusion.java |  30 +++-
 .../LargeBlockSameTagLevelToContentFilter.java     |  30 +++-
 .../filters/heuristics/ListAtEndFilter.java        |  30 +++-
 .../heuristics/SimpleBlockFusionProcessor.java     |  28 +++-
 .../TrailingHeadlineToBoilerplateFilter.java       |  30 +++-
 .../filters/heuristics/package-info.java}          |   7 +-
 .../filters/simple/BoilerplateBlockFilter.java     |  30 +++-
 .../boilerpipe/filters/simple/InvertedFilter.java  |  28 +++-
 .../filters/simple/LabelToBoilerplateFilter.java   |  30 +++-
 .../filters/simple/LabelToContentFilter.java       |  28 +++-
 .../simple/MarkEverythingBoilerplateFilter.java    |  28 +++-
 .../simple/MarkEverythingContentFilter.java        |  28 +++-
 .../filters/simple/MinClauseWordsFilter.java       |  28 +++-
 .../boilerpipe/filters/simple/MinWordsFilter.java  |  28 +++-
 .../filters/simple/SplitParagraphBlocksFilter.java |  28 +++-
 .../filters/simple/SurroundingToContentFilter.java |  30 +++-
 .../boilerpipe/filters/simple/package-info.java}   |   8 +-
 .../boilerpipe/labels/ConditionalLabelAction.java  |  24 +++-
 .../java}/boilerpipe/labels/DefaultLabels.java     |  22 ++-
 .../main/java}/boilerpipe/labels/LabelAction.java  |  22 ++-
 .../src/main/java/boilerpipe/package-info.java}    |   7 +-
 .../sax/BoilerpipeHTMLContentHandler.java          |  28 +++-
 .../java}/boilerpipe/sax/BoilerpipeHTMLParser.java |  26 +++-
 .../java}/boilerpipe/sax/BoilerpipeSAXInput.java   |  26 +++-
 .../java}/boilerpipe/sax/CommonTagActions.java     |  26 +++-
 .../java}/boilerpipe/sax/DefaultTagActionMap.java  |  24 +++-
 .../main/java}/boilerpipe/sax/HTMLDocument.java    |  20 ++-
 .../src/main/java}/boilerpipe/sax/HTMLFetcher.java |  20 ++-
 .../main/java}/boilerpipe/sax/HTMLHighlighter.java |  28 +++-
 .../main/java}/boilerpipe/sax/ImageExtractor.java  |  30 +++-
 .../main/java}/boilerpipe/sax/InputSourceable.java |  20 ++-
 .../main/java}/boilerpipe/sax/MarkupTagAction.java |  26 +++-
 .../src/main/java}/boilerpipe/sax/TagAction.java   |  22 ++-
 .../main/java}/boilerpipe/sax/TagActionMap.java    |  20 ++-
 .../main/java/boilerpipe/sax/package-info.java}    |   8 +-
 .../java}/boilerpipe/util/UnicodeTokenizer.java    |  20 ++-
 .../main/java/boilerpipe/util/package-info.java}   |   8 +-
 .../flink/AbstractFlinkTransformationProgram.java  |   2 +-
 .../pe}/flink/AbstractPatternDetectionProgram.java |   2 +-
 .../pe/flink/AllFlinkPipelineElementsInit.java     | 100 +++++++++++++
 .../streampipes/pe}/flink/config/ConfigKeys.java   |   2 +-
 .../pe}/flink/extensions/MapKeySelector.java       |   2 +-
 .../pe}/flink/extensions/SlidingBatchWindow.java   |   2 +-
 .../flink/extensions/SlidingEventTimeWindow.java   |   2 +-
 .../flink/extensions/TimestampMappingFunction.java |   2 +-
 .../pe}/flink/processor/absence/Absence.java       |   2 +-
 .../flink/processor/absence/AbsenceController.java |   4 +-
 .../flink/processor/absence/AbsenceParameters.java |   4 +-
 .../flink/processor/absence/AbsenceProgram.java    |   4 +-
 .../flink/processor/aggregation/Aggregation.java   |   2 +-
 .../aggregation/AggregationController.java         |   2 +-
 .../aggregation/AggregationParameters.java         |   2 +-
 .../processor/aggregation/AggregationProgram.java  |   2 +-
 .../processor/aggregation/AggregationType.java     |   2 +-
 .../processor/aggregation/CountAggregation.java    |   2 +-
 .../processor/aggregation/TimeAggregation.java     |   2 +-
 .../processor/aggregation/config/aggregation.md    |   0
 .../streampipes/pe}/flink/processor/and/And.java   |   2 +-
 .../pe}/flink/processor/and/AndController.java     |   2 +-
 .../pe}/flink/processor/and/AndParameters.java     |   2 +-
 .../pe}/flink/processor/and/AndProgram.java        |   4 +-
 .../pe}/flink/processor/and/TimeUnit.java          |   2 +-
 .../pe}/flink/processor/and/TimeUnitConverter.java |   2 +-
 .../boilerplate/BoilerplateController.java         |   2 +-
 .../boilerplate/BoilerplateParameters.java         |   2 +-
 .../processor/boilerplate/BoilerplateProgram.java  |   4 +-
 .../processor/boilerplate/BoilerplateRemover.java  |  14 +-
 .../flink/processor/boilerplate/ExtractorMode.java |   2 +-
 .../flink/processor/boilerplate/OutputMode.java    |   2 +-
 .../flink/processor/common/TimestampExtractor.java |   2 +-
 .../flink/processor/converter/FieldConverter.java  |   2 +-
 .../converter/FieldConverterController.java        |   2 +-
 .../converter/FieldConverterParameters.java        |   2 +-
 .../processor/converter/FieldConverterProgram.java |   4 +-
 .../pe}/flink/processor/count/CountController.java |   2 +-
 .../pe}/flink/processor/count/CountMapper.java     |   2 +-
 .../pe}/flink/processor/count/CountParameters.java |   2 +-
 .../pe}/flink/processor/count/CountProgram.java    |   2 +-
 .../pe}/flink/processor/count/CountTrigger.java    |   2 +-
 .../flink/processor/count/TimeWindowConverter.java |   2 +-
 .../pe}/flink/processor/count/Tuple2MapMapper.java |   2 +-
 .../processor/eventcount/EventCountController.java |   2 +-
 .../processor/eventcount/EventCountMapper.java     |   2 +-
 .../eventcount/EventCountOutputMapper.java         |   2 +-
 .../processor/eventcount/EventCountParameters.java |   2 +-
 .../processor/eventcount/EventCountProgram.java    |   4 +-
 .../flink/processor/gridenricher/CellOption.java   |   4 +-
 .../processor/gridenricher/EnrichmentSettings.java |   2 +-
 .../gridenricher/SpatialGridCalculator.java        |   2 +-
 .../gridenricher/SpatialGridConstants.java         |   2 +-
 .../gridenricher/SpatialGridEnricher.java          |   2 +-
 .../SpatialGridEnrichmentController.java           |   2 +-
 .../SpatialGridEnrichmentParameters.java           |   2 +-
 .../gridenricher/SpatialGridEnrichmentProgram.java |   2 +-
 .../MeasurementUnitConverter.java                  |   2 +-
 .../MeasurementUnitConverterController.java        |   2 +-
 .../MeasurementUnitConverterParameters.java        |   2 +-
 .../MeasurementUnitConverterProgram.java           |   4 +-
 .../processor/peak/PeakDetectionCalculator.java    |   2 +-
 .../processor/peak/PeakDetectionController.java    |   2 +-
 .../processor/peak/PeakDetectionParameters.java    |   2 +-
 .../flink/processor/peak/PeakDetectionProgram.java |   6 +-
 .../processor/peak/utils/SlidingBatchWindow.java   |   2 +-
 .../pe}/flink/processor/rate/EventRate.java        |   2 +-
 .../flink/processor/rate/EventRateController.java  |   2 +-
 .../flink/processor/rate/EventRateParameter.java   |   2 +-
 .../pe}/flink/processor/rate/EventRateProgram.java |   2 +-
 .../pe}/flink/processor/rename/FieldRenamer.java   |   2 +-
 .../processor/rename/FieldRenamerController.java   |   2 +-
 .../processor/rename/FieldRenamerParameters.java   |   2 +-
 .../processor/rename/FieldRenamerProgram.java      |   4 +-
 .../pe}/flink/processor/sequence/EventStorage.java |   2 +-
 .../pe}/flink/processor/sequence/Sequence.java     |   2 +-
 .../processor/sequence/SequenceController.java     |   2 +-
 .../processor/sequence/SequenceParameters.java     |   2 +-
 .../flink/processor/sequence/SequenceProgram.java  |   4 +-
 .../stat/summary/StatisticsSummaryCalculator.java  |   2 +-
 .../stat/summary/StatisticsSummaryController.java  |   2 +-
 .../stat/summary/StatisticsSummaryParameters.java  |   2 +-
 .../stat/summary/StatisticsSummaryProgram.java     |   2 +-
 .../window/StatisticsSummaryCalculatorWindow.java  |   4 +-
 .../window/StatisticsSummaryControllerWindow.java  |   4 +-
 .../window/StatisticsSummaryParametersWindow.java  |   2 +-
 .../StatisticsSummaryParamsSerializable.java       |   2 +-
 .../window/StatisticsSummaryProgramWindow.java     |   8 +-
 .../processor/timestamp/TimestampController.java   |   2 +-
 .../processor/timestamp/TimestampEnricher.java     |   2 +-
 .../processor/timestamp/TimestampParameters.java   |   2 +-
 .../processor/timestamp/TimestampProgram.java      |   2 +-
 .../urldereferencing/UrlDereferencing.java         |   2 +-
 .../UrlDereferencingController.java                |   2 +-
 .../UrlDereferencingParameter.java                 |   2 +-
 .../urldereferencing/UrlDereferencingProgram.java  |   2 +-
 .../pe}/flink/processor/wordcount/Word.java        |   2 +-
 .../processor/wordcount/WordCountController.java   |   2 +-
 .../processor/wordcount/WordCountParameters.java   |   2 +-
 .../processor/wordcount/WordCountProgram.java      |   2 +-
 .../flink/processor/wordcount/WordSplitter.java    |   2 +-
 .../processor/wordcount/WordToEventConverter.java  |   2 +-
 .../elasticsearch/ElasticSearchController.java     |   2 +-
 .../elasticsearch/ElasticSearchParameters.java     |   2 +-
 .../sink}/elasticsearch/ElasticSearchProgram.java  |   4 +-
 .../ElasticsearchIndexRequestBuilder.java          |   6 +-
 .../elastic/ActionRequestFailureHandler.java       |   4 +-
 .../elastic/BulkProcessorIndexer.java              |   4 +-
 .../elastic/Elasticsearch6ApiCallBridge.java       |   2 +-
 .../elastic/ElasticsearchApiCallBridge.java        |   2 +-
 .../elasticsearch/elastic/ElasticsearchSink.java   |   4 +-
 .../elastic/ElasticsearchSinkBase.java             |   4 +-
 .../elastic/ElasticsearchSinkFunction.java         |   4 +-
 .../elasticsearch/elastic/NoOpFailureHandler.java  |   4 +-
 .../elasticsearch/elastic/RequestIndexer.java      |   4 +-
 .../documentation.md                               |   0
 .../icon.png                                       | Bin
 .../strings.en                                     |   0
 .../documentation.md                               |   0
 .../icon.png                                       | Bin
 .../strings.en                                     |   0
 .../documentation.md                               |   0
 .../icon.png                                       | Bin
 .../strings.en                                     |   0
 .../documentation.md                               |   0
 .../strings.en                                     |   0
 .../documentation.md                               |   0
 .../icon.png                                       | Bin
 .../strings.en                                     |   0
 .../documentation.md                               |   0
 .../icon.png                                       | Bin
 .../strings.en                                     |   0
 .../documentation.md                               |   0
 .../icon.png                                       | Bin
 .../strings.en                                     |   0
 .../documentation.md                               |   0
 .../strings.en                                     |   0
 .../documentation.md                               |   0
 .../icon.png                                       | Bin
 .../strings.en                                     |   0
 .../documentation.md                               |   0
 .../icon.png                                       | Bin
 .../strings.en                                     |   0
 .../documentation.md                               |   0
 .../icon.png                                       | Bin
 .../strings.en                                     |   0
 .../documentation.md                               |   0
 .../icon.png                                       | Bin
 .../strings.en                                     |   0
 .../documentation.md                               |   0
 .../icon.png                                       | Bin
 .../strings.en                                     |   0
 .../documentation.md                               |   0
 .../icon.png                                       | Bin
 .../strings.en                                     |   0
 .../documentation.md                               |   0
 .../icon.png                                       | Bin
 .../strings.en                                     |   0
 .../documentation.md                               |   0
 .../icon.png                                       | Bin
 .../strings.en                                     |   0
 .../documentation.md                               |   0
 .../icon.png                                       | Bin
 .../strings.en                                     |   0
 .../documentation.md                               |   0
 .../icon.png                                       | Bin
 .../strings.en                                     |   0
 .../documentation.md                               |   0
 .../icon.png                                       | Bin
 .../strings.en                                     |   0
 .../documentation.md                               |   0
 .../icon.png                                       | Bin
 .../strings.en                                     |   0
 .../documentation.md                               |   0
 .../icon.png                                       | Bin
 .../strings.en                                     |   0
 .../pom.xml                                        | 155 ---------------------
 .../aggregation/flink/AggregationFlinkInit.java    |  72 ----------
 .../aggregation/flink/config/ConfigKeys.java       |  26 ----
 .../streampipes-processors-enricher-flink/pom.xml  |  98 -------------
 .../enricher/flink/EnricherFlinkInit.java          |  69 ---------
 .../enricher/flink/config/ConfigKeys.java          |  26 ----
 .../streampipes-processors-geo-flink/pom.xml       |  91 ------------
 .../processor/geo/flink/GeoFlinkInit.java          |  65 ---------
 .../processor/geo/flink/config/ConfigKeys.java     |  26 ----
 .../pom.xml                                        | 145 -------------------
 .../detection/flink/PatternDetectionFlinkInit.java |  73 ----------
 .../pattern/detection/flink/config/ConfigKeys.java |  26 ----
 .../pom.xml                                        | 103 --------------
 .../statistics/flink/StatisticsFlinkInit.java      |  67 ---------
 .../statistics/flink/config/ConfigKeys.java        |  26 ----
 .../pom.xml                                        | 122 ----------------
 .../textmining/flink/TextMiningFlinkInit.java      |  64 ---------
 .../textmining/flink/config/ConfigKeys.java        |  26 ----
 .../processor/language/LanguageDetection.java      |  76 ----------
 .../language/LanguageDetectionController.java      |  69 ---------
 .../language/LanguageDetectionParameters.java      |  36 -----
 .../language/LanguageDetectionProgram.java         |  36 -----
 .../documentation.md                               |  47 -------
 .../strings.en                                     |  24 ----
 .../pom.xml                                        | 124 -----------------
 .../boilerpipe/document/package-info.java          |   4 -
 .../boilerpipe/extractors/package-info.java        |   4 -
 .../boilerpipe/filters/english/package-info.java   |   7 -
 .../filters/heuristics/package-info.java           |   4 -
 .../boilerpipe/filters/simple/package-info.java    |   5 -
 .../com/kohlschutter/boilerpipe/package-info.java  |   4 -
 .../kohlschutter/boilerpipe/sax/package-info.java  |   5 -
 .../kohlschutter/boilerpipe/util/package-info.java |   5 -
 .../flink/TransformationFlinkInit.java             |  72 ----------
 .../transformation/flink/config/ConfigKeys.java    |  26 ----
 .../sinks/databases/flink/DatabasesFlinkInit.java  |  66 ---------
 297 files changed, 1858 insertions(+), 2609 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1c20d7e1a..85ac7418a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -108,13 +108,13 @@ jobs:
           push: true
           tags: ${{ env.DOCKERHUB_APACHE_REPO }}/extensions-all-jvm:${{ env.MVN_VERSION }}
 
-      - name: Build and Push Docker Image pipeline-elements-all-flink
+      - name: Build and Push Docker Image pipeline-elements-experimental-flink
         uses: docker/build-push-action@v4
         with:
-          context: ./streampipes-extensions/streampipes-pipeline-elements-all-flink
+          context: ./streampipes-extensions/streampipes-pipeline-elements-experimental-flink
           platforms: linux/amd64,linux/arm64/v8,linux/arm/v7
           push: true
-          tags: ${{ env.DOCKERHUB_APACHE_REPO }}/pipeline-elements-all-flink:${{ env.MVN_VERSION }}
+          tags: ${{ env.DOCKERHUB_APACHE_REPO }}/pipeline-elements-experimental-flink:${{ env.MVN_VERSION }}
 
       - name: Build and Push Docker Image extensions-all-iiot
         uses: docker/build-push-action@v4
diff --git a/.idea/runConfigurations/all_pipeline_elements_flink.xml b/.idea/runConfigurations/all_pipeline_elements_flink.xml
index d991e42eb..5675eac01 100644
--- a/.idea/runConfigurations/all_pipeline_elements_flink.xml
+++ b/.idea/runConfigurations/all_pipeline_elements_flink.xml
@@ -6,9 +6,9 @@
       <env name="SP_FLINK_DEBUG" value="true" />
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.apache.streampipes.pe.flink.AllFlinkPipelineElementsInit" />
-    <module name="streampipes-pipeline-elements-all-flink" />
+    <module name="streampipes-pipeline-elements-experimental-flink" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git a/streampipes-extensions/pom.xml b/streampipes-extensions/pom.xml
index 732faa660..67efd28d6 100644
--- a/streampipes-extensions/pom.xml
+++ b/streampipes-extensions/pom.xml
@@ -38,30 +38,22 @@
         <module>streampipes-extensions-all-jvm</module>
 
         <module>streampipes-pipeline-elements-all-jvm</module>
-        <module>streampipes-pipeline-elements-all-flink</module>
+        <module>streampipes-pipeline-elements-experimental-flink</module>
         <module>streampipes-pipeline-elements-data-simulator</module>
         <module>streampipes-pipeline-elements-shared</module>
 
-        <module>streampipes-processors-aggregation-flink</module>
         <module>streampipes-processors-change-detection-jvm</module>
-        <module>streampipes-processors-enricher-flink</module>
         <module>streampipes-processors-enricher-jvm</module>
         <module>streampipes-processors-filters-jvm</module>
         <module>streampipes-processors-filters-siddhi</module>
-        <module>streampipes-processors-geo-flink</module>
         <module>streampipes-processors-geo-jvm</module>
         <module>streampipes-processors-image-processing-jvm</module>
-        <module>streampipes-processors-pattern-detection-flink</module>
-        <module>streampipes-processors-statistics-flink</module>
-        <module>streampipes-processors-transformation-flink</module>
-        <module>streampipes-processors-text-mining-flink</module>
         <module>streampipes-processors-text-mining-jvm</module>
         <module>streampipes-processors-transformation-jvm</module>
 
         <module>streampipes-sinks-brokers-jvm</module>
         <module>streampipes-sinks-databases-jvm</module>
         <module>streampipes-sinks-internal-jvm</module>
-        <module>streampipes-sinks-databases-flink</module>
         <module>streampipes-sinks-notifications-jvm</module>
 
         <module>streampipes-sources-watertank-simulator</module>
diff --git a/streampipes-extensions/streampipes-pipeline-elements-all-flink/pom.xml b/streampipes-extensions/streampipes-pipeline-elements-all-flink/pom.xml
deleted file mode 100644
index ac43390a3..000000000
--- a/streampipes-extensions/streampipes-pipeline-elements-all-flink/pom.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>streampipes-extensions</artifactId>
-        <groupId>org.apache.streampipes</groupId>
-        <version>0.93.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>streampipes-pipeline-elements-all-flink</artifactId>
-
-    <properties>
-        <maven.deploy.skip>true</maven.deploy.skip>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.streampipes</groupId>
-            <artifactId>streampipes-processors-aggregation-flink</artifactId>
-            <version>0.93.0-SNAPSHOT</version>
-            <classifier>embed</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.streampipes</groupId>
-            <artifactId>streampipes-processors-enricher-flink</artifactId>
-            <version>0.93.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.streampipes</groupId>
-            <artifactId>streampipes-processors-geo-flink</artifactId>
-            <version>0.93.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.streampipes</groupId>
-            <artifactId>streampipes-processors-pattern-detection-flink</artifactId>
-            <version>0.93.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.streampipes</groupId>
-            <artifactId>streampipes-processors-statistics-flink</artifactId>
-            <version>0.93.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.streampipes</groupId>
-            <artifactId>streampipes-processors-text-mining-flink</artifactId>
-            <version>0.93.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.streampipes</groupId>
-            <artifactId>streampipes-processors-transformation-flink</artifactId>
-            <version>0.93.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.streampipes</groupId>
-            <artifactId>streampipes-sinks-databases-flink</artifactId>
-            <version>0.93.0-SNAPSHOT</version>
-        </dependency>
-
-        <!-- 3rd party dependencies to avoid convergence errors -->
-        <dependency>
-            <groupId>io.dropwizard.metrics</groupId>
-            <artifactId>metrics-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.atteo.classindex</groupId>
-            <artifactId>classindex</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/spring.handlers</resource>
-                                </transformer>
-                                <transformer implementation="org.springframework.boot.maven.PropertiesMergingResourceTransformer">
-                                    <resource>META-INF/spring.factories</resource>
-                                </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/spring.schemas</resource>
-                                </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                                    <resource>reference.conf</resource>
-                                </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>org.apache.streampipes.pe.flink.AllFlinkPipelineElementsInit
-                                    </mainClass>
-                                </transformer>
-                            </transformers>
-                            <createDependencyReducedPom>false</createDependencyReducedPom>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-        <finalName>streampipes-pipeline-elements-all-flink</finalName>
-    </build>
-</project>
diff --git a/streampipes-extensions/streampipes-pipeline-elements-all-flink/src/main/java/org/apache/streampipes/pe/flink/AllFlinkPipelineElementsInit.java b/streampipes-extensions/streampipes-pipeline-elements-all-flink/src/main/java/org/apache/streampipes/pe/flink/AllFlinkPipelineElementsInit.java
deleted file mode 100644
index 7c4339d73..000000000
--- a/streampipes-extensions/streampipes-pipeline-elements-all-flink/src/main/java/org/apache/streampipes/pe/flink/AllFlinkPipelineElementsInit.java
+++ /dev/null
@@ -1,73 +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.streampipes.pe.flink;
-
-import org.apache.streampipes.dataformat.cbor.CborDataFormatFactory;
-import org.apache.streampipes.dataformat.fst.FstDataFormatFactory;
-import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
-import org.apache.streampipes.dataformat.smile.SmileDataFormatFactory;
-import org.apache.streampipes.extensions.management.model.SpServiceDefinition;
-import org.apache.streampipes.extensions.management.model.SpServiceDefinitionBuilder;
-import org.apache.streampipes.messaging.jms.SpJmsProtocolFactory;
-import org.apache.streampipes.messaging.kafka.SpKafkaProtocolFactory;
-import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
-import org.apache.streampipes.messaging.nats.SpNatsProtocolFactory;
-import org.apache.streampipes.processor.geo.flink.GeoFlinkInit;
-import org.apache.streampipes.processors.aggregation.flink.AggregationFlinkInit;
-import org.apache.streampipes.processors.enricher.flink.EnricherFlinkInit;
-import org.apache.streampipes.processors.pattern.detection.flink.PatternDetectionFlinkInit;
-import org.apache.streampipes.processors.statistics.flink.StatisticsFlinkInit;
-import org.apache.streampipes.processors.textmining.flink.TextMiningFlinkInit;
-import org.apache.streampipes.processors.transformation.flink.TransformationFlinkInit;
-import org.apache.streampipes.service.extensions.ExtensionsModelSubmitter;
-import org.apache.streampipes.sinks.databases.flink.DatabasesFlinkInit;
-
-
-public class AllFlinkPipelineElementsInit extends ExtensionsModelSubmitter {
-
-  public static void main(String[] args) {
-    new AllFlinkPipelineElementsInit().init();
-  }
-
-  @Override
-  public SpServiceDefinition provideServiceDefinition() {
-    return SpServiceDefinitionBuilder.create("org-apache-streampipes-pe-all-flink",
-                    "StreamPipes Bundled Pipeline Elements for JVM Wrapper",
-                    "",
-                    8090)
-            .merge(new AggregationFlinkInit().provideServiceDefinition())
-            .merge(new EnricherFlinkInit().provideServiceDefinition())
-            .merge(new GeoFlinkInit().provideServiceDefinition())
-            .merge(new PatternDetectionFlinkInit().provideServiceDefinition())
-            .merge(new StatisticsFlinkInit().provideServiceDefinition())
-            .merge(new TextMiningFlinkInit().provideServiceDefinition())
-            .merge(new TransformationFlinkInit().provideServiceDefinition())
-            .merge(new DatabasesFlinkInit().provideServiceDefinition())
-            .registerMessagingFormats(
-                    new JsonDataFormatFactory(),
-                    new CborDataFormatFactory(),
-                    new SmileDataFormatFactory(),
-                    new FstDataFormatFactory())
-            .registerMessagingProtocols(
-                    new SpKafkaProtocolFactory(),
-                    new SpJmsProtocolFactory(),
-                    new SpMqttProtocolFactory(),
-                    new SpNatsProtocolFactory())
-            .build();
-  }
-}
diff --git a/streampipes-extensions/streampipes-pipeline-elements-all-flink/Dockerfile b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/Dockerfile
similarity index 100%
rename from streampipes-extensions/streampipes-pipeline-elements-all-flink/Dockerfile
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/Dockerfile
diff --git a/streampipes-extensions/streampipes-pipeline-elements-all-flink/development/env b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/development/env
similarity index 100%
rename from streampipes-extensions/streampipes-pipeline-elements-all-flink/development/env
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/development/env
diff --git a/streampipes-extensions/streampipes-sinks-databases-flink/pom.xml b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/pom.xml
similarity index 80%
rename from streampipes-extensions/streampipes-sinks-databases-flink/pom.xml
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/pom.xml
index 16c2d7d38..da281177d 100644
--- a/streampipes-extensions/streampipes-sinks-databases-flink/pom.xml
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/pom.xml
@@ -25,29 +25,32 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>streampipes-sinks-databases-flink</artifactId>
+    <artifactId>streampipes-pipeline-elements-experimental-flink</artifactId>
 
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
     </properties>
 
     <dependencies>
-        <!-- StreamPipes dependencies -->
         <dependency>
-            <groupId>org.apache.streampipes</groupId>
-            <artifactId>streampipes-sdk-bundle</artifactId>
-            <version>0.93.0-SNAPSHOT</version>
+            <groupId>org.atteo.classindex</groupId>
+            <artifactId>classindex</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.streampipes</groupId>
-            <artifactId>streampipes-wrapper-flink</artifactId>
-            <version>0.93.0-SNAPSHOT</version>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-cep_2.11</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-runtime_2.11</artifactId>
         </dependency>
-
-        <!-- External dependencies -->
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-math3</artifactId>
+            <groupId>org.scala-lang</groupId>
+            <artifactId>scala-library</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.scala-lang.modules</groupId>
+            <artifactId>scala-parser-combinators_2.11</artifactId>
         </dependency>
         <dependency>
             <groupId>org.elasticsearch.client</groupId>
@@ -63,18 +66,25 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
+        <!-- 3rd party dependencies to avoid convergence errors -->
         <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-to-slf4j</artifactId>
+            <groupId>io.dropwizard.metrics</groupId>
+            <artifactId>metrics-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.yaml</groupId>
-            <artifactId>snakeyaml</artifactId>
+            <groupId>org.scala-lang.modules</groupId>
+            <artifactId>scala-xml_2.11</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
@@ -100,7 +110,7 @@
                                     <resource>reference.conf</resource>
                                 </transformer>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>org.apache.streampipes.sinks.databases.flink.DatabasesFlinkInit
+                                    <mainClass>org.apache.streampipes.pe.flink.AllFlinkPipelineElementsInit
                                     </mainClass>
                                 </transformer>
                             </transformers>
@@ -109,11 +119,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-            </plugin>
         </plugins>
-        <finalName>streampipes-sinks-databases-flink</finalName>
+        <finalName>streampipes-pipeline-elements-all-flink</finalName>
     </build>
 </project>
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/BoilerpipeDocumentSource.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/BoilerpipeDocumentSource.java
old mode 100755
new mode 100644
similarity index 50%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/BoilerpipeDocumentSource.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/BoilerpipeDocumentSource.java
index 78b1545a8..bae779bca
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/BoilerpipeDocumentSource.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/BoilerpipeDocumentSource.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,9 +33,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe;
+package boilerpipe;
 
-import com.kohlschutter.boilerpipe.document.TextDocument;
+import boilerpipe.document.TextDocument;
 
 /**
  * Something that can be represented as a {@link TextDocument}.
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/BoilerpipeExtractor.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/BoilerpipeExtractor.java
old mode 100755
new mode 100644
similarity index 69%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/BoilerpipeExtractor.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/BoilerpipeExtractor.java
index 32fb11140..1aba66f45
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/BoilerpipeExtractor.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/BoilerpipeExtractor.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,9 +33,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe;
+package boilerpipe;
 
-import com.kohlschutter.boilerpipe.document.TextDocument;
+import boilerpipe.document.TextDocument;
 import org.xml.sax.InputSource;
 
 import java.io.Reader;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/BoilerpipeFilter.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/BoilerpipeFilter.java
old mode 100755
new mode 100644
similarity index 58%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/BoilerpipeFilter.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/BoilerpipeFilter.java
index 34bf0494a..5763ff6b2
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/BoilerpipeFilter.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/BoilerpipeFilter.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,9 +33,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe;
+package boilerpipe;
 
-import com.kohlschutter.boilerpipe.document.TextDocument;
+import boilerpipe.document.TextDocument;
 
 import java.io.Serializable;
 
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/BoilerpipeInput.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/BoilerpipeInput.java
old mode 100755
new mode 100644
similarity index 53%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/BoilerpipeInput.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/BoilerpipeInput.java
index 2fcbceb44..a8fc3254e
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/BoilerpipeInput.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/BoilerpipeInput.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,9 +33,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe;
+package boilerpipe;
 
-import com.kohlschutter.boilerpipe.document.TextDocument;
+import boilerpipe.document.TextDocument;
 
 /**
  * A source that returns {@link TextDocument}s.
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/BoilerpipeProcessingException.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/BoilerpipeProcessingException.java
old mode 100755
new mode 100644
similarity index 58%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/BoilerpipeProcessingException.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/BoilerpipeProcessingException.java
index 7bcd0236b..ca34992bc
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/BoilerpipeProcessingException.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/BoilerpipeProcessingException.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  *
@@ -15,7 +33,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe;
+package boilerpipe;
 
 /**
  * Exception for signaling failure in the processing pipeline.
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/conditions/TextBlockCondition.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/conditions/TextBlockCondition.java
old mode 100755
new mode 100644
similarity index 54%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/conditions/TextBlockCondition.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/conditions/TextBlockCondition.java
index ecbd44965..3cab3d326
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/conditions/TextBlockCondition.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/conditions/TextBlockCondition.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,10 +33,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.conditions;
+package boilerpipe.conditions;
 
-import com.kohlschutter.boilerpipe.document.TextBlock;
-import com.kohlschutter.boilerpipe.labels.ConditionalLabelAction;
+import boilerpipe.labels.ConditionalLabelAction;
+import boilerpipe.document.TextBlock;
 
 /**
  * Evaluates whether a given {@link TextBlock} meets a certain condition.
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/document/Image.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/document/Image.java
old mode 100755
new mode 100644
similarity index 75%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/document/Image.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/document/Image.java
index 9e88b9b63..869d61b06
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/document/Image.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/document/Image.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,7 +33,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.document;
+package boilerpipe.document;
 
 /**
  * Represents an Image resource that is contained in the document.
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/document/TextBlock.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/document/TextBlock.java
old mode 100755
new mode 100644
similarity index 89%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/document/TextBlock.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/document/TextBlock.java
index 51721b58c..0cad73857
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/document/TextBlock.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/document/TextBlock.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,9 +33,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.document;
+package boilerpipe.document;
 
-import com.kohlschutter.boilerpipe.labels.DefaultLabels;
+import boilerpipe.labels.DefaultLabels;
 
 import java.util.BitSet;
 import java.util.HashSet;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/document/TextDocument.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/document/TextDocument.java
old mode 100755
new mode 100644
similarity index 81%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/document/TextDocument.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/document/TextDocument.java
index 68eeca27f..8eae51ebe
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/document/TextDocument.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/document/TextDocument.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,7 +33,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.document;
+package boilerpipe.document;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/document/TextDocumentStatistics.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/document/TextDocumentStatistics.java
old mode 100755
new mode 100644
similarity index 66%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/document/TextDocumentStatistics.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/document/TextDocumentStatistics.java
index 4f408125f..f2ac06d61
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/document/TextDocumentStatistics.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/document/TextDocumentStatistics.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,7 +33,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.document;
+package boilerpipe.document;
 
 /**
  * Provides shallow statistics on a given {@link TextDocument}
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/And.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/document/package-info.java
similarity index 88%
copy from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/And.java
copy to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/document/package-info.java
index a0e4f6cd7..7a47a3067 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/And.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/document/package-info.java
@@ -15,7 +15,8 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.processors.pattern.detection.flink.processor.and;
 
-public class And {
-}
+/**
+ * The Boilerpipe document model.
+ */
+package boilerpipe.document;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/estimators/SimpleEstimator.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/estimators/SimpleEstimator.java
old mode 100755
new mode 100644
similarity index 62%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/estimators/SimpleEstimator.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/estimators/SimpleEstimator.java
index 91542a56b..769a21c13
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/estimators/SimpleEstimator.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/estimators/SimpleEstimator.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,12 +33,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.estimators;
+package boilerpipe.estimators;
 
-import com.kohlschutter.boilerpipe.BoilerpipeExtractor;
-import com.kohlschutter.boilerpipe.document.TextDocumentStatistics;
-import com.kohlschutter.boilerpipe.extractors.ArticleExtractor;
-import com.kohlschutter.boilerpipe.extractors.DefaultExtractor;
+import boilerpipe.BoilerpipeExtractor;
+import boilerpipe.extractors.ArticleExtractor;
+import boilerpipe.extractors.DefaultExtractor;
+import boilerpipe.document.TextDocumentStatistics;
 
 /**
  * Estimates the "goodness" of a {@link BoilerpipeExtractor} on a given document.
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/extractors/ArticleExtractor.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/extractors/ArticleExtractor.java
old mode 100755
new mode 100644
similarity index 55%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/extractors/ArticleExtractor.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/extractors/ArticleExtractor.java
index ea8db9507..5a5691ea1
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/extractors/ArticleExtractor.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/extractors/ArticleExtractor.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,21 +33,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.extractors;
+package boilerpipe.extractors;
 
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextDocument;
-import com.kohlschutter.boilerpipe.filters.english.IgnoreBlocksAfterContentFilter;
-import com.kohlschutter.boilerpipe.filters.english.NumWordsRulesClassifier;
-import com.kohlschutter.boilerpipe.filters.english.TerminatingBlocksFinder;
-import com.kohlschutter.boilerpipe.filters.heuristics.BlockProximityFusion;
-import com.kohlschutter.boilerpipe.filters.heuristics.DocumentTitleMatchClassifier;
-import com.kohlschutter.boilerpipe.filters.heuristics.ExpandTitleToContentFilter;
-import com.kohlschutter.boilerpipe.filters.heuristics.KeepLargestBlockFilter;
-import com.kohlschutter.boilerpipe.filters.heuristics.LargeBlockSameTagLevelToContentFilter;
-import com.kohlschutter.boilerpipe.filters.heuristics.ListAtEndFilter;
-import com.kohlschutter.boilerpipe.filters.heuristics.TrailingHeadlineToBoilerplateFilter;
-import com.kohlschutter.boilerpipe.filters.simple.BoilerplateBlockFilter;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.filters.english.IgnoreBlocksAfterContentFilter;
+import boilerpipe.filters.english.NumWordsRulesClassifier;
+import boilerpipe.filters.english.TerminatingBlocksFinder;
+import boilerpipe.filters.simple.BoilerplateBlockFilter;
+import boilerpipe.document.TextDocument;
+import boilerpipe.filters.heuristics.BlockProximityFusion;
+import boilerpipe.filters.heuristics.DocumentTitleMatchClassifier;
+import boilerpipe.filters.heuristics.ExpandTitleToContentFilter;
+import boilerpipe.filters.heuristics.KeepLargestBlockFilter;
+import boilerpipe.filters.heuristics.LargeBlockSameTagLevelToContentFilter;
+import boilerpipe.filters.heuristics.ListAtEndFilter;
+import boilerpipe.filters.heuristics.TrailingHeadlineToBoilerplateFilter;
 
 /**
  * A full-text extractor which is tuned towards news articles. In this scenario it achieves higher
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/extractors/ArticleSentencesExtractor.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/extractors/ArticleSentencesExtractor.java
old mode 100755
new mode 100644
similarity index 56%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/extractors/ArticleSentencesExtractor.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/extractors/ArticleSentencesExtractor.java
index 289617fb5..1ae06a230
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/extractors/ArticleSentencesExtractor.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/extractors/ArticleSentencesExtractor.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,12 +33,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.extractors;
+package boilerpipe.extractors;
 
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextDocument;
-import com.kohlschutter.boilerpipe.filters.simple.MinClauseWordsFilter;
-import com.kohlschutter.boilerpipe.filters.simple.SplitParagraphBlocksFilter;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.filters.simple.MinClauseWordsFilter;
+import boilerpipe.filters.simple.SplitParagraphBlocksFilter;
+import boilerpipe.document.TextDocument;
 
 /**
  * A full-text extractor which is tuned towards extracting sentences from news articles.
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/extractors/CanolaExtractor.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/extractors/CanolaExtractor.java
old mode 100755
new mode 100644
similarity index 74%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/extractors/CanolaExtractor.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/extractors/CanolaExtractor.java
index 0012e068e..4bc48046d
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/extractors/CanolaExtractor.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/extractors/CanolaExtractor.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,13 +33,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.extractors;
+package boilerpipe.extractors;
 
-import com.kohlschutter.boilerpipe.BoilerpipeFilter;
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextBlock;
-import com.kohlschutter.boilerpipe.document.TextDocument;
-import com.kohlschutter.boilerpipe.estimators.SimpleEstimator;
+import boilerpipe.BoilerpipeFilter;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.document.TextBlock;
+import boilerpipe.document.TextDocument;
+import boilerpipe.estimators.SimpleEstimator;
 
 import java.util.List;
 import java.util.ListIterator;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/extractors/CommonExtractors.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/extractors/CommonExtractors.java
old mode 100755
new mode 100644
similarity index 67%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/extractors/CommonExtractors.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/extractors/CommonExtractors.java
index d2fb5abaa..c08924011
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/extractors/CommonExtractors.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/extractors/CommonExtractors.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,9 +33,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.extractors;
+package boilerpipe.extractors;
 
-import com.kohlschutter.boilerpipe.BoilerpipeExtractor;
+import boilerpipe.BoilerpipeExtractor;
 
 /**
  * Provides quick access to common {@link BoilerpipeExtractor}s.
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/extractors/DefaultExtractor.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/extractors/DefaultExtractor.java
old mode 100755
new mode 100644
similarity index 53%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/extractors/DefaultExtractor.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/extractors/DefaultExtractor.java
index 3fbd9681b..a563db508
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/extractors/DefaultExtractor.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/extractors/DefaultExtractor.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,13 +33,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.extractors;
+package boilerpipe.extractors;
 
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextDocument;
-import com.kohlschutter.boilerpipe.filters.english.DensityRulesClassifier;
-import com.kohlschutter.boilerpipe.filters.heuristics.BlockProximityFusion;
-import com.kohlschutter.boilerpipe.filters.heuristics.SimpleBlockFusionProcessor;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.filters.english.DensityRulesClassifier;
+import boilerpipe.document.TextDocument;
+import boilerpipe.filters.heuristics.BlockProximityFusion;
+import boilerpipe.filters.heuristics.SimpleBlockFusionProcessor;
 
 /**
  * A quite generic full-text extractor.
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/extractors/ExtractorBase.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/extractors/ExtractorBase.java
old mode 100755
new mode 100644
similarity index 76%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/extractors/ExtractorBase.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/extractors/ExtractorBase.java
index 7a5b3103f..5e7095e78
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/extractors/ExtractorBase.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/extractors/ExtractorBase.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,13 +33,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.extractors;
+package boilerpipe.extractors;
 
-import com.kohlschutter.boilerpipe.BoilerpipeExtractor;
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextDocument;
-import com.kohlschutter.boilerpipe.sax.BoilerpipeSAXInput;
-import com.kohlschutter.boilerpipe.sax.HTMLFetcher;
+import boilerpipe.BoilerpipeExtractor;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.sax.BoilerpipeSAXInput;
+import boilerpipe.sax.HTMLFetcher;
+import boilerpipe.document.TextDocument;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/extractors/KeepEverythingExtractor.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/extractors/KeepEverythingExtractor.java
old mode 100755
new mode 100644
similarity index 51%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/extractors/KeepEverythingExtractor.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/extractors/KeepEverythingExtractor.java
index c21d4a200..0db40cf51
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/extractors/KeepEverythingExtractor.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/extractors/KeepEverythingExtractor.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,11 +33,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.extractors;
+package boilerpipe.extractors;
 
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextDocument;
-import com.kohlschutter.boilerpipe.filters.simple.MarkEverythingContentFilter;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.filters.simple.MarkEverythingContentFilter;
+import boilerpipe.document.TextDocument;
 
 /**
  * Marks everything as content.
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/extractors/KeepEverythingWithMinKWordsExtractor.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/extractors/KeepEverythingWithMinKWordsExtractor.java
old mode 100755
new mode 100644
similarity index 55%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/extractors/KeepEverythingWithMinKWordsExtractor.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/extractors/KeepEverythingWithMinKWordsExtractor.java
index e7d272135..e916173c0
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/extractors/KeepEverythingWithMinKWordsExtractor.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/extractors/KeepEverythingWithMinKWordsExtractor.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,13 +33,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.extractors;
+package boilerpipe.extractors;
 
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextDocument;
-import com.kohlschutter.boilerpipe.filters.heuristics.SimpleBlockFusionProcessor;
-import com.kohlschutter.boilerpipe.filters.simple.MarkEverythingContentFilter;
-import com.kohlschutter.boilerpipe.filters.simple.MinWordsFilter;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.filters.simple.MarkEverythingContentFilter;
+import boilerpipe.filters.simple.MinWordsFilter;
+import boilerpipe.document.TextDocument;
+import boilerpipe.filters.heuristics.SimpleBlockFusionProcessor;
 
 /**
  * A full-text extractor which extracts the largest text component of a page. For news articles, it
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/extractors/LargestContentExtractor.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/extractors/LargestContentExtractor.java
old mode 100755
new mode 100644
similarity index 57%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/extractors/LargestContentExtractor.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/extractors/LargestContentExtractor.java
index ed0ed6724..35cfc1974
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/extractors/LargestContentExtractor.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/extractors/LargestContentExtractor.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,13 +33,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.extractors;
+package boilerpipe.extractors;
 
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextDocument;
-import com.kohlschutter.boilerpipe.filters.english.NumWordsRulesClassifier;
-import com.kohlschutter.boilerpipe.filters.heuristics.BlockProximityFusion;
-import com.kohlschutter.boilerpipe.filters.heuristics.KeepLargestBlockFilter;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.filters.english.NumWordsRulesClassifier;
+import boilerpipe.document.TextDocument;
+import boilerpipe.filters.heuristics.BlockProximityFusion;
+import boilerpipe.filters.heuristics.KeepLargestBlockFilter;
 
 /**
  * A full-text extractor which extracts the largest text component of a page. For news articles, it
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/extractors/NumWordsRulesExtractor.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/extractors/NumWordsRulesExtractor.java
old mode 100755
new mode 100644
similarity index 56%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/extractors/NumWordsRulesExtractor.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/extractors/NumWordsRulesExtractor.java
index 4467ee817..4a31161b6
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/extractors/NumWordsRulesExtractor.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/extractors/NumWordsRulesExtractor.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,11 +33,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.extractors;
+package boilerpipe.extractors;
 
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextDocument;
-import com.kohlschutter.boilerpipe.filters.english.NumWordsRulesClassifier;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.filters.english.NumWordsRulesClassifier;
+import boilerpipe.document.TextDocument;
 
 /**
  * A quite generic full-text extractor solely based upon the number of words per block (the current,
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/absence/Absence.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/extractors/package-info.java
similarity index 87%
copy from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/absence/Absence.java
copy to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/extractors/package-info.java
index f24702829..c282dc660 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/absence/Absence.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/extractors/package-info.java
@@ -15,7 +15,8 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.processors.pattern.detection.flink.processor.absence;
 
-public class Absence {
-}
+/**
+ * Some standard extractors (i.e., completely piped BoilerpipeFilters)
+ */
+package boilerpipe.extractors;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/debug/PrintDebugFilter.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/debug/PrintDebugFilter.java
old mode 100755
new mode 100644
similarity index 66%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/debug/PrintDebugFilter.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/debug/PrintDebugFilter.java
index 183573738..2c44d0e4c
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/debug/PrintDebugFilter.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/debug/PrintDebugFilter.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,11 +33,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.filters.debug;
+package boilerpipe.filters.debug;
 
-import com.kohlschutter.boilerpipe.BoilerpipeFilter;
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextDocument;
+import boilerpipe.BoilerpipeFilter;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.document.TextDocument;
 
 import java.io.PrintWriter;
 
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/english/DensityRulesClassifier.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/english/DensityRulesClassifier.java
old mode 100755
new mode 100644
similarity index 76%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/english/DensityRulesClassifier.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/english/DensityRulesClassifier.java
index b38fa1dd6..bc59a3ff3
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/english/DensityRulesClassifier.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/english/DensityRulesClassifier.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,12 +33,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.filters.english;
+package boilerpipe.filters.english;
 
-import com.kohlschutter.boilerpipe.BoilerpipeFilter;
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextBlock;
-import com.kohlschutter.boilerpipe.document.TextDocument;
+import boilerpipe.BoilerpipeFilter;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.document.TextBlock;
+import boilerpipe.document.TextDocument;
 
 import java.util.List;
 import java.util.ListIterator;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/english/HeuristicFilterBase.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/english/HeuristicFilterBase.java
old mode 100755
new mode 100644
similarity index 55%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/english/HeuristicFilterBase.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/english/HeuristicFilterBase.java
index 4aa17a0cf..9db905711
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/english/HeuristicFilterBase.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/english/HeuristicFilterBase.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,9 +33,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.filters.english;
+package boilerpipe.filters.english;
 
-import com.kohlschutter.boilerpipe.document.TextBlock;
+import boilerpipe.document.TextBlock;
 
 /**
  * Base class for some heuristics that are used by boilerpipe filters.
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/english/IgnoreBlocksAfterContentFilter.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/english/IgnoreBlocksAfterContentFilter.java
old mode 100755
new mode 100644
similarity index 69%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/english/IgnoreBlocksAfterContentFilter.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/english/IgnoreBlocksAfterContentFilter.java
index 0e4a35ad6..eaec2f433
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/english/IgnoreBlocksAfterContentFilter.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/english/IgnoreBlocksAfterContentFilter.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,13 +33,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.filters.english;
+package boilerpipe.filters.english;
 
-import com.kohlschutter.boilerpipe.BoilerpipeFilter;
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextBlock;
-import com.kohlschutter.boilerpipe.document.TextDocument;
-import com.kohlschutter.boilerpipe.labels.DefaultLabels;
+import boilerpipe.BoilerpipeFilter;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.document.TextBlock;
+import boilerpipe.document.TextDocument;
+import boilerpipe.labels.DefaultLabels;
 
 import java.util.Iterator;
 
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/english/IgnoreBlocksAfterContentFromEndFilter.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/english/IgnoreBlocksAfterContentFromEndFilter.java
old mode 100755
new mode 100644
similarity index 66%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/english/IgnoreBlocksAfterContentFromEndFilter.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/english/IgnoreBlocksAfterContentFromEndFilter.java
index e0fea3e82..e8bd071d0
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/english/IgnoreBlocksAfterContentFromEndFilter.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/english/IgnoreBlocksAfterContentFromEndFilter.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  *
@@ -15,13 +33,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.filters.english;
+package boilerpipe.filters.english;
 
-import com.kohlschutter.boilerpipe.BoilerpipeFilter;
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextBlock;
-import com.kohlschutter.boilerpipe.document.TextDocument;
-import com.kohlschutter.boilerpipe.labels.DefaultLabels;
+import boilerpipe.BoilerpipeFilter;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.document.TextBlock;
+import boilerpipe.document.TextDocument;
+import boilerpipe.labels.DefaultLabels;
 
 import java.util.List;
 import java.util.ListIterator;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/english/KeepLargestFulltextBlockFilter.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/english/KeepLargestFulltextBlockFilter.java
old mode 100755
new mode 100644
similarity index 69%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/english/KeepLargestFulltextBlockFilter.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/english/KeepLargestFulltextBlockFilter.java
index d01fc554b..f08da7c91
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/english/KeepLargestFulltextBlockFilter.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/english/KeepLargestFulltextBlockFilter.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,14 +33,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.filters.english;
+package boilerpipe.filters.english;
 
-import com.kohlschutter.boilerpipe.BoilerpipeFilter;
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextBlock;
-import com.kohlschutter.boilerpipe.document.TextDocument;
-import com.kohlschutter.boilerpipe.filters.heuristics.KeepLargestBlockFilter;
-import com.kohlschutter.boilerpipe.labels.DefaultLabels;
+import boilerpipe.BoilerpipeFilter;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.document.TextBlock;
+import boilerpipe.document.TextDocument;
+import boilerpipe.filters.heuristics.KeepLargestBlockFilter;
+import boilerpipe.labels.DefaultLabels;
 
 import java.util.List;
 
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/english/MinFulltextWordsFilter.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/english/MinFulltextWordsFilter.java
old mode 100755
new mode 100644
similarity index 61%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/english/MinFulltextWordsFilter.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/english/MinFulltextWordsFilter.java
index b13cf7116..ed513b033
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/english/MinFulltextWordsFilter.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/english/MinFulltextWordsFilter.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,12 +33,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.filters.english;
+package boilerpipe.filters.english;
 
-import com.kohlschutter.boilerpipe.BoilerpipeFilter;
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextBlock;
-import com.kohlschutter.boilerpipe.document.TextDocument;
+import boilerpipe.BoilerpipeFilter;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.document.TextBlock;
+import boilerpipe.document.TextDocument;
 
 /**
  * Keeps only those content blocks which contain at least k full-text words (measured by
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/english/NumWordsRulesClassifier.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/english/NumWordsRulesClassifier.java
old mode 100755
new mode 100644
similarity index 76%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/english/NumWordsRulesClassifier.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/english/NumWordsRulesClassifier.java
index 7e9091bf4..5f4a8cdd6
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/english/NumWordsRulesClassifier.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/english/NumWordsRulesClassifier.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,12 +33,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.filters.english;
+package boilerpipe.filters.english;
 
-import com.kohlschutter.boilerpipe.BoilerpipeFilter;
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextBlock;
-import com.kohlschutter.boilerpipe.document.TextDocument;
+import boilerpipe.BoilerpipeFilter;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.document.TextBlock;
+import boilerpipe.document.TextDocument;
 
 import java.util.List;
 import java.util.ListIterator;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/english/TerminatingBlocksFinder.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/english/TerminatingBlocksFinder.java
old mode 100755
new mode 100644
similarity index 77%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/english/TerminatingBlocksFinder.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/english/TerminatingBlocksFinder.java
index 081ece58f..1fae7c54e
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/english/TerminatingBlocksFinder.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/english/TerminatingBlocksFinder.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,13 +33,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.filters.english;
+package boilerpipe.filters.english;
 
-import com.kohlschutter.boilerpipe.BoilerpipeFilter;
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextBlock;
-import com.kohlschutter.boilerpipe.document.TextDocument;
-import com.kohlschutter.boilerpipe.labels.DefaultLabels;
+import boilerpipe.BoilerpipeFilter;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.document.TextBlock;
+import boilerpipe.document.TextDocument;
+import boilerpipe.labels.DefaultLabels;
 
 /**
  * Finds blocks which are potentially indicating the end of an article text and marks them with
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/boilerplate/ExtractorMode.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/english/package-info.java
similarity index 77%
copy from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/boilerplate/ExtractorMode.java
copy to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/english/package-info.java
index be65e71c9..e49bed96f 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/boilerplate/ExtractorMode.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/english/package-info.java
@@ -16,13 +16,10 @@
  *
  */
 
-package org.apache.streampipes.processors.transformation.flink.processor.boilerplate;
-
-public enum ExtractorMode {
-  ARTICLE,
-  DEFAULT,
-  LARGEST_CONTENT,
-  CANOLA,
-  KEEP_EVERYTHING
+/**
+ * These BoilerpipeFilters have only been tested on English text.
+ * <p>
+ * That is, they will probably work with other Western languages, but maybe need some parameter tuning to perform well.
+ */
+package boilerpipe.filters.english;
 
-}
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/AddPrecedingLabelsFilter.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/AddPrecedingLabelsFilter.java
old mode 100755
new mode 100644
similarity index 69%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/AddPrecedingLabelsFilter.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/AddPrecedingLabelsFilter.java
index 22d76970f..acaf204b1
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/AddPrecedingLabelsFilter.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/AddPrecedingLabelsFilter.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,12 +33,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.filters.heuristics;
+package boilerpipe.filters.heuristics;
 
-import com.kohlschutter.boilerpipe.BoilerpipeFilter;
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextBlock;
-import com.kohlschutter.boilerpipe.document.TextDocument;
+import boilerpipe.BoilerpipeFilter;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.document.TextBlock;
+import boilerpipe.document.TextDocument;
 
 import java.util.List;
 import java.util.ListIterator;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/ArticleMetadataFilter.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/ArticleMetadataFilter.java
old mode 100755
new mode 100644
similarity index 63%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/ArticleMetadataFilter.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/ArticleMetadataFilter.java
index 0a94abf33..cde8ea09e
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/ArticleMetadataFilter.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/ArticleMetadataFilter.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,13 +33,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.filters.heuristics;
+package boilerpipe.filters.heuristics;
 
-import com.kohlschutter.boilerpipe.BoilerpipeFilter;
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextBlock;
-import com.kohlschutter.boilerpipe.document.TextDocument;
-import com.kohlschutter.boilerpipe.labels.DefaultLabels;
+import boilerpipe.BoilerpipeFilter;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.document.TextBlock;
+import boilerpipe.document.TextDocument;
+import boilerpipe.labels.DefaultLabels;
 
 import java.util.regex.Pattern;
 
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/BlockProximityFusion.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/BlockProximityFusion.java
old mode 100755
new mode 100644
similarity index 77%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/BlockProximityFusion.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/BlockProximityFusion.java
index b2538d8c4..7e15bd40e
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/BlockProximityFusion.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/BlockProximityFusion.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,12 +33,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.filters.heuristics;
+package boilerpipe.filters.heuristics;
 
-import com.kohlschutter.boilerpipe.BoilerpipeFilter;
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextBlock;
-import com.kohlschutter.boilerpipe.document.TextDocument;
+import boilerpipe.BoilerpipeFilter;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.document.TextBlock;
+import boilerpipe.document.TextDocument;
 
 import java.util.Iterator;
 import java.util.List;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/ContentFusion.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/ContentFusion.java
old mode 100755
new mode 100644
similarity index 62%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/ContentFusion.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/ContentFusion.java
index 1e6dfbfed..3d70a3dfd
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/ContentFusion.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/ContentFusion.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,13 +33,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.filters.heuristics;
+package boilerpipe.filters.heuristics;
 
-import com.kohlschutter.boilerpipe.BoilerpipeFilter;
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextBlock;
-import com.kohlschutter.boilerpipe.document.TextDocument;
-import com.kohlschutter.boilerpipe.labels.DefaultLabels;
+import boilerpipe.BoilerpipeFilter;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.document.TextBlock;
+import boilerpipe.document.TextDocument;
+import boilerpipe.labels.DefaultLabels;
 
 import java.util.List;
 import java.util.ListIterator;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/DocumentTitleMatchClassifier.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/DocumentTitleMatchClassifier.java
old mode 100755
new mode 100644
similarity index 81%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/DocumentTitleMatchClassifier.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/DocumentTitleMatchClassifier.java
index 3bcf9f6cf..4d635c3ad
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/DocumentTitleMatchClassifier.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/DocumentTitleMatchClassifier.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,13 +33,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.filters.heuristics;
+package boilerpipe.filters.heuristics;
 
-import com.kohlschutter.boilerpipe.BoilerpipeFilter;
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextBlock;
-import com.kohlschutter.boilerpipe.document.TextDocument;
-import com.kohlschutter.boilerpipe.labels.DefaultLabels;
+import boilerpipe.BoilerpipeFilter;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.document.TextBlock;
+import boilerpipe.document.TextDocument;
+import boilerpipe.labels.DefaultLabels;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/ExpandTitleToContentFilter.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/ExpandTitleToContentFilter.java
old mode 100755
new mode 100644
similarity index 65%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/ExpandTitleToContentFilter.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/ExpandTitleToContentFilter.java
index 423597e7e..3ec4cb8d0
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/ExpandTitleToContentFilter.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/ExpandTitleToContentFilter.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,13 +33,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.filters.heuristics;
+package boilerpipe.filters.heuristics;
 
-import com.kohlschutter.boilerpipe.BoilerpipeFilter;
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextBlock;
-import com.kohlschutter.boilerpipe.document.TextDocument;
-import com.kohlschutter.boilerpipe.labels.DefaultLabels;
+import boilerpipe.BoilerpipeFilter;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.document.TextBlock;
+import boilerpipe.document.TextDocument;
+import boilerpipe.labels.DefaultLabels;
 
 /**
  * Marks all {@link TextBlock}s "content" which are between the headline and the part that has
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/KeepLargestBlockFilter.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/KeepLargestBlockFilter.java
old mode 100755
new mode 100644
similarity index 76%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/KeepLargestBlockFilter.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/KeepLargestBlockFilter.java
index d04703394..a0d78cb33
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/KeepLargestBlockFilter.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/KeepLargestBlockFilter.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,13 +33,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.filters.heuristics;
+package boilerpipe.filters.heuristics;
 
-import com.kohlschutter.boilerpipe.BoilerpipeFilter;
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextBlock;
-import com.kohlschutter.boilerpipe.document.TextDocument;
-import com.kohlschutter.boilerpipe.labels.DefaultLabels;
+import boilerpipe.BoilerpipeFilter;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.document.TextBlock;
+import boilerpipe.document.TextDocument;
+import boilerpipe.labels.DefaultLabels;
 
 import java.util.List;
 import java.util.ListIterator;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/LabelFusion.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/LabelFusion.java
old mode 100755
new mode 100644
similarity index 68%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/LabelFusion.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/LabelFusion.java
index 07d1c9f63..8b2040b99
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/LabelFusion.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/LabelFusion.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,13 +33,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.filters.heuristics;
+package boilerpipe.filters.heuristics;
 
-import com.kohlschutter.boilerpipe.BoilerpipeFilter;
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextBlock;
-import com.kohlschutter.boilerpipe.document.TextDocument;
-import com.kohlschutter.boilerpipe.labels.DefaultLabels;
+import boilerpipe.BoilerpipeFilter;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.document.TextBlock;
+import boilerpipe.document.TextDocument;
+import boilerpipe.labels.DefaultLabels;
 
 import java.util.HashSet;
 import java.util.Iterator;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/LargeBlockSameTagLevelToContentFilter.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/LargeBlockSameTagLevelToContentFilter.java
old mode 100755
new mode 100644
similarity index 63%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/LargeBlockSameTagLevelToContentFilter.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/LargeBlockSameTagLevelToContentFilter.java
index 1fc5df4d4..13cdb9ad8
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/LargeBlockSameTagLevelToContentFilter.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/LargeBlockSameTagLevelToContentFilter.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,13 +33,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.filters.heuristics;
+package boilerpipe.filters.heuristics;
 
-import com.kohlschutter.boilerpipe.BoilerpipeFilter;
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextBlock;
-import com.kohlschutter.boilerpipe.document.TextDocument;
-import com.kohlschutter.boilerpipe.labels.DefaultLabels;
+import boilerpipe.BoilerpipeFilter;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.document.TextBlock;
+import boilerpipe.document.TextDocument;
+import boilerpipe.labels.DefaultLabels;
 
 /**
  * Marks all blocks as content that:
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/ListAtEndFilter.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/ListAtEndFilter.java
old mode 100755
new mode 100644
similarity index 60%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/ListAtEndFilter.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/ListAtEndFilter.java
index 1b316fb51..55c515959
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/ListAtEndFilter.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/ListAtEndFilter.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,13 +33,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.filters.heuristics;
+package boilerpipe.filters.heuristics;
 
-import com.kohlschutter.boilerpipe.BoilerpipeFilter;
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextBlock;
-import com.kohlschutter.boilerpipe.document.TextDocument;
-import com.kohlschutter.boilerpipe.labels.DefaultLabels;
+import boilerpipe.BoilerpipeFilter;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.document.TextBlock;
+import boilerpipe.document.TextDocument;
+import boilerpipe.labels.DefaultLabels;
 
 /**
  * Marks nested list-item blocks after the end of the main content.
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/SimpleBlockFusionProcessor.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/SimpleBlockFusionProcessor.java
old mode 100755
new mode 100644
similarity index 63%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/SimpleBlockFusionProcessor.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/SimpleBlockFusionProcessor.java
index c7109e791..de7bb5f73
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/SimpleBlockFusionProcessor.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/SimpleBlockFusionProcessor.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,12 +33,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.filters.heuristics;
+package boilerpipe.filters.heuristics;
 
-import com.kohlschutter.boilerpipe.BoilerpipeFilter;
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextBlock;
-import com.kohlschutter.boilerpipe.document.TextDocument;
+import boilerpipe.BoilerpipeFilter;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.document.TextBlock;
+import boilerpipe.document.TextDocument;
 
 import java.util.Iterator;
 import java.util.List;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/TrailingHeadlineToBoilerplateFilter.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/TrailingHeadlineToBoilerplateFilter.java
old mode 100755
new mode 100644
similarity index 63%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/TrailingHeadlineToBoilerplateFilter.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/TrailingHeadlineToBoilerplateFilter.java
index 91f4610e7..8bb82c1c8
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/TrailingHeadlineToBoilerplateFilter.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/TrailingHeadlineToBoilerplateFilter.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,13 +33,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.filters.heuristics;
+package boilerpipe.filters.heuristics;
 
-import com.kohlschutter.boilerpipe.BoilerpipeFilter;
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextBlock;
-import com.kohlschutter.boilerpipe.document.TextDocument;
-import com.kohlschutter.boilerpipe.labels.DefaultLabels;
+import boilerpipe.BoilerpipeFilter;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.document.TextBlock;
+import boilerpipe.document.TextDocument;
+import boilerpipe.labels.DefaultLabels;
 
 import java.util.List;
 import java.util.ListIterator;
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/And.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/package-info.java
similarity index 88%
copy from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/And.java
copy to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/package-info.java
index a0e4f6cd7..b1e63235b 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/And.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/heuristics/package-info.java
@@ -15,7 +15,8 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.processors.pattern.detection.flink.processor.and;
 
-public class And {
-}
+/**
+ * These BoilerpipeFilters are pure heuristics.
+ */
+package boilerpipe.filters.heuristics;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/simple/BoilerplateBlockFilter.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/simple/BoilerplateBlockFilter.java
old mode 100755
new mode 100644
similarity index 64%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/simple/BoilerplateBlockFilter.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/simple/BoilerplateBlockFilter.java
index 85e9ccc38..5b858d786
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/simple/BoilerplateBlockFilter.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/simple/BoilerplateBlockFilter.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,13 +33,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.filters.simple;
+package boilerpipe.filters.simple;
 
-import com.kohlschutter.boilerpipe.BoilerpipeFilter;
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextBlock;
-import com.kohlschutter.boilerpipe.document.TextDocument;
-import com.kohlschutter.boilerpipe.labels.DefaultLabels;
+import boilerpipe.BoilerpipeFilter;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.document.TextBlock;
+import boilerpipe.document.TextDocument;
+import boilerpipe.labels.DefaultLabels;
 
 import java.util.Iterator;
 import java.util.List;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/simple/InvertedFilter.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/simple/InvertedFilter.java
old mode 100755
new mode 100644
similarity index 54%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/simple/InvertedFilter.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/simple/InvertedFilter.java
index 260e90756..cd6ea50d2
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/simple/InvertedFilter.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/simple/InvertedFilter.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,12 +33,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.filters.simple;
+package boilerpipe.filters.simple;
 
-import com.kohlschutter.boilerpipe.BoilerpipeFilter;
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextBlock;
-import com.kohlschutter.boilerpipe.document.TextDocument;
+import boilerpipe.BoilerpipeFilter;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.document.TextBlock;
+import boilerpipe.document.TextDocument;
 
 import java.util.List;
 
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/simple/LabelToBoilerplateFilter.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/simple/LabelToBoilerplateFilter.java
old mode 100755
new mode 100644
similarity index 59%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/simple/LabelToBoilerplateFilter.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/simple/LabelToBoilerplateFilter.java
index 9dad1856c..c2726561b
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/simple/LabelToBoilerplateFilter.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/simple/LabelToBoilerplateFilter.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,13 +33,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.filters.simple;
+package boilerpipe.filters.simple;
 
-import com.kohlschutter.boilerpipe.BoilerpipeFilter;
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextBlock;
-import com.kohlschutter.boilerpipe.document.TextDocument;
-import com.kohlschutter.boilerpipe.labels.DefaultLabels;
+import boilerpipe.BoilerpipeFilter;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.document.TextBlock;
+import boilerpipe.document.TextDocument;
+import boilerpipe.labels.DefaultLabels;
 
 /**
  * Marks all blocks that contain a given label as "boilerplate".
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/simple/LabelToContentFilter.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/simple/LabelToContentFilter.java
old mode 100755
new mode 100644
similarity index 57%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/simple/LabelToContentFilter.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/simple/LabelToContentFilter.java
index 31bdbe9dc..35fbfb1ec
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/simple/LabelToContentFilter.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/simple/LabelToContentFilter.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,12 +33,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.filters.simple;
+package boilerpipe.filters.simple;
 
-import com.kohlschutter.boilerpipe.BoilerpipeFilter;
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextBlock;
-import com.kohlschutter.boilerpipe.document.TextDocument;
+import boilerpipe.BoilerpipeFilter;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.document.TextBlock;
+import boilerpipe.document.TextDocument;
 
 /**
  * Marks all blocks that contain a given label as "content".
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/simple/MarkEverythingBoilerplateFilter.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/simple/MarkEverythingBoilerplateFilter.java
old mode 100755
new mode 100644
similarity index 55%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/simple/MarkEverythingBoilerplateFilter.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/simple/MarkEverythingBoilerplateFilter.java
index 67334bdbe..c7d4818be
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/simple/MarkEverythingBoilerplateFilter.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/simple/MarkEverythingBoilerplateFilter.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,12 +33,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.filters.simple;
+package boilerpipe.filters.simple;
 
-import com.kohlschutter.boilerpipe.BoilerpipeFilter;
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextBlock;
-import com.kohlschutter.boilerpipe.document.TextDocument;
+import boilerpipe.BoilerpipeFilter;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.document.TextBlock;
+import boilerpipe.document.TextDocument;
 
 /**
  * Marks all blocks as boilerplate.
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/simple/MarkEverythingContentFilter.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/simple/MarkEverythingContentFilter.java
old mode 100755
new mode 100644
similarity index 55%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/simple/MarkEverythingContentFilter.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/simple/MarkEverythingContentFilter.java
index 70595a118..29af19e69
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/simple/MarkEverythingContentFilter.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/simple/MarkEverythingContentFilter.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,12 +33,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.filters.simple;
+package boilerpipe.filters.simple;
 
-import com.kohlschutter.boilerpipe.BoilerpipeFilter;
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextBlock;
-import com.kohlschutter.boilerpipe.document.TextDocument;
+import boilerpipe.BoilerpipeFilter;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.document.TextBlock;
+import boilerpipe.document.TextDocument;
 
 /**
  * Marks all blocks as content.
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/simple/MinClauseWordsFilter.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/simple/MinClauseWordsFilter.java
old mode 100755
new mode 100644
similarity index 75%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/simple/MinClauseWordsFilter.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/simple/MinClauseWordsFilter.java
index e2e607400..fb7f12464
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/simple/MinClauseWordsFilter.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/simple/MinClauseWordsFilter.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,12 +33,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.filters.simple;
+package boilerpipe.filters.simple;
 
-import com.kohlschutter.boilerpipe.BoilerpipeFilter;
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextBlock;
-import com.kohlschutter.boilerpipe.document.TextDocument;
+import boilerpipe.BoilerpipeFilter;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.document.TextBlock;
+import boilerpipe.document.TextDocument;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/simple/MinWordsFilter.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/simple/MinWordsFilter.java
old mode 100755
new mode 100644
similarity index 56%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/simple/MinWordsFilter.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/simple/MinWordsFilter.java
index 372b94fbb..403e8425a
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/simple/MinWordsFilter.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/simple/MinWordsFilter.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,12 +33,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.filters.simple;
+package boilerpipe.filters.simple;
 
-import com.kohlschutter.boilerpipe.BoilerpipeFilter;
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextBlock;
-import com.kohlschutter.boilerpipe.document.TextDocument;
+import boilerpipe.BoilerpipeFilter;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.document.TextBlock;
+import boilerpipe.document.TextDocument;
 
 /**
  * Keeps only those content blocks which contain at least <em>k</em> words.
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/simple/SplitParagraphBlocksFilter.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/simple/SplitParagraphBlocksFilter.java
old mode 100755
new mode 100644
similarity index 68%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/simple/SplitParagraphBlocksFilter.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/simple/SplitParagraphBlocksFilter.java
index def7fc921..ad18298fa
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/simple/SplitParagraphBlocksFilter.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/simple/SplitParagraphBlocksFilter.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,12 +33,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.filters.simple;
+package boilerpipe.filters.simple;
 
-import com.kohlschutter.boilerpipe.BoilerpipeFilter;
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextBlock;
-import com.kohlschutter.boilerpipe.document.TextDocument;
+import boilerpipe.BoilerpipeFilter;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.document.TextBlock;
+import boilerpipe.document.TextDocument;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/simple/SurroundingToContentFilter.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/simple/SurroundingToContentFilter.java
old mode 100755
new mode 100644
similarity index 66%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/simple/SurroundingToContentFilter.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/simple/SurroundingToContentFilter.java
index 2e827d60d..128eedacc
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/simple/SurroundingToContentFilter.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/simple/SurroundingToContentFilter.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,13 +33,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.filters.simple;
+package boilerpipe.filters.simple;
 
-import com.kohlschutter.boilerpipe.BoilerpipeFilter;
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.conditions.TextBlockCondition;
-import com.kohlschutter.boilerpipe.document.TextBlock;
-import com.kohlschutter.boilerpipe.document.TextDocument;
+import boilerpipe.BoilerpipeFilter;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.conditions.TextBlockCondition;
+import boilerpipe.document.TextBlock;
+import boilerpipe.document.TextDocument;
 
 import java.util.Iterator;
 import java.util.List;
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/And.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/simple/package-info.java
similarity index 85%
copy from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/And.java
copy to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/simple/package-info.java
index a0e4f6cd7..4d02b739d 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/And.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/filters/simple/package-info.java
@@ -15,7 +15,9 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.processors.pattern.detection.flink.processor.and;
 
-public class And {
-}
+/**
+ * These BoilerpipeFilters are straight-forward and probably not really specific to English.
+ */
+package boilerpipe.filters.simple;
+
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/labels/ConditionalLabelAction.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/labels/ConditionalLabelAction.java
old mode 100755
new mode 100644
similarity index 54%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/labels/ConditionalLabelAction.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/labels/ConditionalLabelAction.java
index e9926f1a8..71eacf32b
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/labels/ConditionalLabelAction.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/labels/ConditionalLabelAction.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,10 +33,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.labels;
+package boilerpipe.labels;
 
-import com.kohlschutter.boilerpipe.conditions.TextBlockCondition;
-import com.kohlschutter.boilerpipe.document.TextBlock;
+import boilerpipe.conditions.TextBlockCondition;
+import boilerpipe.document.TextBlock;
 
 /**
  * Adds labels to a {@link TextBlock} if the given criteria are met.
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/labels/DefaultLabels.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/labels/DefaultLabels.java
old mode 100755
new mode 100644
similarity index 68%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/labels/DefaultLabels.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/labels/DefaultLabels.java
index 60803d573..24e1f7c31
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/labels/DefaultLabels.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/labels/DefaultLabels.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,9 +33,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.labels;
+package boilerpipe.labels;
 
-import com.kohlschutter.boilerpipe.document.TextBlock;
+import boilerpipe.document.TextBlock;
 
 /**
  * Some pre-defined labels which can be used in conjunction with {@link TextBlock#addLabel(String)}
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/labels/LabelAction.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/labels/LabelAction.java
old mode 100755
new mode 100644
similarity index 57%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/labels/LabelAction.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/labels/LabelAction.java
index da9dd0e40..16c79d1b2
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/labels/LabelAction.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/labels/LabelAction.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,9 +33,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.labels;
+package boilerpipe.labels;
 
-import com.kohlschutter.boilerpipe.document.TextBlock;
+import boilerpipe.document.TextBlock;
 
 import java.util.Arrays;
 
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/And.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/package-info.java
similarity index 88%
copy from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/And.java
copy to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/package-info.java
index a0e4f6cd7..3942c3b88 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/And.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/package-info.java
@@ -15,7 +15,8 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.processors.pattern.detection.flink.processor.and;
 
-public class And {
-}
+/**
+ * The Boilerpipe top-level package.
+ */
+package boilerpipe;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/BoilerpipeHTMLContentHandler.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/BoilerpipeHTMLContentHandler.java
old mode 100755
new mode 100644
similarity index 91%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/BoilerpipeHTMLContentHandler.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/BoilerpipeHTMLContentHandler.java
index 909d80bb9..809507dca
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/BoilerpipeHTMLContentHandler.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/BoilerpipeHTMLContentHandler.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,12 +33,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.sax;
+package boilerpipe.sax;
 
-import com.kohlschutter.boilerpipe.document.TextBlock;
-import com.kohlschutter.boilerpipe.document.TextDocument;
-import com.kohlschutter.boilerpipe.labels.LabelAction;
-import com.kohlschutter.boilerpipe.util.UnicodeTokenizer;
+import boilerpipe.labels.LabelAction;
+import boilerpipe.util.UnicodeTokenizer;
+import boilerpipe.document.TextBlock;
+import boilerpipe.document.TextDocument;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.Locator;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/BoilerpipeHTMLParser.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/BoilerpipeHTMLParser.java
old mode 100755
new mode 100644
similarity index 70%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/BoilerpipeHTMLParser.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/BoilerpipeHTMLParser.java
index f9f07099d..10d7afb0b
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/BoilerpipeHTMLParser.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/BoilerpipeHTMLParser.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,11 +33,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.sax;
+package boilerpipe.sax;
 
-import com.kohlschutter.boilerpipe.BoilerpipeDocumentSource;
-import com.kohlschutter.boilerpipe.document.TextBlock;
-import com.kohlschutter.boilerpipe.document.TextDocument;
+import boilerpipe.BoilerpipeDocumentSource;
+import boilerpipe.document.TextBlock;
+import boilerpipe.document.TextDocument;
 import org.apache.xerces.parsers.AbstractSAXParser;
 import org.cyberneko.html.HTMLConfiguration;
 
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/BoilerpipeSAXInput.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/BoilerpipeSAXInput.java
old mode 100755
new mode 100644
similarity index 68%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/BoilerpipeSAXInput.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/BoilerpipeSAXInput.java
index 21c7cf63a..7e08bf5c7
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/BoilerpipeSAXInput.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/BoilerpipeSAXInput.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,11 +33,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.sax;
+package boilerpipe.sax;
 
-import com.kohlschutter.boilerpipe.BoilerpipeInput;
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextDocument;
+import boilerpipe.BoilerpipeInput;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.document.TextDocument;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/CommonTagActions.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/CommonTagActions.java
old mode 100755
new mode 100644
similarity index 92%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/CommonTagActions.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/CommonTagActions.java
index fea4c00ba..e3d6037b4
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/CommonTagActions.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/CommonTagActions.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,10 +33,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.sax;
+package boilerpipe.sax;
 
-import com.kohlschutter.boilerpipe.document.TextBlock;
-import com.kohlschutter.boilerpipe.labels.LabelAction;
+import boilerpipe.labels.LabelAction;
+import boilerpipe.document.TextBlock;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
@@ -340,4 +358,4 @@ public abstract class CommonTagActions {
       return true;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/DefaultTagActionMap.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/DefaultTagActionMap.java
old mode 100755
new mode 100644
similarity index 78%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/DefaultTagActionMap.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/DefaultTagActionMap.java
index 41d3c4830..226afd53d
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/DefaultTagActionMap.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/DefaultTagActionMap.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,10 +33,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.sax;
+package boilerpipe.sax;
 
-import com.kohlschutter.boilerpipe.labels.DefaultLabels;
-import com.kohlschutter.boilerpipe.labels.LabelAction;
+import boilerpipe.labels.DefaultLabels;
+import boilerpipe.labels.LabelAction;
 
 /**
  * Default {@link TagAction}s. Seem to work well.
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/HTMLDocument.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/HTMLDocument.java
old mode 100755
new mode 100644
similarity index 64%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/HTMLDocument.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/HTMLDocument.java
index 8ec1f6117..de81cba2c
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/HTMLDocument.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/HTMLDocument.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,7 +33,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.sax;
+package boilerpipe.sax;
 
 import org.xml.sax.InputSource;
 
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/HTMLFetcher.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/HTMLFetcher.java
old mode 100755
new mode 100644
similarity index 76%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/HTMLFetcher.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/HTMLFetcher.java
index 55c31104d..6519a16c6
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/HTMLFetcher.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/HTMLFetcher.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,7 +33,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.sax;
+package boilerpipe.sax;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/HTMLHighlighter.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/HTMLHighlighter.java
old mode 100755
new mode 100644
similarity index 93%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/HTMLHighlighter.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/HTMLHighlighter.java
index 27263047f..65acdfde3
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/HTMLHighlighter.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/HTMLHighlighter.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,12 +33,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.sax;
+package boilerpipe.sax;
 
-import com.kohlschutter.boilerpipe.BoilerpipeExtractor;
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.TextBlock;
-import com.kohlschutter.boilerpipe.document.TextDocument;
+import boilerpipe.BoilerpipeExtractor;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.document.TextBlock;
+import boilerpipe.document.TextDocument;
 import org.apache.xerces.parsers.AbstractSAXParser;
 import org.cyberneko.html.HTMLConfiguration;
 import org.xml.sax.Attributes;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/ImageExtractor.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/ImageExtractor.java
old mode 100755
new mode 100644
similarity index 88%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/ImageExtractor.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/ImageExtractor.java
index 6466d04de..2d73189d6
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/ImageExtractor.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/ImageExtractor.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,13 +33,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.sax;
+package boilerpipe.sax;
 
-import com.kohlschutter.boilerpipe.BoilerpipeExtractor;
-import com.kohlschutter.boilerpipe.BoilerpipeProcessingException;
-import com.kohlschutter.boilerpipe.document.Image;
-import com.kohlschutter.boilerpipe.document.TextBlock;
-import com.kohlschutter.boilerpipe.document.TextDocument;
+import boilerpipe.BoilerpipeExtractor;
+import boilerpipe.BoilerpipeProcessingException;
+import boilerpipe.document.Image;
+import boilerpipe.document.TextBlock;
+import boilerpipe.document.TextDocument;
 import org.apache.xerces.parsers.AbstractSAXParser;
 import org.cyberneko.html.HTMLConfiguration;
 import org.xml.sax.Attributes;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/InputSourceable.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/InputSourceable.java
old mode 100755
new mode 100644
similarity index 51%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/InputSourceable.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/InputSourceable.java
index c4982d90a..dfa2b11f7
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/InputSourceable.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/InputSourceable.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,7 +33,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.sax;
+package boilerpipe.sax;
 
 import org.xml.sax.InputSource;
 
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/MarkupTagAction.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/MarkupTagAction.java
old mode 100755
new mode 100644
similarity index 78%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/MarkupTagAction.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/MarkupTagAction.java
index acf0ddc8e..333f6fa9f
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/MarkupTagAction.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/MarkupTagAction.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,11 +33,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.sax;
+package boilerpipe.sax;
 
-import com.kohlschutter.boilerpipe.document.TextBlock;
-import com.kohlschutter.boilerpipe.labels.DefaultLabels;
-import com.kohlschutter.boilerpipe.labels.LabelAction;
+import boilerpipe.labels.DefaultLabels;
+import boilerpipe.labels.LabelAction;
+import boilerpipe.document.TextBlock;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/TagAction.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/TagAction.java
old mode 100755
new mode 100644
similarity index 59%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/TagAction.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/TagAction.java
index 9c51f4cfa..e3736e0b5
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/TagAction.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/TagAction.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,7 +33,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.sax;
+package boilerpipe.sax;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
@@ -35,4 +53,4 @@ public interface TagAction {
               String qName) throws SAXException;
 
   boolean changesTagLevel();
-}
\ No newline at end of file
+}
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/TagActionMap.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/TagActionMap.java
old mode 100755
new mode 100644
similarity index 71%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/TagActionMap.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/TagActionMap.java
index 693719f3b..89db82407
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/TagActionMap.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/TagActionMap.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,7 +33,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.sax;
+package boilerpipe.sax;
 
 import java.util.HashMap;
 
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/And.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/package-info.java
similarity index 87%
copy from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/And.java
copy to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/package-info.java
index a0e4f6cd7..402da4e33 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/And.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/sax/package-info.java
@@ -15,7 +15,9 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.processors.pattern.detection.flink.processor.and;
 
-public class And {
-}
+/**
+ * Classes related to parsing and producing HTML from/to Boilerpipe TextDocuments.
+ */
+package boilerpipe.sax;
+
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/util/UnicodeTokenizer.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/util/UnicodeTokenizer.java
old mode 100755
new mode 100644
similarity index 63%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/util/UnicodeTokenizer.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/util/UnicodeTokenizer.java
index 7bccdce9d..21177b071
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/util/UnicodeTokenizer.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/util/UnicodeTokenizer.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ */
+
 /**
  * boilerpipe
  * <p>
@@ -15,7 +33,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.kohlschutter.boilerpipe.util;
+package boilerpipe.util;
 
 import java.util.regex.Pattern;
 
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/And.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/util/package-info.java
similarity index 88%
copy from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/And.java
copy to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/util/package-info.java
index a0e4f6cd7..90f0fa865 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/And.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/boilerpipe/util/package-info.java
@@ -15,7 +15,9 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.processors.pattern.detection.flink.processor.and;
 
-public class And {
-}
+/**
+ * Some helper classes.
+ */
+package boilerpipe.util;
+
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/AbstractFlinkTransformationProgram.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/AbstractFlinkTransformationProgram.java
similarity index 94%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/AbstractFlinkTransformationProgram.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/AbstractFlinkTransformationProgram.java
index 9f4ce5f4d..3f058b4bc 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/AbstractFlinkTransformationProgram.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/AbstractFlinkTransformationProgram.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.processors.transformation.flink;
+package org.apache.streampipes.pe.flink;
 
 import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
 import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/AbstractPatternDetectionProgram.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/AbstractPatternDetectionProgram.java
similarity index 95%
rename from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/AbstractPatternDetectionProgram.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/AbstractPatternDetectionProgram.java
index 5ce132910..9835d9b15 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/AbstractPatternDetectionProgram.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/AbstractPatternDetectionProgram.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.processors.pattern.detection.flink;
+package org.apache.streampipes.pe.flink;
 
 import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
 import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
diff --git a/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/AllFlinkPipelineElementsInit.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/AllFlinkPipelineElementsInit.java
new file mode 100644
index 000000000..47e568367
--- /dev/null
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/AllFlinkPipelineElementsInit.java
@@ -0,0 +1,100 @@
+/*
+ * 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.streampipes.pe.flink;
+
+import org.apache.streampipes.dataformat.cbor.CborDataFormatFactory;
+import org.apache.streampipes.dataformat.fst.FstDataFormatFactory;
+import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
+import org.apache.streampipes.dataformat.smile.SmileDataFormatFactory;
+import org.apache.streampipes.extensions.management.model.SpServiceDefinition;
+import org.apache.streampipes.extensions.management.model.SpServiceDefinitionBuilder;
+import org.apache.streampipes.messaging.jms.SpJmsProtocolFactory;
+import org.apache.streampipes.messaging.kafka.SpKafkaProtocolFactory;
+import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
+import org.apache.streampipes.messaging.nats.SpNatsProtocolFactory;
+import org.apache.streampipes.pe.flink.config.ConfigKeys;
+import org.apache.streampipes.pe.flink.processor.absence.AbsenceController;
+import org.apache.streampipes.pe.flink.processor.aggregation.AggregationController;
+import org.apache.streampipes.pe.flink.processor.and.AndController;
+import org.apache.streampipes.pe.flink.processor.boilerplate.BoilerplateController;
+import org.apache.streampipes.pe.flink.processor.converter.FieldConverterController;
+import org.apache.streampipes.pe.flink.processor.count.CountController;
+import org.apache.streampipes.pe.flink.processor.eventcount.EventCountController;
+import org.apache.streampipes.pe.flink.processor.gridenricher.SpatialGridEnrichmentController;
+import org.apache.streampipes.pe.flink.processor.measurementunitonverter.MeasurementUnitConverterController;
+import org.apache.streampipes.pe.flink.processor.peak.PeakDetectionController;
+import org.apache.streampipes.pe.flink.processor.rate.EventRateController;
+import org.apache.streampipes.pe.flink.processor.rename.FieldRenamerController;
+import org.apache.streampipes.pe.flink.processor.sequence.SequenceController;
+import org.apache.streampipes.pe.flink.processor.stat.summary.StatisticsSummaryController;
+import org.apache.streampipes.pe.flink.processor.stat.window.StatisticsSummaryControllerWindow;
+import org.apache.streampipes.pe.flink.processor.timestamp.TimestampController;
+import org.apache.streampipes.pe.flink.processor.urldereferencing.UrlDereferencingController;
+import org.apache.streampipes.pe.flink.processor.wordcount.WordCountController;
+import org.apache.streampipes.pe.flink.sink.elasticsearch.ElasticSearchController;
+import org.apache.streampipes.service.extensions.ExtensionsModelSubmitter;
+import org.apache.streampipes.wrapper.flink.FlinkRuntimeProvider;
+
+
+public class AllFlinkPipelineElementsInit extends ExtensionsModelSubmitter {
+
+  public static void main(String[] args) {
+    new AllFlinkPipelineElementsInit().init();
+  }
+
+  @Override
+  public SpServiceDefinition provideServiceDefinition() {
+    return SpServiceDefinitionBuilder.create("org-apache-streampipes-pe-all-flink",
+            "StreamPipes Bundled Pipeline Elements for JVM Wrapper",
+            "",
+            8090)
+        .registerPipelineElements(new AggregationController(),
+            new CountController(),
+            new EventRateController(),
+            new EventCountController(),
+            new TimestampController(),
+            new UrlDereferencingController(),
+            new SpatialGridEnrichmentController(),
+            new PeakDetectionController(),
+            new SequenceController(),
+            new AbsenceController(),
+            new AndController(),
+            new StatisticsSummaryController(),
+            new StatisticsSummaryControllerWindow(),
+            new WordCountController(),
+            new FieldConverterController(),
+            new MeasurementUnitConverterController(),
+            new FieldRenamerController(),
+            new BoilerplateController(),
+            new ElasticSearchController())
+        .registerRuntimeProvider(new FlinkRuntimeProvider())
+        .registerMessagingFormats(
+            new JsonDataFormatFactory(),
+            new CborDataFormatFactory(),
+            new SmileDataFormatFactory(),
+            new FstDataFormatFactory())
+        .registerMessagingProtocols(
+            new SpKafkaProtocolFactory(),
+            new SpJmsProtocolFactory(),
+            new SpMqttProtocolFactory(),
+            new SpNatsProtocolFactory())
+        .addConfig(ConfigKeys.ELASTIC_HOST, "elasticsearch", "Elastic search host address")
+        .addConfig(ConfigKeys.ELASTIC_PORT_REST, 9200, "Elasitc search rest port")
+        .build();
+  }
+}
diff --git a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/config/ConfigKeys.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/config/ConfigKeys.java
similarity index 95%
rename from streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/config/ConfigKeys.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/config/ConfigKeys.java
index ad7e30830..994cf7b14 100644
--- a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/config/ConfigKeys.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/config/ConfigKeys.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.sinks.databases.flink.config;
+package org.apache.streampipes.pe.flink.config;
 
 public class ConfigKeys {
   public static final String FLINK_HOST = "SP_FLINK_HOST";
diff --git a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/extensions/MapKeySelector.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/extensions/MapKeySelector.java
similarity index 95%
rename from streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/extensions/MapKeySelector.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/extensions/MapKeySelector.java
index ac75284e6..5538d90eb 100644
--- a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/extensions/MapKeySelector.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/extensions/MapKeySelector.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.statistics.flink.extensions;
+package org.apache.streampipes.pe.flink.extensions;
 
 import org.apache.streampipes.model.runtime.Event;
 
diff --git a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/extensions/SlidingBatchWindow.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/extensions/SlidingBatchWindow.java
similarity index 95%
rename from streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/extensions/SlidingBatchWindow.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/extensions/SlidingBatchWindow.java
index 0bd24393d..9dc043196 100644
--- a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/extensions/SlidingBatchWindow.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/extensions/SlidingBatchWindow.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.statistics.flink.extensions;
+package org.apache.streampipes.pe.flink.extensions;
 
 import org.apache.flink.streaming.api.operators.AbstractStreamOperator;
 import org.apache.flink.streaming.api.operators.OneInputStreamOperator;
diff --git a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/extensions/SlidingEventTimeWindow.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/extensions/SlidingEventTimeWindow.java
similarity index 97%
rename from streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/extensions/SlidingEventTimeWindow.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/extensions/SlidingEventTimeWindow.java
index 8086ae08a..94a1aefd9 100644
--- a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/extensions/SlidingEventTimeWindow.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/extensions/SlidingEventTimeWindow.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.statistics.flink.extensions;
+package org.apache.streampipes.pe.flink.extensions;
 
 import org.apache.flink.streaming.api.operators.AbstractUdfStreamOperator;
 import org.apache.flink.streaming.api.operators.OneInputStreamOperator;
diff --git a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/extensions/TimestampMappingFunction.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/extensions/TimestampMappingFunction.java
similarity index 93%
rename from streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/extensions/TimestampMappingFunction.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/extensions/TimestampMappingFunction.java
index 4f6675f8d..1f9d96cc2 100644
--- a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/extensions/TimestampMappingFunction.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/extensions/TimestampMappingFunction.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.statistics.flink.extensions;
+package org.apache.streampipes.pe.flink.extensions;
 
 import org.apache.flink.api.common.functions.Function;
 
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/absence/Absence.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/absence/Absence.java
similarity index 90%
rename from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/absence/Absence.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/absence/Absence.java
index f24702829..8a00c7a5e 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/absence/Absence.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/absence/Absence.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.processors.pattern.detection.flink.processor.absence;
+package org.apache.streampipes.pe.flink.processor.absence;
 
 public class Absence {
 }
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/absence/AbsenceController.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/absence/AbsenceController.java
similarity index 95%
rename from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/absence/AbsenceController.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/absence/AbsenceController.java
index fdf3834f2..3420700f3 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/absence/AbsenceController.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/absence/AbsenceController.java
@@ -16,13 +16,13 @@
  *
  */
 
-package org.apache.streampipes.processors.pattern.detection.flink.processor.absence;
+package org.apache.streampipes.pe.flink.processor.absence;
 
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
 import org.apache.streampipes.model.schema.EventProperty;
-import org.apache.streampipes.processors.pattern.detection.flink.processor.and.TimeUnit;
+import org.apache.streampipes.pe.flink.processor.and.TimeUnit;
 import org.apache.streampipes.sdk.builder.ProcessingElementBuilder;
 import org.apache.streampipes.sdk.builder.StreamRequirementsBuilder;
 import org.apache.streampipes.sdk.extractor.ProcessingElementParameterExtractor;
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/absence/AbsenceParameters.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/absence/AbsenceParameters.java
similarity index 91%
rename from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/absence/AbsenceParameters.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/absence/AbsenceParameters.java
index 3302da441..d5f42c3e3 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/absence/AbsenceParameters.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/absence/AbsenceParameters.java
@@ -16,10 +16,10 @@
  *
  */
 
-package org.apache.streampipes.processors.pattern.detection.flink.processor.absence;
+package org.apache.streampipes.pe.flink.processor.absence;
 
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
-import org.apache.streampipes.processors.pattern.detection.flink.processor.and.TimeUnit;
+import org.apache.streampipes.pe.flink.processor.and.TimeUnit;
 import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 
 import java.util.ArrayList;
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/absence/AbsenceProgram.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/absence/AbsenceProgram.java
similarity index 96%
rename from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/absence/AbsenceProgram.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/absence/AbsenceProgram.java
index d67c5b0d3..342f8ba53 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/absence/AbsenceProgram.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/absence/AbsenceProgram.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.processors.pattern.detection.flink.processor.absence;
+package org.apache.streampipes.pe.flink.processor.absence;
 
 import org.apache.streampipes.model.runtime.Event;
-import org.apache.streampipes.processors.pattern.detection.flink.processor.and.TimeUnitConverter;
+import org.apache.streampipes.pe.flink.processor.and.TimeUnitConverter;
 import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
 
 import org.apache.flink.api.common.functions.FlatMapFunction;
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/aggregation/Aggregation.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/aggregation/Aggregation.java
similarity index 97%
rename from streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/aggregation/Aggregation.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/aggregation/Aggregation.java
index b1ab4309d..fdf61e29e 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/aggregation/Aggregation.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/aggregation/Aggregation.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.aggregation.flink.processor.aggregation;
+package org.apache.streampipes.pe.flink.processor.aggregation;
 
 import org.apache.streampipes.model.runtime.Event;
 
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/aggregation/AggregationController.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/aggregation/AggregationController.java
similarity index 98%
rename from streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/aggregation/AggregationController.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/aggregation/AggregationController.java
index 34c6dbe38..5f4e72766 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/aggregation/AggregationController.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/aggregation/AggregationController.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.aggregation.flink.processor.aggregation;
+package org.apache.streampipes.pe.flink.processor.aggregation;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
 import org.apache.streampipes.extensions.api.runtime.ResolvesContainerProvidedOutputStrategy;
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/aggregation/AggregationParameters.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/aggregation/AggregationParameters.java
similarity index 96%
rename from streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/aggregation/AggregationParameters.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/aggregation/AggregationParameters.java
index 6f11602a5..1de84150b 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/aggregation/AggregationParameters.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/aggregation/AggregationParameters.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.aggregation.flink.processor.aggregation;
+package org.apache.streampipes.pe.flink.processor.aggregation;
 
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
 import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/aggregation/AggregationProgram.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/aggregation/AggregationProgram.java
similarity index 97%
rename from streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/aggregation/AggregationProgram.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/aggregation/AggregationProgram.java
index 6cab6c5b7..1b1c27591 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/aggregation/AggregationProgram.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/aggregation/AggregationProgram.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.aggregation.flink.processor.aggregation;
+package org.apache.streampipes.pe.flink.processor.aggregation;
 
 import org.apache.streampipes.model.runtime.Event;
 import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/aggregation/AggregationType.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/aggregation/AggregationType.java
similarity index 91%
rename from streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/aggregation/AggregationType.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/aggregation/AggregationType.java
index 0346e5d8f..25ce1b7cf 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/aggregation/AggregationType.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/aggregation/AggregationType.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.aggregation.flink.processor.aggregation;
+package org.apache.streampipes.pe.flink.processor.aggregation;
 
 public enum AggregationType {
   AVG,
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/aggregation/CountAggregation.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/aggregation/CountAggregation.java
similarity index 96%
rename from streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/aggregation/CountAggregation.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/aggregation/CountAggregation.java
index 584376ddb..5e4218194 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/aggregation/CountAggregation.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/aggregation/CountAggregation.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.aggregation.flink.processor.aggregation;
+package org.apache.streampipes.pe.flink.processor.aggregation;
 
 import org.apache.streampipes.model.runtime.Event;
 
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/aggregation/TimeAggregation.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/aggregation/TimeAggregation.java
similarity index 96%
rename from streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/aggregation/TimeAggregation.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/aggregation/TimeAggregation.java
index 350108cf8..c8369bba9 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/aggregation/TimeAggregation.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/aggregation/TimeAggregation.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.aggregation.flink.processor.aggregation;
+package org.apache.streampipes.pe.flink.processor.aggregation;
 
 import org.apache.streampipes.model.runtime.Event;
 
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/aggregation/config/aggregation.md b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/aggregation/config/aggregation.md
similarity index 100%
rename from streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/aggregation/config/aggregation.md
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/aggregation/config/aggregation.md
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/And.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/and/And.java
similarity index 91%
rename from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/And.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/and/And.java
index a0e4f6cd7..9a91ba40f 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/And.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/and/And.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.processors.pattern.detection.flink.processor.and;
+package org.apache.streampipes.pe.flink.processor.and;
 
 public class And {
 }
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/AndController.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/and/AndController.java
similarity index 97%
rename from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/AndController.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/and/AndController.java
index 72d0d9184..b7f3daac7 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/AndController.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/and/AndController.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.pattern.detection.flink.processor.and;
+package org.apache.streampipes.pe.flink.processor.and;
 
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/AndParameters.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/and/AndParameters.java
similarity index 95%
rename from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/AndParameters.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/and/AndParameters.java
index 81e523f05..2917c26db 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/AndParameters.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/and/AndParameters.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.pattern.detection.flink.processor.and;
+package org.apache.streampipes.pe.flink.processor.and;
 
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
 import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/AndProgram.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/and/AndProgram.java
similarity index 94%
rename from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/AndProgram.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/and/AndProgram.java
index 7b0573caf..00e345b97 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/AndProgram.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/and/AndProgram.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.processors.pattern.detection.flink.processor.and;
+package org.apache.streampipes.pe.flink.processor.and;
 
 import org.apache.streampipes.model.runtime.Event;
-import org.apache.streampipes.processors.pattern.detection.flink.AbstractPatternDetectionProgram;
+import org.apache.streampipes.pe.flink.AbstractPatternDetectionProgram;
 
 import org.apache.flink.api.common.functions.JoinFunction;
 import org.apache.flink.api.java.functions.KeySelector;
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/TimeUnit.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/and/TimeUnit.java
similarity index 91%
rename from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/TimeUnit.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/and/TimeUnit.java
index 2a0202af5..f85685686 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/TimeUnit.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/and/TimeUnit.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.processors.pattern.detection.flink.processor.and;
+package org.apache.streampipes.pe.flink.processor.and;
 
 public enum TimeUnit {
   Seconds, Minutes, Hours;
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/TimeUnitConverter.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/and/TimeUnitConverter.java
similarity index 93%
rename from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/TimeUnitConverter.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/and/TimeUnitConverter.java
index 7c17e9f8c..8fb2d9c3a 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/TimeUnitConverter.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/and/TimeUnitConverter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.processors.pattern.detection.flink.processor.and;
+package org.apache.streampipes.pe.flink.processor.and;
 
 import org.apache.flink.streaming.api.windowing.time.Time;
 
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/boilerplate/BoilerplateController.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/boilerplate/BoilerplateController.java
similarity index 98%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/boilerplate/BoilerplateController.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/boilerplate/BoilerplateController.java
index 67736026a..692e06d02 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/boilerplate/BoilerplateController.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/boilerplate/BoilerplateController.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.transformation.flink.processor.boilerplate;
+package org.apache.streampipes.pe.flink.processor.boilerplate;
 
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/boilerplate/BoilerplateParameters.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/boilerplate/BoilerplateParameters.java
similarity index 94%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/boilerplate/BoilerplateParameters.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/boilerplate/BoilerplateParameters.java
index e88d5db10..3f7b62eb5 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/boilerplate/BoilerplateParameters.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/boilerplate/BoilerplateParameters.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.transformation.flink.processor.boilerplate;
+package org.apache.streampipes.pe.flink.processor.boilerplate;
 
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
 import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/boilerplate/BoilerplateProgram.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/boilerplate/BoilerplateProgram.java
similarity index 88%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/boilerplate/BoilerplateProgram.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/boilerplate/BoilerplateProgram.java
index be2f1f196..321cc4a3b 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/boilerplate/BoilerplateProgram.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/boilerplate/BoilerplateProgram.java
@@ -16,10 +16,10 @@
  *
  */
 
-package org.apache.streampipes.processors.transformation.flink.processor.boilerplate;
+package org.apache.streampipes.pe.flink.processor.boilerplate;
 
 import org.apache.streampipes.model.runtime.Event;
-import org.apache.streampipes.processors.transformation.flink.AbstractFlinkTransformationProgram;
+import org.apache.streampipes.pe.flink.AbstractFlinkTransformationProgram;
 
 import org.apache.flink.streaming.api.datastream.DataStream;
 
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/boilerplate/BoilerplateRemover.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/boilerplate/BoilerplateRemover.java
similarity index 88%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/boilerplate/BoilerplateRemover.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/boilerplate/BoilerplateRemover.java
index 1d18c9dd6..850efb7a9 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/boilerplate/BoilerplateRemover.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/boilerplate/BoilerplateRemover.java
@@ -16,16 +16,16 @@
  *
  */
 
-package org.apache.streampipes.processors.transformation.flink.processor.boilerplate;
+package org.apache.streampipes.pe.flink.processor.boilerplate;
 
 import org.apache.streampipes.model.runtime.Event;
 
-import com.kohlschutter.boilerpipe.document.TextDocument;
-import com.kohlschutter.boilerpipe.extractors.CommonExtractors;
-import com.kohlschutter.boilerpipe.extractors.ExtractorBase;
-import com.kohlschutter.boilerpipe.sax.BoilerpipeSAXInput;
-import com.kohlschutter.boilerpipe.sax.HTMLDocument;
-import com.kohlschutter.boilerpipe.sax.HTMLHighlighter;
+import boilerpipe.document.TextDocument;
+import boilerpipe.extractors.CommonExtractors;
+import boilerpipe.extractors.ExtractorBase;
+import boilerpipe.sax.BoilerpipeSAXInput;
+import boilerpipe.sax.HTMLDocument;
+import boilerpipe.sax.HTMLHighlighter;
 import org.apache.flink.api.common.functions.FlatMapFunction;
 import org.apache.flink.util.Collector;
 
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/boilerplate/ExtractorMode.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/boilerplate/ExtractorMode.java
similarity index 91%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/boilerplate/ExtractorMode.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/boilerplate/ExtractorMode.java
index be65e71c9..bf1e3ded9 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/boilerplate/ExtractorMode.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/boilerplate/ExtractorMode.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.transformation.flink.processor.boilerplate;
+package org.apache.streampipes.pe.flink.processor.boilerplate;
 
 public enum ExtractorMode {
   ARTICLE,
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/boilerplate/OutputMode.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/boilerplate/OutputMode.java
similarity index 91%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/boilerplate/OutputMode.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/boilerplate/OutputMode.java
index bb357c339..09d1bf26f 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/boilerplate/OutputMode.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/boilerplate/OutputMode.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.transformation.flink.processor.boilerplate;
+package org.apache.streampipes.pe.flink.processor.boilerplate;
 
 public enum OutputMode {
   PLAIN_TEXT,
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/common/TimestampExtractor.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/common/TimestampExtractor.java
similarity index 93%
rename from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/common/TimestampExtractor.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/common/TimestampExtractor.java
index 73375499a..2cb820d4a 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/common/TimestampExtractor.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/common/TimestampExtractor.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.processors.pattern.detection.flink.processor.common;
+package org.apache.streampipes.pe.flink.processor.common;
 
 import org.apache.streampipes.model.runtime.Event;
 
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/converter/FieldConverter.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/converter/FieldConverter.java
similarity index 96%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/converter/FieldConverter.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/converter/FieldConverter.java
index c0cc69b2d..87e68dad5 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/converter/FieldConverter.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/converter/FieldConverter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.processors.transformation.flink.processor.converter;
+package org.apache.streampipes.pe.flink.processor.converter;
 
 import org.apache.streampipes.model.runtime.Event;
 import org.apache.streampipes.vocabulary.XSD;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/converter/FieldConverterController.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/converter/FieldConverterController.java
similarity index 98%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/converter/FieldConverterController.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/converter/FieldConverterController.java
index 3929a3650..6c0bb3a2f 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/converter/FieldConverterController.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/converter/FieldConverterController.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.processors.transformation.flink.processor.converter;
+package org.apache.streampipes.pe.flink.processor.converter;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
 import org.apache.streampipes.extensions.api.extractor.IStaticPropertyExtractor;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/converter/FieldConverterParameters.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/converter/FieldConverterParameters.java
similarity index 94%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/converter/FieldConverterParameters.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/converter/FieldConverterParameters.java
index 14b174615..155ed821b 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/converter/FieldConverterParameters.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/converter/FieldConverterParameters.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.processors.transformation.flink.processor.converter;
+package org.apache.streampipes.pe.flink.processor.converter;
 
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
 import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/converter/FieldConverterProgram.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/converter/FieldConverterProgram.java
similarity index 87%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/converter/FieldConverterProgram.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/converter/FieldConverterProgram.java
index 268005af6..976f75fcd 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/converter/FieldConverterProgram.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/converter/FieldConverterProgram.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.processors.transformation.flink.processor.converter;
+package org.apache.streampipes.pe.flink.processor.converter;
 
 import org.apache.streampipes.model.runtime.Event;
-import org.apache.streampipes.processors.transformation.flink.AbstractFlinkTransformationProgram;
+import org.apache.streampipes.pe.flink.AbstractFlinkTransformationProgram;
 
 import org.apache.flink.streaming.api.datastream.DataStream;
 
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/count/CountController.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/count/CountController.java
similarity index 98%
rename from streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/count/CountController.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/count/CountController.java
index 0e6dc844e..6f17445d7 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/count/CountController.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/count/CountController.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.aggregation.flink.processor.count;
+package org.apache.streampipes.pe.flink.processor.count;
 
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/count/CountMapper.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/count/CountMapper.java
similarity index 94%
rename from streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/count/CountMapper.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/count/CountMapper.java
index 4e9be6ba4..d57bff90f 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/count/CountMapper.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/count/CountMapper.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.processors.aggregation.flink.processor.count;
+package org.apache.streampipes.pe.flink.processor.count;
 
 import org.apache.streampipes.model.runtime.Event;
 
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/count/CountParameters.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/count/CountParameters.java
similarity index 95%
rename from streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/count/CountParameters.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/count/CountParameters.java
index cf1ece238..3cf81466d 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/count/CountParameters.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/count/CountParameters.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.aggregation.flink.processor.count;
+package org.apache.streampipes.pe.flink.processor.count;
 
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
 import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/count/CountProgram.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/count/CountProgram.java
similarity index 96%
rename from streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/count/CountProgram.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/count/CountProgram.java
index 90ceed3fe..cd07a17d7 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/count/CountProgram.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/count/CountProgram.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.processors.aggregation.flink.processor.count;
+package org.apache.streampipes.pe.flink.processor.count;
 
 import org.apache.streampipes.model.runtime.Event;
 import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/count/CountTrigger.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/count/CountTrigger.java
similarity index 96%
rename from streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/count/CountTrigger.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/count/CountTrigger.java
index 0d106a611..383136b6a 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/count/CountTrigger.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/count/CountTrigger.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.processors.aggregation.flink.processor.count;
+package org.apache.streampipes.pe.flink.processor.count;
 
 import org.apache.flink.api.java.tuple.Tuple3;
 import org.apache.flink.streaming.api.windowing.triggers.Trigger;
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/count/TimeWindowConverter.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/count/TimeWindowConverter.java
similarity index 94%
rename from streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/count/TimeWindowConverter.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/count/TimeWindowConverter.java
index 71eb85f30..ecfa82eaf 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/count/TimeWindowConverter.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/count/TimeWindowConverter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.processors.aggregation.flink.processor.count;
+package org.apache.streampipes.pe.flink.processor.count;
 
 import org.apache.flink.streaming.api.windowing.time.Time;
 
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/count/Tuple2MapMapper.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/count/Tuple2MapMapper.java
similarity index 94%
rename from streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/count/Tuple2MapMapper.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/count/Tuple2MapMapper.java
index 3d61a74b5..6f212a9b1 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/count/Tuple2MapMapper.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/count/Tuple2MapMapper.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.processors.aggregation.flink.processor.count;
+package org.apache.streampipes.pe.flink.processor.count;
 
 import org.apache.streampipes.model.runtime.Event;
 
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/eventcount/EventCountController.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/eventcount/EventCountController.java
similarity index 97%
rename from streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/eventcount/EventCountController.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/eventcount/EventCountController.java
index 0336a8b43..addb0fcae 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/eventcount/EventCountController.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/eventcount/EventCountController.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.processors.aggregation.flink.processor.eventcount;
+package org.apache.streampipes.pe.flink.processor.eventcount;
 
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/eventcount/EventCountMapper.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/eventcount/EventCountMapper.java
similarity index 92%
rename from streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/eventcount/EventCountMapper.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/eventcount/EventCountMapper.java
index 23f655204..03b45bdec 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/eventcount/EventCountMapper.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/eventcount/EventCountMapper.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.processors.aggregation.flink.processor.eventcount;
+package org.apache.streampipes.pe.flink.processor.eventcount;
 
 import org.apache.streampipes.model.runtime.Event;
 
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/eventcount/EventCountOutputMapper.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/eventcount/EventCountOutputMapper.java
similarity index 94%
rename from streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/eventcount/EventCountOutputMapper.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/eventcount/EventCountOutputMapper.java
index bb6fd1452..0dde8798a 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/eventcount/EventCountOutputMapper.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/eventcount/EventCountOutputMapper.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.processors.aggregation.flink.processor.eventcount;
+package org.apache.streampipes.pe.flink.processor.eventcount;
 
 import org.apache.streampipes.model.runtime.Event;
 
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/eventcount/EventCountParameters.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/eventcount/EventCountParameters.java
similarity index 94%
rename from streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/eventcount/EventCountParameters.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/eventcount/EventCountParameters.java
index 8d4bd0f8e..d4bd8741b 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/eventcount/EventCountParameters.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/eventcount/EventCountParameters.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.processors.aggregation.flink.processor.eventcount;
+package org.apache.streampipes.pe.flink.processor.eventcount;
 
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
 import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/eventcount/EventCountProgram.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/eventcount/EventCountProgram.java
similarity index 89%
rename from streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/eventcount/EventCountProgram.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/eventcount/EventCountProgram.java
index c4682ab1a..93ed14f3e 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/eventcount/EventCountProgram.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/eventcount/EventCountProgram.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.processors.aggregation.flink.processor.eventcount;
+package org.apache.streampipes.pe.flink.processor.eventcount;
 
 import org.apache.streampipes.model.runtime.Event;
-import org.apache.streampipes.processors.aggregation.flink.processor.count.TimeWindowConverter;
+import org.apache.streampipes.pe.flink.processor.count.TimeWindowConverter;
 import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
 
 import org.apache.flink.streaming.api.datastream.DataStream;
diff --git a/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/processor/gridenricher/CellOption.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/gridenricher/CellOption.java
similarity index 97%
rename from streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/processor/gridenricher/CellOption.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/gridenricher/CellOption.java
index 5ec28d1e9..2f2ea05d8 100644
--- a/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/processor/gridenricher/CellOption.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/gridenricher/CellOption.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processor.geo.flink.processor.gridenricher;
+package org.apache.streampipes.pe.flink.processor.gridenricher;
 
 public class CellOption {
   private int cellX;
@@ -125,4 +125,4 @@ public class CellOption {
     hash = hash * 13 + cellY;
     return hash;
   }
-}
\ No newline at end of file
+}
diff --git a/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/processor/gridenricher/EnrichmentSettings.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/gridenricher/EnrichmentSettings.java
similarity index 96%
rename from streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/processor/gridenricher/EnrichmentSettings.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/gridenricher/EnrichmentSettings.java
index 4977907ed..3d4130097 100644
--- a/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/processor/gridenricher/EnrichmentSettings.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/gridenricher/EnrichmentSettings.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processor.geo.flink.processor.gridenricher;
+package org.apache.streampipes.pe.flink.processor.gridenricher;
 
 import java.io.Serializable;
 
diff --git a/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/processor/gridenricher/SpatialGridCalculator.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/gridenricher/SpatialGridCalculator.java
similarity index 96%
rename from streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/processor/gridenricher/SpatialGridCalculator.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/gridenricher/SpatialGridCalculator.java
index 167f79d59..a01bebd2f 100644
--- a/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/processor/gridenricher/SpatialGridCalculator.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/gridenricher/SpatialGridCalculator.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processor.geo.flink.processor.gridenricher;
+package org.apache.streampipes.pe.flink.processor.gridenricher;
 
 import java.io.Serializable;
 
diff --git a/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/processor/gridenricher/SpatialGridConstants.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/gridenricher/SpatialGridConstants.java
similarity index 94%
rename from streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/processor/gridenricher/SpatialGridConstants.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/gridenricher/SpatialGridConstants.java
index 620f4999e..003fbee94 100644
--- a/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/processor/gridenricher/SpatialGridConstants.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/gridenricher/SpatialGridConstants.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processor.geo.flink.processor.gridenricher;
+package org.apache.streampipes.pe.flink.processor.gridenricher;
 
 public class SpatialGridConstants {
 
diff --git a/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/processor/gridenricher/SpatialGridEnricher.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/gridenricher/SpatialGridEnricher.java
similarity index 96%
rename from streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/processor/gridenricher/SpatialGridEnricher.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/gridenricher/SpatialGridEnricher.java
index 0c5007a8b..96955e1d1 100644
--- a/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/processor/gridenricher/SpatialGridEnricher.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/gridenricher/SpatialGridEnricher.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processor.geo.flink.processor.gridenricher;
+package org.apache.streampipes.pe.flink.processor.gridenricher;
 
 import org.apache.streampipes.model.runtime.Event;
 
diff --git a/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/processor/gridenricher/SpatialGridEnrichmentController.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/gridenricher/SpatialGridEnrichmentController.java
similarity index 98%
rename from streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/processor/gridenricher/SpatialGridEnrichmentController.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/gridenricher/SpatialGridEnrichmentController.java
index 84e96dd68..951b45fd7 100644
--- a/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/processor/gridenricher/SpatialGridEnrichmentController.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/gridenricher/SpatialGridEnrichmentController.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processor.geo.flink.processor.gridenricher;
+package org.apache.streampipes.pe.flink.processor.gridenricher;
 
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
diff --git a/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/processor/gridenricher/SpatialGridEnrichmentParameters.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/gridenricher/SpatialGridEnrichmentParameters.java
similarity index 94%
rename from streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/processor/gridenricher/SpatialGridEnrichmentParameters.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/gridenricher/SpatialGridEnrichmentParameters.java
index 5e76cf9ce..2985a7ace 100644
--- a/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/processor/gridenricher/SpatialGridEnrichmentParameters.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/gridenricher/SpatialGridEnrichmentParameters.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processor.geo.flink.processor.gridenricher;
+package org.apache.streampipes.pe.flink.processor.gridenricher;
 
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
 import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
diff --git a/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/processor/gridenricher/SpatialGridEnrichmentProgram.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/gridenricher/SpatialGridEnrichmentProgram.java
similarity index 94%
rename from streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/processor/gridenricher/SpatialGridEnrichmentProgram.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/gridenricher/SpatialGridEnrichmentProgram.java
index a94813ea8..0cdaad582 100644
--- a/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/processor/gridenricher/SpatialGridEnrichmentProgram.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/gridenricher/SpatialGridEnrichmentProgram.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processor.geo.flink.processor.gridenricher;
+package org.apache.streampipes.pe.flink.processor.gridenricher;
 
 import org.apache.streampipes.model.runtime.Event;
 import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/measurementunitonverter/MeasurementUnitConverter.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/measurementunitonverter/MeasurementUnitConverter.java
similarity index 95%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/measurementunitonverter/MeasurementUnitConverter.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/measurementunitonverter/MeasurementUnitConverter.java
index 05ab081f2..21b558ede 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/measurementunitonverter/MeasurementUnitConverter.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/measurementunitonverter/MeasurementUnitConverter.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.transformation.flink.processor.measurementunitonverter;
+package org.apache.streampipes.pe.flink.processor.measurementunitonverter;
 
 import org.apache.streampipes.model.runtime.Event;
 import org.apache.streampipes.units.UnitProvider;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/measurementunitonverter/MeasurementUnitConverterController.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/measurementunitonverter/MeasurementUnitConverterController.java
similarity index 98%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/measurementunitonverter/MeasurementUnitConverterController.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/measurementunitonverter/MeasurementUnitConverterController.java
index 6999c832a..3fef1ade5 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/measurementunitonverter/MeasurementUnitConverterController.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/measurementunitonverter/MeasurementUnitConverterController.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.transformation.flink.processor.measurementunitonverter;
+package org.apache.streampipes.pe.flink.processor.measurementunitonverter;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
 import org.apache.streampipes.extensions.api.extractor.IStaticPropertyExtractor;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/measurementunitonverter/MeasurementUnitConverterParameters.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/measurementunitonverter/MeasurementUnitConverterParameters.java
similarity index 94%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/measurementunitonverter/MeasurementUnitConverterParameters.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/measurementunitonverter/MeasurementUnitConverterParameters.java
index 98a36ffd0..4ad4609d0 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/measurementunitonverter/MeasurementUnitConverterParameters.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/measurementunitonverter/MeasurementUnitConverterParameters.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.transformation.flink.processor.measurementunitonverter;
+package org.apache.streampipes.pe.flink.processor.measurementunitonverter;
 
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
 import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/measurementunitonverter/MeasurementUnitConverterProgram.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/measurementunitonverter/MeasurementUnitConverterProgram.java
similarity index 88%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/measurementunitonverter/MeasurementUnitConverterProgram.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/measurementunitonverter/MeasurementUnitConverterProgram.java
index 2f6ec1b2d..ec7916e20 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/measurementunitonverter/MeasurementUnitConverterProgram.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/measurementunitonverter/MeasurementUnitConverterProgram.java
@@ -16,10 +16,10 @@
  *
  */
 
-package org.apache.streampipes.processors.transformation.flink.processor.measurementunitonverter;
+package org.apache.streampipes.pe.flink.processor.measurementunitonverter;
 
 import org.apache.streampipes.model.runtime.Event;
-import org.apache.streampipes.processors.transformation.flink.AbstractFlinkTransformationProgram;
+import org.apache.streampipes.pe.flink.AbstractFlinkTransformationProgram;
 
 import org.apache.flink.streaming.api.datastream.DataStream;
 
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/peak/PeakDetectionCalculator.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/peak/PeakDetectionCalculator.java
similarity index 98%
rename from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/peak/PeakDetectionCalculator.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/peak/PeakDetectionCalculator.java
index 11b300612..29fe3484c 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/peak/PeakDetectionCalculator.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/peak/PeakDetectionCalculator.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.pattern.detection.flink.processor.peak;
+package org.apache.streampipes.pe.flink.processor.peak;
 
 import org.apache.streampipes.model.runtime.Event;
 
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/peak/PeakDetectionController.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/peak/PeakDetectionController.java
similarity index 98%
rename from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/peak/PeakDetectionController.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/peak/PeakDetectionController.java
index 22fa3b42f..8bc361b94 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/peak/PeakDetectionController.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/peak/PeakDetectionController.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.pattern.detection.flink.processor.peak;
+package org.apache.streampipes.pe.flink.processor.peak;
 
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/peak/PeakDetectionParameters.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/peak/PeakDetectionParameters.java
similarity index 96%
rename from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/peak/PeakDetectionParameters.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/peak/PeakDetectionParameters.java
index 3026a45a9..9f2aa1414 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/peak/PeakDetectionParameters.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/peak/PeakDetectionParameters.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.pattern.detection.flink.processor.peak;
+package org.apache.streampipes.pe.flink.processor.peak;
 
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
 import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/peak/PeakDetectionProgram.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/peak/PeakDetectionProgram.java
similarity index 89%
rename from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/peak/PeakDetectionProgram.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/peak/PeakDetectionProgram.java
index dcabe7ad8..8c3ac0d75 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/peak/PeakDetectionProgram.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/peak/PeakDetectionProgram.java
@@ -16,11 +16,11 @@
  *
  */
 
-package org.apache.streampipes.processors.pattern.detection.flink.processor.peak;
+package org.apache.streampipes.pe.flink.processor.peak;
 
 import org.apache.streampipes.model.runtime.Event;
-import org.apache.streampipes.processors.pattern.detection.flink.AbstractPatternDetectionProgram;
-import org.apache.streampipes.processors.pattern.detection.flink.processor.peak.utils.SlidingBatchWindow;
+import org.apache.streampipes.pe.flink.AbstractPatternDetectionProgram;
+import org.apache.streampipes.pe.flink.processor.peak.utils.SlidingBatchWindow;
 
 import org.apache.flink.api.common.typeinfo.TypeHint;
 import org.apache.flink.api.common.typeinfo.TypeInformation;
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/peak/utils/SlidingBatchWindow.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/peak/utils/SlidingBatchWindow.java
similarity index 95%
rename from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/peak/utils/SlidingBatchWindow.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/peak/utils/SlidingBatchWindow.java
index ba9d99129..0e03b90ea 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/peak/utils/SlidingBatchWindow.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/peak/utils/SlidingBatchWindow.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.pattern.detection.flink.processor.peak.utils;
+package org.apache.streampipes.pe.flink.processor.peak.utils;
 
 import org.apache.flink.streaming.api.operators.AbstractStreamOperator;
 import org.apache.flink.streaming.api.operators.OneInputStreamOperator;
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/rate/EventRate.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/rate/EventRate.java
similarity index 95%
rename from streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/rate/EventRate.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/rate/EventRate.java
index 12ddf2909..f03179d4c 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/rate/EventRate.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/rate/EventRate.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.processors.aggregation.flink.processor.rate;
+package org.apache.streampipes.pe.flink.processor.rate;
 
 import org.apache.streampipes.model.runtime.Event;
 
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/rate/EventRateController.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/rate/EventRateController.java
similarity index 97%
rename from streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/rate/EventRateController.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/rate/EventRateController.java
index ee269f901..f1f86ac8f 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/rate/EventRateController.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/rate/EventRateController.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.aggregation.flink.processor.rate;
+package org.apache.streampipes.pe.flink.processor.rate;
 
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/rate/EventRateParameter.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/rate/EventRateParameter.java
similarity index 94%
rename from streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/rate/EventRateParameter.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/rate/EventRateParameter.java
index 011e712d9..7aa819c78 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/rate/EventRateParameter.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/rate/EventRateParameter.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.aggregation.flink.processor.rate;
+package org.apache.streampipes.pe.flink.processor.rate;
 
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
 import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/rate/EventRateProgram.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/rate/EventRateProgram.java
similarity index 96%
rename from streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/rate/EventRateProgram.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/rate/EventRateProgram.java
index 720486a13..e6ad44896 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/rate/EventRateProgram.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/rate/EventRateProgram.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.processors.aggregation.flink.processor.rate;
+package org.apache.streampipes.pe.flink.processor.rate;
 
 import org.apache.streampipes.model.runtime.Event;
 import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/rename/FieldRenamer.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/rename/FieldRenamer.java
similarity index 95%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/rename/FieldRenamer.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/rename/FieldRenamer.java
index abe8849a9..bf5acd9b4 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/rename/FieldRenamer.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/rename/FieldRenamer.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.transformation.flink.processor.rename;
+package org.apache.streampipes.pe.flink.processor.rename;
 
 import org.apache.streampipes.model.runtime.Event;
 import org.apache.streampipes.model.runtime.field.AbstractField;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/rename/FieldRenamerController.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/rename/FieldRenamerController.java
similarity index 97%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/rename/FieldRenamerController.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/rename/FieldRenamerController.java
index 9f33c4f00..cb1a61036 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/rename/FieldRenamerController.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/rename/FieldRenamerController.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.transformation.flink.processor.rename;
+package org.apache.streampipes.pe.flink.processor.rename;
 
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/rename/FieldRenamerParameters.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/rename/FieldRenamerParameters.java
similarity index 95%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/rename/FieldRenamerParameters.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/rename/FieldRenamerParameters.java
index d4ec843e5..5d06b798d 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/rename/FieldRenamerParameters.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/rename/FieldRenamerParameters.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.transformation.flink.processor.rename;
+package org.apache.streampipes.pe.flink.processor.rename;
 
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
 import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/rename/FieldRenamerProgram.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/rename/FieldRenamerProgram.java
similarity index 88%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/rename/FieldRenamerProgram.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/rename/FieldRenamerProgram.java
index 7315bfab6..99cd29eb0 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/rename/FieldRenamerProgram.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/rename/FieldRenamerProgram.java
@@ -16,10 +16,10 @@
  *
  */
 
-package org.apache.streampipes.processors.transformation.flink.processor.rename;
+package org.apache.streampipes.pe.flink.processor.rename;
 
 import org.apache.streampipes.model.runtime.Event;
-import org.apache.streampipes.processors.transformation.flink.AbstractFlinkTransformationProgram;
+import org.apache.streampipes.pe.flink.AbstractFlinkTransformationProgram;
 
 import org.apache.flink.streaming.api.datastream.DataStream;
 
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/sequence/EventStorage.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/sequence/EventStorage.java
similarity index 93%
rename from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/sequence/EventStorage.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/sequence/EventStorage.java
index ad0ebaa07..c1c5f7a0d 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/sequence/EventStorage.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/sequence/EventStorage.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.pattern.detection.flink.processor.sequence;
+package org.apache.streampipes.pe.flink.processor.sequence;
 
 import org.apache.streampipes.model.runtime.Event;
 
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/sequence/Sequence.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/sequence/Sequence.java
similarity index 97%
rename from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/sequence/Sequence.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/sequence/Sequence.java
index e5e3c10cb..b9840fba4 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/sequence/Sequence.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/sequence/Sequence.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.pattern.detection.flink.processor.sequence;
+package org.apache.streampipes.pe.flink.processor.sequence;
 
 import org.apache.streampipes.model.runtime.Event;
 
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/sequence/SequenceController.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/sequence/SequenceController.java
similarity index 97%
rename from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/sequence/SequenceController.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/sequence/SequenceController.java
index 620c28da3..4324e7415 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/sequence/SequenceController.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/sequence/SequenceController.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.pattern.detection.flink.processor.sequence;
+package org.apache.streampipes.pe.flink.processor.sequence;
 
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/sequence/SequenceParameters.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/sequence/SequenceParameters.java
similarity index 94%
rename from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/sequence/SequenceParameters.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/sequence/SequenceParameters.java
index e98aab018..02f42e02e 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/sequence/SequenceParameters.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/sequence/SequenceParameters.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.pattern.detection.flink.processor.sequence;
+package org.apache.streampipes.pe.flink.processor.sequence;
 
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
 import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/sequence/SequenceProgram.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/sequence/SequenceProgram.java
similarity index 89%
rename from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/sequence/SequenceProgram.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/sequence/SequenceProgram.java
index e798ede29..4b28c612e 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/sequence/SequenceProgram.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/sequence/SequenceProgram.java
@@ -16,10 +16,10 @@
  *
  */
 
-package org.apache.streampipes.processors.pattern.detection.flink.processor.sequence;
+package org.apache.streampipes.pe.flink.processor.sequence;
 
 import org.apache.streampipes.model.runtime.Event;
-import org.apache.streampipes.processors.pattern.detection.flink.AbstractPatternDetectionProgram;
+import org.apache.streampipes.pe.flink.AbstractPatternDetectionProgram;
 
 import org.apache.flink.api.java.functions.KeySelector;
 import org.apache.flink.streaming.api.datastream.DataStream;
diff --git a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/summary/StatisticsSummaryCalculator.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/stat/summary/StatisticsSummaryCalculator.java
similarity index 96%
rename from streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/summary/StatisticsSummaryCalculator.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/stat/summary/StatisticsSummaryCalculator.java
index 2c2b10b3c..bdb300e04 100644
--- a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/summary/StatisticsSummaryCalculator.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/stat/summary/StatisticsSummaryCalculator.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.statistics.flink.processor.stat.summary;
+package org.apache.streampipes.pe.flink.processor.stat.summary;
 
 import org.apache.streampipes.model.runtime.Event;
 
diff --git a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/summary/StatisticsSummaryController.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/stat/summary/StatisticsSummaryController.java
similarity index 98%
rename from streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/summary/StatisticsSummaryController.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/stat/summary/StatisticsSummaryController.java
index 71985c3e5..dfb7bafc0 100644
--- a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/summary/StatisticsSummaryController.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/stat/summary/StatisticsSummaryController.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.statistics.flink.processor.stat.summary;
+package org.apache.streampipes.pe.flink.processor.stat.summary;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
 import org.apache.streampipes.extensions.api.runtime.ResolvesContainerProvidedOutputStrategy;
diff --git a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/summary/StatisticsSummaryParameters.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/stat/summary/StatisticsSummaryParameters.java
similarity index 94%
rename from streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/summary/StatisticsSummaryParameters.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/stat/summary/StatisticsSummaryParameters.java
index aaebc2f91..b2304c781 100644
--- a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/summary/StatisticsSummaryParameters.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/stat/summary/StatisticsSummaryParameters.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.statistics.flink.processor.stat.summary;
+package org.apache.streampipes.pe.flink.processor.stat.summary;
 
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
 import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
diff --git a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/summary/StatisticsSummaryProgram.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/stat/summary/StatisticsSummaryProgram.java
similarity index 94%
rename from streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/summary/StatisticsSummaryProgram.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/stat/summary/StatisticsSummaryProgram.java
index 082ca5092..209a709ca 100644
--- a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/summary/StatisticsSummaryProgram.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/stat/summary/StatisticsSummaryProgram.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.statistics.flink.processor.stat.summary;
+package org.apache.streampipes.pe.flink.processor.stat.summary;
 
 import org.apache.streampipes.model.runtime.Event;
 import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
diff --git a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/window/StatisticsSummaryCalculatorWindow.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/stat/window/StatisticsSummaryCalculatorWindow.java
similarity index 93%
rename from streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/window/StatisticsSummaryCalculatorWindow.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/stat/window/StatisticsSummaryCalculatorWindow.java
index e20dcb51e..a25c0da49 100644
--- a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/window/StatisticsSummaryCalculatorWindow.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/stat/window/StatisticsSummaryCalculatorWindow.java
@@ -16,10 +16,10 @@
  *
  */
 
-package org.apache.streampipes.processors.statistics.flink.processor.stat.window;
+package org.apache.streampipes.pe.flink.processor.stat.window;
 
 import org.apache.streampipes.model.runtime.Event;
-import org.apache.streampipes.processors.statistics.flink.processor.stat.summary.StatisticsSummaryController;
+import org.apache.streampipes.pe.flink.processor.stat.summary.StatisticsSummaryController;
 
 import org.apache.commons.math3.stat.descriptive.SummaryStatistics;
 import org.apache.flink.api.common.functions.FlatMapFunction;
diff --git a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/window/StatisticsSummaryControllerWindow.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/stat/window/StatisticsSummaryControllerWindow.java
similarity index 96%
rename from streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/window/StatisticsSummaryControllerWindow.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/stat/window/StatisticsSummaryControllerWindow.java
index 98c9f3fe1..92389c466 100644
--- a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/window/StatisticsSummaryControllerWindow.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/stat/window/StatisticsSummaryControllerWindow.java
@@ -16,12 +16,12 @@
  *
  */
 
-package org.apache.streampipes.processors.statistics.flink.processor.stat.window;
+package org.apache.streampipes.pe.flink.processor.stat.window;
 
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
 import org.apache.streampipes.model.schema.PropertyScope;
-import org.apache.streampipes.processors.statistics.flink.processor.stat.summary.StatisticsSummaryController;
+import org.apache.streampipes.pe.flink.processor.stat.summary.StatisticsSummaryController;
 import org.apache.streampipes.sdk.builder.ProcessingElementBuilder;
 import org.apache.streampipes.sdk.builder.StreamRequirementsBuilder;
 import org.apache.streampipes.sdk.extractor.ProcessingElementParameterExtractor;
diff --git a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/window/StatisticsSummaryParametersWindow.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/stat/window/StatisticsSummaryParametersWindow.java
similarity index 96%
rename from streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/window/StatisticsSummaryParametersWindow.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/stat/window/StatisticsSummaryParametersWindow.java
index a07640fb1..0ba9dbed9 100644
--- a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/window/StatisticsSummaryParametersWindow.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/stat/window/StatisticsSummaryParametersWindow.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.statistics.flink.processor.stat.window;
+package org.apache.streampipes.pe.flink.processor.stat.window;
 
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
 import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
diff --git a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/window/StatisticsSummaryParamsSerializable.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/stat/window/StatisticsSummaryParamsSerializable.java
similarity index 95%
rename from streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/window/StatisticsSummaryParamsSerializable.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/stat/window/StatisticsSummaryParamsSerializable.java
index b264b1ff1..b3ee1d144 100644
--- a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/window/StatisticsSummaryParamsSerializable.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/stat/window/StatisticsSummaryParamsSerializable.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.statistics.flink.processor.stat.window;
+package org.apache.streampipes.pe.flink.processor.stat.window;
 
 import java.io.Serializable;
 import java.util.concurrent.TimeUnit;
diff --git a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/window/StatisticsSummaryProgramWindow.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/stat/window/StatisticsSummaryProgramWindow.java
similarity index 88%
rename from streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/window/StatisticsSummaryProgramWindow.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/stat/window/StatisticsSummaryProgramWindow.java
index 16ccf8982..fcff65efc 100644
--- a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/window/StatisticsSummaryProgramWindow.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/stat/window/StatisticsSummaryProgramWindow.java
@@ -16,12 +16,12 @@
  *
  */
 
-package org.apache.streampipes.processors.statistics.flink.processor.stat.window;
+package org.apache.streampipes.pe.flink.processor.stat.window;
 
 import org.apache.streampipes.model.runtime.Event;
-import org.apache.streampipes.processors.statistics.flink.extensions.MapKeySelector;
-import org.apache.streampipes.processors.statistics.flink.extensions.SlidingEventTimeWindow;
-import org.apache.streampipes.processors.statistics.flink.extensions.TimestampMappingFunction;
+import org.apache.streampipes.pe.flink.extensions.MapKeySelector;
+import org.apache.streampipes.pe.flink.extensions.SlidingEventTimeWindow;
+import org.apache.streampipes.pe.flink.extensions.TimestampMappingFunction;
 import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
 
 import org.apache.flink.api.common.typeinfo.TypeHint;
diff --git a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/timestamp/TimestampController.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/timestamp/TimestampController.java
similarity index 97%
rename from streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/timestamp/TimestampController.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/timestamp/TimestampController.java
index d46d1e8cc..a8e2a00c4 100644
--- a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/timestamp/TimestampController.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/timestamp/TimestampController.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.enricher.flink.processor.timestamp;
+package org.apache.streampipes.pe.flink.processor.timestamp;
 
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
diff --git a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/timestamp/TimestampEnricher.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/timestamp/TimestampEnricher.java
similarity index 94%
rename from streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/timestamp/TimestampEnricher.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/timestamp/TimestampEnricher.java
index 1229b4d13..7a002f15b 100644
--- a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/timestamp/TimestampEnricher.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/timestamp/TimestampEnricher.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.enricher.flink.processor.timestamp;
+package org.apache.streampipes.pe.flink.processor.timestamp;
 
 import org.apache.streampipes.model.runtime.Event;
 
diff --git a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/timestamp/TimestampParameters.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/timestamp/TimestampParameters.java
similarity index 94%
rename from streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/timestamp/TimestampParameters.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/timestamp/TimestampParameters.java
index 1f25db0ab..a663d011f 100644
--- a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/timestamp/TimestampParameters.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/timestamp/TimestampParameters.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.enricher.flink.processor.timestamp;
+package org.apache.streampipes.pe.flink.processor.timestamp;
 
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
 import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
diff --git a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/timestamp/TimestampProgram.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/timestamp/TimestampProgram.java
similarity index 94%
rename from streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/timestamp/TimestampProgram.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/timestamp/TimestampProgram.java
index b46df3ff0..34b54795c 100644
--- a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/timestamp/TimestampProgram.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/timestamp/TimestampProgram.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.enricher.flink.processor.timestamp;
+package org.apache.streampipes.pe.flink.processor.timestamp;
 
 import org.apache.streampipes.model.runtime.Event;
 import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
diff --git a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/urldereferencing/UrlDereferencing.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/urldereferencing/UrlDereferencing.java
similarity index 96%
rename from streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/urldereferencing/UrlDereferencing.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/urldereferencing/UrlDereferencing.java
index b65c87f83..c21974b80 100644
--- a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/urldereferencing/UrlDereferencing.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/urldereferencing/UrlDereferencing.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.enricher.flink.processor.urldereferencing;
+package org.apache.streampipes.pe.flink.processor.urldereferencing;
 
 import org.apache.streampipes.logging.api.Logger;
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
diff --git a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/urldereferencing/UrlDereferencingController.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/urldereferencing/UrlDereferencingController.java
similarity index 97%
rename from streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/urldereferencing/UrlDereferencingController.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/urldereferencing/UrlDereferencingController.java
index f5f3437d1..3b7e2c63f 100644
--- a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/urldereferencing/UrlDereferencingController.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/urldereferencing/UrlDereferencingController.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.enricher.flink.processor.urldereferencing;
+package org.apache.streampipes.pe.flink.processor.urldereferencing;
 
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
diff --git a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/urldereferencing/UrlDereferencingParameter.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/urldereferencing/UrlDereferencingParameter.java
similarity index 94%
rename from streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/urldereferencing/UrlDereferencingParameter.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/urldereferencing/UrlDereferencingParameter.java
index f2c509a89..c22a5da2e 100644
--- a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/urldereferencing/UrlDereferencingParameter.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/urldereferencing/UrlDereferencingParameter.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.enricher.flink.processor.urldereferencing;
+package org.apache.streampipes.pe.flink.processor.urldereferencing;
 
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
 import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
diff --git a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/urldereferencing/UrlDereferencingProgram.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/urldereferencing/UrlDereferencingProgram.java
similarity index 94%
rename from streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/urldereferencing/UrlDereferencingProgram.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/urldereferencing/UrlDereferencingProgram.java
index 4bf504000..c2fcd72c5 100644
--- a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/urldereferencing/UrlDereferencingProgram.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/urldereferencing/UrlDereferencingProgram.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.enricher.flink.processor.urldereferencing;
+package org.apache.streampipes.pe.flink.processor.urldereferencing;
 
 import org.apache.streampipes.model.runtime.Event;
 import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
diff --git a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/wordcount/Word.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/wordcount/Word.java
similarity index 93%
rename from streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/wordcount/Word.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/wordcount/Word.java
index 2064af6f6..e0605d81f 100644
--- a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/wordcount/Word.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/wordcount/Word.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.textmining.flink.processor.wordcount;
+package org.apache.streampipes.pe.flink.processor.wordcount;
 
 public class Word {
 
diff --git a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/wordcount/WordCountController.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/wordcount/WordCountController.java
similarity index 97%
rename from streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/wordcount/WordCountController.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/wordcount/WordCountController.java
index afd3e686e..a4f2d3c70 100644
--- a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/wordcount/WordCountController.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/wordcount/WordCountController.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.textmining.flink.processor.wordcount;
+package org.apache.streampipes.pe.flink.processor.wordcount;
 
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
diff --git a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/wordcount/WordCountParameters.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/wordcount/WordCountParameters.java
similarity index 94%
rename from streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/wordcount/WordCountParameters.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/wordcount/WordCountParameters.java
index 331be63f8..430c3d24e 100644
--- a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/wordcount/WordCountParameters.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/wordcount/WordCountParameters.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.textmining.flink.processor.wordcount;
+package org.apache.streampipes.pe.flink.processor.wordcount;
 
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
 import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
diff --git a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/wordcount/WordCountProgram.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/wordcount/WordCountProgram.java
similarity index 94%
rename from streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/wordcount/WordCountProgram.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/wordcount/WordCountProgram.java
index e6384df3d..8c25876dd 100644
--- a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/wordcount/WordCountProgram.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/wordcount/WordCountProgram.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.textmining.flink.processor.wordcount;
+package org.apache.streampipes.pe.flink.processor.wordcount;
 
 import org.apache.streampipes.model.runtime.Event;
 import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
diff --git a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/wordcount/WordSplitter.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/wordcount/WordSplitter.java
similarity index 94%
rename from streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/wordcount/WordSplitter.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/wordcount/WordSplitter.java
index 8e23aaeab..9f7116fcc 100644
--- a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/wordcount/WordSplitter.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/wordcount/WordSplitter.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.processors.textmining.flink.processor.wordcount;
+package org.apache.streampipes.pe.flink.processor.wordcount;
 
 import org.apache.streampipes.model.runtime.Event;
 
diff --git a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/wordcount/WordToEventConverter.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/wordcount/WordToEventConverter.java
similarity index 94%
rename from streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/wordcount/WordToEventConverter.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/wordcount/WordToEventConverter.java
index ca0968eea..f81b8b784 100644
--- a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/wordcount/WordToEventConverter.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/processor/wordcount/WordToEventConverter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.processors.textmining.flink.processor.wordcount;
+package org.apache.streampipes.pe.flink.processor.wordcount;
 
 import org.apache.streampipes.model.runtime.Event;
 
diff --git a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/ElasticSearchController.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/ElasticSearchController.java
similarity index 97%
rename from streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/ElasticSearchController.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/ElasticSearchController.java
index 3913b9b7e..1b2998248 100644
--- a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/ElasticSearchController.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/ElasticSearchController.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.sinks.databases.flink.elasticsearch;
+package org.apache.streampipes.pe.flink.sink.elasticsearch;
 
 import org.apache.streampipes.extensions.api.extractor.IDataSinkParameterExtractor;
 import org.apache.streampipes.model.DataSinkType;
diff --git a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/ElasticSearchParameters.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/ElasticSearchParameters.java
similarity index 96%
rename from streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/ElasticSearchParameters.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/ElasticSearchParameters.java
index 397f03213..185cbb77b 100644
--- a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/ElasticSearchParameters.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/ElasticSearchParameters.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.sinks.databases.flink.elasticsearch;
+package org.apache.streampipes.pe.flink.sink.elasticsearch;
 
 import org.apache.streampipes.model.graph.DataSinkInvocation;
 import org.apache.streampipes.wrapper.params.compat.SinkParams;
diff --git a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/ElasticSearchProgram.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/ElasticSearchProgram.java
similarity index 94%
rename from streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/ElasticSearchProgram.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/ElasticSearchProgram.java
index bf121c24b..3d31cc2bb 100644
--- a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/ElasticSearchProgram.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/ElasticSearchProgram.java
@@ -16,11 +16,11 @@
  *
  */
 
-package org.apache.streampipes.sinks.databases.flink.elasticsearch;
+package org.apache.streampipes.pe.flink.sink.elasticsearch;
 
 
 import org.apache.streampipes.model.runtime.Event;
-import org.apache.streampipes.sinks.databases.flink.elasticsearch.elastic.ElasticsearchSink;
+import org.apache.streampipes.pe.flink.sink.elasticsearch.elastic.ElasticsearchSink;
 import org.apache.streampipes.wrapper.flink.FlinkDataSinkProgram;
 
 import org.apache.flink.api.common.functions.FlatMapFunction;
diff --git a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/ElasticsearchIndexRequestBuilder.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/ElasticsearchIndexRequestBuilder.java
similarity index 87%
rename from streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/ElasticsearchIndexRequestBuilder.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/ElasticsearchIndexRequestBuilder.java
index 9c00c4885..c8c861bea 100644
--- a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/ElasticsearchIndexRequestBuilder.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/ElasticsearchIndexRequestBuilder.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.sinks.databases.flink.elasticsearch;
+package org.apache.streampipes.pe.flink.sink.elasticsearch;
 
-import org.apache.streampipes.sinks.databases.flink.elasticsearch.elastic.ElasticsearchSinkFunction;
-import org.apache.streampipes.sinks.databases.flink.elasticsearch.elastic.RequestIndexer;
+import org.apache.streampipes.pe.flink.sink.elasticsearch.elastic.ElasticsearchSinkFunction;
+import org.apache.streampipes.pe.flink.sink.elasticsearch.elastic.RequestIndexer;
 
 import org.apache.flink.api.common.functions.RuntimeContext;
 import org.elasticsearch.action.index.IndexRequest;
diff --git a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/elastic/ActionRequestFailureHandler.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/elastic/ActionRequestFailureHandler.java
similarity index 95%
rename from streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/elastic/ActionRequestFailureHandler.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/elastic/ActionRequestFailureHandler.java
index 026d3a426..708a16cfa 100644
--- a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/elastic/ActionRequestFailureHandler.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/elastic/ActionRequestFailureHandler.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.sinks.databases.flink.elasticsearch.elastic;
+package org.apache.streampipes.pe.flink.sink.elasticsearch.elastic;
 
 import org.apache.flink.annotation.PublicEvolving;
 import org.elasticsearch.action.ActionRequest;
@@ -39,4 +39,4 @@ public interface ActionRequestFailureHandler extends Serializable {
    */
   void onFailure(DocWriteRequest action, Throwable failure, int restStatusCode, RequestIndexer indexer)
       throws Throwable;
-}
\ No newline at end of file
+}
diff --git a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/elastic/BulkProcessorIndexer.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/elastic/BulkProcessorIndexer.java
similarity index 96%
rename from streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/elastic/BulkProcessorIndexer.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/elastic/BulkProcessorIndexer.java
index e6f86bd97..ac35bfc60 100644
--- a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/elastic/BulkProcessorIndexer.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/elastic/BulkProcessorIndexer.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.sinks.databases.flink.elasticsearch.elastic;
+package org.apache.streampipes.pe.flink.sink.elasticsearch.elastic;
 
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.DocWriteRequest;
@@ -52,4 +52,4 @@ public class BulkProcessorIndexer implements RequestIndexer {
       this.bulkProcessor.add((DocWriteRequest) actionRequest);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/elastic/Elasticsearch6ApiCallBridge.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/elastic/Elasticsearch6ApiCallBridge.java
similarity index 98%
rename from streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/elastic/Elasticsearch6ApiCallBridge.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/elastic/Elasticsearch6ApiCallBridge.java
index 042c5dfa4..155ec3158 100644
--- a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/elastic/Elasticsearch6ApiCallBridge.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/elastic/Elasticsearch6ApiCallBridge.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.sinks.databases.flink.elasticsearch.elastic;
+package org.apache.streampipes.pe.flink.sink.elasticsearch.elastic;
 
 import org.apache.flink.util.Preconditions;
 import org.apache.http.HttpHost;
diff --git a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/elastic/ElasticsearchApiCallBridge.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/elastic/ElasticsearchApiCallBridge.java
similarity index 98%
rename from streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/elastic/ElasticsearchApiCallBridge.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/elastic/ElasticsearchApiCallBridge.java
index 1c29a4f0f..12f175b92 100644
--- a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/elastic/ElasticsearchApiCallBridge.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/elastic/ElasticsearchApiCallBridge.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.sinks.databases.flink.elasticsearch.elastic;
+package org.apache.streampipes.pe.flink.sink.elasticsearch.elastic;
 
 import org.apache.flink.annotation.Internal;
 import org.elasticsearch.action.bulk.BulkItemResponse;
diff --git a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/elastic/ElasticsearchSink.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/elastic/ElasticsearchSink.java
similarity index 98%
rename from streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/elastic/ElasticsearchSink.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/elastic/ElasticsearchSink.java
index 0fe9ed62a..36bbc0262 100644
--- a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/elastic/ElasticsearchSink.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/elastic/ElasticsearchSink.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.sinks.databases.flink.elasticsearch.elastic;
+package org.apache.streampipes.pe.flink.sink.elasticsearch.elastic;
 
 import org.apache.http.HttpHost;
 import org.elasticsearch.action.ActionRequest;
@@ -90,4 +90,4 @@ public class ElasticsearchSink<T> extends ElasticsearchSinkBase<T> {
 
     super(new Elasticsearch6ApiCallBridge(httpHosts), userConfig, elasticsearchSinkFunction, failureHandler);
   }
-}
\ No newline at end of file
+}
diff --git a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/elastic/ElasticsearchSinkBase.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/elastic/ElasticsearchSinkBase.java
similarity index 99%
rename from streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/elastic/ElasticsearchSinkBase.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/elastic/ElasticsearchSinkBase.java
index 7de96dae5..3dde69a88 100644
--- a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/elastic/ElasticsearchSinkBase.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/elastic/ElasticsearchSinkBase.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.sinks.databases.flink.elasticsearch.elastic;
+package org.apache.streampipes.pe.flink.sink.elasticsearch.elastic;
 
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.annotation.VisibleForTesting;
@@ -453,4 +453,4 @@ public abstract class ElasticsearchSinkBase<T> extends RichSinkFunction<T> imple
           "The number of pending requests is not maintained when flushing on checkpoint is disabled.");
     }
   }
-}
\ No newline at end of file
+}
diff --git a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/elastic/ElasticsearchSinkFunction.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/elastic/ElasticsearchSinkFunction.java
similarity index 95%
rename from streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/elastic/ElasticsearchSinkFunction.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/elastic/ElasticsearchSinkFunction.java
index 1ffed1cb6..1ff68ee00 100644
--- a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/elastic/ElasticsearchSinkFunction.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/elastic/ElasticsearchSinkFunction.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.sinks.databases.flink.elasticsearch.elastic;
+package org.apache.streampipes.pe.flink.sink.elasticsearch.elastic;
 
 import org.apache.flink.annotation.PublicEvolving;
 import org.apache.flink.api.common.functions.Function;
@@ -37,4 +37,4 @@ public interface ElasticsearchSinkFunction<T> extends Serializable, Function {
    * @param indexer request indexer that {@code ActionRequest} should be added to
    */
   void process(T element, RuntimeContext ctx, RequestIndexer indexer);
-}
\ No newline at end of file
+}
diff --git a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/elastic/NoOpFailureHandler.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/elastic/NoOpFailureHandler.java
similarity index 94%
rename from streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/elastic/NoOpFailureHandler.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/elastic/NoOpFailureHandler.java
index 98efb5450..2cea41989 100644
--- a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/elastic/NoOpFailureHandler.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/elastic/NoOpFailureHandler.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.sinks.databases.flink.elasticsearch.elastic;
+package org.apache.streampipes.pe.flink.sink.elasticsearch.elastic;
 
 import org.apache.flink.annotation.Internal;
 import org.elasticsearch.action.DocWriteRequest;
@@ -36,4 +36,4 @@ public class NoOpFailureHandler implements ActionRequestFailureHandler {
     throw failure;
   }
 
-}
\ No newline at end of file
+}
diff --git a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/elastic/RequestIndexer.java b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/elastic/RequestIndexer.java
similarity index 94%
rename from streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/elastic/RequestIndexer.java
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/elastic/RequestIndexer.java
index 7c3cc10ac..45723b617 100644
--- a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/elastic/RequestIndexer.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/java/org/apache/streampipes/pe/flink/sink/elasticsearch/elastic/RequestIndexer.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.sinks.databases.flink.elasticsearch.elastic;
+package org.apache.streampipes.pe.flink.sink.elasticsearch.elastic;
 
 import org.apache.flink.annotation.PublicEvolving;
 import org.elasticsearch.action.ActionRequest;
@@ -34,4 +34,4 @@ public interface RequestIndexer {
    * @param actionRequests The multiple {@link ActionRequest} to add.
    */
   void add(ActionRequest... actionRequests);
-}
\ No newline at end of file
+}
diff --git a/streampipes-extensions/streampipes-processors-geo-flink/src/main/resources/org.apache.streampipes.processor.geo.flink/documentation.md b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processor.geo.flink/documentation.md
similarity index 100%
rename from streampipes-extensions/streampipes-processors-geo-flink/src/main/resources/org.apache.streampipes.processor.geo.flink/documentation.md
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processor.geo.flink/documentation.md
diff --git a/streampipes-extensions/streampipes-processors-geo-flink/src/main/resources/org.apache.streampipes.processor.geo.flink/icon.png b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processor.geo.flink/icon.png
similarity index 100%
rename from streampipes-extensions/streampipes-processors-geo-flink/src/main/resources/org.apache.streampipes.processor.geo.flink/icon.png
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processor.geo.flink/icon.png
diff --git a/streampipes-extensions/streampipes-processors-geo-flink/src/main/resources/org.apache.streampipes.processor.geo.flink/strings.en b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processor.geo.flink/strings.en
similarity index 100%
rename from streampipes-extensions/streampipes-processors-geo-flink/src/main/resources/org.apache.streampipes.processor.geo.flink/strings.en
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processor.geo.flink/strings.en
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.aggregation/documentation.md b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.aggregation/documentation.md
similarity index 100%
rename from streampipes-extensions/streampipes-processors-aggregation-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.aggregation/documentation.md
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.aggregation/documentation.md
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.aggregation/icon.png b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.aggregation/icon.png
similarity index 100%
rename from streampipes-extensions/streampipes-processors-aggregation-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.aggregation/icon.png
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.aggregation/icon.png
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.aggregation/strings.en b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.aggregation/strings.en
similarity index 100%
rename from streampipes-extensions/streampipes-processors-aggregation-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.aggregation/strings.en
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.aggregation/strings.en
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.count/documentation.md b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.count/documentation.md
similarity index 100%
rename from streampipes-extensions/streampipes-processors-aggregation-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.count/documentation.md
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.count/documentation.md
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.count/icon.png b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.count/icon.png
similarity index 100%
rename from streampipes-extensions/streampipes-processors-aggregation-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.count/icon.png
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.count/icon.png
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.count/strings.en b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.count/strings.en
similarity index 100%
rename from streampipes-extensions/streampipes-processors-aggregation-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.count/strings.en
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.count/strings.en
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.eventcount/documentation.md b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.eventcount/documentation.md
similarity index 100%
rename from streampipes-extensions/streampipes-processors-aggregation-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.eventcount/documentation.md
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.eventcount/documentation.md
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.eventcount/strings.en b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.eventcount/strings.en
similarity index 100%
rename from streampipes-extensions/streampipes-processors-aggregation-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.eventcount/strings.en
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.eventcount/strings.en
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.rate/documentation.md b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.rate/documentation.md
similarity index 100%
rename from streampipes-extensions/streampipes-processors-aggregation-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.rate/documentation.md
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.rate/documentation.md
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.rate/icon.png b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.rate/icon.png
similarity index 100%
rename from streampipes-extensions/streampipes-processors-aggregation-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.rate/icon.png
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.rate/icon.png
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.rate/strings.en b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.rate/strings.en
similarity index 100%
rename from streampipes-extensions/streampipes-processors-aggregation-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.rate/strings.en
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.aggregation.flink.rate/strings.en
diff --git a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/resources/org.apache.streampipes.processors.enricher.flink.processor.urldereferencing/documentation.md b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.enricher.flink.processor.urldereferencing/documentation.md
similarity index 100%
rename from streampipes-extensions/streampipes-processors-enricher-flink/src/main/resources/org.apache.streampipes.processors.enricher.flink.processor.urldereferencing/documentation.md
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.enricher.flink.processor.urldereferencing/documentation.md
diff --git a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/resources/org.apache.streampipes.processors.enricher.flink.processor.urldereferencing/icon.png b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.enricher.flink.processor.urldereferencing/icon.png
similarity index 100%
rename from streampipes-extensions/streampipes-processors-enricher-flink/src/main/resources/org.apache.streampipes.processors.enricher.flink.processor.urldereferencing/icon.png
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.enricher.flink.processor.urldereferencing/icon.png
diff --git a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/resources/org.apache.streampipes.processors.enricher.flink.processor.urldereferencing/strings.en b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.enricher.flink.processor.urldereferencing/strings.en
similarity index 100%
rename from streampipes-extensions/streampipes-processors-enricher-flink/src/main/resources/org.apache.streampipes.processors.enricher.flink.processor.urldereferencing/strings.en
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.enricher.flink.processor.urldereferencing/strings.en
diff --git a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/resources/org.apache.streampipes.processors.enricher.flink.timestamp/documentation.md b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.enricher.flink.timestamp/documentation.md
similarity index 100%
rename from streampipes-extensions/streampipes-processors-enricher-flink/src/main/resources/org.apache.streampipes.processors.enricher.flink.timestamp/documentation.md
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.enricher.flink.timestamp/documentation.md
diff --git a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/resources/org.apache.streampipes.processors.enricher.flink.timestamp/icon.png b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.enricher.flink.timestamp/icon.png
similarity index 100%
rename from streampipes-extensions/streampipes-processors-enricher-flink/src/main/resources/org.apache.streampipes.processors.enricher.flink.timestamp/icon.png
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.enricher.flink.timestamp/icon.png
diff --git a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/resources/org.apache.streampipes.processors.enricher.flink.timestamp/strings.en b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.enricher.flink.timestamp/strings.en
similarity index 100%
rename from streampipes-extensions/streampipes-processors-enricher-flink/src/main/resources/org.apache.streampipes.processors.enricher.flink.timestamp/strings.en
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.enricher.flink.timestamp/strings.en
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.absence/documentation.md b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.absence/documentation.md
similarity index 100%
rename from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.absence/documentation.md
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.absence/documentation.md
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.absence/strings.en b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.absence/strings.en
similarity index 100%
rename from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.absence/strings.en
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.absence/strings.en
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.and/documentation.md b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.and/documentation.md
similarity index 100%
rename from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.and/documentation.md
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.and/documentation.md
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.and/icon.png b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.and/icon.png
similarity index 100%
rename from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.and/icon.png
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.and/icon.png
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.and/strings.en b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.and/strings.en
similarity index 100%
rename from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.and/strings.en
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.and/strings.en
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.peak-detection/documentation.md b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.peak-detection/documentation.md
similarity index 100%
rename from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.peak-detection/documentation.md
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.peak-detection/documentation.md
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.peak-detection/icon.png b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.peak-detection/icon.png
similarity index 100%
rename from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.peak-detection/icon.png
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.peak-detection/icon.png
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.peak-detection/strings.en b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.peak-detection/strings.en
similarity index 100%
rename from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.peak-detection/strings.en
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.peak-detection/strings.en
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.sequence/documentation.md b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.sequence/documentation.md
similarity index 100%
rename from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.sequence/documentation.md
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.sequence/documentation.md
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.sequence/icon.png b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.sequence/icon.png
similarity index 100%
rename from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.sequence/icon.png
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.sequence/icon.png
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.sequence/strings.en b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.sequence/strings.en
similarity index 100%
rename from streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.sequence/strings.en
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.pattern-detection.flink.sequence/strings.en
diff --git a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/resources/org.apache.streampipes.processors.statistics.flink.statistics-summary-window/documentation.md b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.statistics.flink.statistics-summary-window/documentation.md
similarity index 100%
rename from streampipes-extensions/streampipes-processors-statistics-flink/src/main/resources/org.apache.streampipes.processors.statistics.flink.statistics-summary-window/documentation.md
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.statistics.flink.statistics-summary-window/documentation.md
diff --git a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/resources/org.apache.streampipes.processors.statistics.flink.statistics-summary-window/icon.png b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.statistics.flink.statistics-summary-window/icon.png
similarity index 100%
rename from streampipes-extensions/streampipes-processors-statistics-flink/src/main/resources/org.apache.streampipes.processors.statistics.flink.statistics-summary-window/icon.png
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.statistics.flink.statistics-summary-window/icon.png
diff --git a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/resources/org.apache.streampipes.processors.statistics.flink.statistics-summary-window/strings.en b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.statistics.flink.statistics-summary-window/strings.en
similarity index 100%
rename from streampipes-extensions/streampipes-processors-statistics-flink/src/main/resources/org.apache.streampipes.processors.statistics.flink.statistics-summary-window/strings.en
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.statistics.flink.statistics-summary-window/strings.en
diff --git a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/resources/org.apache.streampipes.processors.statistics.flink.statistics-summary/documentation.md b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.statistics.flink.statistics-summary/documentation.md
similarity index 100%
rename from streampipes-extensions/streampipes-processors-statistics-flink/src/main/resources/org.apache.streampipes.processors.statistics.flink.statistics-summary/documentation.md
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.statistics.flink.statistics-summary/documentation.md
diff --git a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/resources/org.apache.streampipes.processors.statistics.flink.statistics-summary/icon.png b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.statistics.flink.statistics-summary/icon.png
similarity index 100%
rename from streampipes-extensions/streampipes-processors-statistics-flink/src/main/resources/org.apache.streampipes.processors.statistics.flink.statistics-summary/icon.png
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.statistics.flink.statistics-summary/icon.png
diff --git a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/resources/org.apache.streampipes.processors.statistics.flink.statistics-summary/strings.en b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.statistics.flink.statistics-summary/strings.en
similarity index 100%
rename from streampipes-extensions/streampipes-processors-statistics-flink/src/main/resources/org.apache.streampipes.processors.statistics.flink.statistics-summary/strings.en
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.statistics.flink.statistics-summary/strings.en
diff --git a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/resources/org.apache.streampipes.processors.textmining.flink.wordcount/documentation.md b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.textmining.flink.wordcount/documentation.md
similarity index 100%
rename from streampipes-extensions/streampipes-processors-text-mining-flink/src/main/resources/org.apache.streampipes.processors.textmining.flink.wordcount/documentation.md
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.textmining.flink.wordcount/documentation.md
diff --git a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/resources/org.apache.streampipes.processors.textmining.flink.wordcount/icon.png b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.textmining.flink.wordcount/icon.png
similarity index 100%
rename from streampipes-extensions/streampipes-processors-text-mining-flink/src/main/resources/org.apache.streampipes.processors.textmining.flink.wordcount/icon.png
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.textmining.flink.wordcount/icon.png
diff --git a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/resources/org.apache.streampipes.processors.textmining.flink.wordcount/strings.en b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.textmining.flink.wordcount/strings.en
similarity index 100%
rename from streampipes-extensions/streampipes-processors-text-mining-flink/src/main/resources/org.apache.streampipes.processors.textmining.flink.wordcount/strings.en
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.textmining.flink.wordcount/strings.en
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.field-converter/documentation.md b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.field-converter/documentation.md
similarity index 100%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.field-converter/documentation.md
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.field-converter/documentation.md
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.field-converter/icon.png b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.field-converter/icon.png
similarity index 100%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.field-converter/icon.png
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.field-converter/icon.png
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.field-converter/strings.en b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.field-converter/strings.en
similarity index 100%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.field-converter/strings.en
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.field-converter/strings.en
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.field-mapper/documentation.md b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.field-mapper/documentation.md
similarity index 100%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.field-mapper/documentation.md
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.field-mapper/documentation.md
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.field-mapper/icon.png b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.field-mapper/icon.png
similarity index 100%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.field-mapper/icon.png
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.field-mapper/icon.png
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.field-mapper/strings.en b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.field-mapper/strings.en
similarity index 100%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.field-mapper/strings.en
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.field-mapper/strings.en
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.field-renamer/documentation.md b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.field-renamer/documentation.md
similarity index 100%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.field-renamer/documentation.md
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.field-renamer/documentation.md
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.field-renamer/icon.png b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.field-renamer/icon.png
similarity index 100%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.field-renamer/icon.png
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.field-renamer/icon.png
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.field-renamer/strings.en b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.field-renamer/strings.en
similarity index 100%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.field-renamer/strings.en
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.field-renamer/strings.en
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.fieldhasher/documentation.md b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.fieldhasher/documentation.md
similarity index 100%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.fieldhasher/documentation.md
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.fieldhasher/documentation.md
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.fieldhasher/icon.png b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.fieldhasher/icon.png
similarity index 100%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.fieldhasher/icon.png
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.fieldhasher/icon.png
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.fieldhasher/strings.en b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.fieldhasher/strings.en
similarity index 100%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.fieldhasher/strings.en
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.fieldhasher/strings.en
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.measurementunitconverter/documentation.md b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.measurementunitconverter/documentation.md
similarity index 100%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.measurementunitconverter/documentation.md
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.measurementunitconverter/documentation.md
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.measurementunitconverter/icon.png b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.measurementunitconverter/icon.png
similarity index 100%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.measurementunitconverter/icon.png
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.measurementunitconverter/icon.png
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.measurementunitconverter/strings.en b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.measurementunitconverter/strings.en
similarity index 100%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.measurementunitconverter/strings.en
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.measurementunitconverter/strings.en
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.processor.boilerplate/documentation.md b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.processor.boilerplate/documentation.md
similarity index 100%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.processor.boilerplate/documentation.md
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.processor.boilerplate/documentation.md
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.processor.boilerplate/icon.png b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.processor.boilerplate/icon.png
similarity index 100%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.processor.boilerplate/icon.png
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.processor.boilerplate/icon.png
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.processor.boilerplate/strings.en b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.processor.boilerplate/strings.en
similarity index 100%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.processor.boilerplate/strings.en
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.processors.transformation.flink.processor.boilerplate/strings.en
diff --git a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/resources/org.apache.streampipes.sinks.databases.flink.elasticsearch/documentation.md b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.sinks.databases.flink.elasticsearch/documentation.md
similarity index 100%
rename from streampipes-extensions/streampipes-sinks-databases-flink/src/main/resources/org.apache.streampipes.sinks.databases.flink.elasticsearch/documentation.md
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.sinks.databases.flink.elasticsearch/documentation.md
diff --git a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/resources/org.apache.streampipes.sinks.databases.flink.elasticsearch/icon.png b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.sinks.databases.flink.elasticsearch/icon.png
similarity index 100%
rename from streampipes-extensions/streampipes-sinks-databases-flink/src/main/resources/org.apache.streampipes.sinks.databases.flink.elasticsearch/icon.png
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.sinks.databases.flink.elasticsearch/icon.png
diff --git a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/resources/org.apache.streampipes.sinks.databases.flink.elasticsearch/strings.en b/streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.sinks.databases.flink.elasticsearch/strings.en
similarity index 100%
rename from streampipes-extensions/streampipes-sinks-databases-flink/src/main/resources/org.apache.streampipes.sinks.databases.flink.elasticsearch/strings.en
rename to streampipes-extensions/streampipes-pipeline-elements-experimental-flink/src/main/resources/org.apache.streampipes.sinks.databases.flink.elasticsearch/strings.en
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/pom.xml b/streampipes-extensions/streampipes-processors-aggregation-flink/pom.xml
deleted file mode 100644
index 22a11b023..000000000
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/pom.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>streampipes-extensions</artifactId>
-        <groupId>org.apache.streampipes</groupId>
-        <version>0.93.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>streampipes-processors-aggregation-flink</artifactId>
-
-    <properties>
-        <maven.deploy.skip>true</maven.deploy.skip>
-    </properties>
-
-    <dependencies>
-        <!-- StreamPipes dependencies -->
-        <dependency>
-            <groupId>org.apache.streampipes</groupId>
-            <artifactId>streampipes-sdk-bundle</artifactId>
-            <version>0.93.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.streampipes</groupId>
-            <artifactId>streampipes-wrapper-flink</artifactId>
-            <version>0.93.0-SNAPSHOT</version>
-        </dependency>
-
-        <!-- External dependencies -->
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-to-slf4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-math3</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-runtime_2.11</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.scala-lang</groupId>
-            <artifactId>scala-library</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.scala-lang.modules</groupId>
-            <artifactId>scala-parser-combinators_2.11</artifactId>
-        </dependency>
-
-        <!-- dependency convergence -->
-        <dependency>
-            <groupId>org.lz4</groupId>
-            <artifactId>lz4-java</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.scala-lang.modules</groupId>
-            <artifactId>scala-xml_2.11</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-
-        <!-- Test dependencies -->
-        <dependency>
-            <groupId>org.apache.streampipes</groupId>
-            <artifactId>streampipes-test-utils</artifactId>
-            <version>0.93.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                        <phase>package</phase>
-                        <configuration>
-                            <classifier>embed</classifier>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/spring.handlers</resource>
-                                </transformer>
-                                <transformer implementation="org.springframework.boot.maven.PropertiesMergingResourceTransformer">
-                                    <resource>META-INF/spring.factories</resource>
-                                </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/spring.schemas</resource>
-                                </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                                    <resource>reference.conf</resource>
-                                </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>org.apache.streampipes.processors.aggregation.flink.AggregationFlinkInit
-                                    </mainClass>
-                                </transformer>
-                            </transformers>
-                            <createDependencyReducedPom>false</createDependencyReducedPom>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-            </plugin>
-        </plugins>
-        <finalName>streampipes-processors-aggregation-flink</finalName>
-
-    </build>
-</project>
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/AggregationFlinkInit.java b/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/AggregationFlinkInit.java
deleted file mode 100644
index e65423e20..000000000
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/AggregationFlinkInit.java
+++ /dev/null
@@ -1,72 +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.streampipes.processors.aggregation.flink;
-
-import org.apache.streampipes.dataformat.cbor.CborDataFormatFactory;
-import org.apache.streampipes.dataformat.fst.FstDataFormatFactory;
-import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
-import org.apache.streampipes.dataformat.smile.SmileDataFormatFactory;
-import org.apache.streampipes.extensions.management.model.SpServiceDefinition;
-import org.apache.streampipes.extensions.management.model.SpServiceDefinitionBuilder;
-import org.apache.streampipes.messaging.jms.SpJmsProtocolFactory;
-import org.apache.streampipes.messaging.kafka.SpKafkaProtocolFactory;
-import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
-import org.apache.streampipes.messaging.nats.SpNatsProtocolFactory;
-import org.apache.streampipes.processors.aggregation.flink.config.ConfigKeys;
-import org.apache.streampipes.processors.aggregation.flink.processor.aggregation.AggregationController;
-import org.apache.streampipes.processors.aggregation.flink.processor.count.CountController;
-import org.apache.streampipes.processors.aggregation.flink.processor.eventcount.EventCountController;
-import org.apache.streampipes.processors.aggregation.flink.processor.rate.EventRateController;
-import org.apache.streampipes.service.extensions.ExtensionsModelSubmitter;
-
-public class AggregationFlinkInit extends ExtensionsModelSubmitter {
-
-  public static final String SERVICE_GROUP = "org.apache.streampipes.processors.aggregation.flink";
-
-  public static void main(String[] args) {
-    new AggregationFlinkInit().init();
-  }
-
-  @Override
-  public SpServiceDefinition provideServiceDefinition() {
-    return SpServiceDefinitionBuilder.create(SERVICE_GROUP,
-            "Processors Aggregation Flink",
-            "",
-            8090)
-        .registerPipelineElements(new AggregationController(),
-            new CountController(),
-            new EventRateController(),
-            new EventCountController())
-        .registerMessagingFormats(
-            new JsonDataFormatFactory(),
-            new CborDataFormatFactory(),
-            new SmileDataFormatFactory(),
-            new FstDataFormatFactory())
-        .registerMessagingProtocols(
-            new SpKafkaProtocolFactory(),
-            new SpJmsProtocolFactory(),
-            new SpMqttProtocolFactory(),
-            new SpNatsProtocolFactory())
-        .addConfig(ConfigKeys.FLINK_HOST, "jobmanager", "Hostname of the Flink Jobmanager")
-        .addConfig(ConfigKeys.FLINK_PORT, 8081, "Port of the Flink Jobmanager")
-        .addConfig(ConfigKeys.DEBUG, false, "Debug/Mini cluster mode of Flink program")
-        .addConfig(ConfigKeys.FLINK_JAR_FILE_LOC, "./streampipes-processing-element-container.jar", "Jar file location")
-        .build();
-  }
-}
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/config/ConfigKeys.java b/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/config/ConfigKeys.java
deleted file mode 100644
index a3a529f9b..000000000
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/config/ConfigKeys.java
+++ /dev/null
@@ -1,26 +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.streampipes.processors.aggregation.flink.config;
-
-public class ConfigKeys {
-  public static final String FLINK_HOST = "SP_FLINK_HOST";
-  public static final String FLINK_PORT = "SP_FLINK_PORT";
-  public static final String DEBUG = "SP_FLINK_DEBUG";
-  public static final String FLINK_JAR_FILE_LOC = "SP_FLINK_JAR_FILE_LOC";
-}
diff --git a/streampipes-extensions/streampipes-processors-enricher-flink/pom.xml b/streampipes-extensions/streampipes-processors-enricher-flink/pom.xml
deleted file mode 100644
index 208f80e7d..000000000
--- a/streampipes-extensions/streampipes-processors-enricher-flink/pom.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>streampipes-extensions</artifactId>
-        <groupId>org.apache.streampipes</groupId>
-        <version>0.93.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>streampipes-processors-enricher-flink</artifactId>
-
-    <properties>
-        <elasticsearch.version>5.2.2</elasticsearch.version>
-        <maven.deploy.skip>true</maven.deploy.skip>
-    </properties>
-
-    <dependencies>
-        <!-- StreamPipes dependencies -->
-        <dependency>
-            <groupId>org.apache.streampipes</groupId>
-            <artifactId>streampipes-sdk-bundle</artifactId>
-            <version>0.93.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.streampipes</groupId>
-            <artifactId>streampipes-wrapper-flink</artifactId>
-            <version>0.93.0-SNAPSHOT</version>
-        </dependency>
-
-        <!-- External dependencies -->
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-to-slf4j</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/spring.handlers</resource>
-                                </transformer>
-                                <transformer implementation="org.springframework.boot.maven.PropertiesMergingResourceTransformer">
-                                    <resource>META-INF/spring.factories</resource>
-                                </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/spring.schemas</resource>
-                                </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                                    <resource>reference.conf</resource>
-                                </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>org.apache.streampipes.processors.enricher.flink.EnricherFlinkInit
-                                    </mainClass>
-                                </transformer>
-                            </transformers>
-                            <createDependencyReducedPom>false</createDependencyReducedPom>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-            </plugin>
-        </plugins>
-        <finalName>streampipes-processors-enricher-flink</finalName>
-    </build>
-</project>
diff --git a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/EnricherFlinkInit.java b/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/EnricherFlinkInit.java
deleted file mode 100644
index ea97362bb..000000000
--- a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/EnricherFlinkInit.java
+++ /dev/null
@@ -1,69 +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.streampipes.processors.enricher.flink;
-
-import org.apache.streampipes.dataformat.cbor.CborDataFormatFactory;
-import org.apache.streampipes.dataformat.fst.FstDataFormatFactory;
-import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
-import org.apache.streampipes.dataformat.smile.SmileDataFormatFactory;
-import org.apache.streampipes.extensions.management.model.SpServiceDefinition;
-import org.apache.streampipes.extensions.management.model.SpServiceDefinitionBuilder;
-import org.apache.streampipes.messaging.jms.SpJmsProtocolFactory;
-import org.apache.streampipes.messaging.kafka.SpKafkaProtocolFactory;
-import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
-import org.apache.streampipes.messaging.nats.SpNatsProtocolFactory;
-import org.apache.streampipes.processors.enricher.flink.config.ConfigKeys;
-import org.apache.streampipes.processors.enricher.flink.processor.timestamp.TimestampController;
-import org.apache.streampipes.processors.enricher.flink.processor.urldereferencing.UrlDereferencingController;
-import org.apache.streampipes.service.extensions.ExtensionsModelSubmitter;
-import org.apache.streampipes.wrapper.flink.FlinkRuntimeProvider;
-
-public class EnricherFlinkInit extends ExtensionsModelSubmitter {
-
-  public static void main(String[] args) {
-    new EnricherFlinkInit().init();
-  }
-
-  @Override
-  public SpServiceDefinition provideServiceDefinition() {
-    return SpServiceDefinitionBuilder.create("org.apache.streampipes.processors.enricher.flink",
-            "Processors Enricher Flink",
-            "",
-            8090)
-        .registerPipelineElements(
-            new TimestampController(),
-            new UrlDereferencingController())
-        .registerRuntimeProvider(new FlinkRuntimeProvider())
-        .registerMessagingFormats(
-            new JsonDataFormatFactory(),
-            new CborDataFormatFactory(),
-            new SmileDataFormatFactory(),
-            new FstDataFormatFactory())
-        .registerMessagingProtocols(
-            new SpKafkaProtocolFactory(),
-            new SpJmsProtocolFactory(),
-            new SpMqttProtocolFactory(),
-            new SpNatsProtocolFactory())
-        .addConfig(ConfigKeys.FLINK_HOST, "jobmanager", "Hostname of the Flink Jobmanager")
-        .addConfig(ConfigKeys.FLINK_PORT, 8081, "Port of the Flink Jobmanager")
-        .addConfig(ConfigKeys.DEBUG, false, "Debug/Mini cluster mode of Flink program")
-        .addConfig(ConfigKeys.FLINK_JAR_FILE_LOC, "./streampipes-processing-element-container.jar", "Jar file location")
-        .build();
-  }
-}
diff --git a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/config/ConfigKeys.java b/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/config/ConfigKeys.java
deleted file mode 100644
index 0a57b2df6..000000000
--- a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/config/ConfigKeys.java
+++ /dev/null
@@ -1,26 +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.streampipes.processors.enricher.flink.config;
-
-public class ConfigKeys {
-  public static final String FLINK_HOST = "SP_FLINK_HOST";
-  public static final String FLINK_PORT = "SP_FLINK_PORT";
-  public static final String DEBUG = "SP_FLINK_DEBUG";
-  public static final String FLINK_JAR_FILE_LOC = "SP_FLINK_JAR_FILE_LOC";
-}
diff --git a/streampipes-extensions/streampipes-processors-geo-flink/pom.xml b/streampipes-extensions/streampipes-processors-geo-flink/pom.xml
deleted file mode 100644
index f1ab70cd5..000000000
--- a/streampipes-extensions/streampipes-processors-geo-flink/pom.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>streampipes-extensions</artifactId>
-        <groupId>org.apache.streampipes</groupId>
-        <version>0.93.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>streampipes-processors-geo-flink</artifactId>
-
-    <properties>
-        <maven.deploy.skip>true</maven.deploy.skip>
-    </properties>
-
-    <dependencies>
-        <!-- StreamPipes dependencies -->
-        <dependency>
-            <groupId>org.apache.streampipes</groupId>
-            <artifactId>streampipes-sdk-bundle</artifactId>
-            <version>0.93.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.streampipes</groupId>
-            <artifactId>streampipes-wrapper-flink</artifactId>
-            <version>0.93.0-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/spring.handlers</resource>
-                                </transformer>
-                                <transformer implementation="org.springframework.boot.maven.PropertiesMergingResourceTransformer">
-                                    <resource>META-INF/spring.factories</resource>
-                                </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/spring.schemas</resource>
-                                </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                                    <resource>reference.conf</resource>
-                                </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>org.apache.streampipes.processor.geo.flink.GeoFlinkInit
-                                    </mainClass>
-                                </transformer>
-                            </transformers>
-                            <createDependencyReducedPom>false</createDependencyReducedPom>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-            </plugin>
-        </plugins>
-        <finalName>streampipes-processors-geo-flink</finalName>
-    </build>
-</project>
diff --git a/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/GeoFlinkInit.java b/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/GeoFlinkInit.java
deleted file mode 100644
index 9aa5917a4..000000000
--- a/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/GeoFlinkInit.java
+++ /dev/null
@@ -1,65 +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.streampipes.processor.geo.flink;
-
-import org.apache.streampipes.dataformat.cbor.CborDataFormatFactory;
-import org.apache.streampipes.dataformat.fst.FstDataFormatFactory;
-import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
-import org.apache.streampipes.dataformat.smile.SmileDataFormatFactory;
-import org.apache.streampipes.extensions.management.model.SpServiceDefinition;
-import org.apache.streampipes.extensions.management.model.SpServiceDefinitionBuilder;
-import org.apache.streampipes.messaging.jms.SpJmsProtocolFactory;
-import org.apache.streampipes.messaging.kafka.SpKafkaProtocolFactory;
-import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
-import org.apache.streampipes.messaging.nats.SpNatsProtocolFactory;
-import org.apache.streampipes.processor.geo.flink.config.ConfigKeys;
-import org.apache.streampipes.processor.geo.flink.processor.gridenricher.SpatialGridEnrichmentController;
-import org.apache.streampipes.service.extensions.ExtensionsModelSubmitter;
-
-public class GeoFlinkInit extends ExtensionsModelSubmitter {
-
-  public static void main(String[] args) {
-    new GeoFlinkInit().init();
-  }
-
-  @Override
-  public SpServiceDefinition provideServiceDefinition() {
-    return SpServiceDefinitionBuilder.create("org.apache.streampipes.processors.geo.flink",
-            "Processors Geo Flink",
-            "",
-            8090)
-        .registerPipelineElements(new SpatialGridEnrichmentController())
-        .registerMessagingFormats(
-            new JsonDataFormatFactory(),
-            new CborDataFormatFactory(),
-            new SmileDataFormatFactory(),
-            new FstDataFormatFactory())
-        .registerMessagingProtocols(
-            new SpKafkaProtocolFactory(),
-            new SpJmsProtocolFactory(),
-            new SpMqttProtocolFactory(),
-            new SpNatsProtocolFactory())
-        .addConfig(ConfigKeys.FLINK_HOST, "jobmanager", "Hostname of the Flink Jobmanager")
-        .addConfig(ConfigKeys.FLINK_PORT, 8081, "Port of the Flink Jobmanager")
-        .addConfig(ConfigKeys.DEBUG, false, "Debug/Mini cluster mode of Flink program")
-        .addConfig(ConfigKeys.FLINK_JAR_FILE_LOC, "./streampipes-processing-element-container.jar", "Jar file location")
-        .build();
-  }
-
-}
diff --git a/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/config/ConfigKeys.java b/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/config/ConfigKeys.java
deleted file mode 100644
index 11d84e73f..000000000
--- a/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/config/ConfigKeys.java
+++ /dev/null
@@ -1,26 +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.streampipes.processor.geo.flink.config;
-
-public class ConfigKeys {
-  public static final String FLINK_HOST = "SP_FLINK_HOST";
-  public static final String FLINK_PORT = "SP_FLINK_PORT";
-  public static final String DEBUG = "SP_FLINK_DEBUG";
-  public static final String FLINK_JAR_FILE_LOC = "SP_FLINK_JAR_FILE_LOC";
-}
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/pom.xml b/streampipes-extensions/streampipes-processors-pattern-detection-flink/pom.xml
deleted file mode 100644
index a421bd4cc..000000000
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/pom.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>streampipes-extensions</artifactId>
-        <groupId>org.apache.streampipes</groupId>
-        <version>0.93.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>streampipes-processors-pattern-detection-flink</artifactId>
-
-    <properties>
-        <maven.deploy.skip>true</maven.deploy.skip>
-        <elasticsearch.version>5.2.2</elasticsearch.version>
-    </properties>
-
-    <dependencies>
-        <!-- StreamPipes dependencies -->
-        <dependency>
-            <groupId>org.apache.streampipes</groupId>
-            <artifactId>streampipes-sdk-bundle</artifactId>
-            <version>0.93.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.streampipes</groupId>
-            <artifactId>streampipes-wrapper-flink</artifactId>
-            <version>0.93.0-SNAPSHOT</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <!-- External dependencies -->
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-to-slf4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-cep_2.11</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-runtime_2.11</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.scala-lang</groupId>
-            <artifactId>scala-library</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.scala-lang.modules</groupId>
-            <artifactId>scala-parser-combinators_2.11</artifactId>
-        </dependency>
-
-        <!-- Dependency convergence -->
-        <dependency>
-            <groupId>org.scala-lang.modules</groupId>
-            <artifactId>scala-xml_2.11</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- Test dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.streampipes</groupId>
-            <artifactId>streampipes-test-utils</artifactId>
-            <version>0.93.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/spring.handlers</resource>
-                                </transformer>
-                                <transformer implementation="org.springframework.boot.maven.PropertiesMergingResourceTransformer">
-                                    <resource>META-INF/spring.factories</resource>
-                                </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/spring.schemas</resource>
-                                </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                                    <resource>reference.conf</resource>
-                                </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>
-                                        org.apache.streampipes.processors.pattern.detection.flink.PatternDetectionFlinkInit
-                                    </mainClass>
-                                </transformer>
-                            </transformers>
-                            <createDependencyReducedPom>false</createDependencyReducedPom>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-            </plugin>
-        </plugins>
-        <finalName>streampipes-processors-pattern-detection-flink</finalName>
-    </build>
-</project>
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/PatternDetectionFlinkInit.java b/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/PatternDetectionFlinkInit.java
deleted file mode 100644
index cbcf3e9a4..000000000
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/PatternDetectionFlinkInit.java
+++ /dev/null
@@ -1,73 +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.streampipes.processors.pattern.detection.flink;
-
-import org.apache.streampipes.dataformat.cbor.CborDataFormatFactory;
-import org.apache.streampipes.dataformat.fst.FstDataFormatFactory;
-import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
-import org.apache.streampipes.dataformat.smile.SmileDataFormatFactory;
-import org.apache.streampipes.extensions.management.model.SpServiceDefinition;
-import org.apache.streampipes.extensions.management.model.SpServiceDefinitionBuilder;
-import org.apache.streampipes.messaging.jms.SpJmsProtocolFactory;
-import org.apache.streampipes.messaging.kafka.SpKafkaProtocolFactory;
-import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
-import org.apache.streampipes.messaging.nats.SpNatsProtocolFactory;
-import org.apache.streampipes.processors.pattern.detection.flink.config.ConfigKeys;
-import org.apache.streampipes.processors.pattern.detection.flink.processor.absence.AbsenceController;
-import org.apache.streampipes.processors.pattern.detection.flink.processor.and.AndController;
-import org.apache.streampipes.processors.pattern.detection.flink.processor.peak.PeakDetectionController;
-import org.apache.streampipes.processors.pattern.detection.flink.processor.sequence.SequenceController;
-import org.apache.streampipes.service.extensions.ExtensionsModelSubmitter;
-
-public class PatternDetectionFlinkInit extends ExtensionsModelSubmitter {
-
-  public static final String SERVICE_GROUP = "org.apache.streampipes.processors.patterndetection.flink";
-
-  public static void main(String[] args) {
-    new PatternDetectionFlinkInit().init();
-  }
-
-  @Override
-  public SpServiceDefinition provideServiceDefinition() {
-    return SpServiceDefinitionBuilder.create(SERVICE_GROUP,
-            "Processors Pattern Detection Flink",
-            "",
-            8090)
-        .registerPipelineElements(new PeakDetectionController(),
-            new SequenceController(),
-            new AbsenceController(),
-            new AndController())
-        .registerMessagingFormats(
-            new JsonDataFormatFactory(),
-            new CborDataFormatFactory(),
-            new SmileDataFormatFactory(),
-            new FstDataFormatFactory())
-        .registerMessagingProtocols(
-            new SpKafkaProtocolFactory(),
-            new SpJmsProtocolFactory(),
-            new SpMqttProtocolFactory(),
-            new SpNatsProtocolFactory())
-        .addConfig(ConfigKeys.FLINK_HOST, "jobmanager", "Hostname of the Flink Jobmanager")
-        .addConfig(ConfigKeys.FLINK_PORT, 8081, "Port of the Flink Jobmanager")
-        .addConfig(ConfigKeys.DEBUG, false, "Debug/Mini cluster mode of Flink program")
-        .addConfig(ConfigKeys.FLINK_JAR_FILE_LOC, "./streampipes-processing-element-container.jar", "Jar file location")
-        .build();
-  }
-
-}
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/config/ConfigKeys.java b/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/config/ConfigKeys.java
deleted file mode 100644
index 031be0b10..000000000
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/config/ConfigKeys.java
+++ /dev/null
@@ -1,26 +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.streampipes.processors.pattern.detection.flink.config;
-
-public class ConfigKeys {
-  public static final String FLINK_HOST = "SP_FLINK_HOST";
-  public static final String FLINK_PORT = "SP_FLINK_PORT";
-  public static final String DEBUG = "SP_FLINK_DEBUG";
-  public static final String FLINK_JAR_FILE_LOC = "SP_FLINK_JAR_FILE_LOC";
-}
diff --git a/streampipes-extensions/streampipes-processors-statistics-flink/pom.xml b/streampipes-extensions/streampipes-processors-statistics-flink/pom.xml
deleted file mode 100644
index 00f18416c..000000000
--- a/streampipes-extensions/streampipes-processors-statistics-flink/pom.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>streampipes-extensions</artifactId>
-        <groupId>org.apache.streampipes</groupId>
-        <version>0.93.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>streampipes-processors-statistics-flink</artifactId>
-
-    <properties>
-        <maven.deploy.skip>true</maven.deploy.skip>
-    </properties>
-
-    <dependencies>
-        <!-- StreamPipes dependencies -->
-        <dependency>
-            <groupId>org.apache.streampipes</groupId>
-            <artifactId>streampipes-sdk-bundle</artifactId>
-            <version>0.93.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.streampipes</groupId>
-            <artifactId>streampipes-wrapper-flink</artifactId>
-            <version>0.93.0-SNAPSHOT</version>
-        </dependency>
-
-        <!-- External dependencies -->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-math3</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-to-slf4j</artifactId>
-        </dependency>
-
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/spring.handlers</resource>
-                                </transformer>
-                                <transformer implementation="org.springframework.boot.maven.PropertiesMergingResourceTransformer">
-                                    <resource>META-INF/spring.factories</resource>
-                                </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/spring.schemas</resource>
-                                </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                                    <resource>reference.conf</resource>
-                                </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>org.apache.streampipes.processors.statistics.flink.StatisticsFlinkInit
-                                    </mainClass>
-                                </transformer>
-                            </transformers>
-                            <createDependencyReducedPom>false</createDependencyReducedPom>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-            </plugin>
-        </plugins>
-        <finalName>streampipes-processors-statistics-flink</finalName>
-    </build>
-</project>
diff --git a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/StatisticsFlinkInit.java b/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/StatisticsFlinkInit.java
deleted file mode 100644
index e61911cd2..000000000
--- a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/StatisticsFlinkInit.java
+++ /dev/null
@@ -1,67 +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.streampipes.processors.statistics.flink;
-
-import org.apache.streampipes.dataformat.cbor.CborDataFormatFactory;
-import org.apache.streampipes.dataformat.fst.FstDataFormatFactory;
-import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
-import org.apache.streampipes.dataformat.smile.SmileDataFormatFactory;
-import org.apache.streampipes.extensions.management.model.SpServiceDefinition;
-import org.apache.streampipes.extensions.management.model.SpServiceDefinitionBuilder;
-import org.apache.streampipes.messaging.jms.SpJmsProtocolFactory;
-import org.apache.streampipes.messaging.kafka.SpKafkaProtocolFactory;
-import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
-import org.apache.streampipes.messaging.nats.SpNatsProtocolFactory;
-import org.apache.streampipes.processors.statistics.flink.config.ConfigKeys;
-import org.apache.streampipes.processors.statistics.flink.processor.stat.summary.StatisticsSummaryController;
-import org.apache.streampipes.processors.statistics.flink.processor.stat.window.StatisticsSummaryControllerWindow;
-import org.apache.streampipes.service.extensions.ExtensionsModelSubmitter;
-
-public class StatisticsFlinkInit extends ExtensionsModelSubmitter {
-
-  public static void main(String[] args) {
-    new StatisticsFlinkInit().init();
-  }
-
-  @Override
-  public SpServiceDefinition provideServiceDefinition() {
-    return SpServiceDefinitionBuilder.create("org.apache.streampipes.processors.statistics.flink",
-            "Processors Statistics Flink",
-            "",
-            8090)
-        .registerPipelineElements(new StatisticsSummaryController(),
-            new StatisticsSummaryControllerWindow())
-        .registerMessagingFormats(
-            new JsonDataFormatFactory(),
-            new CborDataFormatFactory(),
-            new SmileDataFormatFactory(),
-            new FstDataFormatFactory())
-        .registerMessagingProtocols(
-            new SpKafkaProtocolFactory(),
-            new SpJmsProtocolFactory(),
-            new SpMqttProtocolFactory(),
-            new SpNatsProtocolFactory())
-        .addConfig(ConfigKeys.FLINK_HOST, "jobmanager", "Hostname of the Flink Jobmanager")
-        .addConfig(ConfigKeys.FLINK_PORT, 8081, "Port of the Flink Jobmanager")
-        .addConfig(ConfigKeys.DEBUG, false, "Debug/Mini cluster mode of Flink program")
-        .addConfig(ConfigKeys.FLINK_JAR_FILE_LOC, "./streampipes-processing-element-container.jar", "Jar file location")
-        .build();
-  }
-
-}
diff --git a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/config/ConfigKeys.java b/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/config/ConfigKeys.java
deleted file mode 100644
index 74f67f5e3..000000000
--- a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/config/ConfigKeys.java
+++ /dev/null
@@ -1,26 +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.streampipes.processors.statistics.flink.config;
-
-public class ConfigKeys {
-  public static final String FLINK_HOST = "SP_FLINK_HOST";
-  public static final String FLINK_PORT = "SP_FLINK_PORT";
-  public static final String DEBUG = "SP_FLINK_DEBUG";
-  public static final String FLINK_JAR_FILE_LOC = "SP_FLINK_JAR_FILE_LOC";
-}
diff --git a/streampipes-extensions/streampipes-processors-text-mining-flink/pom.xml b/streampipes-extensions/streampipes-processors-text-mining-flink/pom.xml
deleted file mode 100644
index ead73a7ad..000000000
--- a/streampipes-extensions/streampipes-processors-text-mining-flink/pom.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>streampipes-extensions</artifactId>
-        <groupId>org.apache.streampipes</groupId>
-        <version>0.93.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>streampipes-processors-text-mining-flink</artifactId>
-
-    <properties>
-        <maven.deploy.skip>true</maven.deploy.skip>
-    </properties>
-
-    <dependencies>
-        <!-- StreamPipes dependencies -->
-        <dependency>
-            <groupId>org.apache.streampipes</groupId>
-            <artifactId>streampipes-sdk-bundle</artifactId>
-            <version>0.93.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.streampipes</groupId>
-            <artifactId>streampipes-wrapper-flink</artifactId>
-            <version>0.93.0-SNAPSHOT</version>
-        </dependency>
-
-        <!-- External dependencies -->
-        <dependency>
-            <groupId>com.optimaize.languagedetector</groupId>
-            <artifactId>language-detector</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-cep_2.11</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-to-slf4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.opennlp</groupId>
-            <artifactId>opennlp-tools</artifactId>
-        </dependency>
-
-        <!-- Test dependencies -->
-        <dependency>
-            <groupId>org.apache.streampipes</groupId>
-            <artifactId>streampipes-test-utils</artifactId>
-            <version>0.93.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/spring.handlers</resource>
-                                </transformer>
-                                <transformer implementation="org.springframework.boot.maven.PropertiesMergingResourceTransformer">
-                                    <resource>META-INF/spring.factories</resource>
-                                </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/spring.schemas</resource>
-                                </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                                    <resource>reference.conf</resource>
-                                </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>org.apache.streampipes.processors.textmining.flink.TextMiningFlinkInit
-                                    </mainClass>
-                                </transformer>
-                            </transformers>
-                            <createDependencyReducedPom>false</createDependencyReducedPom>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-            </plugin>
-        </plugins>
-        <finalName>streampipes-processors-textmining-flink</finalName>
-    </build>
-</project>
diff --git a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/TextMiningFlinkInit.java b/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/TextMiningFlinkInit.java
deleted file mode 100644
index 333b07985..000000000
--- a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/TextMiningFlinkInit.java
+++ /dev/null
@@ -1,64 +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.streampipes.processors.textmining.flink;
-
-import org.apache.streampipes.dataformat.cbor.CborDataFormatFactory;
-import org.apache.streampipes.dataformat.fst.FstDataFormatFactory;
-import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
-import org.apache.streampipes.dataformat.smile.SmileDataFormatFactory;
-import org.apache.streampipes.extensions.management.model.SpServiceDefinition;
-import org.apache.streampipes.extensions.management.model.SpServiceDefinitionBuilder;
-import org.apache.streampipes.messaging.jms.SpJmsProtocolFactory;
-import org.apache.streampipes.messaging.kafka.SpKafkaProtocolFactory;
-import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
-import org.apache.streampipes.messaging.nats.SpNatsProtocolFactory;
-import org.apache.streampipes.processors.textmining.flink.config.ConfigKeys;
-import org.apache.streampipes.processors.textmining.flink.processor.wordcount.WordCountController;
-import org.apache.streampipes.service.extensions.ExtensionsModelSubmitter;
-
-public class TextMiningFlinkInit extends ExtensionsModelSubmitter {
-
-  public static void main(String[] args) {
-    new TextMiningFlinkInit().init();
-  }
-
-  @Override
-  public SpServiceDefinition provideServiceDefinition() {
-
-    return SpServiceDefinitionBuilder.create("org.apache.streampipes.processors.textmining.flink",
-            "Processors Text Mining Flink", "",
-            8090)
-        .registerPipelineElements(new WordCountController())
-        .registerMessagingFormats(
-            new JsonDataFormatFactory(),
-            new CborDataFormatFactory(),
-            new SmileDataFormatFactory(),
-            new FstDataFormatFactory())
-        .registerMessagingProtocols(
-            new SpKafkaProtocolFactory(),
-            new SpJmsProtocolFactory(),
-            new SpMqttProtocolFactory(),
-            new SpNatsProtocolFactory())
-        .addConfig(ConfigKeys.FLINK_HOST, "jobmanager", "Hostname of the Flink Jobmanager")
-        .addConfig(ConfigKeys.FLINK_PORT, 8081, "Port of the Flink Jobmanager")
-        .addConfig(ConfigKeys.DEBUG, false, "Debug/Mini cluster mode of Flink program")
-        .addConfig(ConfigKeys.FLINK_JAR_FILE_LOC, "./streampipes-processing-element-container.jar", "Jar file location")
-        .build();
-  }
-}
diff --git a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/config/ConfigKeys.java b/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/config/ConfigKeys.java
deleted file mode 100644
index aca97b1c2..000000000
--- a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/config/ConfigKeys.java
+++ /dev/null
@@ -1,26 +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.streampipes.processors.textmining.flink.config;
-
-public class ConfigKeys {
-  public static final String FLINK_HOST = "SP_FLINK_HOST";
-  public static final String FLINK_PORT = "SP_FLINK_PORT";
-  public static final String DEBUG = "SP_FLINK_DEBUG";
-  public static final String FLINK_JAR_FILE_LOC = "SP_FLINK_JAR_FILE_LOC";
-}
diff --git a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/language/LanguageDetection.java b/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/language/LanguageDetection.java
deleted file mode 100644
index f164fdfc2..000000000
--- a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/language/LanguageDetection.java
+++ /dev/null
@@ -1,76 +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.streampipes.processors.textmining.flink.processor.language;
-
-import org.apache.streampipes.model.runtime.Event;
-
-import com.optimaize.langdetect.LanguageDetector;
-import com.optimaize.langdetect.LanguageDetectorBuilder;
-import com.optimaize.langdetect.i18n.LdLocale;
-import com.optimaize.langdetect.ngram.NgramExtractors;
-import com.optimaize.langdetect.profiles.LanguageProfile;
-import com.optimaize.langdetect.profiles.LanguageProfileReader;
-import com.optimaize.langdetect.text.CommonTextObjectFactories;
-import com.optimaize.langdetect.text.TextObject;
-import com.optimaize.langdetect.text.TextObjectFactory;
-import org.apache.flink.api.common.functions.FlatMapFunction;
-import org.apache.flink.util.Collector;
-
-import java.io.IOException;
-import java.util.List;
-
-public class LanguageDetection implements FlatMapFunction<Event, Event> {
-
-  private static final String LANGUAGE_KEY = "language";
-
-  private String fieldName;
-  private LanguageDetector languageDetector;
-  private TextObjectFactory textObjectFactory;
-
-  public LanguageDetection(String fieldName) {
-    this.fieldName = fieldName;
-    List<LanguageProfile> languageProfiles = null;
-    try {
-      languageProfiles = new LanguageProfileReader().readAllBuiltIn();
-    } catch (IOException e) {
-      e.printStackTrace();
-    }
-
-    this.languageDetector = LanguageDetectorBuilder.create(NgramExtractors.standard())
-        .withProfiles(languageProfiles)
-        .build();
-
-    this.textObjectFactory = CommonTextObjectFactories.forDetectingOnLargeText();
-  }
-
-  @Override
-  public void flatMap(Event in, Collector<Event> out) {
-
-    TextObject textObject = textObjectFactory.forText(in.getFieldBySelector(fieldName)
-        .getAsPrimitive().getAsString());
-    com.google.common.base.Optional<LdLocale> lang = languageDetector.detect(textObject);
-
-    if (lang.isPresent()) {
-      in.addField(LANGUAGE_KEY, lang.get().getLanguage());
-    } else {
-      in.addField(LANGUAGE_KEY, "unknown");
-    }
-
-    out.collect(in);
-  }
-}
diff --git a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/language/LanguageDetectionController.java b/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/language/LanguageDetectionController.java
deleted file mode 100644
index e6aa9a8c1..000000000
--- a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/language/LanguageDetectionController.java
+++ /dev/null
@@ -1,69 +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.streampipes.processors.textmining.flink.processor.language;
-
-import org.apache.streampipes.model.DataProcessorType;
-import org.apache.streampipes.model.graph.DataProcessorDescription;
-import org.apache.streampipes.model.graph.DataProcessorInvocation;
-import org.apache.streampipes.model.schema.PropertyScope;
-import org.apache.streampipes.sdk.builder.ProcessingElementBuilder;
-import org.apache.streampipes.sdk.builder.StreamRequirementsBuilder;
-import org.apache.streampipes.sdk.extractor.ProcessingElementParameterExtractor;
-import org.apache.streampipes.sdk.helpers.EpProperties;
-import org.apache.streampipes.sdk.helpers.EpRequirements;
-import org.apache.streampipes.sdk.helpers.Labels;
-import org.apache.streampipes.sdk.helpers.Locales;
-import org.apache.streampipes.sdk.helpers.OutputStrategies;
-import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.flink.FlinkDataProcessorDeclarer;
-import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
-
-public class LanguageDetectionController extends FlinkDataProcessorDeclarer<LanguageDetectionParameters> {
-
-  private static final String DETECTION_FIELD_KEY = "detectionField";
-  private static final String LANGUAGE_KEY = "language";
-
-  @Override
-  public DataProcessorDescription declareModel() {
-    return ProcessingElementBuilder.create("org.apache.streampipes.processors.textmining.flink.languagedetection")
-        .category(DataProcessorType.ENRICH_TEXT)
-        .withAssets(Assets.DOCUMENTATION)
-        .withLocales(Locales.EN)
-        .requiredStream(StreamRequirementsBuilder
-            .create()
-            .requiredPropertyWithUnaryMapping(
-                EpRequirements.stringReq(),
-                Labels.withId(DETECTION_FIELD_KEY),
-                PropertyScope.NONE)
-            .build())
-        .outputStrategy(OutputStrategies.append(EpProperties.stringEp(
-            Labels.withId(LANGUAGE_KEY),
-            "language",
-            "http://schema.org/language")))
-        .build();
-  }
-
-  @Override
-  public FlinkDataProcessorProgram<LanguageDetectionParameters> getProgram(
-      DataProcessorInvocation graph,
-      ProcessingElementParameterExtractor extractor) {
-    String fieldName = extractor.mappingPropertyValue(DETECTION_FIELD_KEY);
-
-    return new LanguageDetectionProgram(new LanguageDetectionParameters(graph, fieldName));
-  }
-}
diff --git a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/language/LanguageDetectionParameters.java b/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/language/LanguageDetectionParameters.java
deleted file mode 100644
index 7085982db..000000000
--- a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/language/LanguageDetectionParameters.java
+++ /dev/null
@@ -1,36 +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.streampipes.processors.textmining.flink.processor.language;
-
-import org.apache.streampipes.model.graph.DataProcessorInvocation;
-import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
-
-public class LanguageDetectionParameters extends ProcessorParams {
-
-  private String fieldName;
-
-  public LanguageDetectionParameters(DataProcessorInvocation graph, String fieldName) {
-    super(graph);
-    this.fieldName = fieldName;
-  }
-
-  public String getFieldName() {
-    return fieldName;
-  }
-
-}
diff --git a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/language/LanguageDetectionProgram.java b/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/language/LanguageDetectionProgram.java
deleted file mode 100644
index bf8de3071..000000000
--- a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/language/LanguageDetectionProgram.java
+++ /dev/null
@@ -1,36 +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.streampipes.processors.textmining.flink.processor.language;
-
-import org.apache.streampipes.model.runtime.Event;
-import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
-
-import org.apache.flink.streaming.api.datastream.DataStream;
-
-public class LanguageDetectionProgram extends FlinkDataProcessorProgram<LanguageDetectionParameters> {
-
-  public LanguageDetectionProgram(LanguageDetectionParameters params) {
-    super(params);
-  }
-
-  @Override
-  public DataStream<Event> getApplicationLogic(DataStream<Event>... messageStream) {
-    return messageStream[0]
-        .flatMap(new LanguageDetection(params.getFieldName()));
-  }
-}
diff --git a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/resources/org.apache.streampipes.processors.textmining.flink.languagedetection/documentation.md b/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/resources/org.apache.streampipes.processors.textmining.flink.languagedetection/documentation.md
deleted file mode 100644
index 60e0c8400..000000000
--- a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/resources/org.apache.streampipes.processors.textmining.flink.languagedetection/documentation.md
+++ /dev/null
@@ -1,47 +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.
-  ~
-  -->
-
-## Language Detection
-
-<p align="center"> 
-    <img src="icon.png" width="150px;" class="pe-image-documentation"/>
-</p>
-
-***
-
-## Description
-
-Detects the language of a written text.
-
-***
-
-## Required input
-
-
-***
-
-## Configuration
-
-Describe the configuration parameters here
-
-### 1st parameter
-
-
-### 2nd parameter
-
-## Output
\ No newline at end of file
diff --git a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/resources/org.apache.streampipes.processors.textmining.flink.languagedetection/strings.en b/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/resources/org.apache.streampipes.processors.textmining.flink.languagedetection/strings.en
deleted file mode 100644
index d9967112b..000000000
--- a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/resources/org.apache.streampipes.processors.textmining.flink.languagedetection/strings.en
+++ /dev/null
@@ -1,24 +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.
-#
-
-org.apache.streampipes.processors.textmining.flink.languagedetection.title=Language Detection
-org.apache.streampipes.processors.textmining.flink.languagedetection.description=Detects the language of a written text.
-
-detectionField.title=Field Selection
-detectionField.description=Specifies the field where the language detection should be applied upon.
-
-
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/pom.xml b/streampipes-extensions/streampipes-processors-transformation-flink/pom.xml
deleted file mode 100644
index 117d46cc7..000000000
--- a/streampipes-extensions/streampipes-processors-transformation-flink/pom.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>streampipes-extensions</artifactId>
-        <groupId>org.apache.streampipes</groupId>
-        <version>0.93.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>streampipes-processors-transformation-flink</artifactId>
-
-    <properties>
-        <maven.deploy.skip>true</maven.deploy.skip>
-    </properties>
-
-    <dependencies>
-        <!-- StreamPipes dependencies -->
-        <dependency>
-            <groupId>org.apache.streampipes</groupId>
-            <artifactId>streampipes-sdk-bundle</artifactId>
-            <version>0.93.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.streampipes</groupId>
-            <artifactId>streampipes-measurement-units</artifactId>
-            <version>0.93.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.streampipes</groupId>
-            <artifactId>streampipes-wrapper-flink</artifactId>
-            <version>0.93.0-SNAPSHOT</version>
-        </dependency>
-
-        <!-- External dependencies -->
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-to-slf4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>net.sourceforge.nekohtml</groupId>
-            <artifactId>nekohtml</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-        </dependency>
-
-        <!-- Test dependencies -->
-        <dependency>
-            <groupId>org.apache.streampipes</groupId>
-            <artifactId>streampipes-test-utils</artifactId>
-            <version>0.93.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/spring.handlers</resource>
-                                </transformer>
-                                <transformer implementation="org.springframework.boot.maven.PropertiesMergingResourceTransformer">
-                                    <resource>META-INF/spring.factories</resource>
-                                </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/spring.schemas</resource>
-                                </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                                    <resource>reference.conf</resource>
-                                </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>org.apache.streampipes.processors.transformation.flink.TransformationFlinkInit
-                                    </mainClass>
-                                </transformer>
-                            </transformers>
-                            <createDependencyReducedPom>false</createDependencyReducedPom>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-            </plugin>
-        </plugins>
-        <finalName>streampipes-processors-transformation-flink</finalName>
-    </build>
-</project>
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/document/package-info.java b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/document/package-info.java
deleted file mode 100755
index 7043bd06f..000000000
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/document/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * The Boilerpipe document model.
- */
-package com.kohlschutter.boilerpipe.document;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/extractors/package-info.java b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/extractors/package-info.java
deleted file mode 100755
index e6be43080..000000000
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/extractors/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Some standard extractors (i.e., completely piped BoilerpipeFilters)
- */
-package com.kohlschutter.boilerpipe.extractors;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/english/package-info.java b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/english/package-info.java
deleted file mode 100755
index 590c3cf7a..000000000
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/english/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * These BoilerpipeFilters have only been tested on English text.
- * <p>
- * That is, they will probably work with other Western languages, but maybe need some parameter tuning to perform well.
- */
-package com.kohlschutter.boilerpipe.filters.english;
-
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/package-info.java b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/package-info.java
deleted file mode 100755
index 3b42b3bd5..000000000
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/heuristics/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * These BoilerpipeFilters are pure heuristics.
- */
-package com.kohlschutter.boilerpipe.filters.heuristics;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/simple/package-info.java b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/simple/package-info.java
deleted file mode 100755
index 5c40ee1da..000000000
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/filters/simple/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * These BoilerpipeFilters are straight-forward and probably not really specific to English.
- */
-package com.kohlschutter.boilerpipe.filters.simple;
-
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/package-info.java b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/package-info.java
deleted file mode 100755
index 99b57046d..000000000
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * The Boilerpipe top-level package.
- */
-package com.kohlschutter.boilerpipe;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/package-info.java b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/package-info.java
deleted file mode 100755
index 35a8e5c03..000000000
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/sax/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * Classes related to parsing and producing HTML from/to Boilerpipe TextDocuments.
- */
-package com.kohlschutter.boilerpipe.sax;
-
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/util/package-info.java b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/util/package-info.java
deleted file mode 100755
index f8044457f..000000000
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/com/kohlschutter/boilerpipe/util/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * Some helper classes.
- */
-package com.kohlschutter.boilerpipe.util;
-
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/TransformationFlinkInit.java b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/TransformationFlinkInit.java
deleted file mode 100644
index c7b3453d8..000000000
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/TransformationFlinkInit.java
+++ /dev/null
@@ -1,72 +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.streampipes.processors.transformation.flink;
-
-import org.apache.streampipes.dataformat.cbor.CborDataFormatFactory;
-import org.apache.streampipes.dataformat.fst.FstDataFormatFactory;
-import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
-import org.apache.streampipes.dataformat.smile.SmileDataFormatFactory;
-import org.apache.streampipes.extensions.management.model.SpServiceDefinition;
-import org.apache.streampipes.extensions.management.model.SpServiceDefinitionBuilder;
-import org.apache.streampipes.messaging.jms.SpJmsProtocolFactory;
-import org.apache.streampipes.messaging.kafka.SpKafkaProtocolFactory;
-import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
-import org.apache.streampipes.messaging.nats.SpNatsProtocolFactory;
-import org.apache.streampipes.processors.transformation.flink.config.ConfigKeys;
-import org.apache.streampipes.processors.transformation.flink.processor.boilerplate.BoilerplateController;
-import org.apache.streampipes.processors.transformation.flink.processor.converter.FieldConverterController;
-import org.apache.streampipes.processors.transformation.flink.processor.measurementunitonverter.MeasurementUnitConverterController;
-import org.apache.streampipes.processors.transformation.flink.processor.rename.FieldRenamerController;
-import org.apache.streampipes.service.extensions.ExtensionsModelSubmitter;
-
-public class TransformationFlinkInit extends ExtensionsModelSubmitter {
-
-  public static final String SERVICE_GROUP = "org.apache.streampipes.processors.transformation.flink";
-
-  public static void main(String[] args) {
-    new TransformationFlinkInit().init();
-  }
-
-  @Override
-  public SpServiceDefinition provideServiceDefinition() {
-    return SpServiceDefinitionBuilder.create(SERVICE_GROUP,
-            "Processors Transformation Flink",
-            "",
-            8090)
-        .registerPipelineElements(new FieldConverterController(),
-            new MeasurementUnitConverterController(),
-            new FieldRenamerController(),
-            new BoilerplateController())
-        .registerMessagingFormats(
-            new JsonDataFormatFactory(),
-            new CborDataFormatFactory(),
-            new SmileDataFormatFactory(),
-            new FstDataFormatFactory())
-        .registerMessagingProtocols(
-            new SpKafkaProtocolFactory(),
-            new SpJmsProtocolFactory(),
-            new SpMqttProtocolFactory(),
-            new SpNatsProtocolFactory())
-        .addConfig(ConfigKeys.FLINK_HOST, "jobmanager", "Hostname of the Flink Jobmanager")
-        .addConfig(ConfigKeys.FLINK_PORT, 8081, "Port of the Flink Jobmanager")
-        .addConfig(ConfigKeys.DEBUG, false, "Debug/Mini cluster mode of Flink program")
-        .addConfig(ConfigKeys.FLINK_JAR_FILE_LOC, "./streampipes-processing-element-container.jar", "Jar file location")
-        .build();
-  }
-}
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/config/ConfigKeys.java b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/config/ConfigKeys.java
deleted file mode 100644
index cd84dc22a..000000000
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/config/ConfigKeys.java
+++ /dev/null
@@ -1,26 +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.streampipes.processors.transformation.flink.config;
-
-public class ConfigKeys {
-  public static final String FLINK_HOST = "SP_FLINK_HOST";
-  public static final String FLINK_PORT = "SP_FLINK_PORT";
-  public static final String DEBUG = "SP_FLINK_DEBUG";
-  public static final String FLINK_JAR_FILE_LOC = "SP_FLINK_JAR_FILE_LOC";
-}
diff --git a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/DatabasesFlinkInit.java b/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/DatabasesFlinkInit.java
deleted file mode 100644
index e409bd737..000000000
--- a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/DatabasesFlinkInit.java
+++ /dev/null
@@ -1,66 +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.streampipes.sinks.databases.flink;
-
-import org.apache.streampipes.dataformat.cbor.CborDataFormatFactory;
-import org.apache.streampipes.dataformat.fst.FstDataFormatFactory;
-import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
-import org.apache.streampipes.dataformat.smile.SmileDataFormatFactory;
-import org.apache.streampipes.extensions.management.model.SpServiceDefinition;
-import org.apache.streampipes.extensions.management.model.SpServiceDefinitionBuilder;
-import org.apache.streampipes.messaging.jms.SpJmsProtocolFactory;
-import org.apache.streampipes.messaging.kafka.SpKafkaProtocolFactory;
-import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
-import org.apache.streampipes.messaging.nats.SpNatsProtocolFactory;
-import org.apache.streampipes.service.extensions.ExtensionsModelSubmitter;
-import org.apache.streampipes.sinks.databases.flink.config.ConfigKeys;
-import org.apache.streampipes.sinks.databases.flink.elasticsearch.ElasticSearchController;
-
-public class DatabasesFlinkInit extends ExtensionsModelSubmitter {
-
-  public static void main(String[] args) {
-    new DatabasesFlinkInit().init();
-  }
-
-  @Override
-  public SpServiceDefinition provideServiceDefinition() {
-    return SpServiceDefinitionBuilder.create("org.apache.streampipes.sinks.databases.flink",
-            "Sinks Databases Flink",
-            "",
-            8090)
-        .registerPipelineElements(new ElasticSearchController())
-        .registerMessagingFormats(
-            new JsonDataFormatFactory(),
-            new CborDataFormatFactory(),
-            new SmileDataFormatFactory(),
-            new FstDataFormatFactory())
-        .registerMessagingProtocols(
-            new SpKafkaProtocolFactory(),
-            new SpJmsProtocolFactory(),
-            new SpMqttProtocolFactory(),
-            new SpNatsProtocolFactory())
-        .addConfig(ConfigKeys.FLINK_HOST, "jobmanager", "Hostname of the Flink Jobmanager")
-        .addConfig(ConfigKeys.FLINK_PORT, 8081, "Port of the Flink Jobmanager")
-        .addConfig(ConfigKeys.DEBUG, false, "Debug/Mini cluster mode of Flink program")
-        .addConfig(ConfigKeys.FLINK_JAR_FILE_LOC, "./streampipes-processing-element-container.jar", "Jar file location")
-        .addConfig(ConfigKeys.ELASTIC_HOST, "elasticsearch", "Elastic search host address")
-        .addConfig(ConfigKeys.ELASTIC_PORT_REST, 9200, "Elasitc search rest port")
-        .build();
-  }
-}