You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wayang.apache.org by be...@apache.org on 2021/02/05 15:56:01 UTC

[incubator-wayang] branch main created (now 5f3acb9)

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

bertty pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-wayang.git.


      at 5f3acb9  minnor correction on the rebranding

This branch includes the following new commits:

     new 086908f  files changes
     new 6c821cd  files modificiation
     new 55107f7  folder structure
     new 98c2084  rename location
     new 5f3acb9  minnor correction on the rebranding

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[incubator-wayang] 02/05: files modificiation

Posted by be...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bertty pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-wayang.git

commit 6c821cd5ff0060d215d895823b8a8485aed5b98f
Author: Bertty Contreras-Rojas <be...@scalytics.io>
AuthorDate: Fri Dec 18 12:11:47 2020 -0300

    files modificiation
---
 LICENSE.TXT                                        |   2 +-
 NOTICE.TXT                                         |   2 +-
 README.md                                          | 170 +++++-----
 bin/rename_org.sh                                  |   6 +-
 pom.xml                                            |  36 +--
 rheem-api/pom.xml                                  |  34 +-
 .../apache/incubator/wayang/api/DataQuanta.scala   |  54 ++--
 .../incubator/wayang/api/DataQuantaBuilder.scala   | 202 ++++++------
 .../incubator/wayang/api/JavaPlanBuilder.scala     |  32 +-
 .../apache/incubator/wayang/api/PlanBuilder.scala  |  34 +-
 .../incubator/wayang/api/RecordDataQuanta.scala    |  12 +-
 .../wayang/api/RecordDataQuantaBuilder.scala       |  18 +-
 .../apache/incubator/wayang/api/graph/Edge.scala   |   2 +-
 .../wayang/api/graph/EdgeDataQuanta.scala          |  10 +-
 .../wayang/api/graph/EdgeDataQuantaBuilder.scala   |  12 +-
 .../incubator/wayang/api/graph/package.scala       |   6 +-
 .../org/apache/incubator/wayang/api/package.scala  |  24 +-
 .../wayang/api/util/DataQuantaBuilderCache.scala   |   8 +-
 .../api/util/DataQuantaBuilderDecorator.scala      |  10 +-
 .../incubator/wayang/api/util/TypeTrap.scala       |   6 +-
 .../apache/incubator/wayang/api/JavaApiTest.java   | 290 ++++++++---------
 .../org/apache/incubator/wayang/api/ApiTest.scala  | 188 +++++------
 rheem-basic/pom.xml                                |  12 +-
 .../incubator/wayang/basic/WayangBasics.java       |  16 +-
 .../wayang/basic/channels/FileChannel.java         |  32 +-
 .../apache/incubator/wayang/basic/data/Record.java |   6 +-
 .../apache/incubator/wayang/basic/data/Tuple2.java |   2 +-
 .../apache/incubator/wayang/basic/data/Tuple5.java |   2 +-
 .../basic/function/ProjectionDescriptor.java       |  12 +-
 .../wayang/basic/mapping/GlobalReduceMapping.java  |  28 +-
 .../incubator/wayang/basic/mapping/Mappings.java   |   4 +-
 .../basic/mapping/MaterializedGroupByMapping.java  |  24 +-
 .../wayang/basic/mapping/PageRankMapping.java      |  58 ++--
 .../wayang/basic/mapping/ReduceByMapping.java      |  24 +-
 .../wayang/basic/mapping/RepeatMapping.java        |  28 +-
 .../wayang/basic/operators/CartesianOperator.java  |  14 +-
 .../wayang/basic/operators/CoGroupOperator.java    |  18 +-
 .../wayang/basic/operators/CollectionSource.java   |  14 +-
 .../wayang/basic/operators/CountOperator.java      |  12 +-
 .../wayang/basic/operators/DistinctOperator.java   |  12 +-
 .../wayang/basic/operators/DoWhileOperator.java    |  28 +-
 .../wayang/basic/operators/FilterOperator.java     |  22 +-
 .../wayang/basic/operators/FlatMapOperator.java    |  24 +-
 .../operators/GlobalMaterializedGroupOperator.java |  12 +-
 .../basic/operators/GlobalReduceOperator.java      |  18 +-
 .../wayang/basic/operators/GroupByOperator.java    |  10 +-
 .../wayang/basic/operators/IntersectOperator.java  |  12 +-
 .../wayang/basic/operators/JoinOperator.java       |  18 +-
 .../wayang/basic/operators/LocalCallbackSink.java  |  16 +-
 .../wayang/basic/operators/LoopOperator.java       |  28 +-
 .../wayang/basic/operators/MapOperator.java        |  22 +-
 .../basic/operators/MapPartitionsOperator.java     |  26 +-
 .../operators/MaterializedGroupByOperator.java     |  16 +-
 .../wayang/basic/operators/PageRankOperator.java   |  22 +-
 .../wayang/basic/operators/ReduceByOperator.java   |  18 +-
 .../wayang/basic/operators/ReduceOperator.java     |  16 +-
 .../wayang/basic/operators/RepeatOperator.java     |  24 +-
 .../wayang/basic/operators/SampleOperator.java     |  14 +-
 .../wayang/basic/operators/SortOperator.java       |  16 +-
 .../wayang/basic/operators/TableSource.java        |  12 +-
 .../wayang/basic/operators/TextFileSink.java       |  12 +-
 .../wayang/basic/operators/TextFileSource.java     |  24 +-
 .../wayang/basic/operators/UnionAllOperator.java   |  16 +-
 .../wayang/basic/operators/ZipWithIdOperator.java  |  14 +-
 .../incubator/wayang/basic/plugin/WayangBasic.java |  26 +-
 .../wayang/basic/plugin/WayangBasicGraph.java      |  18 +-
 .../incubator/wayang/basic/types/RecordType.java   |   6 +-
 .../main/resources/rheem-basic-defaults.properties |   2 +-
 .../basic/function/ProjectionDescriptorTest.java   |   6 +-
 .../wayang/basic/mapping/ReduceByMappingTest.java  |  36 +--
 .../operators/MaterializedGroupByOperatorTest.java |   8 +-
 .../wayang/basic/operators/TextFileSourceTest.java |  12 +-
 .../wayang/basic/operators/test/TestSink.java      |   6 +-
 .../wayang/basic/operators/test/TestSource.java    |   6 +-
 .../wayang/basic/types/RecordTypeTest.java         |   6 +-
 rheem-core/pom.xml                                 |   8 +-
 .../incubator/wayang/core/api/Configuration.java   | 140 ++++-----
 .../org/apache/incubator/wayang/core/api/Job.java  | 202 ++++++------
 .../incubator/wayang/core/api/WayangContext.java   |  78 ++---
 .../core/api/configuration/CollectionProvider.java |   4 +-
 .../api/configuration/ConstantValueProvider.java   |   4 +-
 .../configuration/ExplicitCollectionProvider.java  |   4 +-
 .../FunctionalCollectionProvider.java              |   4 +-
 .../configuration/FunctionalKeyValueProvider.java  |   4 +-
 .../api/configuration/FunctionalValueProvider.java |   4 +-
 .../core/api/configuration/KeyValueProvider.java   |  10 +-
 .../configuration/MapBasedKeyValueProvider.java    |   4 +-
 .../core/api/configuration/ValueProvider.java      |   8 +-
 .../wayang/core/api/exception/WayangException.java |  16 +-
 .../core/function/AggregationDescriptor.java       |  14 +-
 .../wayang/core/function/ConsumerDescriptor.java   |   8 +-
 .../wayang/core/function/ExecutionContext.java     |   6 +-
 .../wayang/core/function/ExtendedFunction.java     |   4 +-
 .../wayang/core/function/FlatMapDescriptor.java    |  10 +-
 .../wayang/core/function/FunctionDescriptor.java   |  10 +-
 .../core/function/MapPartitionsDescriptor.java     |  10 +-
 .../wayang/core/function/PredicateDescriptor.java  |   8 +-
 .../wayang/core/function/ReduceDescriptor.java     |  14 +-
 .../core/function/TransformationDescriptor.java    |  10 +-
 .../incubator/wayang/core/mapping/Mapping.java     |   2 +-
 .../wayang/core/mapping/OperatorMatch.java         |   4 +-
 .../wayang/core/mapping/OperatorPattern.java       |  18 +-
 .../wayang/core/mapping/PlanTransformation.java    |  28 +-
 .../core/mapping/ReplacementSubplanFactory.java    |  16 +-
 .../wayang/core/mapping/SubplanMatch.java          |   6 +-
 .../wayang/core/mapping/SubplanPattern.java        |  30 +-
 .../wayang/core/monitor/DisabledMonitor.java       |   4 +-
 .../incubator/wayang/core/monitor/FileMonitor.java |   8 +-
 .../incubator/wayang/core/monitor/HttpMonitor.java |   4 +-
 .../incubator/wayang/core/monitor/Monitor.java     |  10 +-
 .../wayang/core/monitor/ZeroMQMonitor.java         |   4 +-
 .../optimizer/AggregateOptimizationContext.java    |   6 +-
 .../core/optimizer/DefaultOptimizationContext.java |  28 +-
 .../wayang/core/optimizer/OptimizationContext.java |  68 ++--
 .../wayang/core/optimizer/OptimizationUtils.java   |  34 +-
 .../optimizer/ProbabilisticDoubleInterval.java     |   4 +-
 .../optimizer/ProbabilisticIntervalEstimate.java   |   6 +-
 .../wayang/core/optimizer/SanityChecker.java       |  30 +-
 .../AbstractAlternativeCardinalityPusher.java      |  12 +-
 .../AggregatingCardinalityEstimator.java           |   4 +-
 .../optimizer/cardinality/CardinalityEstimate.java |  12 +-
 .../CardinalityEstimationTraversal.java            |  22 +-
 .../cardinality/CardinalityEstimator.java          |  10 +-
 .../cardinality/CardinalityEstimatorManager.java   |  62 ++--
 .../optimizer/cardinality/CardinalityPusher.java   |  14 +-
 .../cardinality/DefaultCardinalityEstimator.java   |   8 +-
 .../cardinality/DefaultCardinalityPusher.java      |  12 +-
 .../cardinality/FallbackCardinalityEstimator.java  |   4 +-
 .../cardinality/FixedSizeCardinalityEstimator.java |   6 +-
 .../LoopHeadAlternativeCardinalityPusher.java      |  22 +-
 .../cardinality/LoopSubplanCardinalityPusher.java  |  18 +-
 .../OperatorAlternativeCardinalityPusher.java      |  10 +-
 .../cardinality/SubplanCardinalityPusher.java      |  20 +-
 .../SwitchForwardCardinalityEstimator.java         |   6 +-
 .../core/optimizer/channels/ChannelConversion.java |  16 +-
 .../optimizer/channels/ChannelConversionGraph.java |  60 ++--
 .../channels/DefaultChannelConversion.java         |  22 +-
 .../costs/ConstantLoadProfileEstimator.java        |   2 +-
 .../core/optimizer/costs/DefaultLoadEstimator.java |   6 +-
 .../core/optimizer/costs/EstimationContext.java    |  10 +-
 .../optimizer/costs/IntervalLoadEstimator.java     |   6 +-
 .../wayang/core/optimizer/costs/LoadEstimate.java  |   8 +-
 .../wayang/core/optimizer/costs/LoadEstimator.java |   8 +-
 .../wayang/core/optimizer/costs/LoadProfile.java   |  10 +-
 .../core/optimizer/costs/LoadProfileEstimator.java |   4 +-
 .../optimizer/costs/LoadProfileEstimators.java     |  36 +--
 .../costs/LoadProfileToTimeConverter.java          |   2 +-
 .../core/optimizer/costs/LoadToTimeConverter.java  |   2 +-
 .../costs/NestableLoadProfileEstimator.java        |  10 +-
 .../optimizer/costs/SimpleEstimationContext.java   |   8 +-
 .../wayang/core/optimizer/costs/TimeEstimate.java  |   6 +-
 .../core/optimizer/costs/TimeToCostConverter.java  |   4 +-
 .../optimizer/enumeration/ExecutionTaskFlow.java   |  16 +-
 .../enumeration/ExecutionTaskFlowCompiler.java     |  48 +--
 .../enumeration/LatentOperatorPruningStrategy.java |  16 +-
 .../core/optimizer/enumeration/LoopEnumerator.java |  20 +-
 .../optimizer/enumeration/LoopImplementation.java  |  20 +-
 .../optimizer/enumeration/PlanEnumeration.java     |  52 ++--
 .../PlanEnumerationPruningStrategy.java            |   4 +-
 .../core/optimizer/enumeration/PlanEnumerator.java |  82 ++---
 .../optimizer/enumeration/PlanImplementation.java  |  58 ++--
 .../enumeration/RandomPruningStrategy.java         |   8 +-
 .../enumeration/SinglePlatformPruningStrategy.java |  10 +-
 .../enumeration/StageAssignmentTraversal.java      |  34 +-
 .../optimizer/enumeration/TopKPruningStrategy.java |   6 +-
 .../partition/EnumerationAlternative.java          |   2 +-
 .../optimizer/partition/EnumerationBranch.java     |   8 +-
 .../wayang/core/plan/executionplan/Channel.java    |  32 +-
 .../plan/executionplan/ChannelInitializer.java     |  16 +-
 .../core/plan/executionplan/ExecutionPlan.java     |   8 +-
 .../core/plan/executionplan/ExecutionStage.java    |  14 +-
 .../plan/executionplan/ExecutionStageLoop.java     |   8 +-
 .../core/plan/executionplan/ExecutionTask.java     |  18 +-
 .../core/plan/executionplan/PlatformExecution.java |   4 +-
 .../wayang/core/plan/rheemplan/ActualOperator.java |   2 +-
 .../core/plan/rheemplan/BinaryToUnaryOperator.java |   4 +-
 .../core/plan/rheemplan/CompositeOperator.java     |   2 +-
 .../core/plan/rheemplan/ElementaryOperator.java    |   6 +-
 .../plan/rheemplan/EstimationContextProperty.java  |   4 +-
 .../core/plan/rheemplan/ExecutionOperator.java     |  32 +-
 .../wayang/core/plan/rheemplan/InputSlot.java      |   4 +-
 .../core/plan/rheemplan/LoopHeadAlternative.java   |  14 +-
 .../core/plan/rheemplan/LoopHeadOperator.java      |   8 +-
 .../wayang/core/plan/rheemplan/LoopIsolator.java   |  22 +-
 .../wayang/core/plan/rheemplan/LoopSubplan.java    |  10 +-
 .../wayang/core/plan/rheemplan/Operator.java       |  20 +-
 .../core/plan/rheemplan/OperatorAlternative.java   |  14 +-
 .../wayang/core/plan/rheemplan/OperatorBase.java   |  24 +-
 .../core/plan/rheemplan/OperatorContainer.java     |  10 +-
 .../core/plan/rheemplan/OperatorContainers.java    |   2 +-
 .../wayang/core/plan/rheemplan/Operators.java      |   2 +-
 .../wayang/core/plan/rheemplan/OutputSlot.java     |   4 +-
 .../wayang/core/plan/rheemplan/PlanMetrics.java    |  26 +-
 .../wayang/core/plan/rheemplan/PlanTraversal.java  |   2 +-
 .../incubator/wayang/core/plan/rheemplan/Slot.java |   6 +-
 .../wayang/core/plan/rheemplan/SlotMapping.java    |   6 +-
 .../wayang/core/plan/rheemplan/Subplan.java        |  10 +-
 .../core/plan/rheemplan/TopDownPlanVisitor.java    |   4 +-
 .../wayang/core/plan/rheemplan/UnarySink.java      |   4 +-
 .../wayang/core/plan/rheemplan/UnarySource.java    |   4 +-
 .../core/plan/rheemplan/UnaryToUnaryOperator.java  |   4 +-
 .../wayang/core/plan/rheemplan/WayangPlan.java     |  32 +-
 .../traversal/AbstractTopologicalTraversal.java    |  16 +-
 .../core/platform/AbstractChannelInstance.java     |  10 +-
 .../wayang/core/platform/AtomicExecution.java      |  22 +-
 .../wayang/core/platform/AtomicExecutionGroup.java |  18 +-
 .../incubator/wayang/core/platform/Breakpoint.java |   8 +-
 .../core/platform/CardinalityBreakpoint.java       |  24 +-
 .../wayang/core/platform/ChannelDescriptor.java    |  10 +-
 .../wayang/core/platform/ChannelInstance.java      |  12 +-
 .../core/platform/CompositeExecutionResource.java  |   2 +-
 .../core/platform/ConjunctiveBreakpoint.java       |   6 +-
 .../core/platform/CrossPlatformExecutor.java       |  36 +--
 .../wayang/core/platform/ExecutionResource.java    |   8 +-
 .../core/platform/ExecutionResourceTemplate.java   |  10 +-
 .../wayang/core/platform/ExecutionState.java       |   6 +-
 .../incubator/wayang/core/platform/Executor.java   |  10 +-
 .../wayang/core/platform/ExecutorTemplate.java     |  18 +-
 .../wayang/core/platform/FixBreakpoint.java        |   8 +-
 .../incubator/wayang/core/platform/Junction.java   |  24 +-
 .../core/platform/NoIterationBreakpoint.java       |   8 +-
 .../wayang/core/platform/PartialExecution.java     |  22 +-
 .../incubator/wayang/core/platform/Platform.java   |  28 +-
 .../wayang/core/platform/PushExecutorTemplate.java |  30 +-
 .../core/platform/lineage/ChannelLineageNode.java  |   4 +-
 .../platform/lineage/ExecutionLineageNode.java     |  10 +-
 .../platform/lineage/LazyExecutionLineageNode.java |   6 +-
 .../wayang/core/plugin/DynamicPlugin.java          |  24 +-
 .../incubator/wayang/core/plugin/Plugin.java       |  14 +-
 .../core/profiling/CardinalityRepository.java      |  28 +-
 .../wayang/core/profiling/CostMeasurement.java     |   4 +-
 .../wayang/core/profiling/ExecutionLog.java        |  24 +-
 .../core/profiling/ExecutionPlanMeasurement.java   |  12 +-
 .../profiling/FullInstrumentationStrategy.java     |   6 +-
 .../core/profiling/InstrumentationStrategy.java    |   8 +-
 .../core/profiling/NoInstrumentationStrategy.java  |   6 +-
 .../profiling/OutboundInstrumentationStrategy.java |   6 +-
 .../profiling/PartialExecutionMeasurement.java     |   8 +-
 .../wayang/core/profiling/ProfileDBs.java          |  10 +-
 .../wayang/core/types/BasicDataUnitType.java       |   2 +-
 .../incubator/wayang/core/types/DataSetType.java   |   6 +-
 .../wayang/core/types/DataUnitGroupType.java       |   4 +-
 .../incubator/wayang/core/types/DataUnitType.java  |   2 +-
 .../core/util/AbstractReferenceCountable.java      |   2 +-
 .../apache/incubator/wayang/core/util/Action.java  |   2 +-
 .../apache/incubator/wayang/core/util/Actions.java |   2 +-
 .../apache/incubator/wayang/core/util/Bitmask.java |   2 +-
 .../incubator/wayang/core/util/Canonicalizer.java  |   2 +-
 .../wayang/core/util/ConsumerIteratorAdapter.java  |   2 +-
 .../incubator/wayang/core/util/Copyable.java       |   2 +-
 .../apache/incubator/wayang/core/util/Counter.java |   2 +-
 .../wayang/core/util/CrossProductIterable.java     |   2 +-
 .../apache/incubator/wayang/core/util/Formats.java |   2 +-
 .../incubator/wayang/core/util/Iterators.java      |   2 +-
 .../wayang/core/util/JsonSerializable.java         |   6 +-
 .../wayang/core/util/JsonSerializables.java        |   2 +-
 .../incubator/wayang/core/util/JsonSerializer.java |   2 +-
 .../incubator/wayang/core/util/JuelUtils.java      |  10 +-
 .../wayang/core/util/LimitedInputStream.java       |   2 +-
 .../apache/incubator/wayang/core/util/Logging.java |   2 +-
 .../incubator/wayang/core/util/LruCache.java       |   2 +-
 .../incubator/wayang/core/util/MultiMap.java       |   2 +-
 .../wayang/core/util/OneTimeExecutable.java        |   2 +-
 .../incubator/wayang/core/util/Optional.java       |   2 +-
 .../wayang/core/util/ReferenceCountable.java       |   2 +-
 .../wayang/core/util/ReflectionUtils.java          |  12 +-
 .../apache/incubator/wayang/core/util/Tuple.java   |   2 +-
 .../incubator/wayang/core/util/WayangArrays.java   |   6 +-
 .../wayang/core/util/WayangCollections.java        |   6 +-
 .../incubator/wayang/core/util/fs/FileSystem.java  |   2 +-
 .../incubator/wayang/core/util/fs/FileSystems.java |  12 +-
 .../incubator/wayang/core/util/fs/FileUtils.java   |   6 +-
 .../wayang/core/util/fs/HadoopFileSystem.java      |  10 +-
 .../wayang/core/util/fs/LocalFileSystem.java       |  14 +-
 .../incubator/wayang/core/util/mathex/Context.java |   4 +-
 .../wayang/core/util/mathex/DefaultContext.java    |   4 +-
 .../wayang/core/util/mathex/Expression.java        |   6 +-
 .../wayang/core/util/mathex/ExpressionBuilder.java |  20 +-
 .../mathex/exceptions/EvaluationException.java     |   6 +-
 .../util/mathex/exceptions/MathExException.java    |   6 +-
 .../util/mathex/exceptions/ParseException.java     |   6 +-
 .../core/util/mathex/model/BinaryOperation.java    |   8 +-
 .../core/util/mathex/model/CompiledFunction.java   |   6 +-
 .../wayang/core/util/mathex/model/Constant.java    |   6 +-
 .../core/util/mathex/model/NamedFunction.java      |   8 +-
 .../core/util/mathex/model/UnaryOperation.java     |   8 +-
 .../wayang/core/util/mathex/model/Variable.java    |   6 +-
 .../main/resources/rheem-core-defaults.properties  |  72 ++---
 .../org/apache/incubator/wayang/core/SlotTest.java |  14 +-
 .../wayang/core/mapping/OperatorPatternTest.java   |   4 +-
 .../core/mapping/PlanTransformationTest.java       |  32 +-
 .../wayang/core/mapping/SubplanPatternTest.java    |  24 +-
 .../wayang/core/mapping/test/TestSinkMapping.java  |  22 +-
 .../mapping/test/TestSinkToTestSink2Factory.java   |  14 +-
 .../AggregatingCardinalityEstimatorTest.java       |   6 +-
 .../DefaultCardinalityEstimatorTest.java           |   6 +-
 .../LoopSubplanCardinalityPusherTest.java          |  40 +--
 .../cardinality/SubplanCardinalityPusherTest.java  |  30 +-
 .../channels/ChannelConversionGraphTest.java       |  42 +--
 .../costs/NestableLoadProfileEstimatorTest.java    |  20 +-
 .../enumeration/StageAssignmentTraversalTest.java  |  18 +-
 .../core/plan/executionplan/test/TestChannel.java  |  12 +-
 .../core/plan/rheemplan/LoopIsolatorTest.java      |  22 +-
 .../wayang/core/plan/rheemplan/OperatorTest.java   |  10 +-
 .../core/plan/rheemplan/SlotMappingTest.java       |   8 +-
 .../plan/rheemplan/test/TestCustomMapOperator.java |   8 +-
 .../plan/rheemplan/test/TestFilterOperator.java    |  16 +-
 .../wayang/core/plan/rheemplan/test/TestJoin.java  |  26 +-
 .../core/plan/rheemplan/test/TestLoopHead.java     |  22 +-
 .../core/plan/rheemplan/test/TestMapOperator.java  |  14 +-
 .../wayang/core/plan/rheemplan/test/TestSink.java  |  12 +-
 .../wayang/core/plan/rheemplan/test/TestSink2.java |   6 +-
 .../core/plan/rheemplan/test/TestSource.java       |  16 +-
 .../wayang/core/platform/PartialExecutionTest.java |  28 +-
 .../wayang/core/plugin/DynamicPluginTest.java      |  86 +++---
 .../wayang/core/test/DummyExecutionOperator.java   |  18 +-
 .../core/test/DummyExternalReusableChannel.java    |  14 +-
 .../wayang/core/test/DummyNonReusableChannel.java  |  14 +-
 .../incubator/wayang/core/test/DummyPlatform.java  |  18 +-
 .../wayang/core/test/DummyReusableChannel.java     |  14 +-
 .../incubator/wayang/core/test/MockFactory.java    |  24 +-
 .../test/SerializableDummyExecutionOperator.java   |   6 +-
 .../incubator/wayang/core/test/TestDataUnit.java   |   2 +-
 .../incubator/wayang/core/test/TestDataUnit2.java  |   2 +-
 .../incubator/wayang/core/util/BitmaskTest.java    |   2 +-
 .../core/util/ConsumerIteratorAdapterTest.java     |   2 +-
 .../wayang/core/util/CrossProductIterableTest.java |  16 +-
 .../wayang/core/util/LimitedInputStreamTest.java   |   2 +-
 .../wayang/core/util/ReflectionUtilsTest.java      |   6 +-
 .../wayang/core/util/WayangCollectionsTest.java    |  22 +-
 .../core/util/mathex/ExpressionBuilderTest.java    |   4 +-
 .../wayang/core/util/mathex/ExpressionTest.java    |  10 +-
 rheem-core/src/test/resources/partial-plugin.yaml  |   4 +-
 rheem-core/src/test/resources/test-plugin.yaml     |  12 +-
 rheem-distro/pom.xml                               |  50 +--
 rheem-extensions/pom.xml                           |  10 +-
 rheem-extensions/rheem-iejoin/pom.xml              |  22 +-
 .../org/apache/incubator/wayang/iejoin/IEJoin.java |  28 +-
 .../apache/incubator/wayang/iejoin/data/Data.java  |   2 +-
 .../incubator/wayang/iejoin/mapping/Mappings.java  |  16 +-
 .../wayang/iejoin/mapping/java/IEJoinMapping.java  |  22 +-
 .../iejoin/mapping/java/IESelfJoinMapping.java     |  22 +-
 .../wayang/iejoin/mapping/spark/IEJoinMapping.java |  28 +-
 .../iejoin/mapping/spark/IESelfJoinMapping.java    |  28 +-
 .../iejoin/operators/IEJoinMasterOperator.java     |   4 +-
 .../wayang/iejoin/operators/IEJoinOperator.java    |  12 +-
 .../iejoin/operators/IESelfJoinOperator.java       |  12 +-
 .../iejoin/operators/JavaIEJoinOperator.java       |  42 +--
 .../iejoin/operators/JavaIESelfJoinOperator.java   |  44 +--
 .../iejoin/operators/SparkIEJoinOperator.java      |  44 +--
 .../iejoin/operators/SparkIESelfJoinOperator.java  |  44 +--
 .../iejoin/operators/java_helpers/BitSetJoin.java  |   6 +-
 .../operators/java_helpers/DataComparator.java     |   4 +-
 .../iejoin/operators/java_helpers/extractData.java |   4 +-
 .../iejoin/operators/java_helpers/myMergeSort.java |   4 +-
 .../operators/java_helpers/revDataComparator.java  |   4 +-
 .../iejoin/operators/spark_helpers/BitSetJoin.java |   6 +-
 .../spark_helpers/List2AttributesObjectSkinny.java |   4 +-
 .../operators/spark_helpers/addUniqueID.java       |   4 +-
 .../operators/spark_helpers/build2ListObject.java  |   6 +-
 .../operators/spark_helpers/extractData.java       |   4 +-
 .../spark_helpers/filterUnwantedBlocks.java        |   4 +-
 .../operators/spark_helpers/myMergeSort.java       |   4 +-
 .../operators/spark_helpers/revDataComparator.java |   4 +-
 .../operators/JavaExecutionOperatorTestBase.java   |  26 +-
 .../iejoin/operators/JavaIEJoinOperatorTest.java   |  14 +-
 .../iejoin/operators/SparkIEJoinOperatorTest.java  |  16 +-
 .../iejoin/operators/SparkIEJoinOperatorTest2.java |  16 +-
 .../iejoin/operators/SparkIEJoinOperatorTest3.java |  16 +-
 .../iejoin/operators/SparkIEJoinOperatorTest4.java |  16 +-
 .../operators/SparkIESelfJoinOperatorTest.java     |  16 +-
 .../iejoin/operators/SparkOperatorTestBase.java    |  28 +-
 .../wayang/iejoin/test/ChannelFactory.java         |  22 +-
 rheem-platforms/pom.xml                            |  22 +-
 rheem-platforms/rheem-flink/pom.xml                |  18 +-
 .../org/apache/incubator/wayang/flink/Flink.java   |  10 +-
 .../wayang/flink/channels/ChannelConversions.java  |  28 +-
 .../wayang/flink/channels/DataSetChannel.java      |  18 +-
 .../flink/compiler/FlinkCoGroupFunction.java       |   6 +-
 .../wayang/flink/compiler/FunctionCompiler.java    |  24 +-
 .../wayang/flink/compiler/KeySelectorDistinct.java |   2 +-
 .../wayang/flink/compiler/KeySelectorFunction.java |   4 +-
 .../flink/compiler/OutputFormatConsumer.java       |   4 +-
 .../flink/compiler/WayangFileOutputFormat.java     |  22 +-
 .../flink/compiler/criterion/DummyFilter.java      |   2 +-
 .../wayang/flink/compiler/criterion/DummyMap.java  |   2 +-
 .../flink/compiler/criterion/WayangAggregator.java |  18 +-
 .../criterion/WayangConvergenceCriterion.java      |  18 +-
 .../compiler/criterion/WayangFilterCriterion.java  |  12 +-
 .../flink/compiler/criterion/WayangListValue.java  |   8 +-
 .../flink/compiler/criterion/WayangValue.java      |  10 +-
 .../flink/execution/FlinkContextReference.java     |  10 +-
 .../flink/execution/FlinkExecutionContext.java     |  10 +-
 .../wayang/flink/execution/FlinkExecutor.java      |  40 +--
 .../wayang/flink/mapping/CartesianMapping.java     |  20 +-
 .../wayang/flink/mapping/CoGroupMapping.java       |  20 +-
 .../flink/mapping/CollectionSourceMapping.java     |  20 +-
 .../wayang/flink/mapping/CountMapping.java         |  20 +-
 .../wayang/flink/mapping/DistinctMapping.java      |  20 +-
 .../wayang/flink/mapping/DoWhileMapping.java       |  22 +-
 .../wayang/flink/mapping/FilterMapping.java        |  24 +-
 .../wayang/flink/mapping/FlatMapMapping.java       |  20 +-
 .../mapping/GlobalMaterializedGroupMapping.java    |  20 +-
 .../wayang/flink/mapping/GlobalReduceMapping.java  |  20 +-
 .../wayang/flink/mapping/GroupByMapping.java       |  20 +-
 .../wayang/flink/mapping/IntersectMapping.java     |  20 +-
 .../wayang/flink/mapping/JoinMapping.java          |  20 +-
 .../flink/mapping/LocalCallbackSinkMapping.java    |  22 +-
 .../wayang/flink/mapping/LoopMapping.java          |  22 +-
 .../incubator/wayang/flink/mapping/MapMapping.java |  20 +-
 .../wayang/flink/mapping/MapPartitionsMapping.java |  20 +-
 .../incubator/wayang/flink/mapping/Mappings.java   |   4 +-
 .../flink/mapping/MaterializedGroupByMapping.java  |  20 +-
 .../wayang/flink/mapping/PageRankMapping.java      |  18 +-
 .../wayang/flink/mapping/ReduceByMapping.java      |  20 +-
 .../wayang/flink/mapping/RepeatMapping.java        |  22 +-
 .../wayang/flink/mapping/SampleMapping.java        |  20 +-
 .../wayang/flink/mapping/SortMapping.java          |  20 +-
 .../wayang/flink/mapping/TextFileSinkMapping.java  |  20 +-
 .../flink/mapping/TextFileSourceMapping.java       |  18 +-
 .../wayang/flink/mapping/UnionAllMapping.java      |  20 +-
 .../wayang/flink/mapping/ZipWithIdMapping.java     |  20 +-
 .../flink/operators/FlinkCartesianOperator.java    |  28 +-
 .../flink/operators/FlinkCoGroupOperator.java      |  34 +-
 .../flink/operators/FlinkCollectionSink.java       |  32 +-
 .../flink/operators/FlinkCollectionSource.java     |  26 +-
 .../wayang/flink/operators/FlinkCountOperator.java |  28 +-
 .../flink/operators/FlinkDistinctOperator.java     |  26 +-
 .../flink/operators/FlinkDoWhileOperator.java      |  48 +--
 .../flink/operators/FlinkExecutionOperator.java    |  18 +-
 .../flink/operators/FlinkFilterOperator.java       |  32 +-
 .../flink/operators/FlinkFlatMapOperator.java      |  36 +--
 .../FlinkGlobalMaterializedGroupOperator.java      |  26 +-
 .../flink/operators/FlinkGlobalReduceOperator.java |  32 +-
 .../flink/operators/FlinkGroupByOperator.java      |  34 +-
 .../flink/operators/FlinkIntersectOperator.java    |  26 +-
 .../wayang/flink/operators/FlinkJoinOperator.java  |  36 +--
 .../flink/operators/FlinkLocalCallbackSink.java    |  26 +-
 .../wayang/flink/operators/FlinkLoopOperator.java  |  40 +--
 .../wayang/flink/operators/FlinkMapOperator.java   |  34 +-
 .../operators/FlinkMapPartitionsOperator.java      |  34 +-
 .../FlinkMaterializedGroupByOperator.java          |  32 +-
 .../flink/operators/FlinkObjectFileSink.java       |  34 +-
 .../flink/operators/FlinkObjectFileSource.java     |  32 +-
 .../flink/operators/FlinkPageRankOperator.java     |  36 +--
 .../flink/operators/FlinkReduceByOperator.java     |  36 +--
 .../operators/FlinkRepeatExpandedOperator.java     |  30 +-
 .../flink/operators/FlinkRepeatOperator.java       |  24 +-
 .../flink/operators/FlinkSampleOperator.java       |  30 +-
 .../wayang/flink/operators/FlinkSortOperator.java  |  28 +-
 .../wayang/flink/operators/FlinkTextFileSink.java  |  28 +-
 .../flink/operators/FlinkTextFileSource.java       |  28 +-
 .../wayang/flink/operators/FlinkTsvFileSink.java   |  28 +-
 .../flink/operators/FlinkUnionAllOperator.java     |  24 +-
 .../flink/operators/FlinkZipWithIdOperator.java    |  30 +-
 .../wayang/flink/platform/FlinkPlatform.java       |  56 ++--
 .../wayang/flink/plugin/FlinkBasicPlugin.java      |  24 +-
 .../wayang/flink/plugin/FlinkConversionPlugin.java |  18 +-
 .../wayang/flink/plugin/FlinkGraphPlugin.java      |  10 +-
 .../main/resources/rheem-flink-defaults.properties | 224 +++++++-------
 rheem-platforms/rheem-giraph/pom.xml               |  18 +-
 .../wayang/giraph/Algorithm/PageRankAlgorithm.java |   2 +-
 .../giraph/Algorithm/PageRankParameters.java       |  10 +-
 .../org/apache/incubator/wayang/giraph/Giraph.java |   6 +-
 .../wayang/giraph/channels/ChannelConversions.java |   6 +-
 .../wayang/giraph/execution/GiraphExecutor.java    |  22 +-
 .../incubator/wayang/giraph/mappings/Mappings.java |   4 +-
 .../wayang/giraph/mappings/PageRankMapping.java    |  14 +-
 .../giraph/operators/GiraphExecutionOperator.java  |  16 +-
 .../giraph/operators/GiraphPageRankOperator.java   |  74 ++---
 .../wayang/giraph/platform/GiraphPlatform.java     |  32 +-
 .../wayang/giraph/plugin/GiraphPlugin.java         |  22 +-
 .../resources/rheem-giraph-defaults.properties     |  24 +-
 .../operators/GiraphPagaRankOperatorTest.java      |  28 +-
 rheem-platforms/rheem-graphchi/pom.xml             |  18 +-
 .../apache/incubator/wayang/graphchi/GraphChi.java |   6 +-
 .../graphchi/channels/ChannelConversions.java      |   6 +-
 .../graphchi/execution/GraphChiExecutor.java       |  32 +-
 .../wayang/graphchi/mappings/Mappings.java         |   4 +-
 .../wayang/graphchi/mappings/PageRankMapping.java  |  18 +-
 .../operators/GraphChiExecutionOperator.java       |  16 +-
 .../operators/GraphChiPageRankOperator.java        |  54 ++--
 .../wayang/graphchi/platform/GraphChiPlatform.java |  32 +-
 .../wayang/graphchi/plugin/GraphChiPlugin.java     |  24 +-
 .../resources/rheem-graphchi-defaults.properties   |  18 +-
 .../operators/GraphChiPageRankOperatorTest.java    |  28 +-
 rheem-platforms/rheem-java/pom.xml                 |  14 +-
 .../org/apache/incubator/wayang/java/Java.java     |  10 +-
 .../wayang/java/channels/ChannelConversions.java   |  24 +-
 .../wayang/java/channels/CollectionChannel.java    |  18 +-
 .../wayang/java/channels/JavaChannelInstance.java  |   6 +-
 .../wayang/java/channels/StreamChannel.java        |  20 +-
 .../wayang/java/compiler/FunctionCompiler.java     |  16 +-
 .../java/execution/JavaExecutionContext.java       |  18 +-
 .../wayang/java/execution/JavaExecutor.java        |  38 +--
 .../wayang/java/mapping/CartesianMapping.java      |  20 +-
 .../wayang/java/mapping/CoGroupMapping.java        |  24 +-
 .../java/mapping/CollectionSourceMapping.java      |  20 +-
 .../wayang/java/mapping/CountMapping.java          |  20 +-
 .../wayang/java/mapping/DistinctMapping.java       |  20 +-
 .../wayang/java/mapping/DoWhileMapping.java        |  26 +-
 .../wayang/java/mapping/FilterMapping.java         |  22 +-
 .../wayang/java/mapping/FlatMapMapping.java        |  20 +-
 .../mapping/GlobalMaterializedGroupMapping.java    |  20 +-
 .../wayang/java/mapping/GlobalReduceMapping.java   |  20 +-
 .../wayang/java/mapping/IntersectMapping.java      |  20 +-
 .../incubator/wayang/java/mapping/JoinMapping.java |  20 +-
 .../java/mapping/LocalCallbackSinkMapping.java     |  20 +-
 .../incubator/wayang/java/mapping/LoopMapping.java |  22 +-
 .../incubator/wayang/java/mapping/MapMapping.java  |  20 +-
 .../wayang/java/mapping/MapPartitionsMapping.java  |  20 +-
 .../incubator/wayang/java/mapping/Mappings.java    |   6 +-
 .../java/mapping/MaterializedGroupByMapping.java   |  20 +-
 .../wayang/java/mapping/ReduceByMapping.java       |  20 +-
 .../wayang/java/mapping/RepeatMapping.java         |  20 +-
 .../wayang/java/mapping/SampleMapping.java         |  26 +-
 .../incubator/wayang/java/mapping/SortMapping.java |  20 +-
 .../wayang/java/mapping/TextFileSinkMapping.java   |  20 +-
 .../wayang/java/mapping/TextFileSourceMapping.java |  20 +-
 .../wayang/java/mapping/UnionAllMapping.java       |  20 +-
 .../wayang/java/mapping/ZipWithIdMapping.java      |  28 +-
 .../wayang/java/mapping/graph/PageRankMapping.java |  18 +-
 .../java/operators/JavaCartesianOperator.java      |  38 +--
 .../wayang/java/operators/JavaCoGroupOperator.java |  42 +--
 .../wayang/java/operators/JavaCollectOperator.java |  32 +-
 .../java/operators/JavaCollectionSource.java       |  26 +-
 .../wayang/java/operators/JavaCountOperator.java   |  28 +-
 .../java/operators/JavaDistinctOperator.java       |  28 +-
 .../wayang/java/operators/JavaDoWhileOperator.java |  38 +--
 .../java/operators/JavaExecutionOperator.java      |  28 +-
 .../wayang/java/operators/JavaFilterOperator.java  |  38 +--
 .../wayang/java/operators/JavaFlatMapOperator.java |  38 +--
 .../JavaGlobalMaterializedGroupOperator.java       |  26 +-
 .../java/operators/JavaGlobalReduceOperator.java   |  36 +--
 .../java/operators/JavaIntersectOperator.java      |  38 +--
 .../wayang/java/operators/JavaJoinOperator.java    |  46 +--
 .../java/operators/JavaLocalCallbackSink.java      |  28 +-
 .../wayang/java/operators/JavaLoopOperator.java    |  38 +--
 .../wayang/java/operators/JavaMapOperator.java     |  38 +--
 .../java/operators/JavaMapPartitionsOperator.java  |  40 +--
 .../operators/JavaMaterializedGroupByOperator.java |  38 +--
 .../wayang/java/operators/JavaObjectFileSink.java  |  38 +--
 .../java/operators/JavaObjectFileSource.java       |  38 +--
 .../java/operators/JavaRandomSampleOperator.java   |  30 +-
 .../java/operators/JavaReduceByOperator.java       |  40 +--
 .../wayang/java/operators/JavaRepeatOperator.java  |  32 +-
 .../operators/JavaReservoirSampleOperator.java     |  30 +-
 .../wayang/java/operators/JavaSortOperator.java    |  30 +-
 .../wayang/java/operators/JavaTextFileSink.java    |  46 +--
 .../wayang/java/operators/JavaTextFileSource.java  |  38 +--
 .../wayang/java/operators/JavaTsvFileSink.java     |  44 +--
 .../wayang/java/operators/JavaTsvFileSource.java   |  46 +--
 .../java/operators/JavaUnionAllOperator.java       |  28 +-
 .../java/operators/graph/JavaPageRankOperator.java |  28 +-
 .../wayang/java/platform/JavaPlatform.java         |  32 +-
 .../wayang/java/plugin/JavaBasicPlugin.java        |  24 +-
 .../java/plugin/JavaChannelConversionPlugin.java   |  18 +-
 .../wayang/java/plugin/JavaGraphPlugin.java        |  20 +-
 .../main/resources/rheem-java-defaults.properties  | 148 ++++-----
 .../wayang/java/execution/JavaExecutorTest.java    |  38 +--
 .../java/operators/JavaCartesianOperatorTest.java  |   8 +-
 .../java/operators/JavaCoGroupOperatorTest.java    |  20 +-
 .../java/operators/JavaCollectionSourceTest.java   |   6 +-
 .../java/operators/JavaCountOperatorTest.java      |   6 +-
 .../java/operators/JavaDistinctOperatorTest.java   |   6 +-
 .../operators/JavaExecutionOperatorTestBase.java   |  30 +-
 .../java/operators/JavaFilterOperatorTest.java     |   8 +-
 .../JavaGlobalMaterializedGroupOperatorTest.java   |   8 +-
 .../operators/JavaGlobalReduceOperatorTest.java    |  12 +-
 .../java/operators/JavaJoinOperatorTest.java       |  12 +-
 .../java/operators/JavaLocalCallbackSinkTest.java  |   6 +-
 .../JavaMaterializedGroupByOperatorTest.java       |  12 +-
 .../java/operators/JavaObjectFileSinkTest.java     |  10 +-
 .../java/operators/JavaObjectFileSourceTest.java   |   8 +-
 .../operators/JavaRandomSampleOperatorTest.java    |   6 +-
 .../java/operators/JavaReduceByOperatorTest.java   |  14 +-
 .../operators/JavaReservoirSampleOperatorTest.java |   6 +-
 .../java/operators/JavaSortOperatorTest.java       |   8 +-
 .../java/operators/JavaTextFileSinkTest.java       |  22 +-
 .../java/operators/JavaUnionAllOperatorTest.java   |   6 +-
 .../incubator/wayang/java/test/ChannelFactory.java |  12 +-
 rheem-platforms/rheem-jdbc-template/pom.xml        |  18 +-
 .../wayang/jdbc/channels/SqlQueryChannel.java      |  26 +-
 .../wayang/jdbc/compiler/FunctionCompiler.java     |   6 +-
 .../wayang/jdbc/execution/DatabaseDescriptor.java  |   8 +-
 .../wayang/jdbc/execution/JdbcExecutor.java        |  52 ++--
 .../jdbc/operators/JdbcExecutionOperator.java      |  12 +-
 .../wayang/jdbc/operators/JdbcFilterOperator.java  |  18 +-
 .../jdbc/operators/JdbcProjectionOperator.java     |  20 +-
 .../wayang/jdbc/operators/JdbcTableSource.java     |  14 +-
 .../wayang/jdbc/operators/SqlToStreamOperator.java |  52 ++--
 .../wayang/jdbc/platform/JdbcPlatformTemplate.java |  42 +--
 .../wayang/jdbc/execution/JdbcExecutorTest.java    |  38 +--
 .../wayang/jdbc/operators/JdbcTableSourceTest.java |  16 +-
 .../wayang/jdbc/operators/OperatorTestBase.java    |  26 +-
 .../jdbc/operators/SqlToStreamOperatorTest.java    |  36 +--
 .../wayang/jdbc/test/HsqldbFilterOperator.java     |   8 +-
 .../incubator/wayang/jdbc/test/HsqldbPlatform.java |   4 +-
 .../wayang/jdbc/test/HsqldbProjectionOperator.java |   8 +-
 .../wayang/jdbc/test/HsqldbTableSource.java        |  10 +-
 .../resources/rheem-hsqldb-defaults.properties     |   6 +-
 rheem-platforms/rheem-postgres/pom.xml             |  14 +-
 .../apache/incubator/wayang/postgres/Postgres.java |   8 +-
 .../postgres/channels/ChannelConversions.java      |  12 +-
 .../wayang/postgres/mapping/FilterMapping.java     |  22 +-
 .../wayang/postgres/mapping/Mappings.java          |   4 +-
 .../wayang/postgres/mapping/ProjectionMapping.java |  24 +-
 .../operators/PostgresExecutionOperator.java       |   6 +-
 .../postgres/operators/PostgresFilterOperator.java |  10 +-
 .../operators/PostgresProjectionOperator.java      |  12 +-
 .../postgres/operators/PostgresTableSource.java    |   8 +-
 .../wayang/postgres/platform/PostgresPlatform.java |   6 +-
 .../postgres/plugin/PostgresConversionsPlugin.java |  22 +-
 .../wayang/postgres/plugin/PostgresPlugin.java     |  24 +-
 .../resources/rheem-postgres-defaults.properties   |  30 +-
 rheem-platforms/rheem-spark/pom.xml                |  20 +-
 .../org/apache/incubator/wayang/spark/Spark.java   |  10 +-
 .../wayang/spark/channels/BroadcastChannel.java    |  18 +-
 .../wayang/spark/channels/ChannelConversions.java  |  32 +-
 .../wayang/spark/channels/FileChannels.java        |   4 +-
 .../wayang/spark/channels/RddChannel.java          |  24 +-
 .../spark/compiler/BinaryOperatorAdapter.java      |   2 +-
 .../compiler/ExtendedBinaryOperatorAdapter.java    |  10 +-
 .../compiler/ExtendedFlatMapFunctionAdapter.java   |  10 +-
 .../wayang/spark/compiler/ExtendedFunction.java    |  12 +-
 .../spark/compiler/ExtendedMapFunctionAdapter.java |  10 +-
 .../ExtendedMapPartitionsFunctionAdapter.java      |   8 +-
 .../spark/compiler/ExtendedPredicateAdapater.java  |  10 +-
 .../spark/compiler/FlatMapFunctionAdapter.java     |   2 +-
 .../wayang/spark/compiler/FunctionCompiler.java    |  40 +--
 .../wayang/spark/compiler/MapFunctionAdapter.java  |   2 +-
 .../compiler/MapPartitionsFunctionAdapter.java     |   4 +-
 .../wayang/spark/compiler/PredicateAdapter.java    |   2 +-
 .../spark/execution/SparkContextReference.java     |   6 +-
 .../spark/execution/SparkExecutionContext.java     |  18 +-
 .../wayang/spark/execution/SparkExecutor.java      |  40 +--
 .../wayang/spark/mapping/CartesianMapping.java     |  20 +-
 .../wayang/spark/mapping/CoGroupMapping.java       |  20 +-
 .../spark/mapping/CollectionSourceMapping.java     |  20 +-
 .../wayang/spark/mapping/CountMapping.java         |  20 +-
 .../wayang/spark/mapping/DistinctMapping.java      |  20 +-
 .../wayang/spark/mapping/DoWhileMapping.java       |  26 +-
 .../wayang/spark/mapping/FilterMapping.java        |  22 +-
 .../wayang/spark/mapping/FlatMapMapping.java       |  20 +-
 .../mapping/GlobalMaterializedGroupMapping.java    |  20 +-
 .../wayang/spark/mapping/GlobalReduceMapping.java  |  20 +-
 .../wayang/spark/mapping/IntersectMapping.java     |  20 +-
 .../wayang/spark/mapping/JoinMapping.java          |  20 +-
 .../spark/mapping/LocalCallbackSinkMapping.java    |  20 +-
 .../wayang/spark/mapping/LoopMapping.java          |  22 +-
 .../incubator/wayang/spark/mapping/MapMapping.java |  20 +-
 .../wayang/spark/mapping/MapPartitionsMapping.java |  20 +-
 .../incubator/wayang/spark/mapping/Mappings.java   |   6 +-
 .../spark/mapping/MaterializedGroupByMapping.java  |  20 +-
 .../wayang/spark/mapping/ReduceByMapping.java      |  20 +-
 .../wayang/spark/mapping/RepeatMapping.java        |  20 +-
 .../wayang/spark/mapping/SampleMapping.java        |  28 +-
 .../wayang/spark/mapping/SortMapping.java          |  20 +-
 .../wayang/spark/mapping/TextFileSinkMapping.java  |  24 +-
 .../spark/mapping/TextFileSourceMapping.java       |  22 +-
 .../wayang/spark/mapping/UnionAllMapping.java      |  20 +-
 .../wayang/spark/mapping/ZipWithIdMapping.java     |  20 +-
 .../spark/mapping/graph/PageRankMapping.java       |  26 +-
 .../operators/SparkBernoulliSampleOperator.java    |  26 +-
 .../spark/operators/SparkBroadcastOperator.java    |  26 +-
 .../wayang/spark/operators/SparkCacheOperator.java |  30 +-
 .../spark/operators/SparkCartesianOperator.java    |  26 +-
 .../spark/operators/SparkCoGroupOperator.java      |  38 +--
 .../spark/operators/SparkCollectOperator.java      |  34 +-
 .../spark/operators/SparkCollectionSource.java     |  36 +--
 .../wayang/spark/operators/SparkCountOperator.java |  28 +-
 .../spark/operators/SparkDistinctOperator.java     |  24 +-
 .../spark/operators/SparkDoWhileOperator.java      |  38 +--
 .../spark/operators/SparkExecutionOperator.java    |  18 +-
 .../spark/operators/SparkFilterOperator.java       |  34 +-
 .../spark/operators/SparkFlatMapOperator.java      |  34 +-
 .../SparkGlobalMaterializedGroupOperator.java      |  26 +-
 .../spark/operators/SparkGlobalReduceOperator.java |  36 +--
 .../spark/operators/SparkIntersectOperator.java    |  26 +-
 .../wayang/spark/operators/SparkJoinOperator.java  |  38 +--
 .../spark/operators/SparkLocalCallbackSink.java    |  24 +-
 .../wayang/spark/operators/SparkLoopOperator.java  |  40 +--
 .../wayang/spark/operators/SparkMapOperator.java   |  36 +--
 .../operators/SparkMapPartitionsOperator.java      |  34 +-
 .../SparkMaterializedGroupByOperator.java          |  32 +-
 .../spark/operators/SparkObjectFileSink.java       |  32 +-
 .../spark/operators/SparkObjectFileSource.java     |  32 +-
 .../SparkRandomPartitionSampleOperator.java        |  30 +-
 .../spark/operators/SparkReduceByOperator.java     |  36 +--
 .../spark/operators/SparkRepeatOperator.java       |  26 +-
 .../SparkShufflePartitionSampleOperator.java       |  26 +-
 .../wayang/spark/operators/SparkSortOperator.java  |  28 +-
 .../wayang/spark/operators/SparkTextFileSink.java  |  30 +-
 .../spark/operators/SparkTextFileSource.java       |  28 +-
 .../wayang/spark/operators/SparkTsvFileSink.java   |  32 +-
 .../wayang/spark/operators/SparkTsvFileSource.java |  34 +-
 .../spark/operators/SparkUnionAllOperator.java     |  24 +-
 .../spark/operators/SparkZipWithIdOperator.java    |  30 +-
 .../wayang/spark/platform/SparkPlatform.java       |  70 ++---
 .../wayang/spark/plugin/SparkBasicPlugin.java      |  26 +-
 .../wayang/spark/plugin/SparkConversionPlugin.java |  20 +-
 .../wayang/spark/plugin/SparkGraphPlugin.java      |  24 +-
 .../main/resources/rheem-spark-defaults.properties | 230 +++++++-------
 .../operators/graph/SparkPageRankOperator.scala    |  26 +-
 .../SparkBernoulliSampleOperatorTest.java          |  10 +-
 .../operators/SparkCartesianOperatorTest.java      |  10 +-
 .../spark/operators/SparkCoGroupOperatorTest.java  |  20 +-
 .../spark/operators/SparkCollectionSourceTest.java |   8 +-
 .../spark/operators/SparkCountOperatorTest.java    |  10 +-
 .../spark/operators/SparkDistinctOperatorTest.java |   8 +-
 .../spark/operators/SparkFilterOperatorTest.java   |  10 +-
 .../spark/operators/SparkFlatMapOperatorTest.java  |  10 +-
 .../SparkGlobalMaterializedGroupOperatorTest.java  |  12 +-
 .../operators/SparkGlobalReduceOperatorTest.java   |  22 +-
 .../spark/operators/SparkJoinOperatorTest.java     |  14 +-
 .../operators/SparkMapPartitionsOperatorTest.java  |   8 +-
 .../SparkMaterializedGroupByOperatorTest.java      |  14 +-
 .../spark/operators/SparkObjectFileSinkTest.java   |  14 +-
 .../spark/operators/SparkObjectFileSourceTest.java |  10 +-
 .../spark/operators/SparkOperatorTestBase.java     |  28 +-
 .../SparkRandomPartitionSampleOperatorTest.java    |  16 +-
 .../spark/operators/SparkReduceByOperatorTest.java |  16 +-
 .../SparkShufflePartitionSampleOperatorTest.java   |  16 +-
 .../spark/operators/SparkSortOperatorTest.java     |  10 +-
 .../spark/operators/SparkTextFileSinkTest.java     |  10 +-
 .../spark/operators/SparkUnionAllOperatorTest.java |   8 +-
 .../wayang/spark/test/ChannelFactory.java          |  18 +-
 rheem-platforms/rheem-sqlite3/pom.xml              |  18 +-
 .../apache/incubator/wayang/sqlite3/Sqlite3.java   |   8 +-
 .../sqlite3/channels/ChannelConversions.java       |  12 +-
 .../wayang/sqlite3/mapping/FilterMapping.java      |  20 +-
 .../incubator/wayang/sqlite3/mapping/Mappings.java |   4 +-
 .../wayang/sqlite3/mapping/ProjectionMapping.java  |  22 +-
 .../sqlite3/operators/Sqlite3FilterOperator.java   |  12 +-
 .../operators/Sqlite3ProjectionOperator.java       |  12 +-
 .../sqlite3/operators/Sqlite3TableSource.java      |  10 +-
 .../wayang/sqlite3/platform/Sqlite3Platform.java   |   6 +-
 .../sqlite3/plugin/Sqlite3ConversionPlugin.java    |  18 +-
 .../wayang/sqlite3/plugin/Sqlite3Plugin.java       |  24 +-
 .../resources/rheem-sqlite3-defaults.properties    |  30 +-
 rheem-profiler/pom.xml                             |  26 +-
 .../wayang/profiler/data/DataGenerators.java       |   2 +-
 .../wayang/profiler/hardware/DiskProfiler.java     |  10 +-
 .../profiler/java/BinaryOperatorProfiler.java      |   8 +-
 .../java/JavaCollectionSourceProfiler.java         |   6 +-
 .../profiler/java/JavaTextFileSourceProfiler.java  |   6 +-
 .../wayang/profiler/java/OperatorProfiler.java     |  36 +--
 .../wayang/profiler/java/OperatorProfilers.java    |  50 +--
 .../incubator/wayang/profiler/java/Profiler.java   |  18 +-
 .../wayang/profiler/java/SinkProfiler.java         |   6 +-
 .../wayang/profiler/java/SourceProfiler.java       |   6 +-
 .../profiler/java/UnaryOperatorProfiler.java       |   8 +-
 .../profiler/log/DynamicEstimationContext.java     |   6 +-
 .../wayang/profiler/log/DynamicLoadEstimator.java  |  26 +-
 .../profiler/log/DynamicLoadProfileEstimator.java  |  12 +-
 .../profiler/log/DynamicLoadProfileEstimators.java |  56 ++--
 .../wayang/profiler/log/GeneticOptimizer.java      |  36 +--
 .../wayang/profiler/log/GeneticOptimizerApp.java   |  84 ++---
 .../incubator/wayang/profiler/log/Individual.java  |  20 +-
 .../wayang/profiler/log/LogEvaluator.java          |  26 +-
 .../wayang/profiler/log/OptimizationSpace.java     |   4 +-
 .../incubator/wayang/profiler/log/Variable.java    |   2 +-
 .../wayang/profiler/log/sampling/Battle.java       |   2 +-
 .../profiler/log/sampling/ReservoirSampler.java    |   2 +-
 .../wayang/profiler/log/sampling/Sampler.java      |   2 +-
 .../profiler/log/sampling/TournamentSampler.java   |   2 +-
 .../profiler/spark/BinaryOperatorProfiler.java     |  12 +-
 .../incubator/wayang/profiler/spark/Main.java      |  28 +-
 .../wayang/profiler/spark/OperatorProfilers.java   |  54 ++--
 .../wayang/profiler/spark/SinkProfiler.java        |  10 +-
 .../spark/SparkCollectionSourceProfiler.java       |  10 +-
 .../profiler/spark/SparkOperatorProfiler.java      |  56 ++--
 .../wayang/profiler/spark/SparkSourceProfiler.java |  12 +-
 .../spark/SparkTextFileSourceProfiler.java         |  18 +-
 .../profiler/spark/SparkUnaryOperatorProfiler.java |  12 +-
 .../wayang/profiler/util/ProfilingUtils.java       |  24 +-
 .../wayang/profiler/util/RrdAccessor.java          |   2 +-
 rheem-tests/app.properties                         |   6 +-
 rheem-tests/pom.xml                                |  52 ++--
 .../incubator/wayang/tests/FlinkIntegrationIT.java | 292 ++++++++---------
 .../incubator/wayang/tests/FullIntegrationIT.java  | 344 ++++++++++-----------
 .../wayang/tests/GiraphIntegrationIT.java          |  34 +-
 .../wayang/tests/GraphChiIntegrationIT.java        |  36 +--
 .../incubator/wayang/tests/JavaIntegrationIT.java  | 318 +++++++++----------
 .../wayang/tests/PostgresIntegrationIT.java        |  12 +-
 .../incubator/wayang/tests/RegressionIT.java       |  26 +-
 .../incubator/wayang/tests/SparkIntegrationIT.java | 296 +++++++++---------
 .../apache/incubator/wayang/tests/WayangPlans.java | 258 ++++++++--------
 .../wayang/tests/WayangPlansOperators.java         | 108 +++----
 .../apache/incubator/wayang/tests/WordCountIT.java | 138 ++++-----
 .../wayang/tests/platform/MyMadeUpPlatform.java    |  18 +-
 .../resources/rheem-hsqldb-defaults.properties     |   4 +-
 rheem-tests/src/test/resources/rheem.properties    |   2 +-
 793 files changed, 8769 insertions(+), 8769 deletions(-)

diff --git a/LICENSE.TXT b/LICENSE.TXT
index b44d72b..46d6467 100644
--- a/LICENSE.TXT
+++ b/LICENSE.TXT
@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2016 Rheem Project
+   Copyright 2016 Wayang Project
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/NOTICE.TXT b/NOTICE.TXT
index c6c3c60..030c74f 100644
--- a/NOTICE.TXT
+++ b/NOTICE.TXT
@@ -1,4 +1,4 @@
-Copyright 2020 Rheem Ecosystem
+Copyright 2020 Wayang Ecosystem
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/README.md b/README.md
index 8e43052..083fc2d 100644
--- a/README.md
+++ b/README.md
@@ -1,45 +1,45 @@
-# Rheem <img align="right" width="128px" src="https://rheem-ecosystem.github.io/img/logo.png" alt="Rheem logo">
+# Wayang <img align="right" width="128px" src="https://wayang-ecosystem.github.io/img/logo.png" alt="Wayang logo">
 
-[![Build Status (Travis)](https://travis-ci.org/rheem-ecosystem/rheem.svg?branch=master)](https://travis-ci.org/rheem-ecosystem/rheem)
-[![Gitter chat](https://badges.gitter.im/rheem-ecosystem/Lobby.png)](https://gitter.im/rheem-ecosystem/Lobby)
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.rheem.rheem/rheem/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.rheem.rheem/rheem)
+[![Build Status (Travis)](https://travis-ci.org/wayang-ecosystem/wayang.svg?branch=master)](https://travis-ci.org/wayang-ecosystem/wayang)
+[![Gitter chat](https://badges.gitter.im/wayang-ecosystem/Lobby.png)](https://gitter.im/wayang-ecosystem/Lobby)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.incubator.wayang/wayang/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.apache.incubator.wayang/wayang)
 
 #### Turning the Zoo of Data Processing Systems into a Circus
 
 
-Rheem is an efficient and scalable data processing framework developed by the [data analytics](http://da.qcri.org) group at [Qatar Computing Research Institute](http://qcri.com/) in collaboration with the [information systems group](https://www.hpi.de/naumann) at the Hasso Plattner Institute. In contrast to classical data processing systems that provide one dedicated execution engine, Rheem rather is a *meta processing framework*: You can specify your data processing app via one of Rheem [...]
+Wayang is an efficient and scalable data processing framework developed by the [data analytics](http://da.qcri.org) group at [Qatar Computing Research Institute](http://qcri.com/) in collaboration with the [information systems group](https://www.hpi.de/naumann) at the Hasso Plattner Institute. In contrast to classical data processing systems that provide one dedicated execution engine, Wayang rather is a *meta processing framework*: You can specify your data processing app via one of Way [...]
 
-This approach aims at freeing data engineers and software developers from the burden of knowing the zoo of different data processing systems, their APIs, strengths and weakness; the intricacies of coordinating and integrating different processing platforms; and the inflexibility when tying to a fix set of processing platforms. As of now, Rheem has built in support for the following processing platforms:
+This approach aims at freeing data engineers and software developers from the burden of knowing the zoo of different data processing systems, their APIs, strengths and weakness; the intricacies of coordinating and integrating different processing platforms; and the inflexibility when tying to a fix set of processing platforms. As of now, Wayang has built in support for the following processing platforms:
 - Java 8 Streams
 - [Apache Spark](https://spark.apache.org/)
 - [GraphChi](https://github.com/GraphChi/graphchi-java)
 - [Postgres](http://www.postgresql.org)
 - [SQLite](https://www.sqlite.org/)
 
-## How to use Rheem
+## How to use Wayang
 
 **Requirements.**
-Rheem is built with Java 8 and Scala 2.11. However, to execute Rheem it is sufficient to have Java 8 installed. If you want to build Rheem yourself, you will also need to have [Apache Maven](http://maven.apache.org) installed. Please also consider that processing platforms employed by Rheem might have further requirements.
+Wayang is built with Java 8 and Scala 2.11. However, to execute Wayang it is sufficient to have Java 8 installed. If you want to build Wayang yourself, you will also need to have [Apache Maven](http://maven.apache.org) installed. Please also consider that processing platforms employed by Wayang might have further requirements.
 
-**Get Rheem.**
-Rheem is available via Maven Central. To use it with Maven, for instance, include the following into you POM file:
+**Get Wayang.**
+Wayang is available via Maven Central. To use it with Maven, for instance, include the following into you POM file:
 ```xml
 <dependency>

-  <groupId>io.rheem.rheem</groupId>
-  <artifactId>rheem-***</artifactId>
+  <groupId>org.apache.incubator.wayang</groupId>
+  <artifactId>wayang-***</artifactId>
   <version>0.3.0</version>

 </dependency>
 ```
-Note the `***`: Rheem ships with multiple modules that can be included in your app, depending on how you want to use it:
-* `rheem-core`: provides core data structures and the optimizer (required)
-* `rheem-basic`: provides common operators and data types for your apps (recommended)
-* `rheem-api`: provides an easy-to-use Scala and Java API to assemble Rheem plans (recommended)
-* `rheem-java`, `rheem-spark`, `rheem-graphchi`, `rheem-sqlite3`, `rheem-postgres`: adapters for the various supported processing platforms
-* `rheem-profiler`: provides functionality to learn operator and UDF cost functions from historical execution data
+Note the `***`: Wayang ships with multiple modules that can be included in your app, depending on how you want to use it:
+* `wayang-core`: provides core data structures and the optimizer (required)
+* `wayang-basic`: provides common operators and data types for your apps (recommended)
+* `wayang-api`: provides an easy-to-use Scala and Java API to assemble Wayang plans (recommended)
+* `wayang-java`, `wayang-spark`, `wayang-graphchi`, `wayang-sqlite3`, `wayang-postgres`: adapters for the various supported processing platforms
+* `wayang-profiler`: provides functionality to learn operator and UDF cost functions from historical execution data
 
 For the sake of version flexibility, you still have to include your Hadoop (`hadoop-hdfs` and `hadoop-common`) and Spark (`spark-core` and `spark-graphx`) version of choice.
 
-In addition, you can obtain the most recent snapshot version of Rheem via Sonatype's snapshot repository. Just included
+In addition, you can obtain the most recent snapshot version of Wayang via Sonatype's snapshot repository. Just included
 ```xml
 <repositories>
   <repository>
@@ -50,69 +50,69 @@ In addition, you can obtain the most recent snapshot version of Rheem via Sonaty
 <repositories>
 ```
 
-If you need to rebuild Rheem, e.g., to use a different Scala version, you can simply do so via Maven:
+If you need to rebuild Wayang, e.g., to use a different Scala version, you can simply do so via Maven:
 
 1. Adapt the version variables (e.g., `spark.version`) in the main `pom.xml` file.
-2. Build Rheem with the adapted versions.
+2. Build Wayang with the adapted versions.
 	```shell
 	$ mvn clean install
 	```
-	Note the `standalone` profile to fix Hadoop and Spark versions, so that Rheem apps do not explicitly need to declare the corresponding dependencies.
-	Also, note the `distro` profile, which assembles a binary Rheem distribution.
+	Note the `standalone` profile to fix Hadoop and Spark versions, so that Wayang apps do not explicitly need to declare the corresponding dependencies.
+	Also, note the `distro` profile, which assembles a binary Wayang distribution.
 	To activate these profiles, you need to specify them when running maven, i.e.,
 	 ```shell
 	 mvn clean install -P<profile name>
 	 ```
 
-**Configure Rheem.** In order for Rheem to work properly, it is necessary to tell Rheem about the capacities of your processing platforms and how to reach them. While there is a default configuration that allows to test Rheem right away, we recommend to create a properties file to adapt the configuration where necessary. To have Rheem use that configuration transparently, just run you app via
+**Configure Wayang.** In order for Wayang to work properly, it is necessary to tell Wayang about the capacities of your processing platforms and how to reach them. While there is a default configuration that allows to test Wayang right away, we recommend to create a properties file to adapt the configuration where necessary. To have Wayang use that configuration transparently, just run you app via
 ```shell
-$ java -Drheem.configuration=url://to/my/rheem.properties ...
+$ java -Dwayang.configuration=url://to/my/wayang.properties ...
 ```
 
 You can find the most relevant settings in the following:
 * General settings
-  * `rheem.core.log.enabled (= true)`: whether to log execution statistics to allow learning better cardinality and cost estimators for the optimizer
-  * `rheem.core.log.executions (= ~/.rheem/executions.json)` where to log execution times of operator groups
-  * `rheem.core.log.cardinalities (= ~/.rheem/cardinalities.json)` where to log cardinality measurements
-  * `rheem.core.optimizer.instrumentation (= io.rheem.rheem.core.profiling.OutboundInstrumentationStrategy)`: where to measure cardinalities in Rheem plans; other options are `io.rheem.rheem.core.profiling.NoInstrumentationStrategy` and `io.rheem.rheem.core.profiling.FullInstrumentationStrategy`
-  * `rheem.core.optimizer.reoptimize (= false)`: whether to progressively optimize Rheem plans
-  * `rheem.basic.tempdir (= file:///tmp)`: where to store temporary files, in particular for inter-platform communication
+  * `wayang.core.log.enabled (= true)`: whether to log execution statistics to allow learning better cardinality and cost estimators for the optimizer
+  * `wayang.core.log.executions (= ~/.wayang/executions.json)` where to log execution times of operator groups
+  * `wayang.core.log.cardinalities (= ~/.wayang/cardinalities.json)` where to log cardinality measurements
+  * `wayang.core.optimizer.instrumentation (= org.apache.incubator.wayang.core.profiling.OutboundInstrumentationStrategy)`: where to measure cardinalities in Wayang plans; other options are `org.apache.incubator.wayang.core.profiling.NoInstrumentationStrategy` and `org.apache.incubator.wayang.core.profiling.FullInstrumentationStrategy`
+  * `wayang.core.optimizer.reoptimize (= false)`: whether to progressively optimize Wayang plans
+  * `wayang.basic.tempdir (= file:///tmp)`: where to store temporary files, in particular for inter-platform communication
 * Java Streams
-  * `rheem.java.cpu.mhz (= 2700)`: clock frequency of processor the JVM runs on in MHz
-  * `rheem.java.hdfs.ms-per-mb (= 2.7)`: average throughput from HDFS to JVM in ms/MB
+  * `wayang.java.cpu.mhz (= 2700)`: clock frequency of processor the JVM runs on in MHz
+  * `wayang.java.hdfs.ms-per-mb (= 2.7)`: average throughput from HDFS to JVM in ms/MB
 * Apache Spark
   * `spark.master (= local)`: Spark master
     * various other Spark settings are supported, e.g., `spark.executor.memory`, `spark.serializer`, ...
-  * `rheem.spark.cpu.mhz (= 2700)`: clock frequency of processor the Spark workers run on in MHz
-  * `rheem.spark.hdfs.ms-per-mb (= 2.7)`: average throughput from HDFS to the Spark workers in ms/MB
-  * `rheem.spark.network.ms-per-mb (= 8.6)`: average network throughput of the Spark workers in ms/MB
-  * `rheem.spark.init.ms (= 4500)`: time it takes Spark to initialize in ms
+  * `wayang.spark.cpu.mhz (= 2700)`: clock frequency of processor the Spark workers run on in MHz
+  * `wayang.spark.hdfs.ms-per-mb (= 2.7)`: average throughput from HDFS to the Spark workers in ms/MB
+  * `wayang.spark.network.ms-per-mb (= 8.6)`: average network throughput of the Spark workers in ms/MB
+  * `wayang.spark.init.ms (= 4500)`: time it takes Spark to initialize in ms
 * GraphChi
-  * `rheem.graphchi.cpu.mhz (= 2700)`: clock frequency of processor GraphChi runs on in MHz
-  * `rheem.graphchi.cpu.cores (= 2)`: number of cores GraphChi runs on
-  * `rheem.graphchi.hdfs.ms-per-mb (= 2.7)`: average throughput from HDFS to GraphChi in ms/MB
+  * `wayang.graphchi.cpu.mhz (= 2700)`: clock frequency of processor GraphChi runs on in MHz
+  * `wayang.graphchi.cpu.cores (= 2)`: number of cores GraphChi runs on
+  * `wayang.graphchi.hdfs.ms-per-mb (= 2.7)`: average throughput from HDFS to GraphChi in ms/MB
 * SQLite
-  * `rheem.sqlite3.jdbc.url`: JDBC URL to use SQLite
-  * `rheem.sqlite3.jdbc.user`: optional user name
-  * `rheem.sqlite3.jdbc.password`: optional password
-  * `rheem.sqlite3.cpu.mhz (= 2700)`: clock frequency of processor SQLite runs on in MHz
-  * `rheem.sqlite3.cpu.cores (= 2)`: number of cores SQLite runs on
+  * `wayang.sqlite3.jdbc.url`: JDBC URL to use SQLite
+  * `wayang.sqlite3.jdbc.user`: optional user name
+  * `wayang.sqlite3.jdbc.password`: optional password
+  * `wayang.sqlite3.cpu.mhz (= 2700)`: clock frequency of processor SQLite runs on in MHz
+  * `wayang.sqlite3.cpu.cores (= 2)`: number of cores SQLite runs on
 * PostgreSQL
-  * `rheem.postgres.jdbc.url`: JDBC URL to use PostgreSQL
-  * `rheem.postgres.jdbc.user`: optional user name
-  * `rheem.postgres.jdbc.password`: optional password
-  * `rheem.postgres.cpu.mhz (= 2700)`: clock frequency of processor PostgreSQL runs on in MHz
-  * `rheem.postgres.cpu.cores (= 2)`: number of cores PostgreSQL runs on
+  * `wayang.postgres.jdbc.url`: JDBC URL to use PostgreSQL
+  * `wayang.postgres.jdbc.user`: optional user name
+  * `wayang.postgres.jdbc.password`: optional password
+  * `wayang.postgres.cpu.mhz (= 2700)`: clock frequency of processor PostgreSQL runs on in MHz
+  * `wayang.postgres.cpu.cores (= 2)`: number of cores PostgreSQL runs on
 
-**Code with Rheem.** The recommended way to specify your apps with Rheem is via its Scala or Java API from the `rheem-api` module. You can find examples below.
+**Code with Wayang.** The recommended way to specify your apps with Wayang is via its Scala or Java API from the `wayang-api` module. You can find examples below.
 
 **Learn cost functions.**
-Rheem provides a utility to learn cost functions from historical execution data.
-Specifically, Rheem can learn configurations for load profile estimators (that estimate CPU load, disk load etc.) for both operators and UDFs, as long as the configuration provides a template for those estimators.
-As an example, the `JavaMapOperator` draws its load profile estimator configuration via the configuration key `rheem.java.map.load`.
+Wayang provides a utility to learn cost functions from historical execution data.
+Specifically, Wayang can learn configurations for load profile estimators (that estimate CPU load, disk load etc.) for both operators and UDFs, as long as the configuration provides a template for those estimators.
+As an example, the `JavaMapOperator` draws its load profile estimator configuration via the configuration key `wayang.java.map.load`.
 Now, it is possible to specify a load profile estimator template in the configuration under the key `<original key>.template`, e.g.:
 ```xml
-rheem.java.map.load.template = {\
+wayang.java.map.load.template = {\
   "in":1, "out":1,\
   "cpu":"?*in0"\
 }
@@ -127,17 +127,17 @@ In particular, you can use
 * the functions `min(x0, x1, ...))`, `max(x0, x1, ...)`, `abs(x)`, `log(x, base)`, `ln(x)`, `ld(x)`;
 * and the constants `e` and `pi`.
 
-While Rheem specifies templates for all execution operators, you will need to specify that your UDFs are modelled by some configuration-based cost function (see the k-means example below) and create the according initial specification and template yourself.
+While Wayang specifies templates for all execution operators, you will need to specify that your UDFs are modelled by some configuration-based cost function (see the k-means example below) and create the according initial specification and template yourself.
 Once, you gathered execution data, you can run
 ```shell
-java ... io.rheem.rheem.profiler.ga.GeneticOptimizerApp [configuration URL [execution log]]
+java ... org.apache.incubator.wayang.profiler.ga.GeneticOptimizerApp [configuration URL [execution log]]
 ```
 This app will try to find appropriate values for the question marks (`?`) in the load profile estimator templates to fit the gathered execution data and ready-made configuration entries for the load profile estimators.
 You can then copy them into your configuration.
 
 ## Examples
 
-For some executable examples, have a look at [this repository](https://www.github.com/sekruse/rheem-examples).
+For some executable examples, have a look at [this repository](https://www.github.com/sekruse/wayang-examples).
 
 ### WordCount
 
@@ -145,13 +145,13 @@ The "Hello World!" of data processing systems is the wordcount.
 
 #### Java API
 ```java
-import io.rheem.rheem.api.JavaPlanBuilder;
-import io.rheem.rheem.basic.data.Tuple2;
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.api.RheemContext;
-import io.rheem.rheem.core.optimizer.cardinality.DefaultCardinalityEstimator;
-import io.rheem.rheem.java.Java;
-import io.rheem.rheem.spark.Spark;
+import org.apache.incubator.wayang.api.JavaPlanBuilder;
+import org.apache.incubator.wayang.basic.data.Tuple2;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.api.WayangContext;
+import org.apache.incubator.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
+import org.apache.incubator.wayang.java.Java;
+import org.apache.incubator.wayang.spark.Spark;
 import java.util.Collection;
 import java.util.Arrays;
 
@@ -163,14 +163,14 @@ public class WordcountJava {
         String inputUrl = "file:/tmp.txt";
 
         // Get a plan builder.
-        RheemContext rheemContext = new RheemContext(new Configuration())
+        WayangContext wayangContext = new WayangContext(new Configuration())
                 .withPlugin(Java.basicPlugin())
                 .withPlugin(Spark.basicPlugin());
-        JavaPlanBuilder planBuilder = new JavaPlanBuilder(rheemContext)
+        JavaPlanBuilder planBuilder = new JavaPlanBuilder(wayangContext)
                 .withJobName(String.format("WordCount (%s)", inputUrl))
                 .withUdfJarOf(WordcountJava.class);
 
-        // Start building the RheemPlan.
+        // Start building the WayangPlan.
         Collection<Tuple2<String, Integer>> wordcounts = planBuilder
                 // Read the text file.
                 .readTextFile(inputUrl).withName("Load file")
@@ -207,10 +207,10 @@ public class WordcountJava {
 #### Scala API
 
 ```scala
-import io.rheem.rheem.api._
-import io.rheem.rheem.core.api.{Configuration, RheemContext}
-import io.rheem.rheem.java.Java
-import io.rheem.rheem.spark.Spark
+import org.apache.incubator.wayang.api._
+import org.apache.incubator.wayang.core.api.{Configuration, WayangContext}
+import org.apache.incubator.wayang.java.Java
+import org.apache.incubator.wayang.spark.Spark
 
 object WordcountScala {
   def main(args: Array[String]) {
@@ -219,10 +219,10 @@ object WordcountScala {
     val inputUrl = "file:/tmp.txt"
 
     // Get a plan builder.
-    val rheemContext = new RheemContext(new Configuration)
+    val wayangContext = new WayangContext(new Configuration)
       .withPlugin(Java.basicPlugin)
       .withPlugin(Spark.basicPlugin)
-    val planBuilder = new PlanBuilder(rheemContext)
+    val planBuilder = new PlanBuilder(wayangContext)
       .withJobName(s"WordCount ($inputUrl)")
       .withUdfJarsOf(this.getClass)
 
@@ -253,18 +253,18 @@ object WordcountScala {
 
 ### k-means
 
-Rheem is also capable of iterative processing, which is, e.g., very important for machine learning algorithms, such as k-means.
+Wayang is also capable of iterative processing, which is, e.g., very important for machine learning algorithms, such as k-means.
 
 #### Scala API
 
 ```scala
-import io.rheem.rheem.api._
-import io.rheem.rheem.core.api.{Configuration, RheemContext}
-import io.rheem.rheem.core.function.FunctionDescriptor.ExtendedSerializableFunction
-import io.rheem.rheem.core.function.ExecutionContext
-import io.rheem.rheem.core.optimizer.costs.LoadProfileEstimators
-import io.rheem.rheem.java.Java
-import io.rheem.rheem.spark.Spark
+import org.apache.incubator.wayang.api._
+import org.apache.incubator.wayang.core.api.{Configuration, WayangContext}
+import org.apache.incubator.wayang.core.function.FunctionDescriptor.ExtendedSerializableFunction
+import org.apache.incubator.wayang.core.function.ExecutionContext
+import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileEstimators
+import org.apache.incubator.wayang.java.Java
+import org.apache.incubator.wayang.spark.Spark
 
 import scala.util.Random
 import scala.collection.JavaConversions._
@@ -279,10 +279,10 @@ object kmeans {
     val configuration = new Configuration
 
     // Get a plan builder.
-    val rheemContext = new RheemContext(new Configuration)
+    val wayangContext = new WayangContext(new Configuration)
       .withPlugin(Java.basicPlugin)
       .withPlugin(Spark.basicPlugin)
-    val planBuilder = new PlanBuilder(rheemContext)
+    val planBuilder = new PlanBuilder(wayangContext)
       .withJobName(s"k-means ($inputUrl, k=$k, $iterations iterations)")
       .withUdfJarsOf(this.getClass)
 
@@ -356,7 +356,7 @@ object kmeans {
 
 Unless explicitly stated otherwise all files in this repository are licensed under the Apache Software License 2.0
 
-Copyright 2020 Rheem Ecosystem
+Copyright 2020 Wayang Ecosystem
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/bin/rename_org.sh b/bin/rename_org.sh
index c5dea4d..cb25580 100755
--- a/bin/rename_org.sh
+++ b/bin/rename_org.sh
@@ -14,7 +14,7 @@ function change_files {
 cd ../
 
 #TODO replace new_one with the new
-rename_structure io io new_one
-rename_structure rheem/rheem rheem new_one
+rename_structure io io org
+rename_structure wayang/wayang wayang  apache
 
-change_files "io\.rheem\.rheem" "new_one\.new_one\.rheem"
+change_files "io\.wayang\.wayang" "new_one\.new_one\.wayang"
diff --git a/pom.xml b/pom.xml
index 602eb9e..a313219 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,16 +17,16 @@
         <external.platforms.scope>provided</external.platforms.scope>
     </properties>
 
-    <groupId>io.rheem.rheem</groupId>
-    <artifactId>rheem</artifactId>
+    <groupId>org.apache.incubator.wayang</groupId>
+    <artifactId>wayang</artifactId>
     <packaging>pom</packaging>
     <version>1.0.0-SNAPSHOT</version>
 
-    <name>Rheem</name>
-    <description>Rheem is a tool to build platform-agnostic data processing apps and have them both optimized for and
+    <name>Wayang</name>
+    <description>Wayang is a tool to build platform-agnostic data processing apps and have them both optimized for and
         executed on multiple different execution platforms, such as Java Streams and Apache Spark.
     </description>
-    <url>http://rheem.io</url>
+    <url>http://wayang.io</url>
 
     <licenses>
         <license>
@@ -64,9 +64,9 @@
     </developers>
 
     <scm>
-        <connection>scm:git:git://github.com/rheem-ecosystem/rheem</connection>
-        <developerConnection>scm:git:https://github.com/rheem-ecosystem/rheem</developerConnection>
-        <url>https://github.com/rheem-ecosystem/rheem</url>
+        <connection>scm:git:git://github.com/wayang-ecosystem/wayang</connection>
+        <developerConnection>scm:git:https://github.com/wayang-ecosystem/wayang</developerConnection>
+        <url>https://github.com/wayang-ecosystem/wayang</url>
     </scm>
 
     <distributionManagement>
@@ -92,11 +92,11 @@
             <!-- Build the distribution. -->
             <id>distro</id>
             <modules>
-                <module>rheem-distro</module>
+                <module>wayang-distro</module>
             </modules>
         </profile>
         <profile>
-            <!-- Perform steps to deploy Rheem. -->
+            <!-- Perform steps to deploy Wayang. -->
             <id>deployment</id>
             <build>
                 <plugins>
@@ -116,7 +116,7 @@
             </build>
         </profile>
         <profile>
-            <!-- Perform steps to deploy Rheem. -->
+            <!-- Perform steps to deploy Wayang. -->
             <id>deployment-dryrun</id>
             <build>
                 <plugins>
@@ -604,12 +604,12 @@
     </dependencyManagement>
 
     <modules>
-        <module>rheem-core</module>
-        <module>rheem-basic</module>
-        <module>rheem-platforms</module>
-        <module>rheem-tests</module>
-        <module>rheem-api</module>
-        <module>rheem-profiler</module>
-        <module>rheem-extensions</module>
+        <module>wayang-core</module>
+        <module>wayang-basic</module>
+        <module>wayang-platforms</module>
+        <module>wayang-tests</module>
+        <module>wayang-api</module>
+        <module>wayang-profiler</module>
+        <module>wayang-extensions</module>
     </modules>
 </project>
diff --git a/rheem-api/pom.xml b/rheem-api/pom.xml
index d69ce80..f247995 100644
--- a/rheem-api/pom.xml
+++ b/rheem-api/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>rheem</artifactId>
-        <groupId>io.rheem.rheem</groupId>
+        <artifactId>wayang</artifactId>
+        <groupId>org.apache.incubator.wayang</groupId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>rheem-api_2.11</artifactId>
+    <artifactId>wayang-api_2.11</artifactId>
 
     <build>
         <plugins>
@@ -39,36 +39,36 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.rheem.rheem</groupId>
-            <artifactId>rheem-core</artifactId>
+            <groupId>org.apache.incubator.wayang</groupId>
+            <artifactId>wayang-core</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>io.rheem.rheem</groupId>
-            <artifactId>rheem-basic</artifactId>
+            <groupId>org.apache.incubator.wayang</groupId>
+            <artifactId>wayang-basic</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>io.rheem.rheem</groupId>
-            <artifactId>rheem-java</artifactId>
+            <groupId>org.apache.incubator.wayang</groupId>
+            <artifactId>wayang-java</artifactId>
             <version>1.0.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.rheem.rheem</groupId>
-            <artifactId>rheem-spark_2.11</artifactId>
+            <groupId>org.apache.incubator.wayang</groupId>
+            <artifactId>wayang-spark_2.11</artifactId>
             <version>1.0.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.rheem.rheem</groupId>
-            <artifactId>rheem-sqlite3</artifactId>
+            <groupId>org.apache.incubator.wayang</groupId>
+            <artifactId>wayang-sqlite3</artifactId>
             <version>1.0.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.rheem.rheem</groupId>
-            <artifactId>rheem-jdbc-template</artifactId>
+            <groupId>org.apache.incubator.wayang</groupId>
+            <artifactId>wayang-jdbc-template</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
@@ -77,8 +77,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.rheem.rheem</groupId>
-            <artifactId>rheem-graphchi_2.11</artifactId>
+            <groupId>org.apache.incubator.wayang</groupId>
+            <artifactId>wayang-graphchi_2.11</artifactId>
             <version>1.0.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
diff --git a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/DataQuanta.scala b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/DataQuanta.scala
index 73edbfa..13179e6 100644
--- a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/DataQuanta.scala
+++ b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/DataQuanta.scala
@@ -1,4 +1,4 @@
-package io.rheem.rheem.api
+package org.apache.incubator.wayang.api
 
 import _root_.java.lang.{Iterable => JavaIterable}
 import _root_.java.util.function.{Consumer, IntUnaryOperator, BiFunction => JavaBiFunction, Function => JavaFunction}
@@ -6,28 +6,28 @@ import _root_.java.util.{Collection => JavaCollection}
 
 import de.hpi.isg.profiledb.store.model.Experiment
 import org.apache.commons.lang3.Validate
-import io.rheem.rheem.basic.function.ProjectionDescriptor
-import io.rheem.rheem.basic.operators._
-import io.rheem.rheem.core.function.FunctionDescriptor.{SerializableBinaryOperator, SerializableFunction, SerializablePredicate}
-import io.rheem.rheem.core.function._
-import io.rheem.rheem.core.optimizer.ProbabilisticDoubleInterval
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator
-import io.rheem.rheem.core.optimizer.costs.LoadProfileEstimator
-import io.rheem.rheem.core.plan.rheemplan._
-import io.rheem.rheem.core.platform.Platform
-import io.rheem.rheem.core.util.{Tuple => RheemTuple}
-import io.rheem.rheem.basic.data.{Tuple2 => RheemTuple2}
+import org.apache.incubator.wayang.basic.function.ProjectionDescriptor
+import org.apache.incubator.wayang.basic.operators._
+import org.apache.incubator.wayang.core.function.FunctionDescriptor.{SerializableBinaryOperator, SerializableFunction, SerializablePredicate}
+import org.apache.incubator.wayang.core.function._
+import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator
+import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileEstimator
+import org.apache.incubator.wayang.core.plan.wayangplan._
+import org.apache.incubator.wayang.core.platform.Platform
+import org.apache.incubator.wayang.core.util.{Tuple => WayangTuple}
+import org.apache.incubator.wayang.basic.data.{Tuple2 => WayangTuple2}
 
 import scala.collection.JavaConversions
 import scala.collection.JavaConversions._
 import scala.reflect._
 
 /**
-  * Represents an intermediate result/data flow edge in a [[RheemPlan]].
+  * Represents an intermediate result/data flow edge in a [[WayangPlan]].
   *
   * @param operator    a unary [[Operator]] that produces this instance
   * @param ev$1        the data type of the elements in this instance
-  * @param planBuilder keeps track of the [[RheemPlan]] being build
+  * @param planBuilder keeps track of the [[WayangPlan]] being build
   */
 class DataQuanta[Out: ClassTag](val operator: ElementaryOperator, outputIndex: Int = 0)(implicit val planBuilder: PlanBuilder) {
 
@@ -419,7 +419,7 @@ class DataQuanta[Out: ClassTag](val operator: ElementaryOperator, outputIndex: I
   (thisKeyUdf: Out => Key,
    that: DataQuanta[ThatOut],
    thatKeyUdf: ThatOut => Key)
-  : DataQuanta[RheemTuple2[Out, ThatOut]] =
+  : DataQuanta[WayangTuple2[Out, ThatOut]] =
     joinJava(toSerializableFunction(thisKeyUdf), that, toSerializableFunction(thatKeyUdf))
 
   /**
@@ -434,7 +434,7 @@ class DataQuanta[Out: ClassTag](val operator: ElementaryOperator, outputIndex: I
   (thisKeyUdf: SerializableFunction[Out, Key],
    that: DataQuanta[ThatOut],
    thatKeyUdf: SerializableFunction[ThatOut, Key])
-  : DataQuanta[RheemTuple2[Out, ThatOut]] = {
+  : DataQuanta[WayangTuple2[Out, ThatOut]] = {
     require(this.planBuilder eq that.planBuilder, s"$this and $that must use the same plan builders.")
     val joinOperator = new JoinOperator(
       new TransformationDescriptor(thisKeyUdf, basicDataUnitType[Out], basicDataUnitType[Key]),
@@ -457,7 +457,7 @@ class DataQuanta[Out: ClassTag](val operator: ElementaryOperator, outputIndex: I
   (thisKeyUdf: Out => Key,
    that: DataQuanta[ThatOut],
    thatKeyUdf: ThatOut => Key)
-  : DataQuanta[RheemTuple2[java.lang.Iterable[Out], java.lang.Iterable[ThatOut]]] =
+  : DataQuanta[WayangTuple2[java.lang.Iterable[Out], java.lang.Iterable[ThatOut]]] =
     coGroupJava(toSerializableFunction(thisKeyUdf), that, toSerializableFunction(thatKeyUdf))
 
   /**
@@ -472,7 +472,7 @@ class DataQuanta[Out: ClassTag](val operator: ElementaryOperator, outputIndex: I
   (thisKeyUdf: SerializableFunction[Out, Key],
    that: DataQuanta[ThatOut],
    thatKeyUdf: SerializableFunction[ThatOut, Key])
-  : DataQuanta[RheemTuple2[java.lang.Iterable[Out], java.lang.Iterable[ThatOut]]] = {
+  : DataQuanta[WayangTuple2[java.lang.Iterable[Out], java.lang.Iterable[ThatOut]]] = {
     require(this.planBuilder eq that.planBuilder, s"$this and $that must use the same plan builders.")
     val coGroupOperator = new CoGroupOperator(
       new TransformationDescriptor(thisKeyUdf, basicDataUnitType[Out], basicDataUnitType[Key]),
@@ -518,7 +518,7 @@ class DataQuanta[Out: ClassTag](val operator: ElementaryOperator, outputIndex: I
     * @return a new instance representing the [[CartesianOperator]]'s output
     */
   def cartesian[ThatOut: ClassTag](that: DataQuanta[ThatOut])
-  : DataQuanta[RheemTuple2[Out, ThatOut]] = {
+  : DataQuanta[WayangTuple2[Out, ThatOut]] = {
     require(this.planBuilder eq that.planBuilder, s"$this and $that must use the same plan builders.")
     val cartesianOperator = new CartesianOperator(dataSetType[Out], dataSetType[ThatOut])
     this.connectTo(cartesianOperator, 0)
@@ -531,7 +531,7 @@ class DataQuanta[Out: ClassTag](val operator: ElementaryOperator, outputIndex: I
     *
     * @return a new instance representing the [[ZipWithIdOperator]]'s output
     */
-  def zipWithId: DataQuanta[RheemTuple2[java.lang.Long, Out]] = {
+  def zipWithId: DataQuanta[WayangTuple2[java.lang.Long, Out]] = {
     val zipWithIdOperator = new ZipWithIdOperator(dataSetType[Out])
     this.connectTo(zipWithIdOperator, 0)
     zipWithIdOperator
@@ -574,10 +574,10 @@ class DataQuanta[Out: ClassTag](val operator: ElementaryOperator, outputIndex: I
                                  udfLoad: LoadProfileEstimator = null) =
     doWhileJava(
       toSerializablePredicate((in: JavaCollection[ConvOut]) => udf(JavaConversions.collectionAsScalaIterable(in))),
-      new JavaFunction[DataQuanta[Out], RheemTuple[DataQuanta[Out], DataQuanta[ConvOut]]] {
+      new JavaFunction[DataQuanta[Out], WayangTuple[DataQuanta[Out], DataQuanta[ConvOut]]] {
         override def apply(t: DataQuanta[Out]) = {
           val result = bodyBuilder(t)
-          new RheemTuple(result._1, result._2)
+          new WayangTuple(result._1, result._2)
         }
       },
       numExpectedIterations, udfLoad
@@ -593,7 +593,7 @@ class DataQuanta[Out: ClassTag](val operator: ElementaryOperator, outputIndex: I
     */
   def doWhileJava[ConvOut: ClassTag](
                                       udf: SerializablePredicate[JavaCollection[ConvOut]],
-                                      bodyBuilder: JavaFunction[DataQuanta[Out], RheemTuple[DataQuanta[Out], DataQuanta[ConvOut]]],
+                                      bodyBuilder: JavaFunction[DataQuanta[Out], WayangTuple[DataQuanta[Out], DataQuanta[ConvOut]]],
                                       numExpectedIterations: Int = 20,
                                       udfLoad: LoadProfileEstimator = null) = {
     // Create the DoWhileOperator.
@@ -823,7 +823,7 @@ class DataQuanta[Out: ClassTag](val operator: ElementaryOperator, outputIndex: I
 
 
   /**
-    * Defines the [[Experiment]] that should collects metrics of the [[RheemPlan]].
+    * Defines the [[Experiment]] that should collects metrics of the [[WayangPlan]].
     *
     * @param experiment the [[Experiment]]
     * @return this instance
@@ -861,7 +861,7 @@ class KeyedDataQuanta[Out: ClassTag, Key: ClassTag](val dataQuanta: DataQuanta[O
     * @return the join product [[DataQuanta]]
     */
   def join[ThatOut: ClassTag](that: KeyedDataQuanta[ThatOut, Key]):
-  DataQuanta[RheemTuple2[Out, ThatOut]] =
+  DataQuanta[WayangTuple2[Out, ThatOut]] =
     dataQuanta.joinJava[ThatOut, Key](this.keyExtractor, that.dataQuanta, that.keyExtractor)
 
   /**
@@ -871,7 +871,7 @@ class KeyedDataQuanta[Out: ClassTag, Key: ClassTag](val dataQuanta: DataQuanta[O
     * @return the co-grouped [[DataQuanta]]
     */
   def coGroup[ThatOut: ClassTag](that: KeyedDataQuanta[ThatOut, Key]):
-  DataQuanta[RheemTuple2[java.lang.Iterable[Out], java.lang.Iterable[ThatOut]]] =
+  DataQuanta[WayangTuple2[java.lang.Iterable[Out], java.lang.Iterable[ThatOut]]] =
     dataQuanta.coGroupJava[ThatOut, Key](this.keyExtractor, that.dataQuanta, that.keyExtractor)
 
 }
@@ -880,7 +880,7 @@ class KeyedDataQuanta[Out: ClassTag, Key: ClassTag](val dataQuanta: DataQuanta[O
   * This class amends joined [[DataQuanta]] with additional operations.
   */
 class JoinedDataQuanta[Out0: ClassTag, Out1: ClassTag]
-(val dataQuanta: DataQuanta[RheemTuple2[Out0, Out1]]) {
+(val dataQuanta: DataQuanta[WayangTuple2[Out0, Out1]]) {
 
   /**
     * Assembles a new element from a join product tuple.
diff --git a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/DataQuantaBuilder.scala b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/DataQuantaBuilder.scala
index adacdf5..8c064d0 100644
--- a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/DataQuantaBuilder.scala
+++ b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/DataQuantaBuilder.scala
@@ -1,29 +1,29 @@
-package io.rheem.rheem.api
+package org.apache.incubator.wayang.api
 
 
 import java.util.function.{Consumer, IntUnaryOperator, Function => JavaFunction}
 import java.util.{Collection => JavaCollection}
 
 import de.hpi.isg.profiledb.store.model.Experiment
-import io.rheem.rheem.api.graph.{Edge, EdgeDataQuantaBuilder, EdgeDataQuantaBuilderDecorator}
-import io.rheem.rheem.api.util.{DataQuantaBuilderCache, TypeTrap}
-import io.rheem.rheem.basic.data.{Record, Tuple2 => RT2}
-import io.rheem.rheem.basic.operators.{GlobalReduceOperator, LocalCallbackSink, MapOperator, SampleOperator}
-import io.rheem.rheem.core.function.FunctionDescriptor.{SerializableBiFunction, SerializableBinaryOperator, SerializableFunction, SerializablePredicate}
-import io.rheem.rheem.core.optimizer.ProbabilisticDoubleInterval
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator
-import io.rheem.rheem.core.optimizer.costs.{LoadEstimator, LoadProfile, LoadProfileEstimator}
-import io.rheem.rheem.core.plan.rheemplan.{Operator, OutputSlot, RheemPlan, UnarySource}
-import io.rheem.rheem.core.platform.Platform
-import io.rheem.rheem.core.types.DataSetType
-import io.rheem.rheem.core.util.{Logging, ReflectionUtils, RheemCollections, Tuple => RheemTuple}
+import org.apache.incubator.wayang.api.graph.{Edge, EdgeDataQuantaBuilder, EdgeDataQuantaBuilderDecorator}
+import org.apache.incubator.wayang.api.util.{DataQuantaBuilderCache, TypeTrap}
+import org.apache.incubator.wayang.basic.data.{Record, Tuple2 => RT2}
+import org.apache.incubator.wayang.basic.operators.{GlobalReduceOperator, LocalCallbackSink, MapOperator, SampleOperator}
+import org.apache.incubator.wayang.core.function.FunctionDescriptor.{SerializableBiFunction, SerializableBinaryOperator, SerializableFunction, SerializablePredicate}
+import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator
+import org.apache.incubator.wayang.core.optimizer.costs.{LoadEstimator, LoadProfile, LoadProfileEstimator}
+import org.apache.incubator.wayang.core.plan.wayangplan.{Operator, OutputSlot, WayangPlan, UnarySource}
+import org.apache.incubator.wayang.core.platform.Platform
+import org.apache.incubator.wayang.core.types.DataSetType
+import org.apache.incubator.wayang.core.util.{Logging, ReflectionUtils, WayangCollections, Tuple => WayangTuple}
 
 import scala.collection.mutable.ListBuffer
 import scala.reflect.ClassTag
 
 /**
   * Trait/interface for builders of [[DataQuanta]]. The purpose of the builders is to provide a convenient
-  * Java API for Rheem that compensates for lacking default and named arguments.
+  * Java API for Wayang that compensates for lacking default and named arguments.
   */
 trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging {
 
@@ -38,7 +38,7 @@ trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging
   protected[api] implicit def javaPlanBuilder: JavaPlanBuilder
 
   /**
-    * Set a name for the [[DataQuanta]] and its associated [[io.rheem.rheem.core.plan.rheemplan.Operator]]s.
+    * Set a name for the [[DataQuanta]] and its associated [[org.apache.incubator.wayang.core.plan.wayangplan.Operator]]s.
     *
     * @param name the name
     * @return this instance
@@ -46,7 +46,7 @@ trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging
   def withName(name: String): This
 
   /**
-    * Set an [[Experiment]] for the currently built [[io.rheem.rheem.core.api.Job]].
+    * Set an [[Experiment]] for the currently built [[org.apache.incubator.wayang.core.api.Job]].
     *
     * @param experiment the [[Experiment]]
     * @return this instance
@@ -98,7 +98,7 @@ trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging
   def withTargetPlatform(platform: Platform): This
 
   /**
-    * Register the JAR file containing the given [[Class]] with the currently built [[io.rheem.rheem.core.api.Job]].
+    * Register the JAR file containing the given [[Class]] with the currently built [[org.apache.incubator.wayang.core.api.Job]].
     *
     * @param cls the [[Class]]
     * @return this instance
@@ -106,7 +106,7 @@ trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging
   def withUdfJarOf(cls: Class[_]): This
 
   /**
-    * Register a JAR file with the currently built [[io.rheem.rheem.core.api.Job]].
+    * Register a JAR file with the currently built [[org.apache.incubator.wayang.core.api.Job]].
     *
     * @param path the path of the JAR file
     * @return this instance
@@ -129,15 +129,15 @@ trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging
   def map[NewOut](udf: SerializableFunction[Out, NewOut]) = new MapDataQuantaBuilder(this, udf)
 
   /**
-    * Feed the built [[DataQuanta]] into a [[MapOperator]] with a [[io.rheem.rheem.basic.function.ProjectionDescriptor]].
+    * Feed the built [[DataQuanta]] into a [[MapOperator]] with a [[org.apache.incubator.wayang.basic.function.ProjectionDescriptor]].
     *
-    * @param fieldNames field names for the [[io.rheem.rheem.basic.function.ProjectionDescriptor]]
+    * @param fieldNames field names for the [[org.apache.incubator.wayang.basic.function.ProjectionDescriptor]]
     * @return a [[MapDataQuantaBuilder]]
     */
   def project[NewOut](fieldNames: Array[String]) = new ProjectionDataQuantaBuilder(this, fieldNames)
 
   /**
-    * Feed the built [[DataQuanta]] into a [[io.rheem.rheem.basic.operators.FilterOperator]].
+    * Feed the built [[DataQuanta]] into a [[org.apache.incubator.wayang.basic.operators.FilterOperator]].
     *
     * @param udf filter UDF
     * @return a [[FilterDataQuantaBuilder]]
@@ -145,24 +145,24 @@ trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging
   def filter(udf: SerializablePredicate[Out]) = new FilterDataQuantaBuilder(this, udf)
 
   /**
-    * Feed the built [[DataQuanta]] into a [[io.rheem.rheem.basic.operators.FlatMapOperator]].
+    * Feed the built [[DataQuanta]] into a [[org.apache.incubator.wayang.basic.operators.FlatMapOperator]].
     *
-    * @param udf the UDF for the [[io.rheem.rheem.basic.operators.FlatMapOperator]]
+    * @param udf the UDF for the [[org.apache.incubator.wayang.basic.operators.FlatMapOperator]]
     * @return a [[FlatMapDataQuantaBuilder]]
     */
   def flatMap[NewOut](udf: SerializableFunction[Out, java.lang.Iterable[NewOut]]) = new FlatMapDataQuantaBuilder(this, udf)
 
   /**
-    * Feed the built [[DataQuanta]] into a [[io.rheem.rheem.basic.operators.MapPartitionsOperator]].
+    * Feed the built [[DataQuanta]] into a [[org.apache.incubator.wayang.basic.operators.MapPartitionsOperator]].
     *
-    * @param udf the UDF for the [[io.rheem.rheem.basic.operators.MapPartitionsOperator]]
+    * @param udf the UDF for the [[org.apache.incubator.wayang.basic.operators.MapPartitionsOperator]]
     * @return a [[MapPartitionsDataQuantaBuilder]]
     */
   def mapPartitions[NewOut](udf: SerializableFunction[java.lang.Iterable[Out], java.lang.Iterable[NewOut]]) =
     new MapPartitionsDataQuantaBuilder(this, udf)
 
   /**
-    * Feed the built [[DataQuanta]] into a [[io.rheem.rheem.basic.operators.SampleOperator]].
+    * Feed the built [[DataQuanta]] into a [[org.apache.incubator.wayang.basic.operators.SampleOperator]].
     *
     * @param sampleSize the absolute size of the sample
     * @return a [[SampleDataQuantaBuilder]]
@@ -173,7 +173,7 @@ trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging
 
 
   /**
-    * Feed the built [[DataQuanta]] into a [[io.rheem.rheem.basic.operators.SampleOperator]].
+    * Feed the built [[DataQuanta]] into a [[org.apache.incubator.wayang.basic.operators.SampleOperator]].
     *
     * @param sampleSizeFunction the absolute size of the sample as a function of the current iteration number
     * @return a [[SampleDataQuantaBuilder]]
@@ -196,26 +196,26 @@ trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging
   def reduce(udf: SerializableBinaryOperator[Out]) = new GlobalReduceDataQuantaBuilder(this, udf)
 
   /**
-    * Feed the built [[DataQuanta]] into a [[io.rheem.rheem.basic.operators.ReduceByOperator]].
+    * Feed the built [[DataQuanta]] into a [[org.apache.incubator.wayang.basic.operators.ReduceByOperator]].
     *
-    * @param keyUdf the key UDF for the [[io.rheem.rheem.basic.operators.ReduceByOperator]]
-    * @param udf    the UDF for the [[io.rheem.rheem.basic.operators.ReduceByOperator]]
+    * @param keyUdf the key UDF for the [[org.apache.incubator.wayang.basic.operators.ReduceByOperator]]
+    * @param udf    the UDF for the [[org.apache.incubator.wayang.basic.operators.ReduceByOperator]]
     * @return a [[ReduceByDataQuantaBuilder]]
     */
   def reduceByKey[Key](keyUdf: SerializableFunction[Out, Key], udf: SerializableBinaryOperator[Out]) =
     new ReduceByDataQuantaBuilder(this, keyUdf, udf)
 
   /**
-    * Feed the built [[DataQuanta]] into a [[io.rheem.rheem.basic.operators.MaterializedGroupByOperator]].
+    * Feed the built [[DataQuanta]] into a [[org.apache.incubator.wayang.basic.operators.MaterializedGroupByOperator]].
     *
-    * @param keyUdf the key UDF for the [[io.rheem.rheem.basic.operators.MaterializedGroupByOperator]]
+    * @param keyUdf the key UDF for the [[org.apache.incubator.wayang.basic.operators.MaterializedGroupByOperator]]
     * @return a [[GroupByDataQuantaBuilder]]
     */
   def groupByKey[Key](keyUdf: SerializableFunction[Out, Key]) =
     new GroupByDataQuantaBuilder(this, keyUdf)
 
   /**
-    * Feed the built [[DataQuanta]] into a [[io.rheem.rheem.basic.operators.GlobalMaterializedGroupOperator]].
+    * Feed the built [[DataQuanta]] into a [[org.apache.incubator.wayang.basic.operators.GlobalMaterializedGroupOperator]].
     *
     * @return a [[GlobalGroupDataQuantaBuilder]]
     */
@@ -223,7 +223,7 @@ trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging
 
   /**
     * Feed the built [[DataQuanta]] of this and the given instance into a
-    * [[io.rheem.rheem.basic.operators.UnionAllOperator]].
+    * [[org.apache.incubator.wayang.basic.operators.UnionAllOperator]].
     *
     * @param that the other [[DataQuantaBuilder]] to union with
     * @return a [[UnionDataQuantaBuilder]]
@@ -232,7 +232,7 @@ trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging
 
   /**
     * Feed the built [[DataQuanta]] of this and the given instance into a
-    * [[io.rheem.rheem.basic.operators.IntersectOperator]].
+    * [[org.apache.incubator.wayang.basic.operators.IntersectOperator]].
     *
     * @param that the other [[DataQuantaBuilder]] to intersect with
     * @return an [[IntersectDataQuantaBuilder]]
@@ -241,7 +241,7 @@ trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging
 
   /**
     * Feed the built [[DataQuanta]] of this and the given instance into a
-    * [[io.rheem.rheem.basic.operators.JoinOperator]].
+    * [[org.apache.incubator.wayang.basic.operators.JoinOperator]].
     *
     * @param thisKeyUdf the key extraction UDF for this instance
     * @param that       the other [[DataQuantaBuilder]] to join with
@@ -255,7 +255,7 @@ trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging
 
   /**
     * Feed the built [[DataQuanta]] of this and the given instance into a
-    * [[io.rheem.rheem.basic.operators.CoGroupOperator]].
+    * [[org.apache.incubator.wayang.basic.operators.CoGroupOperator]].
     *
     * @param thisKeyUdf the key extraction UDF for this instance
     * @param that       the other [[DataQuantaBuilder]] to join with
@@ -270,7 +270,7 @@ trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging
 
   /**
     * Feed the built [[DataQuanta]] of this and the given instance into a
-    * [[io.rheem.rheem.basic.operators.SortOperator]].
+    * [[org.apache.incubator.wayang.basic.operators.SortOperator]].
     *
     * @param keyUdf the key extraction UDF for this instance
     * @return a [[SortDataQuantaBuilder]]
@@ -280,44 +280,44 @@ trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging
 
   /**
     * Feed the built [[DataQuanta]] of this and the given instance into a
-    * [[io.rheem.rheem.basic.operators.CartesianOperator]].
+    * [[org.apache.incubator.wayang.basic.operators.CartesianOperator]].
     *
     * @return a [[CartesianDataQuantaBuilder]]
     */
   def cartesian[ThatOut](that: DataQuantaBuilder[_, ThatOut]) = new CartesianDataQuantaBuilder(this, that)
 
   /**
-    * Feed the built [[DataQuanta]] into a [[io.rheem.rheem.basic.operators.ZipWithIdOperator]].
+    * Feed the built [[DataQuanta]] into a [[org.apache.incubator.wayang.basic.operators.ZipWithIdOperator]].
     *
-    * @return a [[ZipWithIdDataQuantaBuilder]] representing the [[io.rheem.rheem.basic.operators.ZipWithIdOperator]]'s output
+    * @return a [[ZipWithIdDataQuantaBuilder]] representing the [[org.apache.incubator.wayang.basic.operators.ZipWithIdOperator]]'s output
     */
   def zipWithId = new ZipWithIdDataQuantaBuilder(this)
 
   /**
-    * Feed the built [[DataQuanta]] into a [[io.rheem.rheem.basic.operators.DistinctOperator]].
+    * Feed the built [[DataQuanta]] into a [[org.apache.incubator.wayang.basic.operators.DistinctOperator]].
     *
-    * @return a [[DistinctDataQuantaBuilder]] representing the [[io.rheem.rheem.basic.operators.DistinctOperator]]'s output
+    * @return a [[DistinctDataQuantaBuilder]] representing the [[org.apache.incubator.wayang.basic.operators.DistinctOperator]]'s output
     */
   def distinct = new DistinctDataQuantaBuilder(this)
 
   /**
-    * Feed the built [[DataQuanta]] into a [[io.rheem.rheem.basic.operators.CountOperator]].
+    * Feed the built [[DataQuanta]] into a [[org.apache.incubator.wayang.basic.operators.CountOperator]].
     *
-    * @return a [[CountDataQuantaBuilder]] representing the [[io.rheem.rheem.basic.operators.CountOperator]]'s output
+    * @return a [[CountDataQuantaBuilder]] representing the [[org.apache.incubator.wayang.basic.operators.CountOperator]]'s output
     */
   def count = new CountDataQuantaBuilder(this)
 
   /**
-    * Feed the built [[DataQuanta]] into a [[io.rheem.rheem.basic.operators.DoWhileOperator]].
+    * Feed the built [[DataQuanta]] into a [[org.apache.incubator.wayang.basic.operators.DoWhileOperator]].
     *
     * @return a [[DoWhileDataQuantaBuilder]]
     */
   def doWhile[Conv](conditionUdf: SerializablePredicate[JavaCollection[Conv]],
-                    bodyBuilder: JavaFunction[DataQuantaBuilder[_, Out], RheemTuple[DataQuantaBuilder[_, Out], DataQuantaBuilder[_, Conv]]]) =
+                    bodyBuilder: JavaFunction[DataQuantaBuilder[_, Out], WayangTuple[DataQuantaBuilder[_, Out], DataQuantaBuilder[_, Conv]]]) =
     new DoWhileDataQuantaBuilder(this, conditionUdf.asInstanceOf[SerializablePredicate[JavaCollection[Conv]]], bodyBuilder)
 
   /**
-    * Feed the built [[DataQuanta]] into a [[io.rheem.rheem.basic.operators.RepeatOperator]].
+    * Feed the built [[DataQuanta]] into a [[org.apache.incubator.wayang.basic.operators.RepeatOperator]].
     *
     * @return a [[DoWhileDataQuantaBuilder]]
     */
@@ -325,7 +325,7 @@ trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging
     new RepeatDataQuantaBuilder(this, numRepetitions, bodyBuilder)
 
   /**
-    * Feed the built [[DataQuanta]] into a custom [[Operator]] with a single [[io.rheem.rheem.core.plan.rheemplan.InputSlot]]
+    * Feed the built [[DataQuanta]] into a custom [[Operator]] with a single [[org.apache.incubator.wayang.core.plan.wayangplan.InputSlot]]
     * and a single [[OutputSlot]].
     *
     * @param operator the custom [[Operator]]
@@ -340,7 +340,7 @@ trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging
 
   /**
     * Feed the built [[DataQuanta]] into a [[LocalCallbackSink]] that collects all data quanta locally. This triggers
-    * execution of the constructed [[RheemPlan]].
+    * execution of the constructed [[WayangPlan]].
     *
     * @return the collected data quanta
     */
@@ -351,7 +351,7 @@ trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging
 
   /**
     * Feed the built [[DataQuanta]] into a [[JavaFunction]] that runs locally. This triggers
-    * execution of the constructed [[RheemPlan]].
+    * execution of the constructed [[WayangPlan]].
     *
     * @param f the [[JavaFunction]]
     * @return the collected data quanta
@@ -359,19 +359,19 @@ trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging
   def forEach(f: Consumer[Out]): Unit = this.dataQuanta().foreachJava(f)
 
   /**
-    * Feed the built [[DataQuanta]] into a [[io.rheem.rheem.basic.operators.TextFileSink]]. This triggers
-    * execution of the constructed [[RheemPlan]].
+    * Feed the built [[DataQuanta]] into a [[org.apache.incubator.wayang.basic.operators.TextFileSink]]. This triggers
+    * execution of the constructed [[WayangPlan]].
     *
     * @param url     the URL of the file to be written
-    * @param jobName optional name for the [[RheemPlan]]
+    * @param jobName optional name for the [[WayangPlan]]
     * @return the collected data quanta
     */
   def writeTextFile(url: String, formatterUdf: SerializableFunction[Out, String], jobName: String): Unit =
     this.writeTextFile(url, formatterUdf, jobName, null)
 
   /**
-    * Feed the built [[DataQuanta]] into a [[io.rheem.rheem.basic.operators.TextFileSink]]. This triggers
-    * execution of the constructed [[RheemPlan]].
+    * Feed the built [[DataQuanta]] into a [[org.apache.incubator.wayang.basic.operators.TextFileSink]]. This triggers
+    * execution of the constructed [[WayangPlan]].
     *
     * @param url the URL of the file to be written
     * @return the collected data quanta
@@ -423,7 +423,7 @@ trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging
 
 /**
   * Abstract base class for builders of [[DataQuanta]]. The purpose of the builders is to provide a convenient
-  * Java API for Rheem that compensates for lacking default and named arguments.
+  * Java API for Wayang that compensates for lacking default and named arguments.
   */
 abstract class BasicDataQuantaBuilder[This <: DataQuantaBuilder[_, Out], Out](implicit _javaPlanBuilder: JavaPlanBuilder)
   extends Logging with DataQuantaBuilder[This, Out] {
@@ -543,7 +543,7 @@ abstract class BasicDataQuantaBuilder[This <: DataQuantaBuilder[_, Out], Out](im
 }
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[io.rheem.rheem.core.plan.rheemplan.UnarySource]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.core.plan.wayangplan.UnarySource]]s.
   *
   * @param source          the [[UnarySource]]
   * @param javaPlanBuilder the [[JavaPlanBuilder]]
@@ -557,7 +557,7 @@ class UnarySourceDataQuantaBuilder[This <: DataQuantaBuilder[_, Out], Out](sourc
 }
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[io.rheem.rheem.basic.operators.CollectionSource]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.CollectionSource]]s.
   *
   * @param collection      the [[JavaCollection]] to be loaded
   * @param javaPlanBuilder the [[JavaPlanBuilder]]
@@ -568,7 +568,7 @@ class LoadCollectionDataQuantaBuilder[Out](collection: JavaCollection[Out])(impl
   // Try to infer the type class from the collection.
   locally {
     if (!collection.isEmpty) {
-      val any = RheemCollections.getAny(collection)
+      val any = WayangCollections.getAny(collection)
       if (any != null) {
         this.outputTypeTrap.dataSetType = DataSetType.createDefault(any.getClass)
       }
@@ -580,7 +580,7 @@ class LoadCollectionDataQuantaBuilder[Out](collection: JavaCollection[Out])(impl
 }
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[io.rheem.rheem.basic.operators.MapOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.MapOperator]]s.
   *
   * @param inputDataQuanta [[DataQuantaBuilder]] for the input [[DataQuanta]]
   * @param udf             UDF for the [[MapOperator]]
@@ -622,11 +622,11 @@ class MapDataQuantaBuilder[In, Out](inputDataQuanta: DataQuantaBuilder[_, In],
 }
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[io.rheem.rheem.basic.operators.MapOperator]]s with
-  * [[io.rheem.rheem.basic.function.ProjectionDescriptor]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.MapOperator]]s with
+  * [[org.apache.incubator.wayang.basic.function.ProjectionDescriptor]]s.
   *
   * @param inputDataQuanta [[DataQuantaBuilder]] for the input [[DataQuanta]]
-  * @param fieldNames      field names for the [[io.rheem.rheem.basic.function.ProjectionDescriptor]]
+  * @param fieldNames      field names for the [[org.apache.incubator.wayang.basic.function.ProjectionDescriptor]]
   */
 class ProjectionDataQuantaBuilder[In, Out](inputDataQuanta: DataQuantaBuilder[_, In], fieldNames: Array[String])
                                           (implicit javaPlanBuilder: JavaPlanBuilder)
@@ -638,7 +638,7 @@ class ProjectionDataQuantaBuilder[In, Out](inputDataQuanta: DataQuantaBuilder[_,
 
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[io.rheem.rheem.basic.operators.MapOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.MapOperator]]s.
   *
   * @param inputDataQuanta [[DataQuantaBuilder]] for the input [[DataQuanta]]
   * @param udf             UDF for the [[MapOperator]]
@@ -712,10 +712,10 @@ class FilterDataQuantaBuilder[T](inputDataQuanta: DataQuantaBuilder[_, T], udf:
 
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[io.rheem.rheem.basic.operators.SortOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.SortOperator]]s.
   *
   * @param inputDataQuanta [[DataQuantaBuilder]] for the input [[DataQuanta]]
-  * @param keyUdf             UDF for the [[io.rheem.rheem.basic.operators.SortOperator]]
+  * @param keyUdf             UDF for the [[org.apache.incubator.wayang.basic.operators.SortOperator]]
   */
 class SortDataQuantaBuilder[T, Key](inputDataQuanta: DataQuantaBuilder[_, T],
                                     keyUdf: SerializableFunction[T, Key])
@@ -781,10 +781,10 @@ class SortDataQuantaBuilder[T, Key](inputDataQuanta: DataQuantaBuilder[_, T],
 
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[io.rheem.rheem.basic.operators.FlatMapOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.FlatMapOperator]]s.
   *
   * @param inputDataQuanta [[DataQuantaBuilder]] for the input [[DataQuanta]]
-  * @param udf             UDF for the [[io.rheem.rheem.basic.operators.FlatMapOperator]]
+  * @param udf             UDF for the [[org.apache.incubator.wayang.basic.operators.FlatMapOperator]]
   */
 class FlatMapDataQuantaBuilder[In, Out](inputDataQuanta: DataQuantaBuilder[_, In],
                                         udf: SerializableFunction[In, java.lang.Iterable[Out]])
@@ -845,10 +845,10 @@ class FlatMapDataQuantaBuilder[In, Out](inputDataQuanta: DataQuantaBuilder[_, In
 }
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[io.rheem.rheem.basic.operators.MapPartitionsOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.MapPartitionsOperator]]s.
   *
   * @param inputDataQuanta [[DataQuantaBuilder]] for the input [[DataQuanta]]
-  * @param udf             UDF for the [[io.rheem.rheem.basic.operators.MapPartitionsOperator]]
+  * @param udf             UDF for the [[org.apache.incubator.wayang.basic.operators.MapPartitionsOperator]]
   */
 class MapPartitionsDataQuantaBuilder[In, Out](inputDataQuanta: DataQuantaBuilder[_, In],
                                               udf: SerializableFunction[java.lang.Iterable[In], java.lang.Iterable[Out]])
@@ -911,7 +911,7 @@ class MapPartitionsDataQuantaBuilder[In, Out](inputDataQuanta: DataQuantaBuilder
 }
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[io.rheem.rheem.basic.operators.SampleOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.SampleOperator]]s.
   *
   * @param inputDataQuanta    [[DataQuantaBuilder]] for the input [[DataQuanta]]
   * @param sampleSizeFunction the absolute size of the sample as a function of the current iteration number
@@ -977,11 +977,11 @@ class SampleDataQuantaBuilder[T](inputDataQuanta: DataQuantaBuilder[_, T], sampl
 }
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[io.rheem.rheem.basic.operators.ReduceByOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.ReduceByOperator]]s.
   *
   * @param inputDataQuanta [[DataQuantaBuilder]] for the input [[DataQuanta]]
-  * @param udf             UDF for the [[io.rheem.rheem.basic.operators.ReduceByOperator]]
-  * @param keyUdf          key extraction UDF for the [[io.rheem.rheem.basic.operators.ReduceByOperator]]
+  * @param udf             UDF for the [[org.apache.incubator.wayang.basic.operators.ReduceByOperator]]
+  * @param keyUdf          key extraction UDF for the [[org.apache.incubator.wayang.basic.operators.ReduceByOperator]]
   */
 class ReduceByDataQuantaBuilder[Key, T](inputDataQuanta: DataQuantaBuilder[_, T],
                                         keyUdf: SerializableFunction[T, Key],
@@ -1042,10 +1042,10 @@ class ReduceByDataQuantaBuilder[Key, T](inputDataQuanta: DataQuantaBuilder[_, T]
 }
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[io.rheem.rheem.basic.operators.MaterializedGroupByOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.MaterializedGroupByOperator]]s.
   *
   * @param inputDataQuanta [[DataQuantaBuilder]] for the input [[DataQuanta]]
-  * @param keyUdf          key extraction UDF for the [[io.rheem.rheem.basic.operators.MaterializedGroupByOperator]]
+  * @param keyUdf          key extraction UDF for the [[org.apache.incubator.wayang.basic.operators.MaterializedGroupByOperator]]
   */
 class GroupByDataQuantaBuilder[Key, T](inputDataQuanta: DataQuantaBuilder[_, T], keyUdf: SerializableFunction[T, Key])
                                       (implicit javaPlanBuilder: JavaPlanBuilder)
@@ -1090,7 +1090,7 @@ class GroupByDataQuantaBuilder[Key, T](inputDataQuanta: DataQuantaBuilder[_, T],
 }
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[io.rheem.rheem.basic.operators.GlobalMaterializedGroupOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.GlobalMaterializedGroupOperator]]s.
   *
   * @param inputDataQuanta [[DataQuantaBuilder]] for the input [[DataQuanta]]
   */
@@ -1103,10 +1103,10 @@ class GlobalGroupDataQuantaBuilder[T](inputDataQuanta: DataQuantaBuilder[_, T])(
 
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[io.rheem.rheem.basic.operators.GlobalReduceOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.GlobalReduceOperator]]s.
   *
   * @param inputDataQuanta [[DataQuantaBuilder]] for the input [[DataQuanta]]
-  * @param udf             UDF for the [[io.rheem.rheem.basic.operators.GlobalReduceOperator]]
+  * @param udf             UDF for the [[org.apache.incubator.wayang.basic.operators.GlobalReduceOperator]]
   */
 class GlobalReduceDataQuantaBuilder[T](inputDataQuanta: DataQuantaBuilder[_, T],
                                        udf: SerializableBinaryOperator[T])
@@ -1144,7 +1144,7 @@ class GlobalReduceDataQuantaBuilder[T](inputDataQuanta: DataQuantaBuilder[_, T],
 }
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[io.rheem.rheem.basic.operators.UnionAllOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.UnionAllOperator]]s.
   *
   * @param inputDataQuanta0 [[DataQuantaBuilder]] for the first input [[DataQuanta]]
   * @param inputDataQuanta1 [[DataQuantaBuilder]] for the first input [[DataQuanta]]
@@ -1161,7 +1161,7 @@ class UnionDataQuantaBuilder[T](inputDataQuanta0: DataQuantaBuilder[_, T],
 }
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[io.rheem.rheem.basic.operators.IntersectOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.IntersectOperator]]s.
   *
   * @param inputDataQuanta0 [[DataQuantaBuilder]] for the first input [[DataQuanta]]
   * @param inputDataQuanta1 [[DataQuantaBuilder]] for the first input [[DataQuanta]]
@@ -1178,12 +1178,12 @@ class IntersectDataQuantaBuilder[T](inputDataQuanta0: DataQuantaBuilder[_, T],
 }
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[io.rheem.rheem.basic.operators.JoinOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.JoinOperator]]s.
   *
   * @param inputDataQuanta0 [[DataQuantaBuilder]] for the first input [[DataQuanta]]
   * @param inputDataQuanta1 [[DataQuantaBuilder]] for the first input [[DataQuanta]]
-  * @param keyUdf0          first key extraction UDF for the [[io.rheem.rheem.basic.operators.JoinOperator]]
-  * @param keyUdf1          first key extraction UDF for the [[io.rheem.rheem.basic.operators.JoinOperator]]
+  * @param keyUdf0          first key extraction UDF for the [[org.apache.incubator.wayang.basic.operators.JoinOperator]]
+  * @param keyUdf1          first key extraction UDF for the [[org.apache.incubator.wayang.basic.operators.JoinOperator]]
   */
 class JoinDataQuantaBuilder[In0, In1, Key](inputDataQuanta0: DataQuantaBuilder[_, In0],
                                            inputDataQuanta1: DataQuantaBuilder[_, In1],
@@ -1302,12 +1302,12 @@ class JoinDataQuantaBuilder[In0, In1, Key](inputDataQuanta0: DataQuantaBuilder[_
 }
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[io.rheem.rheem.basic.operators.CoGroupOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.CoGroupOperator]]s.
   *
   * @param inputDataQuanta0 [[DataQuantaBuilder]] for the first input [[DataQuanta]]
   * @param inputDataQuanta1 [[DataQuantaBuilder]] for the first input [[DataQuanta]]
-  * @param keyUdf0          first key extraction UDF for the [[io.rheem.rheem.basic.operators.CoGroupOperator]]
-  * @param keyUdf1          first key extraction UDF for the [[io.rheem.rheem.basic.operators.CoGroupOperator]]
+  * @param keyUdf0          first key extraction UDF for the [[org.apache.incubator.wayang.basic.operators.CoGroupOperator]]
+  * @param keyUdf1          first key extraction UDF for the [[org.apache.incubator.wayang.basic.operators.CoGroupOperator]]
   */
 class CoGroupDataQuantaBuilder[In0, In1, Key](inputDataQuanta0: DataQuantaBuilder[_, In0],
                                            inputDataQuanta1: DataQuantaBuilder[_, In1],
@@ -1416,7 +1416,7 @@ class CoGroupDataQuantaBuilder[In0, In1, Key](inputDataQuanta0: DataQuantaBuilde
 
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[io.rheem.rheem.basic.operators.CartesianOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.CartesianOperator]]s.
   *
   * @param inputDataQuanta0 [[DataQuantaBuilder]] for the first input [[DataQuanta]]
   * @param inputDataQuanta1 [[DataQuantaBuilder]] for the first input [[DataQuanta]]
@@ -1437,7 +1437,7 @@ class CartesianDataQuantaBuilder[In0, In1](inputDataQuanta0: DataQuantaBuilder[_
 }
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[io.rheem.rheem.basic.operators.ZipWithIdOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.ZipWithIdOperator]]s.
   *
   * @param inputDataQuanta [[DataQuantaBuilder]] for the input [[DataQuanta]]
   */
@@ -1455,7 +1455,7 @@ class ZipWithIdDataQuantaBuilder[T](inputDataQuanta: DataQuantaBuilder[_, T])
 }
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[io.rheem.rheem.basic.operators.DistinctOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.DistinctOperator]]s.
   *
   * @param inputDataQuanta [[DataQuantaBuilder]] for the input [[DataQuanta]]
   */
@@ -1471,7 +1471,7 @@ class DistinctDataQuantaBuilder[T](inputDataQuanta: DataQuantaBuilder[_, T])
 }
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[io.rheem.rheem.basic.operators.CountOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.CountOperator]]s.
   *
   * @param inputDataQuanta [[DataQuantaBuilder]] for the input [[DataQuanta]]
   */
@@ -1490,14 +1490,14 @@ class CountDataQuantaBuilder[T](inputDataQuanta: DataQuantaBuilder[_, T])
 
 
 /**
-  * [[DataQuantaBuilder]] implementation for any [[io.rheem.rheem.core.plan.rheemplan.Operator]]s. Does not offer
+  * [[DataQuantaBuilder]] implementation for any [[org.apache.incubator.wayang.core.plan.wayangplan.Operator]]s. Does not offer
   * any convenience methods, though.
   *
-  * @param operator        the custom [[io.rheem.rheem.core.plan.rheemplan.Operator]]
+  * @param operator        the custom [[org.apache.incubator.wayang.core.plan.wayangplan.Operator]]
   * @param outputIndex     index of the [[OutputSlot]] addressed by the new instance
   * @param buildCache      a [[DataQuantaBuilderCache]] that must be shared across instances addressing the same [[Operator]]
   * @param inputDataQuanta [[DataQuantaBuilder]]s for the input [[DataQuanta]]
-  * @param javaPlanBuilder the [[JavaPlanBuilder]] used to construct the current [[RheemPlan]]
+  * @param javaPlanBuilder the [[JavaPlanBuilder]] used to construct the current [[WayangPlan]]
   */
 class CustomOperatorDataQuantaBuilder[T](operator: Operator,
                                          outputIndex: Int,
@@ -1518,7 +1518,7 @@ class CustomOperatorDataQuantaBuilder[T](operator: Operator,
 }
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[io.rheem.rheem.basic.operators.DoWhileOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.DoWhileOperator]]s.
   *
   * @param inputDataQuanta [[DataQuantaBuilder]] for the input [[DataQuanta]]
   * @param conditionUdf    UDF for the looping condition
@@ -1526,7 +1526,7 @@ class CustomOperatorDataQuantaBuilder[T](operator: Operator,
   */
 class DoWhileDataQuantaBuilder[T, ConvOut](inputDataQuanta: DataQuantaBuilder[_, T],
                                            conditionUdf: SerializablePredicate[JavaCollection[ConvOut]],
-                                           bodyBuilder: JavaFunction[DataQuantaBuilder[_, T], RheemTuple[DataQuantaBuilder[_, T], DataQuantaBuilder[_, ConvOut]]])
+                                           bodyBuilder: JavaFunction[DataQuantaBuilder[_, T], WayangTuple[DataQuantaBuilder[_, T], DataQuantaBuilder[_, ConvOut]]])
                                           (implicit javaPlanBuilder: JavaPlanBuilder)
   extends BasicDataQuantaBuilder[DoWhileDataQuantaBuilder[T, ConvOut], T] {
 
@@ -1580,7 +1580,7 @@ class DoWhileDataQuantaBuilder[T, ConvOut](inputDataQuanta: DataQuantaBuilder[_,
   }
 
   /**
-    * Set the number of expected iterations for the built [[io.rheem.rheem.basic.operators.DoWhileOperator]].
+    * Set the number of expected iterations for the built [[org.apache.incubator.wayang.basic.operators.DoWhileOperator]].
     *
     * @param numExpectedIterations the expected number of iterations
     * @return this instance
@@ -1602,18 +1602,18 @@ class DoWhileDataQuantaBuilder[T, ConvOut](inputDataQuanta: DataQuantaBuilder[_,
     * @return the loop body builder
     */
   private def dataQuantaBodyBuilder =
-    new JavaFunction[DataQuanta[T], RheemTuple[DataQuanta[T], DataQuanta[ConvOut]]] {
+    new JavaFunction[DataQuanta[T], WayangTuple[DataQuanta[T], DataQuanta[ConvOut]]] {
       override def apply(loopStart: DataQuanta[T]) = {
         val loopStartBuilder = new FakeDataQuantaBuilder(loopStart)
         val loopEndBuilders = bodyBuilder(loopStartBuilder)
-        new RheemTuple(loopEndBuilders.field0.dataQuanta(), loopEndBuilders.field1.dataQuanta())
+        new WayangTuple(loopEndBuilders.field0.dataQuanta(), loopEndBuilders.field1.dataQuanta())
       }
     }
 
 }
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[io.rheem.rheem.basic.operators.DoWhileOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.DoWhileOperator]]s.
   *
   * @param inputDataQuanta [[DataQuantaBuilder]] for the input [[DataQuanta]]
   * @param numRepetitions  number of repetitions of the loop
diff --git a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/JavaPlanBuilder.scala b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/JavaPlanBuilder.scala
index 0781b2c..36d76aa 100644
--- a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/JavaPlanBuilder.scala
+++ b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/JavaPlanBuilder.scala
@@ -1,35 +1,35 @@
-package io.rheem.rheem.api
+package org.apache.incubator.wayang.api
 
 import java.util.{Collection => JavaCollection}
 
 import de.hpi.isg.profiledb.store.model.Experiment
 import org.apache.commons.lang3.Validate
-import io.rheem.rheem.api.util.DataQuantaBuilderCache
-import io.rheem.rheem.basic.data.Record
-import io.rheem.rheem.basic.operators.{TableSource, TextFileSource}
-import io.rheem.rheem.core.api.RheemContext
-import io.rheem.rheem.core.plan.rheemplan._
-import io.rheem.rheem.core.types.DataSetType
+import org.apache.incubator.wayang.api.util.DataQuantaBuilderCache
+import org.apache.incubator.wayang.basic.data.Record
+import org.apache.incubator.wayang.basic.operators.{TableSource, TextFileSource}
+import org.apache.incubator.wayang.core.api.WayangContext
+import org.apache.incubator.wayang.core.plan.wayangplan._
+import org.apache.incubator.wayang.core.types.DataSetType
 
 import scala.reflect.ClassTag
 
 /**
-  * Utility to build and execute [[RheemPlan]]s.
+  * Utility to build and execute [[WayangPlan]]s.
   */
-class JavaPlanBuilder(rheemCtx: RheemContext, jobName: String) {
+class JavaPlanBuilder(wayangCtx: WayangContext, jobName: String) {
 
-  def this(rheemContext: RheemContext) = this(rheemContext, null)
+  def this(wayangContext: WayangContext) = this(wayangContext, null)
 
   /**
-    * A [[PlanBuilder]] that actually takes care of building [[RheemPlan]]s.
+    * A [[PlanBuilder]] that actually takes care of building [[WayangPlan]]s.
     */
-  protected[api] val planBuilder = new PlanBuilder(rheemCtx, jobName = jobName)
+  protected[api] val planBuilder = new PlanBuilder(wayangCtx, jobName = jobName)
 
   /**
-    * Feed a [[JavaCollection]] into a [[io.rheem.rheem.basic.operators.CollectionSource]].
+    * Feed a [[JavaCollection]] into a [[org.apache.incubator.wayang.basic.operators.CollectionSource]].
     *
     * @param collection the [[JavaCollection]]
-    * @return a [[DataQuantaBuilder]] to further develop and configure the just started [[RheemPlan]]
+    * @return a [[DataQuantaBuilder]] to further develop and configure the just started [[WayangPlan]]
     */
   def loadCollection[T](collection: JavaCollection[T]) = new LoadCollectionDataQuantaBuilder[T](collection)(this)
 
@@ -97,7 +97,7 @@ class JavaPlanBuilder(rheemCtx: RheemContext, jobName: String) {
 
 
   /**
-    * Defines the [[Experiment]] that should collects metrics of the [[RheemPlan]].
+    * Defines the [[Experiment]] that should collects metrics of the [[WayangPlan]].
     *
     * @param experiment the [[Experiment]]
     * @return this instance
@@ -119,7 +119,7 @@ class JavaPlanBuilder(rheemCtx: RheemContext, jobName: String) {
   }
 
   /**
-    * Defines the name for the [[RheemPlan]] that is being created.
+    * Defines the name for the [[WayangPlan]] that is being created.
     *
     * @param jobName the name
     * @return this instance
diff --git a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/PlanBuilder.scala b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/PlanBuilder.scala
index 0fb42ce..31871c4 100644
--- a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/PlanBuilder.scala
+++ b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/PlanBuilder.scala
@@ -1,13 +1,13 @@
-package io.rheem.rheem.api
+package org.apache.incubator.wayang.api
 
 import de.hpi.isg.profiledb.store.model.Experiment
 import org.apache.commons.lang3.Validate
-import io.rheem.rheem.api
-import io.rheem.rheem.basic.data.Record
-import io.rheem.rheem.basic.operators.{CollectionSource, TableSource, TextFileSource}
-import io.rheem.rheem.core.api.RheemContext
-import io.rheem.rheem.core.plan.rheemplan._
-import io.rheem.rheem.core.util.ReflectionUtils
+import org.apache.incubator.wayang.api
+import org.apache.incubator.wayang.basic.data.Record
+import org.apache.incubator.wayang.basic.operators.{CollectionSource, TableSource, TextFileSource}
+import org.apache.incubator.wayang.core.api.WayangContext
+import org.apache.incubator.wayang.core.plan.wayangplan._
+import org.apache.incubator.wayang.core.util.ReflectionUtils
 
 import scala.collection.JavaConversions
 import scala.collection.mutable.ListBuffer
@@ -15,9 +15,9 @@ import scala.language.implicitConversions
 import scala.reflect._
 
 /**
-  * Utility to build [[RheemPlan]]s.
+  * Utility to build [[WayangPlan]]s.
   */
-class PlanBuilder(rheemContext: RheemContext, private var jobName: String = null) {
+class PlanBuilder(wayangContext: WayangContext, private var jobName: String = null) {
 
   private[api] val sinks = ListBuffer[Operator]()
 
@@ -44,7 +44,7 @@ class PlanBuilder(rheemContext: RheemContext, private var jobName: String = null
   }
 
   /**
-    * Defines the [[Experiment]] that should collects metrics of the [[RheemPlan]].
+    * Defines the [[Experiment]] that should collects metrics of the [[WayangPlan]].
     *
     * @param experiment the [[Experiment]]
     * @return this instance
@@ -56,7 +56,7 @@ class PlanBuilder(rheemContext: RheemContext, private var jobName: String = null
 
 
   /**
-    * Defines the name for the [[RheemPlan]] that is being created.
+    * Defines the name for the [[WayangPlan]] that is being created.
     *
     * @param jobName the name
     * @return this instance
@@ -77,12 +77,12 @@ class PlanBuilder(rheemContext: RheemContext, private var jobName: String = null
 
 
   /**
-    * Build the [[io.rheem.rheem.core.api.Job]] and execute it.
+    * Build the [[org.apache.incubator.wayang.core.api.Job]] and execute it.
     */
   def buildAndExecute(): Unit = {
-    val plan: RheemPlan = new RheemPlan(this.sinks.toArray: _*)
-    if (this.experiment == null) this.rheemContext.execute(jobName, plan, this.udfJars.toArray: _*)
-    else this.rheemContext.execute(jobName, plan, this.experiment, this.udfJars.toArray: _*)
+    val plan: WayangPlan = new WayangPlan(this.sinks.toArray: _*)
+    if (this.experiment == null) this.wayangContext.execute(jobName, plan, this.udfJars.toArray: _*)
+    else this.wayangContext.execute(jobName, plan, this.experiment, this.udfJars.toArray: _*)
   }
 
   /**
@@ -102,7 +102,7 @@ class PlanBuilder(rheemContext: RheemContext, private var jobName: String = null
   def readTable(source: TableSource): DataQuanta[Record] = load(source)
 
   /**
-    * Loads a [[java.util.Collection]] into Rheem and represents them as [[DataQuanta]].
+    * Loads a [[java.util.Collection]] into Wayang and represents them as [[DataQuanta]].
     *
     * @param collection to be loaded
     * @return [[DataQuanta]] the `collection`
@@ -111,7 +111,7 @@ class PlanBuilder(rheemContext: RheemContext, private var jobName: String = null
   load(new CollectionSource[T](collection, dataSetType[T]))
 
   /**
-    * Loads a [[Iterable]] into Rheem and represents it as [[DataQuanta]].
+    * Loads a [[Iterable]] into Wayang and represents it as [[DataQuanta]].
     *
     * @param iterable to be loaded
     * @return [[DataQuanta]] the `iterable`
diff --git a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/RecordDataQuanta.scala b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/RecordDataQuanta.scala
index ac09577..1557bc4 100644
--- a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/RecordDataQuanta.scala
+++ b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/RecordDataQuanta.scala
@@ -1,10 +1,10 @@
-package io.rheem.rheem.api
+package org.apache.incubator.wayang.api
 
-import io.rheem.rheem.basic.data.Record
-import io.rheem.rheem.basic.function.ProjectionDescriptor
-import io.rheem.rheem.basic.operators.MapOperator
-import io.rheem.rheem.basic.types.RecordType
-import io.rheem.rheem.core.optimizer.costs.LoadEstimator
+import org.apache.incubator.wayang.basic.data.Record
+import org.apache.incubator.wayang.basic.function.ProjectionDescriptor
+import org.apache.incubator.wayang.basic.operators.MapOperator
+import org.apache.incubator.wayang.basic.types.RecordType
+import org.apache.incubator.wayang.core.optimizer.costs.LoadEstimator
 
 /**
   * This class enhances the functionality of [[DataQuanta]] with [[Record]]s.
diff --git a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/RecordDataQuantaBuilder.scala b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/RecordDataQuantaBuilder.scala
index 50c6d03..28f70b2 100644
--- a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/RecordDataQuantaBuilder.scala
+++ b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/RecordDataQuantaBuilder.scala
@@ -1,10 +1,10 @@
-package io.rheem.rheem.api
+package org.apache.incubator.wayang.api
 
-import io.rheem.rheem.api.util.DataQuantaBuilderDecorator
-import io.rheem.rheem.basic.data.Record
-import io.rheem.rheem.basic.function.ProjectionDescriptor
-import io.rheem.rheem.basic.operators.MapOperator
-import io.rheem.rheem.core.optimizer.costs.LoadEstimator
+import org.apache.incubator.wayang.api.util.DataQuantaBuilderDecorator
+import org.apache.incubator.wayang.basic.data.Record
+import org.apache.incubator.wayang.basic.function.ProjectionDescriptor
+import org.apache.incubator.wayang.basic.operators.MapOperator
+import org.apache.incubator.wayang.core.optimizer.costs.LoadEstimator
 
 
 /**
@@ -34,11 +34,11 @@ class RecordDataQuantaBuilderDecorator[This <: RecordDataQuantaBuilder[This]]
   extends DataQuantaBuilderDecorator[This, Record](baseBuilder) with RecordDataQuantaBuilder[This]
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[io.rheem.rheem.basic.operators.MapOperator]]s with
-  * [[io.rheem.rheem.basic.function.ProjectionDescriptor]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.MapOperator]]s with
+  * [[org.apache.incubator.wayang.basic.function.ProjectionDescriptor]]s.
   *
   * @param inputDataQuanta [[DataQuantaBuilder]] for the input [[DataQuanta]]
-  * @param fieldNames      field names for the [[io.rheem.rheem.basic.function.ProjectionDescriptor]]
+  * @param fieldNames      field names for the [[org.apache.incubator.wayang.basic.function.ProjectionDescriptor]]
   */
 class ProjectRecordsDataQuantaBuilder(inputDataQuanta: DataQuantaBuilder[_, Record], fieldNames: Array[String])
                                      (implicit javaPlanBuilder: JavaPlanBuilder)
diff --git a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/graph/Edge.scala b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/graph/Edge.scala
index bad4c4b..3e9fa98 100644
--- a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/graph/Edge.scala
+++ b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/graph/Edge.scala
@@ -1,4 +1,4 @@
-package io.rheem.rheem.api.graph
+package org.apache.incubator.wayang.api.graph
 
 /**
   * Helper to handle [[Edge]]s.
diff --git a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/graph/EdgeDataQuanta.scala b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/graph/EdgeDataQuanta.scala
index dc7bd4a..d256a4c 100644
--- a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/graph/EdgeDataQuanta.scala
+++ b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/graph/EdgeDataQuanta.scala
@@ -1,9 +1,9 @@
-package io.rheem.rheem.api.graph
+package org.apache.incubator.wayang.api.graph
 
-import io.rheem.rheem.api._
-import io.rheem.rheem.basic.data.Record
-import io.rheem.rheem.basic.operators.{MapOperator, PageRankOperator}
-import io.rheem.rheem.core.optimizer.ProbabilisticDoubleInterval
+import org.apache.incubator.wayang.api._
+import org.apache.incubator.wayang.basic.data.Record
+import org.apache.incubator.wayang.basic.operators.{MapOperator, PageRankOperator}
+import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval
 
 /**
   * This class enhances the functionality of [[DataQuanta]] with [[Record]]s.
diff --git a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/graph/EdgeDataQuantaBuilder.scala b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/graph/EdgeDataQuantaBuilder.scala
index e048f8c..8e0b9bd 100644
--- a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/graph/EdgeDataQuantaBuilder.scala
+++ b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/graph/EdgeDataQuantaBuilder.scala
@@ -1,9 +1,9 @@
-package io.rheem.rheem.api.graph
+package org.apache.incubator.wayang.api.graph
 
-import io.rheem.rheem.api.util.DataQuantaBuilderDecorator
-import io.rheem.rheem.api.{BasicDataQuantaBuilder, DataQuanta, DataQuantaBuilder, JavaPlanBuilder, _}
-import io.rheem.rheem.basic.operators.PageRankOperator
-import io.rheem.rheem.core.optimizer.ProbabilisticDoubleInterval
+import org.apache.incubator.wayang.api.util.DataQuantaBuilderDecorator
+import org.apache.incubator.wayang.api.{BasicDataQuantaBuilder, DataQuanta, DataQuantaBuilder, JavaPlanBuilder, _}
+import org.apache.incubator.wayang.basic.operators.PageRankOperator
+import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval
 
 /**
   * Enriches [[DataQuantaBuilder]] by graph-specific operations.
@@ -31,7 +31,7 @@ class EdgeDataQuantaBuilderDecorator[This <: EdgeDataQuantaBuilderDecorator[This
   extends DataQuantaBuilderDecorator[This, Edge](baseBuilder) with EdgeDataQuantaBuilder[This]
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[io.rheem.rheem.basic.operators.MapOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.MapOperator]]s.
   *
   * @param inputDataQuanta [[DataQuantaBuilder]] for the input [[DataQuanta]]
   * @param numIterations   number of PageRank iterations to do
diff --git a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/graph/package.scala b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/graph/package.scala
index 2db3a37..6242d7e 100644
--- a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/graph/package.scala
+++ b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/graph/package.scala
@@ -1,9 +1,9 @@
-package io.rheem.rheem.api
+package org.apache.incubator.wayang.api
 
-import io.rheem.rheem.basic.data.{Tuple2 => T2}
+import org.apache.incubator.wayang.basic.data.{Tuple2 => T2}
 
 /**
-  * Provides implicits for Rheem's graph API.
+  * Provides implicits for Wayang's graph API.
   */
 package object graph {
 
diff --git a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/package.scala b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/package.scala
index 2d4b9b7..6580535 100644
--- a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/package.scala
+++ b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/package.scala
@@ -1,23 +1,23 @@
-package io.rheem.rheem
+package org.apache.incubator.wayang
 
 import _root_.java.lang.{Class => JavaClass, Iterable => JavaIterable}
 import _root_.java.util.function.{Consumer, ToLongBiFunction, ToLongFunction}
 
-import io.rheem.rheem.basic.data.{Record, Tuple2 => RheemTuple2}
-import io.rheem.rheem.core.api.RheemContext
-import io.rheem.rheem.core.function.FunctionDescriptor.{SerializableBinaryOperator, SerializableFunction, SerializablePredicate}
-import io.rheem.rheem.core.optimizer.ProbabilisticDoubleInterval
-import io.rheem.rheem.core.optimizer.cardinality.{CardinalityEstimate, CardinalityEstimator, DefaultCardinalityEstimator, FixedSizeCardinalityEstimator}
-import io.rheem.rheem.core.optimizer.costs.{DefaultLoadEstimator, LoadEstimator, LoadProfileEstimator, NestableLoadProfileEstimator}
-import io.rheem.rheem.core.plan.rheemplan.ElementaryOperator
-import io.rheem.rheem.core.types.{BasicDataUnitType, DataSetType, DataUnitGroupType, DataUnitType}
+import org.apache.incubator.wayang.basic.data.{Record, Tuple2 => WayangTuple2}
+import org.apache.incubator.wayang.core.api.WayangContext
+import org.apache.incubator.wayang.core.function.FunctionDescriptor.{SerializableBinaryOperator, SerializableFunction, SerializablePredicate}
+import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval
+import org.apache.incubator.wayang.core.optimizer.cardinality.{CardinalityEstimate, CardinalityEstimator, DefaultCardinalityEstimator, FixedSizeCardinalityEstimator}
+import org.apache.incubator.wayang.core.optimizer.costs.{DefaultLoadEstimator, LoadEstimator, LoadProfileEstimator, NestableLoadProfileEstimator}
+import org.apache.incubator.wayang.core.plan.wayangplan.ElementaryOperator
+import org.apache.incubator.wayang.core.types.{BasicDataUnitType, DataSetType, DataUnitGroupType, DataUnitType}
 
 import scala.collection.JavaConversions
 import scala.language.implicitConversions
 import scala.reflect.ClassTag
 
 /**
-  * Provides implicits for the basic Rheem API.
+  * Provides implicits for the basic Wayang API.
   */
 package object api {
 
@@ -43,7 +43,7 @@ package object api {
       override def apply(t: In) = scalaFunc(t)
     }
 
-  implicit def toJoinedDataQuanta[Out0: ClassTag, Out1: ClassTag](dataQuanta: DataQuanta[RheemTuple2[Out0, Out1]]):
+  implicit def toJoinedDataQuanta[Out0: ClassTag, Out1: ClassTag](dataQuanta: DataQuanta[WayangTuple2[Out0, Out1]]):
   JoinedDataQuanta[Out0, Out1] =
     new JoinedDataQuanta(dataQuanta)
 
@@ -121,7 +121,7 @@ package object api {
 
   implicit def toInterval(double: Double): ProbabilisticDoubleInterval = new ProbabilisticDoubleInterval(double, double, .99)
 
-  implicit def createPlanBuilder(rheemContext: RheemContext): PlanBuilder = new PlanBuilder(rheemContext)
+  implicit def createPlanBuilder(wayangContext: WayangContext): PlanBuilder = new PlanBuilder(wayangContext)
 
   implicit private[api] def wrap[Out: ClassTag](op: ElementaryOperator)(implicit planBuilder: PlanBuilder): DataQuanta[Out] =
     new DataQuanta[Out](op)
diff --git a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/util/DataQuantaBuilderCache.scala b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/util/DataQuantaBuilderCache.scala
index 210529f..009f4fe 100644
--- a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/util/DataQuantaBuilderCache.scala
+++ b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/util/DataQuantaBuilderCache.scala
@@ -1,10 +1,10 @@
-package io.rheem.rheem.api.util
+package org.apache.incubator.wayang.api.util
 
-import io.rheem.rheem.api.DataQuanta
+import org.apache.incubator.wayang.api.DataQuanta
 
 /**
-  * Caches products of [[io.rheem.rheem.api.DataQuantaBuilder]]s that need to be executed at once, e.g., because they
-  * belong to different [[io.rheem.rheem.core.plan.rheemplan.OutputSlot]]s of the same custom [[io.rheem.rheem.core.plan.rheemplan.Operator]].
+  * Caches products of [[org.apache.incubator.wayang.api.DataQuantaBuilder]]s that need to be executed at once, e.g., because they
+  * belong to different [[org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot]]s of the same custom [[org.apache.incubator.wayang.core.plan.wayangplan.Operator]].
   */
 class DataQuantaBuilderCache {
 
diff --git a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/util/DataQuantaBuilderDecorator.scala b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/util/DataQuantaBuilderDecorator.scala
index cbf90a0..e8b0759 100644
--- a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/util/DataQuantaBuilderDecorator.scala
+++ b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/util/DataQuantaBuilderDecorator.scala
@@ -1,10 +1,10 @@
-package io.rheem.rheem.api.util
+package org.apache.incubator.wayang.api.util
 
 import de.hpi.isg.profiledb.store.model.Experiment
-import io.rheem.rheem.api.{DataQuanta, DataQuantaBuilder, JavaPlanBuilder}
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator
-import io.rheem.rheem.core.platform.Platform
-import io.rheem.rheem.core.types.DataSetType
+import org.apache.incubator.wayang.api.{DataQuanta, DataQuantaBuilder, JavaPlanBuilder}
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator
+import org.apache.incubator.wayang.core.platform.Platform
+import org.apache.incubator.wayang.core.types.DataSetType
 
 /**
   * Utility to extend a [[DataQuantaBuilder]]'s functionality by decoration.
diff --git a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/util/TypeTrap.scala b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/util/TypeTrap.scala
index 61e5941..6f7c3ce 100644
--- a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/util/TypeTrap.scala
+++ b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/util/TypeTrap.scala
@@ -1,9 +1,9 @@
-package io.rheem.rheem.api.util
+package org.apache.incubator.wayang.api.util
 
-import io.rheem.rheem.core.types.DataSetType
+import org.apache.incubator.wayang.core.types.DataSetType
 
 /**
-  * This class waits for a [[io.rheem.rheem.core.types.DataSetType]] to be set and verifies that there are no
+  * This class waits for a [[org.apache.incubator.wayang.core.types.DataSetType]] to be set and verifies that there are no
   * two different sets.
   */
 class TypeTrap {
diff --git a/rheem-api/src/test/java/org/apache/incubator/wayang/api/JavaApiTest.java b/rheem-api/src/test/java/org/apache/incubator/wayang/api/JavaApiTest.java
index d755db7..c6595f0 100644
--- a/rheem-api/src/test/java/org/apache/incubator/wayang/api/JavaApiTest.java
+++ b/rheem-api/src/test/java/org/apache/incubator/wayang/api/JavaApiTest.java
@@ -1,25 +1,25 @@
-package io.rheem.rheem.api;
+package org.apache.incubator.wayang.api;
 
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import io.rheem.rheem.basic.data.Tuple2;
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.api.RheemContext;
-import io.rheem.rheem.core.function.ExecutionContext;
-import io.rheem.rheem.core.function.FunctionDescriptor;
-import io.rheem.rheem.core.function.PredicateDescriptor;
-import io.rheem.rheem.core.function.TransformationDescriptor;
-import io.rheem.rheem.core.types.DataSetType;
-import io.rheem.rheem.core.util.RheemArrays;
-import io.rheem.rheem.core.util.RheemCollections;
-import io.rheem.rheem.core.util.Tuple;
-import io.rheem.rheem.core.util.fs.LocalFileSystem;
-import io.rheem.rheem.java.Java;
-import io.rheem.rheem.java.operators.JavaMapOperator;
-import io.rheem.rheem.spark.Spark;
-import io.rheem.rheem.sqlite3.Sqlite3;
-import io.rheem.rheem.sqlite3.operators.Sqlite3TableSource;
+import org.apache.incubator.wayang.basic.data.Tuple2;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.api.WayangContext;
+import org.apache.incubator.wayang.core.function.ExecutionContext;
+import org.apache.incubator.wayang.core.function.FunctionDescriptor;
+import org.apache.incubator.wayang.core.function.PredicateDescriptor;
+import org.apache.incubator.wayang.core.function.TransformationDescriptor;
+import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.incubator.wayang.core.util.WayangArrays;
+import org.apache.incubator.wayang.core.util.WayangCollections;
+import org.apache.incubator.wayang.core.util.Tuple;
+import org.apache.incubator.wayang.core.util.fs.LocalFileSystem;
+import org.apache.incubator.wayang.java.Java;
+import org.apache.incubator.wayang.java.operators.JavaMapOperator;
+import org.apache.incubator.wayang.spark.Spark;
+import org.apache.incubator.wayang.sqlite3.Sqlite3;
+import org.apache.incubator.wayang.sqlite3.operators.Sqlite3TableSource;
 
 import java.io.File;
 import java.io.IOException;
@@ -50,9 +50,9 @@ public class JavaApiTest {
     public void setUp() throws SQLException, IOException {
         // Generate test data.
         this.sqlite3Configuration = new Configuration();
-        File sqlite3dbFile = File.createTempFile("rheem-sqlite3", "db");
+        File sqlite3dbFile = File.createTempFile("wayang-sqlite3", "db");
         sqlite3dbFile.deleteOnExit();
-        this.sqlite3Configuration.setProperty("rheem.sqlite3.jdbc.url", "jdbc:sqlite:" + sqlite3dbFile.getAbsolutePath());
+        this.sqlite3Configuration.setProperty("wayang.sqlite3.jdbc.url", "jdbc:sqlite:" + sqlite3dbFile.getAbsolutePath());
         try (Connection connection = Sqlite3.platform().createDatabaseDescriptor(this.sqlite3Configuration).createJdbcConnection()) {
             Statement statement = connection.createStatement();
             statement.addBatch("DROP TABLE IF EXISTS customer;");
@@ -66,8 +66,8 @@ public class JavaApiTest {
 
     @Test
     public void testMapReduce() {
-        RheemContext rheemContext = new RheemContext().with(Java.basicPlugin());
-        JavaPlanBuilder javaPlanBuilder = new JavaPlanBuilder(rheemContext);
+        WayangContext wayangContext = new WayangContext().with(Java.basicPlugin());
+        JavaPlanBuilder javaPlanBuilder = new JavaPlanBuilder(wayangContext);
 
         List<Integer> inputCollection = Arrays.asList(0, 1, 2, 3, 4);
         Collection<Integer> outputCollection = javaPlanBuilder
@@ -76,13 +76,13 @@ public class JavaApiTest {
                 .reduce((a, b) -> a + b).withName("sum")
                 .collect();
 
-        Assert.assertEquals(RheemCollections.asSet(1 + 4 + 9 + 16), RheemCollections.asSet(outputCollection));
+        Assert.assertEquals(WayangCollections.asSet(1 + 4 + 9 + 16), WayangCollections.asSet(outputCollection));
     }
 
     @Test
     public void testMapReduceBy() {
-        RheemContext rheemContext = new RheemContext().with(Java.basicPlugin());
-        JavaPlanBuilder javaPlanBuilder = new JavaPlanBuilder(rheemContext);
+        WayangContext wayangContext = new WayangContext().with(Java.basicPlugin());
+        JavaPlanBuilder javaPlanBuilder = new JavaPlanBuilder(wayangContext);
 
         List<Integer> inputCollection = Arrays.asList(0, 1, 2, 3, 4);
         Collection<Integer> outputCollection = javaPlanBuilder
@@ -91,13 +91,13 @@ public class JavaApiTest {
                 .reduceByKey(i -> i & 1, (a, b) -> a + b).withName("sum")
                 .collect();
 
-        Assert.assertEquals(RheemCollections.asSet(4 + 16, 1 + 9), RheemCollections.asSet(outputCollection));
+        Assert.assertEquals(WayangCollections.asSet(4 + 16, 1 + 9), WayangCollections.asSet(outputCollection));
     }
 
     @Test
     public void testBroadcast2() {
-        RheemContext rheemContext = new RheemContext().with(Java.basicPlugin());
-        JavaPlanBuilder javaPlanBuilder = new JavaPlanBuilder(rheemContext);
+        WayangContext wayangContext = new WayangContext().with(Java.basicPlugin());
+        JavaPlanBuilder javaPlanBuilder = new JavaPlanBuilder(wayangContext);
 
         List<Integer> inputCollection = Arrays.asList(0, 1, 2, 3, 4);
         List<Integer> offsetCollection = Collections.singletonList(-2);
@@ -111,18 +111,18 @@ public class JavaApiTest {
                 .map(new AddOffset("offset")).withName("add offset").withBroadcast(offsetDataQuanta, "offset")
                 .collect();
 
-        Assert.assertEquals(RheemCollections.asSet(-2, -1, 0, 1, 2), RheemCollections.asSet(outputCollection));
+        Assert.assertEquals(WayangCollections.asSet(-2, -1, 0, 1, 2), WayangCollections.asSet(outputCollection));
     }
 
     @Test
     public void testCustomOperatorShortCut() {
-        // Set up RheemContext.
-        RheemContext rheemContext = new RheemContext().with(Java.basicPlugin());
+        // Set up WayangContext.
+        WayangContext wayangContext = new WayangContext().with(Java.basicPlugin());
 
-        final List<Integer> inputValues = RheemArrays.asList(0, 1, 2, 3);
+        final List<Integer> inputValues = WayangArrays.asList(0, 1, 2, 3);
 
-        // Build and execute a Rheem plan.
-        final Collection<Integer> outputValues = new JavaPlanBuilder(rheemContext)
+        // Build and execute a Wayang plan.
+        final Collection<Integer> outputValues = new JavaPlanBuilder(wayangContext)
                 .loadCollection(inputValues).withName("Load input values")
                 .<Integer>customOperator(new JavaMapOperator<>(
                         DataSetType.createDefault(Integer.class),
@@ -135,19 +135,19 @@ public class JavaApiTest {
                 .collect();
 
         // Check the outcome.
-        final List<Integer> expectedOutputValues = RheemArrays.asList(2, 3, 4, 5);
-        Assert.assertEquals(RheemCollections.asSet(expectedOutputValues), RheemCollections.asSet(outputValues));
+        final List<Integer> expectedOutputValues = WayangArrays.asList(2, 3, 4, 5);
+        Assert.assertEquals(WayangCollections.asSet(expectedOutputValues), WayangCollections.asSet(outputValues));
     }
 
     @Test
     public void testWordCount() {
-        // Set up RheemContext.
-        RheemContext rheemContext = new RheemContext().with(Java.basicPlugin());
+        // Set up WayangContext.
+        WayangContext wayangContext = new WayangContext().with(Java.basicPlugin());
 
         final List<String> inputValues = Arrays.asList("Big data is big.", "Is data big data?");
 
-        // Build and execute a Rheem plan.
-        final Collection<Tuple2<String, Integer>> outputValues = new JavaPlanBuilder(rheemContext)
+        // Build and execute a Wayang plan.
+        final Collection<Tuple2<String, Integer>> outputValues = new JavaPlanBuilder(wayangContext)
                 .loadCollection(inputValues).withName("Load input values")
                 .flatMap(line -> Arrays.asList(line.split("\\s+"))).withName("Split words")
                 .map(token -> token.replaceAll("\\W+", "").toLowerCase()).withName("To lower case")
@@ -156,23 +156,23 @@ public class JavaApiTest {
                 .collect();
 
         // Check the outcome.
-        final Set<Tuple2<String, Integer>> expectedOutputValues = RheemCollections.asSet(
+        final Set<Tuple2<String, Integer>> expectedOutputValues = WayangCollections.asSet(
                 new Tuple2<>("big", 3),
                 new Tuple2<>("is", 2),
                 new Tuple2<>("data", 3)
         );
-        Assert.assertEquals(RheemCollections.asSet(expectedOutputValues), RheemCollections.asSet(outputValues));
+        Assert.assertEquals(WayangCollections.asSet(expectedOutputValues), WayangCollections.asSet(outputValues));
     }
 
     @Test
     public void testWordCountOnSparkAndJava() {
-        // Set up RheemContext.
-        RheemContext rheemContext = new RheemContext().with(Java.basicPlugin()).with(Spark.basicPlugin());
+        // Set up WayangContext.
+        WayangContext wayangContext = new WayangContext().with(Java.basicPlugin()).with(Spark.basicPlugin());
 
         final List<String> inputValues = Arrays.asList("Big data is big.", "Is data big data?");
 
-        // Build and execute a Rheem plan.
-        final Collection<Tuple2<String, Integer>> outputValues = new JavaPlanBuilder(rheemContext)
+        // Build and execute a Wayang plan.
+        final Collection<Tuple2<String, Integer>> outputValues = new JavaPlanBuilder(wayangContext)
                 .loadCollection(inputValues).withName("Load input values")
                 .flatMap(line -> Arrays.asList(line.split("\\s+"))).withName("Split words")
                 .map(token -> token.replaceAll("\\W+", "").toLowerCase()).withName("To lower case")
@@ -181,45 +181,45 @@ public class JavaApiTest {
                 .collect();
 
         // Check the outcome.
-        final Set<Tuple2<String, Integer>> expectedOutputValues = RheemCollections.asSet(
+        final Set<Tuple2<String, Integer>> expectedOutputValues = WayangCollections.asSet(
                 new Tuple2<>("big", 3),
                 new Tuple2<>("is", 2),
                 new Tuple2<>("data", 3)
         );
-        Assert.assertEquals(RheemCollections.asSet(expectedOutputValues), RheemCollections.asSet(outputValues));
+        Assert.assertEquals(WayangCollections.asSet(expectedOutputValues), WayangCollections.asSet(outputValues));
     }
 
     @Test
     public void testSample() {
-        // Set up RheemContext.
-        RheemContext rheemContext = new RheemContext().with(Java.basicPlugin()).with(Spark.basicPlugin());
+        // Set up WayangContext.
+        WayangContext wayangContext = new WayangContext().with(Java.basicPlugin()).with(Spark.basicPlugin());
 
         // Create some input values.
-        final List<Integer> inputValues = RheemArrays.asList(RheemArrays.range(100));
+        final List<Integer> inputValues = WayangArrays.asList(WayangArrays.range(100));
 
-        // Build and execute a Rheem plan.
-        final Collection<Integer> outputValues = new JavaPlanBuilder(rheemContext)
+        // Build and execute a Wayang plan.
+        final Collection<Integer> outputValues = new JavaPlanBuilder(wayangContext)
                 .loadCollection(inputValues).withName("Load input values")
                 .sample(10).withName("Sample")
                 .collect();
 
         // Check the outcome.
         Assert.assertEquals(10, outputValues.size());
-        Assert.assertEquals(10, RheemCollections.asSet(outputValues).size());
+        Assert.assertEquals(10, WayangCollections.asSet(outputValues).size());
 
     }
 
     @Test
     public void testDoWhile() {
-        // Set up RheemContext.
-        RheemContext rheemContext = new RheemContext().with(Java.basicPlugin());
+        // Set up WayangContext.
+        WayangContext wayangContext = new WayangContext().with(Java.basicPlugin());
 
         // Generate test data.
-        final List<Integer> inputValues = RheemArrays.asList(1, 2);
+        final List<Integer> inputValues = WayangArrays.asList(1, 2);
 
-        // Build and execute a word count RheemPlan.
+        // Build and execute a word count WayangPlan.
 
-        final Collection<Integer> outputValues = new JavaPlanBuilder(rheemContext)
+        final Collection<Integer> outputValues = new JavaPlanBuilder(wayangContext)
                 .loadCollection(inputValues).withName("Load input values")
                 .doWhile(
                         values -> values.stream().mapToInt(i -> i).sum() > 100,
@@ -234,8 +234,8 @@ public class JavaApiTest {
                 ).withConditionClass(Integer.class).withName("While <= 100")
                 .collect();
 
-        Set<Integer> expectedValues = RheemCollections.asSet(1, 2, 3, 6, 12, 24, 48, 96, 192);
-        Assert.assertEquals(expectedValues, RheemCollections.asSet(outputValues));
+        Set<Integer> expectedValues = WayangCollections.asSet(1, 2, 3, 6, 12, 24, 48, 96, 192);
+        Assert.assertEquals(expectedValues, WayangCollections.asSet(outputValues));
     }
 
     private static class AddOffset implements FunctionDescriptor.ExtendedSerializableFunction<Integer, Integer> {
@@ -250,7 +250,7 @@ public class JavaApiTest {
 
         @Override
         public void open(ExecutionContext ctx) {
-            this.offset = RheemCollections.getSingle(ctx.<Integer>getBroadcast(this.broadcastName));
+            this.offset = WayangCollections.getSingle(ctx.<Integer>getBroadcast(this.broadcastName));
         }
 
         @Override
@@ -261,15 +261,15 @@ public class JavaApiTest {
 
     @Test
     public void testRepeat() {
-        // Set up RheemContext.
-        RheemContext rheemContext = new RheemContext().with(Java.basicPlugin());
+        // Set up WayangContext.
+        WayangContext wayangContext = new WayangContext().with(Java.basicPlugin());
 
         // Generate test data.
-        final List<Integer> inputValues = RheemArrays.asList(1, 2);
+        final List<Integer> inputValues = WayangArrays.asList(1, 2);
 
-        // Build and execute a word count RheemPlan.
+        // Build and execute a word count WayangPlan.
 
-        final Collection<Integer> outputValues = new JavaPlanBuilder(rheemContext)
+        final Collection<Integer> outputValues = new JavaPlanBuilder(wayangContext)
                 .loadCollection(inputValues).withName("Load input values")
                 .repeat(3, start -> start
                         .reduce((a, b) -> a * b).withName("Multiply")
@@ -277,8 +277,8 @@ public class JavaApiTest {
                 ).withName("Repeat 3x")
                 .collect();
 
-        Set<Integer> expectedValues = RheemCollections.asSet(42, 43);
-        Assert.assertEquals(expectedValues, RheemCollections.asSet(outputValues));
+        Set<Integer> expectedValues = WayangCollections.asSet(42, 43);
+        Assert.assertEquals(expectedValues, WayangCollections.asSet(outputValues));
     }
 
     private static class SelectWords implements PredicateDescriptor.ExtendedSerializablePredicate<String> {
@@ -304,9 +304,9 @@ public class JavaApiTest {
 
     @Test
     public void testBroadcast() {
-        // Set up RheemContext.
-        RheemContext rheemContext = new RheemContext().with(Java.basicPlugin());
-        JavaPlanBuilder builder = new JavaPlanBuilder(rheemContext);
+        // Set up WayangContext.
+        WayangContext wayangContext = new WayangContext().with(Java.basicPlugin());
+        JavaPlanBuilder builder = new JavaPlanBuilder(wayangContext);
 
         // Generate test data.
         final List<String> inputValues = Arrays.asList("Hello", "World", "Hi", "Mars");
@@ -321,15 +321,15 @@ public class JavaApiTest {
                 .collect();
 
         // Verify the outcome.
-        Set<String> expectedValues = RheemCollections.asSet("Hello", "World");
-        Assert.assertEquals(expectedValues, RheemCollections.asSet(outputValues));
+        Set<String> expectedValues = WayangCollections.asSet("Hello", "World");
+        Assert.assertEquals(expectedValues, WayangCollections.asSet(outputValues));
     }
 
     @Test
     public void testGroupBy() {
-        // Set up RheemContext.
-        RheemContext rheemContext = new RheemContext().with(Java.basicPlugin());
-        JavaPlanBuilder builder = new JavaPlanBuilder(rheemContext);
+        // Set up WayangContext.
+        WayangContext wayangContext = new WayangContext().with(Java.basicPlugin());
+        JavaPlanBuilder builder = new JavaPlanBuilder(wayangContext);
 
         // Generate test data.
         final List<Integer> inputValues = Arrays.asList(1, 2, 3, 4, 5, 7, 8, 9, 10);
@@ -350,15 +350,15 @@ public class JavaApiTest {
                 .collect();
 
         // Verify the outcome.
-        Set<Double> expectedValues = RheemCollections.asSet(5d, 6d);
-        Assert.assertEquals(expectedValues, RheemCollections.asSet(outputValues));
+        Set<Double> expectedValues = WayangCollections.asSet(5d, 6d);
+        Assert.assertEquals(expectedValues, WayangCollections.asSet(outputValues));
     }
 
     @Test
     public void testJoin() {
-        // Set up RheemContext.
-        RheemContext rheemContext = new RheemContext().with(Java.basicPlugin());
-        JavaPlanBuilder builder = new JavaPlanBuilder(rheemContext);
+        // Set up WayangContext.
+        WayangContext wayangContext = new WayangContext().with(Java.basicPlugin());
+        JavaPlanBuilder builder = new JavaPlanBuilder(wayangContext);
 
         // Generate test data.
         final List<Tuple2<String, Integer>> inputValues1 = Arrays.asList(
@@ -381,19 +381,19 @@ public class JavaApiTest {
                 .collect();
 
         // Verify the outcome.
-        Set<Tuple2<String, Integer>> expectedValues = RheemCollections.asSet(
+        Set<Tuple2<String, Integer>> expectedValues = WayangCollections.asSet(
                 new Tuple2<>("Apple juice", 10),
                 new Tuple2<>("Orange juice", 10),
                 new Tuple2<>("Tap water", 0)
         );
-        Assert.assertEquals(expectedValues, RheemCollections.asSet(outputValues));
+        Assert.assertEquals(expectedValues, WayangCollections.asSet(outputValues));
     }
 
     @Test
     public void testJoinAndAssemble() {
-        // Set up RheemContext.
-        RheemContext rheemContext = new RheemContext().with(Java.basicPlugin());
-        JavaPlanBuilder builder = new JavaPlanBuilder(rheemContext);
+        // Set up WayangContext.
+        WayangContext wayangContext = new WayangContext().with(Java.basicPlugin());
+        JavaPlanBuilder builder = new JavaPlanBuilder(wayangContext);
 
         // Generate test data.
         final List<Tuple2<String, Integer>> inputValues1 = Arrays.asList(
@@ -416,19 +416,19 @@ public class JavaApiTest {
                 .collect();
 
         // Verify the outcome.
-        Set<Tuple2<String, Integer>> expectedValues = RheemCollections.asSet(
+        Set<Tuple2<String, Integer>> expectedValues = WayangCollections.asSet(
                 new Tuple2<>("Apple juice", 10),
                 new Tuple2<>("Orange juice", 10),
                 new Tuple2<>("Tap water", 0)
         );
-        Assert.assertEquals(expectedValues, RheemCollections.asSet(outputValues));
+        Assert.assertEquals(expectedValues, WayangCollections.asSet(outputValues));
     }
 
     @Test
     public void testCoGroup() {
-        // Set up RheemContext.
-        RheemContext rheemContext = new RheemContext().with(Java.basicPlugin()).with(Spark.basicPlugin());
-        JavaPlanBuilder builder = new JavaPlanBuilder(rheemContext);
+        // Set up WayangContext.
+        WayangContext wayangContext = new WayangContext().with(Java.basicPlugin()).with(Spark.basicPlugin());
+        JavaPlanBuilder builder = new JavaPlanBuilder(wayangContext);
 
         // Generate test data.
         final List<Tuple2<String, Integer>> inputValues1 = Arrays.asList(
@@ -448,33 +448,33 @@ public class JavaApiTest {
         final Collection<Tuple2<Set<Tuple2<String, Integer>>, Set<Tuple2<String, String>>>> outputValues = dataQuanta1
                 .coGroup(Tuple2::getField0, dataQuanta2, Tuple2::getField1)
                 .map(joinTuple -> new Tuple2<>(
-                        RheemCollections.asSet(joinTuple.getField0()),
-                        RheemCollections.asSet(joinTuple.getField1())
+                        WayangCollections.asSet(joinTuple.getField0()),
+                        WayangCollections.asSet(joinTuple.getField1())
                 ))
                 .collect();
 
         // Verify the outcome.
-        Set<Tuple2<Set<Tuple2<String, Integer>>, Set<Tuple2<String, String>>>> expectedValues = RheemCollections.asSet(
+        Set<Tuple2<Set<Tuple2<String, Integer>>, Set<Tuple2<String, String>>>> expectedValues = WayangCollections.asSet(
                 new Tuple2<>(
-                        RheemCollections.asSet(new Tuple2<>("Water", 0)),
-                        RheemCollections.asSet(new Tuple2<>("Tap water", "Water"))
+                        WayangCollections.asSet(new Tuple2<>("Water", 0)),
+                        WayangCollections.asSet(new Tuple2<>("Tap water", "Water"))
                 ),
                 new Tuple2<>(
-                        RheemCollections.asSet(new Tuple2<>("Cola", 5)),
-                        RheemCollections.asSet()
+                        WayangCollections.asSet(new Tuple2<>("Cola", 5)),
+                        WayangCollections.asSet()
                 ), new Tuple2<>(
-                        RheemCollections.asSet(new Tuple2<>("Juice", 10)),
-                        RheemCollections.asSet(new Tuple2<>("Apple juice", "Juice"), new Tuple2<>("Orange juice", "Juice"))
+                        WayangCollections.asSet(new Tuple2<>("Juice", 10)),
+                        WayangCollections.asSet(new Tuple2<>("Apple juice", "Juice"), new Tuple2<>("Orange juice", "Juice"))
                 )
         );
-        Assert.assertEquals(expectedValues, RheemCollections.asSet(outputValues));
+        Assert.assertEquals(expectedValues, WayangCollections.asSet(outputValues));
     }
 
     @Test
     public void testCoGroupViaKeyBy() {
-        // Set up RheemContext.
-        RheemContext rheemContext = new RheemContext().with(Java.basicPlugin()).with(Spark.basicPlugin());
-        JavaPlanBuilder builder = new JavaPlanBuilder(rheemContext);
+        // Set up WayangContext.
+        WayangContext wayangContext = new WayangContext().with(Java.basicPlugin()).with(Spark.basicPlugin());
+        JavaPlanBuilder builder = new JavaPlanBuilder(wayangContext);
 
         // Generate test data.
         final List<Tuple2<String, Integer>> inputValues1 = Arrays.asList(
@@ -495,33 +495,33 @@ public class JavaApiTest {
                 dataQuanta1.keyBy(Tuple2::getField0)
                         .coGroup(dataQuanta2.keyBy(Tuple2::getField1))
                         .map(joinTuple -> new Tuple2<>(
-                                RheemCollections.asSet(joinTuple.getField0()),
-                                RheemCollections.asSet(joinTuple.getField1())
+                                WayangCollections.asSet(joinTuple.getField0()),
+                                WayangCollections.asSet(joinTuple.getField1())
                         ))
                         .collect();
 
         // Verify the outcome.
-        Set<Tuple2<Set<Tuple2<String, Integer>>, Set<Tuple2<String, String>>>> expectedValues = RheemCollections.asSet(
+        Set<Tuple2<Set<Tuple2<String, Integer>>, Set<Tuple2<String, String>>>> expectedValues = WayangCollections.asSet(
                 new Tuple2<>(
-                        RheemCollections.asSet(new Tuple2<>("Water", 0)),
-                        RheemCollections.asSet(new Tuple2<>("Tap water", "Water"))
+                        WayangCollections.asSet(new Tuple2<>("Water", 0)),
+                        WayangCollections.asSet(new Tuple2<>("Tap water", "Water"))
                 ),
                 new Tuple2<>(
-                        RheemCollections.asSet(new Tuple2<>("Cola", 5)),
-                        RheemCollections.asSet()
+                        WayangCollections.asSet(new Tuple2<>("Cola", 5)),
+                        WayangCollections.asSet()
                 ), new Tuple2<>(
-                        RheemCollections.asSet(new Tuple2<>("Juice", 10)),
-                        RheemCollections.asSet(new Tuple2<>("Apple juice", "Juice"), new Tuple2<>("Orange juice", "Juice"))
+                        WayangCollections.asSet(new Tuple2<>("Juice", 10)),
+                        WayangCollections.asSet(new Tuple2<>("Apple juice", "Juice"), new Tuple2<>("Orange juice", "Juice"))
                 )
         );
-        Assert.assertEquals(expectedValues, RheemCollections.asSet(outputValues));
+        Assert.assertEquals(expectedValues, WayangCollections.asSet(outputValues));
     }
 
     @Test
     public void testIntersect() {
-        // Set up RheemContext.
-        RheemContext rheemContext = new RheemContext().with(Java.basicPlugin());
-        JavaPlanBuilder builder = new JavaPlanBuilder(rheemContext);
+        // Set up WayangContext.
+        WayangContext wayangContext = new WayangContext().with(Java.basicPlugin());
+        JavaPlanBuilder builder = new JavaPlanBuilder(wayangContext);
 
         // Generate test data.
         final List<Integer> inputValues1 = Arrays.asList(1, 2, 3, 4, 5, 7, 8, 9, 10);
@@ -533,15 +533,15 @@ public class JavaApiTest {
         final Collection<Integer> outputValues = dataQuanta1.intersect(dataQuanta2).collect();
 
         // Verify the outcome.
-        Set<Integer> expectedValues = RheemCollections.asSet(2, 3, 4, 5, 7, 8, 9);
-        Assert.assertEquals(expectedValues, RheemCollections.asSet(outputValues));
+        Set<Integer> expectedValues = WayangCollections.asSet(2, 3, 4, 5, 7, 8, 9);
+        Assert.assertEquals(expectedValues, WayangCollections.asSet(outputValues));
     }
 
     @Test
     public void testSort() {
-        // Set up RheemContext.
-        RheemContext rheemContext = new RheemContext().with(Java.basicPlugin());
-        JavaPlanBuilder builder = new JavaPlanBuilder(rheemContext);
+        // Set up WayangContext.
+        WayangContext wayangContext = new WayangContext().with(Java.basicPlugin());
+        JavaPlanBuilder builder = new JavaPlanBuilder(wayangContext);
 
         // Generate test data.
         final List<Integer> inputValues1 = Arrays.asList(3, 4, 5, 2, 1);
@@ -552,17 +552,17 @@ public class JavaApiTest {
 
         // Verify the outcome.
         List<Integer> expectedValues = Arrays.asList(1, 2, 3, 4, 5);
-        Assert.assertEquals(expectedValues, RheemCollections.asList(outputValues));
+        Assert.assertEquals(expectedValues, WayangCollections.asList(outputValues));
     }
 
 
     @Test
     public void testPageRank() {
-        // Set up RheemContext.
-        RheemContext rheemContext = new RheemContext()
+        // Set up WayangContext.
+        WayangContext wayangContext = new WayangContext()
                 .with(Java.basicPlugin())
                 .with(Java.graphPlugin());
-        JavaPlanBuilder builder = new JavaPlanBuilder(rheemContext);
+        JavaPlanBuilder builder = new JavaPlanBuilder(wayangContext);
 
         // Create a test graph.
         Collection<Tuple2<Long, Long>> edges = Arrays.asList(
@@ -591,11 +591,11 @@ public class JavaApiTest {
 
     @Test
     public void testMapPartitions() {
-        RheemContext rheemContext = new RheemContext().with(Java.basicPlugin());
-        JavaPlanBuilder builder = new JavaPlanBuilder(rheemContext);
+        WayangContext wayangContext = new WayangContext().with(Java.basicPlugin());
+        JavaPlanBuilder builder = new JavaPlanBuilder(wayangContext);
 
         // Generate test data.
-        List<Integer> inputValues = RheemArrays.asList(0, 1, 2, 3, 4, 6, 8);
+        List<Integer> inputValues = WayangArrays.asList(0, 1, 2, 3, 4, 6, 8);
 
         // Execute the job.
         Collection<Tuple2<String, Integer>> outputValues = builder.loadCollection(inputValues)
@@ -614,16 +614,16 @@ public class JavaApiTest {
                 .collect();
 
         // Check the output.
-        Set<Tuple2<String, Integer>> expectedOutput = RheemCollections.asSet(
+        Set<Tuple2<String, Integer>> expectedOutput = WayangCollections.asSet(
                 new Tuple2<>("even", 5), new Tuple2<>("odd", 2)
         );
-        Assert.assertEquals(expectedOutput, RheemCollections.asSet(outputValues));
+        Assert.assertEquals(expectedOutput, WayangCollections.asSet(outputValues));
     }
 
     @Test
     public void testZipWithId() {
-        RheemContext rheemContext = new RheemContext().with(Java.basicPlugin());
-        JavaPlanBuilder builder = new JavaPlanBuilder(rheemContext);
+        WayangContext wayangContext = new WayangContext().with(Java.basicPlugin());
+        JavaPlanBuilder builder = new JavaPlanBuilder(wayangContext);
 
         // Generate test data.
         List<Integer> inputValues = new ArrayList<>(42 * 100);
@@ -649,13 +649,13 @@ public class JavaApiTest {
 
         // Check the output.
         Set<Tuple2<Integer, Integer>> expectedOutput = Collections.singleton(new Tuple2<>(42, 100));
-        Assert.assertEquals(expectedOutput, RheemCollections.asSet(outputValues));
+        Assert.assertEquals(expectedOutput, WayangCollections.asSet(outputValues));
     }
 
     @Test
     public void testWriteTextFile() throws IOException, URISyntaxException {
-        RheemContext rheemContext = new RheemContext().with(Java.basicPlugin());
-        JavaPlanBuilder builder = new JavaPlanBuilder(rheemContext);
+        WayangContext wayangContext = new WayangContext().with(Java.basicPlugin());
+        JavaPlanBuilder builder = new JavaPlanBuilder(wayangContext);
 
         // Generate test data.
         List<Double> inputValues = Arrays.asList(0d, 1 / 3d, 2 / 3d, 1d, 4 / 3d, 5 / 3d);
@@ -677,10 +677,10 @@ public class JavaApiTest {
     @Test
     public void testSqlOnJava() throws IOException, SQLException {
         // Execute job.
-        final RheemContext rheemCtx = new RheemContext(this.sqlite3Configuration)
+        final WayangContext wayangCtx = new WayangContext(this.sqlite3Configuration)
                 .with(Java.basicPlugin())
                 .with(Sqlite3.plugin());
-        JavaPlanBuilder builder = new JavaPlanBuilder(rheemCtx, "testSqlOnJava()");
+        JavaPlanBuilder builder = new JavaPlanBuilder(wayangCtx, "testSqlOnJava()");
         final Collection<String> outputValues = builder
                 .readTable(new Sqlite3TableSource("customer", "name", "age"))
                 .filter(r -> (Integer) r.getField(1) >= 18).withSqlUdf("age >= 18").withTargetPlatform(Java.platform())
@@ -690,18 +690,18 @@ public class JavaApiTest {
 
         // Test the outcome.
         Assert.assertEquals(
-                RheemCollections.asSet("John", "Evelyn"),
-                RheemCollections.asSet(outputValues)
+                WayangCollections.asSet("John", "Evelyn"),
+                WayangCollections.asSet(outputValues)
         );
     }
 
     @Test
     public void testSqlOnSqlite3() throws IOException, SQLException {
         // Execute job.
-        final RheemContext rheemCtx = new RheemContext(this.sqlite3Configuration)
+        final WayangContext wayangCtx = new WayangContext(this.sqlite3Configuration)
                 .with(Java.basicPlugin())
                 .with(Sqlite3.plugin());
-        JavaPlanBuilder builder = new JavaPlanBuilder(rheemCtx, "testSqlOnSqlite3()");
+        JavaPlanBuilder builder = new JavaPlanBuilder(wayangCtx, "testSqlOnSqlite3()");
         final Collection<String> outputValues = builder
                 .readTable(new Sqlite3TableSource("customer", "name", "age"))
                 .filter(r -> (Integer) r.getField(1) >= 18).withSqlUdf("age >= 18")
@@ -711,8 +711,8 @@ public class JavaApiTest {
 
         // Test the outcome.
         Assert.assertEquals(
-                RheemCollections.asSet("John", "Evelyn"),
-                RheemCollections.asSet(outputValues)
+                WayangCollections.asSet("John", "Evelyn"),
+                WayangCollections.asSet(outputValues)
         );
     }
 
diff --git a/rheem-api/src/test/scala/org/apache/incubator/wayang/api/ApiTest.scala b/rheem-api/src/test/scala/org/apache/incubator/wayang/api/ApiTest.scala
index 8ac9f76..dba64ab 100644
--- a/rheem-api/src/test/scala/org/apache/incubator/wayang/api/ApiTest.scala
+++ b/rheem-api/src/test/scala/org/apache/incubator/wayang/api/ApiTest.scala
@@ -1,4 +1,4 @@
-package io.rheem.rheem.api
+package org.apache.incubator.wayang.api
 
 import java.io.File
 import java.net.URI
@@ -7,32 +7,32 @@ import java.sql.{Connection, Statement}
 import java.util.function.Consumer
 
 import org.junit.{Assert, Test}
-import io.rheem.rheem.basic.RheemBasics
-import io.rheem.rheem.core.api.{Configuration, RheemContext}
-import io.rheem.rheem.core.function.FunctionDescriptor.ExtendedSerializablePredicate
-import io.rheem.rheem.core.function.{ExecutionContext, TransformationDescriptor}
-import io.rheem.rheem.core.util.fs.LocalFileSystem
-import io.rheem.rheem.java.Java
-import io.rheem.rheem.java.operators.JavaMapOperator
-import io.rheem.rheem.spark.Spark
-import io.rheem.rheem.sqlite3.Sqlite3
-import io.rheem.rheem.sqlite3.operators.Sqlite3TableSource
+import org.apache.incubator.wayang.basic.WayangBasics
+import org.apache.incubator.wayang.core.api.{Configuration, WayangContext}
+import org.apache.incubator.wayang.core.function.FunctionDescriptor.ExtendedSerializablePredicate
+import org.apache.incubator.wayang.core.function.{ExecutionContext, TransformationDescriptor}
+import org.apache.incubator.wayang.core.util.fs.LocalFileSystem
+import org.apache.incubator.wayang.java.Java
+import org.apache.incubator.wayang.java.operators.JavaMapOperator
+import org.apache.incubator.wayang.spark.Spark
+import org.apache.incubator.wayang.sqlite3.Sqlite3
+import org.apache.incubator.wayang.sqlite3.operators.Sqlite3TableSource
 
 /**
-  * Tests the Rheem API.
+  * Tests the Wayang API.
   */
 class ApiTest {
 
   @Test
   def testReadMapCollect(): Unit = {
-    // Set up RheemContext.
-    val rheem = new RheemContext().withPlugin(Java.basicPlugin).withPlugin(Spark.basicPlugin)
+    // Set up WayangContext.
+    val wayang = new WayangContext().withPlugin(Java.basicPlugin).withPlugin(Spark.basicPlugin)
 
     // Generate some test data.
     val inputValues = (for (i <- 1 to 10) yield i).toArray
 
-    // Build and execute a Rheem plan.
-    val outputValues = rheem
+    // Build and execute a Wayang plan.
+    val outputValues = wayang
       .loadCollection(inputValues).withName("Load input values")
       .map(_ + 2).withName("Add 2")
       .collect()
@@ -44,17 +44,17 @@ class ApiTest {
 
   @Test
   def testCustomOperator(): Unit = {
-    // Set up RheemContext.
-    val rheem = new RheemContext().withPlugin(Java.basicPlugin).withPlugin(Spark.basicPlugin)
+    // Set up WayangContext.
+    val wayang = new WayangContext().withPlugin(Java.basicPlugin).withPlugin(Spark.basicPlugin)
 
     // Generate some test data.
     val inputValues = (for (i <- 1 to 10) yield i).toArray
 
-    // Build and execute a Rheem plan.
-    val inputDataSet = rheem.loadCollection(inputValues).withName("Load input values")
+    // Build and execute a Wayang plan.
+    val inputDataSet = wayang.loadCollection(inputValues).withName("Load input values")
 
     // Add the custom operator.
-    val IndexedSeq(addedValues) = rheem.customOperator(new JavaMapOperator(
+    val IndexedSeq(addedValues) = wayang.customOperator(new JavaMapOperator(
       dataSetType[Int],
       dataSetType[Int],
       new TransformationDescriptor(
@@ -74,14 +74,14 @@ class ApiTest {
 
   @Test
   def testCustomOperatorShortCut(): Unit = {
-    // Set up RheemContext.
-    val rheem = new RheemContext().withPlugin(Java.basicPlugin).withPlugin(Spark.basicPlugin)
+    // Set up WayangContext.
+    val wayang = new WayangContext().withPlugin(Java.basicPlugin).withPlugin(Spark.basicPlugin)
 
     // Generate some test data.
     val inputValues = (for (i <- 1 to 10) yield i).toArray
 
-    // Build and execute a Rheem plan.
-    val outputValues = rheem
+    // Build and execute a Wayang plan.
+    val outputValues = wayang
       .loadCollection(inputValues).withName("Load input values")
       .customOperator[Int](new JavaMapOperator(
       dataSetType[Int],
@@ -100,14 +100,14 @@ class ApiTest {
 
   @Test
   def testWordCount(): Unit = {
-    // Set up RheemContext.
-    val rheem = new RheemContext().withPlugin(Java.basicPlugin).withPlugin(Spark.basicPlugin)
+    // Set up WayangContext.
+    val wayang = new WayangContext().withPlugin(Java.basicPlugin).withPlugin(Spark.basicPlugin)
 
     // Generate some test data.
     val inputValues = Array("Big data is big.", "Is data big data?")
 
-    // Build and execute a word count RheemPlan.
-    val wordCounts = rheem
+    // Build and execute a word count WayangPlan.
+    val wordCounts = wayang
       .loadCollection(inputValues).withName("Load input values")
       .flatMap(_.split("\\s+")).withName("Split words")
       .map(_.replaceAll("\\W+", "").toLowerCase).withName("To lowercase")
@@ -122,14 +122,14 @@ class ApiTest {
 
   @Test
   def testWordCountOnSparkAndJava(): Unit = {
-    // Set up RheemContext.
-    val rheem = new RheemContext().withPlugin(Java.basicPlugin).withPlugin(Spark.basicPlugin)
+    // Set up WayangContext.
+    val wayang = new WayangContext().withPlugin(Java.basicPlugin).withPlugin(Spark.basicPlugin)
 
     // Generate some test data.
     val inputValues = Array("Big data is big.", "Is data big data?")
 
-    // Build and execute a word count RheemPlan.
-    val wordCounts = rheem
+    // Build and execute a word count WayangPlan.
+    val wordCounts = wayang
       .loadCollection(inputValues).withName("Load input values").withTargetPlatforms(Java.platform)
       .flatMap(_.split("\\s+")).withName("Split words").withTargetPlatforms(Java.platform)
       .map(_.replaceAll("\\W+", "").toLowerCase).withName("To lowercase").withTargetPlatforms(Spark.platform)
@@ -144,14 +144,14 @@ class ApiTest {
 
   @Test
   def testSample(): Unit = {
-    // Set up RheemContext.
-    val rheem = new RheemContext().withPlugin(Java.basicPlugin).withPlugin(Spark.basicPlugin)
+    // Set up WayangContext.
+    val wayang = new WayangContext().withPlugin(Java.basicPlugin).withPlugin(Spark.basicPlugin)
 
     // Generate some test data.
     val inputValues = for (i <- 0 until 100) yield i
 
-    // Build and execute the RheemPlan.
-    val sample = rheem
+    // Build and execute the WayangPlan.
+    val sample = wayang
       .loadCollection(inputValues)
       .sample(10)
       .collect()
@@ -163,15 +163,15 @@ class ApiTest {
 
   @Test
   def testDoWhile(): Unit = {
-    // Set up RheemContext.
-    val rheem = new RheemContext().withPlugin(Java.basicPlugin).withPlugin(Spark.basicPlugin)
+    // Set up WayangContext.
+    val wayang = new WayangContext().withPlugin(Java.basicPlugin).withPlugin(Spark.basicPlugin)
 
     // Generate some test data.
     val inputValues = Array(1, 2)
 
-    // Build and execute a word count RheemPlan.
+    // Build and execute a word count WayangPlan.
 
-    val values = rheem
+    val values = wayang
       .loadCollection(inputValues).withName("Load input values")
       .doWhile[Int](vals => vals.max > 100, {
       start =>
@@ -186,15 +186,15 @@ class ApiTest {
 
   @Test
   def testRepeat(): Unit = {
-    // Set up RheemContext.
-    val rheem = new RheemContext().withPlugin(Java.basicPlugin).withPlugin(Spark.basicPlugin)
+    // Set up WayangContext.
+    val wayang = new WayangContext().withPlugin(Java.basicPlugin).withPlugin(Spark.basicPlugin)
 
     // Generate some test data.
     val inputValues = Array(1, 2)
 
-    // Build and execute a word count RheemPlan.
+    // Build and execute a word count WayangPlan.
 
-    val values = rheem
+    val values = wayang
       .loadCollection(inputValues).withName("Load input values").withName(inputValues.mkString(","))
       .repeat(3,
         _.reduce(_ * _).withName("Multiply")
@@ -209,9 +209,9 @@ class ApiTest {
 
   @Test
   def testBroadcast() = {
-    // Set up RheemContext.
-    val rheem = new RheemContext().withPlugin(Java.basicPlugin).withPlugin(Spark.basicPlugin)
-    val builder = new PlanBuilder(rheem)
+    // Set up WayangContext.
+    val wayang = new WayangContext().withPlugin(Java.basicPlugin).withPlugin(Spark.basicPlugin)
+    val builder = new PlanBuilder(wayang)
 
     // Generate some test data.
     val inputStrings = Array("Hello", "World", "Hi", "Mars")
@@ -219,7 +219,7 @@ class ApiTest {
 
     val selectorsDataSet = builder.loadCollection(selectors).withName("Load selectors")
 
-    // Build and execute a word count RheemPlan.
+    // Build and execute a word count WayangPlan.
     val values = builder
       .loadCollection(inputStrings).withName("Load input values")
       .filterJava(new ExtendedSerializablePredicate[String] {
@@ -243,12 +243,12 @@ class ApiTest {
 
   @Test
   def testGroupBy() = {
-    // Set up RheemContext.
-    val rheem = new RheemContext().withPlugin(Java.basicPlugin).withPlugin(Spark.basicPlugin)
+    // Set up WayangContext.
+    val wayang = new WayangContext().withPlugin(Java.basicPlugin).withPlugin(Spark.basicPlugin)
 
     val inputValues = Array(1, 2, 3, 4, 5, 7, 8, 9, 10)
 
-    val result = rheem
+    val result = wayang
       .loadCollection(inputValues)
       .groupByKey(_ % 2).withName("group odd and even")
       .map {
@@ -267,12 +267,12 @@ class ApiTest {
 
   @Test
   def testGroup() = {
-    // Set up RheemContext.
-    val rheem = new RheemContext().withPlugin(Java.basicPlugin).withPlugin(Spark.basicPlugin)
+    // Set up WayangContext.
+    val wayang = new WayangContext().withPlugin(Java.basicPlugin).withPlugin(Spark.basicPlugin)
 
     val inputValues = Array(1, 2, 3, 4, 5, 7, 8, 9, 10)
 
-    val result = rheem
+    val result = wayang
       .loadCollection(inputValues)
       .group()
       .map {
@@ -291,13 +291,13 @@ class ApiTest {
 
   @Test
   def testJoin() = {
-    // Set up RheemContext.
-    val rheem = new RheemContext().withPlugin(Java.basicPlugin).withPlugin(Spark.basicPlugin)
+    // Set up WayangContext.
+    val wayang = new WayangContext().withPlugin(Java.basicPlugin).withPlugin(Spark.basicPlugin)
 
     val inputValues1 = Array(("Water", 0), ("Tonic", 5), ("Juice", 10))
     val inputValues2 = Array(("Apple juice", "Juice"), ("Tap water", "Water"), ("Orange juice", "Juice"))
 
-    val builder = new PlanBuilder(rheem)
+    val builder = new PlanBuilder(wayang)
     val dataQuanta1 = builder.loadCollection(inputValues1)
     val dataQuanta2 = builder.loadCollection(inputValues2)
     val result = dataQuanta1
@@ -311,13 +311,13 @@ class ApiTest {
 
   @Test
   def testJoinAndAssemble() = {
-    // Set up RheemContext.
-    val rheem = new RheemContext().withPlugin(Java.basicPlugin).withPlugin(Spark.basicPlugin)
+    // Set up WayangContext.
+    val wayang = new WayangContext().withPlugin(Java.basicPlugin).withPlugin(Spark.basicPlugin)
 
     val inputValues1 = Array(("Water", 0), ("Tonic", 5), ("Juice", 10))
     val inputValues2 = Array(("Apple juice", "Juice"), ("Tap water", "Water"), ("Orange juice", "Juice"))
 
-    val builder = new PlanBuilder(rheem)
+    val builder = new PlanBuilder(wayang)
     val dataQuanta1 = builder.loadCollection(inputValues1)
     val dataQuanta2 = builder.loadCollection(inputValues2)
     val result = dataQuanta1.keyBy(_._1).join(dataQuanta2.keyBy(_._2))
@@ -331,13 +331,13 @@ class ApiTest {
 
   @Test
   def testCoGroup() = {
-    // Set up RheemContext.
-    val rheem = new RheemContext().withPlugin(Java.basicPlugin).withPlugin(Spark.basicPlugin)
+    // Set up WayangContext.
+    val wayang = new WayangContext().withPlugin(Java.basicPlugin).withPlugin(Spark.basicPlugin)
 
     val inputValues1 = Array(("Water", 0), ("Cola", 5), ("Juice", 10))
     val inputValues2 = Array(("Apple juice", "Juice"), ("Tap water", "Water"), ("Orange juice", "Juice"))
 
-    val builder = new PlanBuilder(rheem)
+    val builder = new PlanBuilder(wayang)
     val dataQuanta1 = builder.loadCollection(inputValues1)
     val dataQuanta2 = builder.loadCollection(inputValues2)
     val result = dataQuanta1
@@ -356,13 +356,13 @@ class ApiTest {
 
   @Test
   def testIntersect() = {
-    // Set up RheemContext.
-    val rheem = new RheemContext().withPlugin(Java.basicPlugin).withPlugin(Spark.basicPlugin)
+    // Set up WayangContext.
+    val wayang = new WayangContext().withPlugin(Java.basicPlugin).withPlugin(Spark.basicPlugin)
 
     val inputValues1 = Array(1, 2, 3, 4, 5, 7, 8, 9, 10)
     val inputValues2 = Array(0, 2, 3, 3, 4, 5, 7, 8, 9, 11)
 
-    val builder = new PlanBuilder(rheem)
+    val builder = new PlanBuilder(wayang)
     val dataQuanta1 = builder.loadCollection(inputValues1)
     val dataQuanta2 = builder.loadCollection(inputValues2)
     val result = dataQuanta1
@@ -376,12 +376,12 @@ class ApiTest {
 
   @Test
   def testSort() = {
-    // Set up RheemContext.
-    val rheem = new RheemContext().withPlugin(Java.basicPlugin).withPlugin(Spark.basicPlugin)
+    // Set up WayangContext.
+    val wayang = new WayangContext().withPlugin(Java.basicPlugin).withPlugin(Spark.basicPlugin)
 
     val inputValues1 = Array(3, 4, 5, 2, 1)
 
-    val builder = new PlanBuilder(rheem)
+    val builder = new PlanBuilder(wayang)
     val dataQuanta1 = builder.loadCollection(inputValues1)
     val result = dataQuanta1
       .sort(r=>r)
@@ -394,16 +394,16 @@ class ApiTest {
 
   @Test
   def testPageRank() = {
-    // Set up RheemContext.
-    val rheem = new RheemContext()
+    // Set up WayangContext.
+    val wayang = new WayangContext()
       .withPlugin(Java.graphPlugin)
-      .withPlugin(RheemBasics.graphPlugin)
+      .withPlugin(WayangBasics.graphPlugin)
       .withPlugin(Java.basicPlugin)
-    import io.rheem.rheem.api.graph._
+    import org.apache.incubator.wayang.api.graph._
 
     val edges = Seq((0, 1), (0, 2), (0, 3), (1, 0), (2, 1), (3, 2), (3, 1)).map(t => Edge(t._1, t._2))
 
-    val pageRanks = rheem
+    val pageRanks = wayang
       .loadCollection(edges).withName("Load edges")
       .pageRank(20).withName("PageRank")
       .collect()
@@ -419,12 +419,12 @@ class ApiTest {
 
   @Test
   def testMapPartitions() = {
-    // Set up RheemContext.
-    val rheem = new RheemContext()
+    // Set up WayangContext.
+    val wayang = new WayangContext()
       .withPlugin(Java.basicPlugin())
       .withPlugin(Spark.basicPlugin)
 
-    val typeCounts = rheem
+    val typeCounts = wayang
       .loadCollection(Seq(0, 1, 2, 3, 4, 6, 8))
         .mapPartitions { ints =>
           var (numOdds, numEvens) = (0, 0)
@@ -439,12 +439,12 @@ class ApiTest {
 
   @Test
   def testZipWithId() = {
-    // Set up RheemContext.
-    val rheem = new RheemContext().withPlugin(Java.basicPlugin).withPlugin(Spark.basicPlugin)
+    // Set up WayangContext.
+    val wayang = new WayangContext().withPlugin(Java.basicPlugin).withPlugin(Spark.basicPlugin)
 
     val inputValues = for (i <- 0 until 100; j <- 0 until 42) yield i
 
-    val result = rheem
+    val result = wayang
       .loadCollection(inputValues)
       .zipWithId
       .groupByKey(_.field1)
@@ -464,12 +464,12 @@ class ApiTest {
     val tempDir = LocalFileSystem.findTempDir
     val targetUrl = LocalFileSystem.toURL(new File(tempDir, "testWriteTextFile.txt"))
 
-    // Set up RheemContext.
-    val rheem = new RheemContext().withPlugin(Java.basicPlugin)
+    // Set up WayangContext.
+    val wayang = new WayangContext().withPlugin(Java.basicPlugin)
 
     val inputValues = for (i <- 0 to 5) yield i * 0.333333333333
 
-    val result = rheem
+    val result = wayang
       .loadCollection(inputValues)
       .writeTextFile(targetUrl, formatterUdf = d => f"${d % .2f}")
 
@@ -486,9 +486,9 @@ class ApiTest {
   def testSqlOnJava() = {
     // Initialize some test data.
     val configuration = new Configuration
-    val sqlite3dbFile = File.createTempFile("rheem-sqlite3", "db")
+    val sqlite3dbFile = File.createTempFile("wayang-sqlite3", "db")
     sqlite3dbFile.deleteOnExit()
-    configuration.setProperty("rheem.sqlite3.jdbc.url", "jdbc:sqlite:" + sqlite3dbFile.getAbsolutePath)
+    configuration.setProperty("wayang.sqlite3.jdbc.url", "jdbc:sqlite:" + sqlite3dbFile.getAbsolutePath)
 
     try {
       val connection: Connection = Sqlite3.platform.createDatabaseDescriptor(configuration).createJdbcConnection
@@ -505,10 +505,10 @@ class ApiTest {
       }
     }
 
-    // Set up RheemContext.
-    val rheem = new RheemContext(configuration).withPlugin(Java.basicPlugin).withPlugin(Sqlite3.plugin)
+    // Set up WayangContext.
+    val wayang = new WayangContext(configuration).withPlugin(Java.basicPlugin).withPlugin(Sqlite3.plugin)
 
-    val result = rheem
+    val result = wayang
       .readTable(new Sqlite3TableSource("customer", "name", "age"))
       .filter(r => r.getField(1).asInstanceOf[Integer] >= 18, sqlUdf = "age >= 18").withTargetPlatforms(Java.platform)
       .projectRecords(Seq("name"))
@@ -524,9 +524,9 @@ class ApiTest {
   def testSqlOnSqlite3() = {
     // Initialize some test data.
     val configuration = new Configuration
-    val sqlite3dbFile = File.createTempFile("rheem-sqlite3", "db")
+    val sqlite3dbFile = File.createTempFile("wayang-sqlite3", "db")
     sqlite3dbFile.deleteOnExit()
-    configuration.setProperty("rheem.sqlite3.jdbc.url", "jdbc:sqlite:" + sqlite3dbFile.getAbsolutePath)
+    configuration.setProperty("wayang.sqlite3.jdbc.url", "jdbc:sqlite:" + sqlite3dbFile.getAbsolutePath)
 
     try {
       val connection: Connection = Sqlite3.platform.createDatabaseDescriptor(configuration).createJdbcConnection
@@ -543,10 +543,10 @@ class ApiTest {
       }
     }
 
-    // Set up RheemContext.
-    val rheem = new RheemContext(configuration).withPlugin(Java.basicPlugin).withPlugin(Sqlite3.plugin)
+    // Set up WayangContext.
+    val wayang = new WayangContext(configuration).withPlugin(Java.basicPlugin).withPlugin(Sqlite3.plugin)
 
-    val result = rheem
+    val result = wayang
       .readTable(new Sqlite3TableSource("customer", "name", "age"))
       .filter(r => r.getField(1).asInstanceOf[Integer] >= 18, sqlUdf = "age >= 18")
       .projectRecords(Seq("name")).withTargetPlatforms(Sqlite3.platform)
diff --git a/rheem-basic/pom.xml b/rheem-basic/pom.xml
index 8e56975..6bd6e37 100644
--- a/rheem-basic/pom.xml
+++ b/rheem-basic/pom.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>rheem</artifactId>
-        <groupId>io.rheem.rheem</groupId>
+        <artifactId>wayang</artifactId>
+        <groupId>org.apache.incubator.wayang</groupId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>rheem-basic</artifactId>
-    <description>This modules represents the base Rheem package with the default operators and functions.</description>
+    <artifactId>wayang-basic</artifactId>
+    <description>This modules represents the base Wayang package with the default operators and functions.</description>
 
     <dependencies>
         <dependency>
-            <groupId>io.rheem.rheem</groupId>
-            <artifactId>rheem-core</artifactId>
+            <groupId>org.apache.incubator.wayang</groupId>
+            <artifactId>wayang-core</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/WayangBasics.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/WayangBasics.java
index 35ce869..57c3a63 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/WayangBasics.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/WayangBasics.java
@@ -1,22 +1,22 @@
-package io.rheem.rheem.basic;
+package org.apache.incubator.wayang.basic;
 
-import io.rheem.rheem.basic.plugin.RheemBasic;
-import io.rheem.rheem.basic.plugin.RheemBasicGraph;
+import org.apache.incubator.wayang.basic.plugin.WayangBasic;
+import org.apache.incubator.wayang.basic.plugin.WayangBasicGraph;
 
 /**
  * Register for plugins in the module.
  */
-public class RheemBasics {
+public class WayangBasics {
 
-    private static final RheemBasic DEFAULT_PLUGIN = new RheemBasic();
+    private static final WayangBasic DEFAULT_PLUGIN = new WayangBasic();
 
-    private static final RheemBasicGraph GRAPH_PLUGIN = new RheemBasicGraph();
+    private static final WayangBasicGraph GRAPH_PLUGIN = new WayangBasicGraph();
 
-    public static RheemBasic defaultPlugin() {
+    public static WayangBasic defaultPlugin() {
         return DEFAULT_PLUGIN;
     }
 
-    public static RheemBasicGraph graphPlugin() {
+    public static WayangBasicGraph graphPlugin() {
         return GRAPH_PLUGIN;
     }
 
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/channels/FileChannel.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/channels/FileChannel.java
index 538a18b..c4a8579 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/channels/FileChannel.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/channels/FileChannel.java
@@ -1,17 +1,17 @@
-package io.rheem.rheem.basic.channels;
-
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.api.exception.RheemException;
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.plan.executionplan.Channel;
-import io.rheem.rheem.core.plan.rheemplan.OutputSlot;
-import io.rheem.rheem.core.platform.AbstractChannelInstance;
-import io.rheem.rheem.core.platform.ChannelDescriptor;
-import io.rheem.rheem.core.platform.ChannelInstance;
-import io.rheem.rheem.core.platform.Executor;
-import io.rheem.rheem.core.util.Actions;
-import io.rheem.rheem.core.util.fs.FileSystem;
-import io.rheem.rheem.core.util.fs.FileSystems;
+package org.apache.incubator.wayang.basic.channels;
+
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.api.exception.WayangException;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.plan.executionplan.Channel;
+import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.incubator.wayang.core.platform.AbstractChannelInstance;
+import org.apache.incubator.wayang.core.platform.ChannelDescriptor;
+import org.apache.incubator.wayang.core.platform.ChannelInstance;
+import org.apache.incubator.wayang.core.platform.Executor;
+import org.apache.incubator.wayang.core.util.Actions;
+import org.apache.incubator.wayang.core.util.fs.FileSystem;
+import org.apache.incubator.wayang.core.util.fs.FileSystems;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -148,7 +148,7 @@ public class FileChannel extends Channel {
         }
 
         String generateTempPath(Configuration configuration) {
-            final String tempDir = configuration.getStringProperty("rheem.basic.tempdir");
+            final String tempDir = configuration.getStringProperty("wayang.basic.tempdir");
             Random random = new Random();
             return String.format("%s/%04x-%04x-%04x-%04x.tmp", tempDir,
                     random.nextInt() & 0xFFFF,
@@ -179,7 +179,7 @@ public class FileChannel extends Channel {
         }
 
         @Override
-        public void doDispose() throws RheemException {
+        public void doDispose() throws WayangException {
             Actions.doSafe(() -> {
                 logger.info("Deleting file channel instances {}.", this.paths);
                 final String path = this.getSinglePath();
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/data/Record.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/data/Record.java
index 16f1c13..ab8a13f 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/data/Record.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/data/Record.java
@@ -1,7 +1,7 @@
-package io.rheem.rheem.basic.data;
+package org.apache.incubator.wayang.basic.data;
 
-import io.rheem.rheem.core.util.Copyable;
-import io.rheem.rheem.core.util.ReflectionUtils;
+import org.apache.incubator.wayang.core.util.Copyable;
+import org.apache.incubator.wayang.core.util.ReflectionUtils;
 
 import java.io.Serializable;
 import java.util.Arrays;
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/data/Tuple2.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/data/Tuple2.java
index a1502f9..52c7ed7 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/data/Tuple2.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/data/Tuple2.java
@@ -1,4 +1,4 @@
-package io.rheem.rheem.basic.data;
+package org.apache.incubator.wayang.basic.data;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/data/Tuple5.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/data/Tuple5.java
index 0db1212..5c06255 100755
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/data/Tuple5.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/data/Tuple5.java
@@ -1,4 +1,4 @@
-package io.rheem.rheem.basic.data;
+package org.apache.incubator.wayang.basic.data;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/function/ProjectionDescriptor.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/function/ProjectionDescriptor.java
index 51a514f..aeefe6c 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/function/ProjectionDescriptor.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/function/ProjectionDescriptor.java
@@ -1,10 +1,10 @@
-package io.rheem.rheem.basic.function;
+package org.apache.incubator.wayang.basic.function;
 
-import io.rheem.rheem.basic.data.Record;
-import io.rheem.rheem.basic.types.RecordType;
-import io.rheem.rheem.core.function.FunctionDescriptor;
-import io.rheem.rheem.core.function.TransformationDescriptor;
-import io.rheem.rheem.core.types.BasicDataUnitType;
+import org.apache.incubator.wayang.basic.data.Record;
+import org.apache.incubator.wayang.basic.types.RecordType;
+import org.apache.incubator.wayang.core.function.FunctionDescriptor;
+import org.apache.incubator.wayang.core.function.TransformationDescriptor;
+import org.apache.incubator.wayang.core.types.BasicDataUnitType;
 
 import java.lang.reflect.Field;
 import java.util.Arrays;
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/GlobalReduceMapping.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/GlobalReduceMapping.java
index ac88a8d..88c67d3 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/GlobalReduceMapping.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/GlobalReduceMapping.java
@@ -1,17 +1,17 @@
-package io.rheem.rheem.basic.mapping;
-
-import io.rheem.rheem.basic.operators.GlobalReduceOperator;
-import io.rheem.rheem.basic.operators.GroupByOperator;
-import io.rheem.rheem.basic.operators.ReduceByOperator;
-import io.rheem.rheem.basic.operators.ReduceOperator;
-import io.rheem.rheem.core.mapping.Mapping;
-import io.rheem.rheem.core.mapping.OperatorPattern;
-import io.rheem.rheem.core.mapping.PlanTransformation;
-import io.rheem.rheem.core.mapping.ReplacementSubplanFactory;
-import io.rheem.rheem.core.mapping.SubplanMatch;
-import io.rheem.rheem.core.mapping.SubplanPattern;
-import io.rheem.rheem.core.plan.rheemplan.Operator;
-import io.rheem.rheem.core.types.DataSetType;
+package org.apache.incubator.wayang.basic.mapping;
+
+import org.apache.incubator.wayang.basic.operators.GlobalReduceOperator;
+import org.apache.incubator.wayang.basic.operators.GroupByOperator;
+import org.apache.incubator.wayang.basic.operators.ReduceByOperator;
+import org.apache.incubator.wayang.basic.operators.ReduceOperator;
+import org.apache.incubator.wayang.core.mapping.Mapping;
+import org.apache.incubator.wayang.core.mapping.OperatorPattern;
+import org.apache.incubator.wayang.core.mapping.PlanTransformation;
+import org.apache.incubator.wayang.core.mapping.ReplacementSubplanFactory;
+import org.apache.incubator.wayang.core.mapping.SubplanMatch;
+import org.apache.incubator.wayang.core.mapping.SubplanPattern;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/Mappings.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/Mappings.java
index 4272a34..4eed237 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/Mappings.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/Mappings.java
@@ -1,6 +1,6 @@
-package io.rheem.rheem.basic.mapping;
+package org.apache.incubator.wayang.basic.mapping;
 
-import io.rheem.rheem.core.mapping.Mapping;
+import org.apache.incubator.wayang.core.mapping.Mapping;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/MaterializedGroupByMapping.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/MaterializedGroupByMapping.java
index c11841f..bc98f1c 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/MaterializedGroupByMapping.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/MaterializedGroupByMapping.java
@@ -1,15 +1,15 @@
-package io.rheem.rheem.basic.mapping;
-
-import io.rheem.rheem.basic.operators.GroupByOperator;
-import io.rheem.rheem.basic.operators.MaterializedGroupByOperator;
-import io.rheem.rheem.core.mapping.Mapping;
-import io.rheem.rheem.core.mapping.OperatorPattern;
-import io.rheem.rheem.core.mapping.PlanTransformation;
-import io.rheem.rheem.core.mapping.ReplacementSubplanFactory;
-import io.rheem.rheem.core.mapping.SubplanMatch;
-import io.rheem.rheem.core.mapping.SubplanPattern;
-import io.rheem.rheem.core.plan.rheemplan.Operator;
-import io.rheem.rheem.core.types.DataSetType;
+package org.apache.incubator.wayang.basic.mapping;
+
+import org.apache.incubator.wayang.basic.operators.GroupByOperator;
+import org.apache.incubator.wayang.basic.operators.MaterializedGroupByOperator;
+import org.apache.incubator.wayang.core.mapping.Mapping;
+import org.apache.incubator.wayang.core.mapping.OperatorPattern;
+import org.apache.incubator.wayang.core.mapping.PlanTransformation;
+import org.apache.incubator.wayang.core.mapping.ReplacementSubplanFactory;
+import org.apache.incubator.wayang.core.mapping.SubplanMatch;
+import org.apache.incubator.wayang.core.mapping.SubplanPattern;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/PageRankMapping.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/PageRankMapping.java
index 92b3c6f..f49fbab 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/PageRankMapping.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/PageRankMapping.java
@@ -1,30 +1,30 @@
-package io.rheem.rheem.basic.mapping;
-
-import io.rheem.rheem.basic.data.Tuple2;
-import io.rheem.rheem.basic.operators.CountOperator;
-import io.rheem.rheem.basic.operators.DistinctOperator;
-import io.rheem.rheem.basic.operators.FlatMapOperator;
-import io.rheem.rheem.basic.operators.JoinOperator;
-import io.rheem.rheem.basic.operators.MapOperator;
-import io.rheem.rheem.basic.operators.PageRankOperator;
-import io.rheem.rheem.basic.operators.ReduceByOperator;
-import io.rheem.rheem.basic.operators.RepeatOperator;
-import io.rheem.rheem.core.function.ExecutionContext;
-import io.rheem.rheem.core.function.FlatMapDescriptor;
-import io.rheem.rheem.core.function.FunctionDescriptor;
-import io.rheem.rheem.core.mapping.Mapping;
-import io.rheem.rheem.core.mapping.OperatorPattern;
-import io.rheem.rheem.core.mapping.PlanTransformation;
-import io.rheem.rheem.core.mapping.ReplacementSubplanFactory;
-import io.rheem.rheem.core.mapping.SubplanPattern;
-import io.rheem.rheem.core.optimizer.ProbabilisticDoubleInterval;
-import io.rheem.rheem.core.optimizer.cardinality.DefaultCardinalityEstimator;
-import io.rheem.rheem.core.plan.rheemplan.LoopIsolator;
-import io.rheem.rheem.core.plan.rheemplan.LoopSubplan;
-import io.rheem.rheem.core.plan.rheemplan.Operator;
-import io.rheem.rheem.core.plan.rheemplan.Subplan;
-import io.rheem.rheem.core.util.ReflectionUtils;
-import io.rheem.rheem.core.util.RheemCollections;
+package org.apache.incubator.wayang.basic.mapping;
+
+import org.apache.incubator.wayang.basic.data.Tuple2;
+import org.apache.incubator.wayang.basic.operators.CountOperator;
+import org.apache.incubator.wayang.basic.operators.DistinctOperator;
+import org.apache.incubator.wayang.basic.operators.FlatMapOperator;
+import org.apache.incubator.wayang.basic.operators.JoinOperator;
+import org.apache.incubator.wayang.basic.operators.MapOperator;
+import org.apache.incubator.wayang.basic.operators.PageRankOperator;
+import org.apache.incubator.wayang.basic.operators.ReduceByOperator;
+import org.apache.incubator.wayang.basic.operators.RepeatOperator;
+import org.apache.incubator.wayang.core.function.ExecutionContext;
+import org.apache.incubator.wayang.core.function.FlatMapDescriptor;
+import org.apache.incubator.wayang.core.function.FunctionDescriptor;
+import org.apache.incubator.wayang.core.mapping.Mapping;
+import org.apache.incubator.wayang.core.mapping.OperatorPattern;
+import org.apache.incubator.wayang.core.mapping.PlanTransformation;
+import org.apache.incubator.wayang.core.mapping.ReplacementSubplanFactory;
+import org.apache.incubator.wayang.core.mapping.SubplanPattern;
+import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.incubator.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
+import org.apache.incubator.wayang.core.plan.wayangplan.LoopIsolator;
+import org.apache.incubator.wayang.core.plan.wayangplan.LoopSubplan;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.incubator.wayang.core.plan.wayangplan.Subplan;
+import org.apache.incubator.wayang.core.util.ReflectionUtils;
+import org.apache.incubator.wayang.core.util.WayangCollections;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -243,7 +243,7 @@ public class PageRankMapping implements Mapping {
 
         @Override
         public void open(ExecutionContext ctx) {
-            long numVertices = RheemCollections.getSingle(ctx.getBroadcast("numVertices"));
+            long numVertices = WayangCollections.getSingle(ctx.getBroadcast("numVertices"));
             this.initialRank = 1f / numVertices;
         }
 
@@ -269,7 +269,7 @@ public class PageRankMapping implements Mapping {
 
         @Override
         public void open(ExecutionContext ctx) {
-            long numVertices = RheemCollections.getSingle(ctx.getBroadcast("numVertices"));
+            long numVertices = WayangCollections.getSingle(ctx.getBroadcast("numVertices"));
             this.minRank = (1 - this.dampingFactor) / numVertices;
         }
 
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/ReduceByMapping.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/ReduceByMapping.java
index b63bded..31afc7e 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/ReduceByMapping.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/ReduceByMapping.java
@@ -1,16 +1,16 @@
-package io.rheem.rheem.basic.mapping;
+package org.apache.incubator.wayang.basic.mapping;
 
-import io.rheem.rheem.basic.operators.GroupByOperator;
-import io.rheem.rheem.basic.operators.ReduceByOperator;
-import io.rheem.rheem.basic.operators.ReduceOperator;
-import io.rheem.rheem.core.mapping.Mapping;
-import io.rheem.rheem.core.mapping.OperatorPattern;
-import io.rheem.rheem.core.mapping.PlanTransformation;
-import io.rheem.rheem.core.mapping.ReplacementSubplanFactory;
-import io.rheem.rheem.core.mapping.SubplanMatch;
-import io.rheem.rheem.core.mapping.SubplanPattern;
-import io.rheem.rheem.core.plan.rheemplan.Operator;
-import io.rheem.rheem.core.types.DataSetType;
+import org.apache.incubator.wayang.basic.operators.GroupByOperator;
+import org.apache.incubator.wayang.basic.operators.ReduceByOperator;
+import org.apache.incubator.wayang.basic.operators.ReduceOperator;
+import org.apache.incubator.wayang.core.mapping.Mapping;
+import org.apache.incubator.wayang.core.mapping.OperatorPattern;
+import org.apache.incubator.wayang.core.mapping.PlanTransformation;
+import org.apache.incubator.wayang.core.mapping.ReplacementSubplanFactory;
+import org.apache.incubator.wayang.core.mapping.SubplanMatch;
+import org.apache.incubator.wayang.core.mapping.SubplanPattern;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/RepeatMapping.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/RepeatMapping.java
index 8391916..c005338 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/RepeatMapping.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/RepeatMapping.java
@@ -1,17 +1,17 @@
-package io.rheem.rheem.basic.mapping;
+package org.apache.incubator.wayang.basic.mapping;
 
-import io.rheem.rheem.basic.operators.CollectionSource;
-import io.rheem.rheem.basic.operators.LoopOperator;
-import io.rheem.rheem.basic.operators.MapOperator;
-import io.rheem.rheem.basic.operators.RepeatOperator;
-import io.rheem.rheem.core.mapping.Mapping;
-import io.rheem.rheem.core.mapping.OperatorPattern;
-import io.rheem.rheem.core.mapping.PlanTransformation;
-import io.rheem.rheem.core.mapping.ReplacementSubplanFactory;
-import io.rheem.rheem.core.mapping.SubplanPattern;
-import io.rheem.rheem.core.plan.rheemplan.Subplan;
-import io.rheem.rheem.core.types.DataSetType;
-import io.rheem.rheem.core.util.RheemCollections;
+import org.apache.incubator.wayang.basic.operators.CollectionSource;
+import org.apache.incubator.wayang.basic.operators.LoopOperator;
+import org.apache.incubator.wayang.basic.operators.MapOperator;
+import org.apache.incubator.wayang.basic.operators.RepeatOperator;
+import org.apache.incubator.wayang.core.mapping.Mapping;
+import org.apache.incubator.wayang.core.mapping.OperatorPattern;
+import org.apache.incubator.wayang.core.mapping.PlanTransformation;
+import org.apache.incubator.wayang.core.mapping.ReplacementSubplanFactory;
+import org.apache.incubator.wayang.core.mapping.SubplanPattern;
+import org.apache.incubator.wayang.core.plan.wayangplan.Subplan;
+import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.incubator.wayang.core.util.WayangCollections;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -57,7 +57,7 @@ public class RepeatMapping implements Mapping {
         final LoopOperator<?, ?> loopOperator = new LoopOperator<>(
                 repeatOperator.getType().unchecked(),
                 DataSetType.createDefault(Integer.class),
-                ints -> RheemCollections.getSingle(ints) >= numIterations,
+                ints -> WayangCollections.getSingle(ints) >= numIterations,
                 numIterations
         );
         loopOperator.setName(repeatOperator.getName());
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CartesianOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CartesianOperator.java
index 20a4556..b512973 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CartesianOperator.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CartesianOperator.java
@@ -1,12 +1,12 @@
-package io.rheem.rheem.basic.operators;
+package org.apache.incubator.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.basic.data.Tuple2;
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator;
-import io.rheem.rheem.core.optimizer.cardinality.DefaultCardinalityEstimator;
-import io.rheem.rheem.core.plan.rheemplan.BinaryToUnaryOperator;
-import io.rheem.rheem.core.types.DataSetType;
+import org.apache.incubator.wayang.basic.data.Tuple2;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.incubator.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
+import org.apache.incubator.wayang.core.plan.wayangplan.BinaryToUnaryOperator;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CoGroupOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CoGroupOperator.java
index 58bae6a..7fa8748 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CoGroupOperator.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CoGroupOperator.java
@@ -1,14 +1,14 @@
-package io.rheem.rheem.basic.operators;
+package org.apache.incubator.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.basic.data.Tuple2;
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.function.FunctionDescriptor;
-import io.rheem.rheem.core.function.TransformationDescriptor;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator;
-import io.rheem.rheem.core.optimizer.cardinality.DefaultCardinalityEstimator;
-import io.rheem.rheem.core.plan.rheemplan.BinaryToUnaryOperator;
-import io.rheem.rheem.core.types.DataSetType;
+import org.apache.incubator.wayang.basic.data.Tuple2;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.function.FunctionDescriptor;
+import org.apache.incubator.wayang.core.function.TransformationDescriptor;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.incubator.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
+import org.apache.incubator.wayang.core.plan.wayangplan.BinaryToUnaryOperator;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CollectionSource.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CollectionSource.java
index 128e93c..41708f3 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CollectionSource.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CollectionSource.java
@@ -1,12 +1,12 @@
-package io.rheem.rheem.basic.operators;
+package org.apache.incubator.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator;
-import io.rheem.rheem.core.optimizer.cardinality.DefaultCardinalityEstimator;
-import io.rheem.rheem.core.plan.rheemplan.ElementaryOperator;
-import io.rheem.rheem.core.plan.rheemplan.UnarySource;
-import io.rheem.rheem.core.types.DataSetType;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.incubator.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
+import org.apache.incubator.wayang.core.plan.wayangplan.ElementaryOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.UnarySource;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CountOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CountOperator.java
index 49b8100..eda119d 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CountOperator.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CountOperator.java
@@ -1,11 +1,11 @@
-package io.rheem.rheem.basic.operators;
+package org.apache.incubator.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator;
-import io.rheem.rheem.core.optimizer.cardinality.FixedSizeCardinalityEstimator;
-import io.rheem.rheem.core.plan.rheemplan.UnaryToUnaryOperator;
-import io.rheem.rheem.core.types.DataSetType;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.incubator.wayang.core.optimizer.cardinality.FixedSizeCardinalityEstimator;
+import org.apache.incubator.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/DistinctOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/DistinctOperator.java
index fe43391..2b3eae0 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/DistinctOperator.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/DistinctOperator.java
@@ -1,11 +1,11 @@
-package io.rheem.rheem.basic.operators;
+package org.apache.incubator.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator;
-import io.rheem.rheem.core.optimizer.cardinality.DefaultCardinalityEstimator;
-import io.rheem.rheem.core.plan.rheemplan.UnaryToUnaryOperator;
-import io.rheem.rheem.core.types.DataSetType;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.incubator.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
+import org.apache.incubator.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/DoWhileOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/DoWhileOperator.java
index 314c5fa..4fee82e 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/DoWhileOperator.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/DoWhileOperator.java
@@ -1,17 +1,17 @@
-package io.rheem.rheem.basic.operators;
-
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.function.PredicateDescriptor;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator;
-import io.rheem.rheem.core.optimizer.cardinality.SwitchForwardCardinalityEstimator;
-import io.rheem.rheem.core.plan.rheemplan.ElementaryOperator;
-import io.rheem.rheem.core.plan.rheemplan.InputSlot;
-import io.rheem.rheem.core.plan.rheemplan.LoopHeadOperator;
-import io.rheem.rheem.core.plan.rheemplan.Operator;
-import io.rheem.rheem.core.plan.rheemplan.OperatorBase;
-import io.rheem.rheem.core.plan.rheemplan.OutputSlot;
-import io.rheem.rheem.core.types.DataSetType;
-import io.rheem.rheem.core.util.ReflectionUtils;
+package org.apache.incubator.wayang.basic.operators;
+
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.function.PredicateDescriptor;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.incubator.wayang.core.optimizer.cardinality.SwitchForwardCardinalityEstimator;
+import org.apache.incubator.wayang.core.plan.wayangplan.ElementaryOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.LoopHeadOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.incubator.wayang.core.plan.wayangplan.OperatorBase;
+import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.incubator.wayang.core.util.ReflectionUtils;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/FilterOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/FilterOperator.java
index c95b45b..ee43bca 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/FilterOperator.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/FilterOperator.java
@@ -1,13 +1,13 @@
-package io.rheem.rheem.basic.operators;
+package org.apache.incubator.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.function.PredicateDescriptor;
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.optimizer.ProbabilisticDoubleInterval;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimate;
-import io.rheem.rheem.core.plan.rheemplan.UnaryToUnaryOperator;
-import io.rheem.rheem.core.types.DataSetType;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.function.PredicateDescriptor;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.incubator.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
@@ -73,7 +73,7 @@ public class FilterOperator<Type> extends UnaryToUnaryOperator<Type, Type> {
     }
 
     @Override
-    public Optional<io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator> createCardinalityEstimator(
+    public Optional<org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator> createCardinalityEstimator(
             final int outputIndex,
             final Configuration configuration) {
         Validate.inclusiveBetween(0, this.getNumOutputs() - 1, outputIndex);
@@ -85,9 +85,9 @@ public class FilterOperator<Type> extends UnaryToUnaryOperator<Type, Type> {
     }
 
     /**
-     * Custom {@link io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator} for {@link FilterOperator}s.
+     * Custom {@link org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator} for {@link FilterOperator}s.
      */
-    private class CardinalityEstimator implements io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator {
+    private class CardinalityEstimator implements org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator {
 
         /**
          * The expected selectivity to be applied in this instance.
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/FlatMapOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/FlatMapOperator.java
index 201f4c9..67a4529 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/FlatMapOperator.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/FlatMapOperator.java
@@ -1,14 +1,14 @@
-package io.rheem.rheem.basic.operators;
+package org.apache.incubator.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.function.FlatMapDescriptor;
-import io.rheem.rheem.core.function.FunctionDescriptor;
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.optimizer.ProbabilisticDoubleInterval;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimate;
-import io.rheem.rheem.core.plan.rheemplan.UnaryToUnaryOperator;
-import io.rheem.rheem.core.types.DataSetType;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.function.FlatMapDescriptor;
+import org.apache.incubator.wayang.core.function.FunctionDescriptor;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.incubator.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
@@ -68,7 +68,7 @@ public class FlatMapOperator<InputType, OutputType> extends UnaryToUnaryOperator
     }
 
     @Override
-    public Optional<io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator> createCardinalityEstimator(
+    public Optional<org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator> createCardinalityEstimator(
             final int outputIndex,
             final Configuration configuration) {
         Validate.inclusiveBetween(0, this.getNumOutputs() - 1, outputIndex);
@@ -76,9 +76,9 @@ public class FlatMapOperator<InputType, OutputType> extends UnaryToUnaryOperator
     }
 
     /**
-     * Custom {@link io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator} for {@link FlatMapOperator}s.
+     * Custom {@link org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator} for {@link FlatMapOperator}s.
      */
-    private class CardinalityEstimator implements io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator {
+    private class CardinalityEstimator implements org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator {
 
         /**
          * The selectivity of this instance.
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/GlobalMaterializedGroupOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/GlobalMaterializedGroupOperator.java
index 0c38051..89cc45f 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/GlobalMaterializedGroupOperator.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/GlobalMaterializedGroupOperator.java
@@ -1,10 +1,10 @@
-package io.rheem.rheem.basic.operators;
+package org.apache.incubator.wayang.basic.operators;
 
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator;
-import io.rheem.rheem.core.optimizer.cardinality.FixedSizeCardinalityEstimator;
-import io.rheem.rheem.core.plan.rheemplan.UnaryToUnaryOperator;
-import io.rheem.rheem.core.types.DataSetType;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.incubator.wayang.core.optimizer.cardinality.FixedSizeCardinalityEstimator;
+import org.apache.incubator.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/GlobalReduceOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/GlobalReduceOperator.java
index 4f63e7b..d380890 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/GlobalReduceOperator.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/GlobalReduceOperator.java
@@ -1,14 +1,14 @@
-package io.rheem.rheem.basic.operators;
+package org.apache.incubator.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.function.FunctionDescriptor;
-import io.rheem.rheem.core.function.ReduceDescriptor;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator;
-import io.rheem.rheem.core.optimizer.cardinality.FixedSizeCardinalityEstimator;
-import io.rheem.rheem.core.plan.rheemplan.UnaryToUnaryOperator;
-import io.rheem.rheem.core.types.BasicDataUnitType;
-import io.rheem.rheem.core.types.DataSetType;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.function.FunctionDescriptor;
+import org.apache.incubator.wayang.core.function.ReduceDescriptor;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.incubator.wayang.core.optimizer.cardinality.FixedSizeCardinalityEstimator;
+import org.apache.incubator.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
+import org.apache.incubator.wayang.core.types.BasicDataUnitType;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/GroupByOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/GroupByOperator.java
index 8fe8cb0..b3ceacc 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/GroupByOperator.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/GroupByOperator.java
@@ -1,9 +1,9 @@
-package io.rheem.rheem.basic.operators;
+package org.apache.incubator.wayang.basic.operators;
 
-import io.rheem.rheem.core.function.FunctionDescriptor;
-import io.rheem.rheem.core.function.TransformationDescriptor;
-import io.rheem.rheem.core.plan.rheemplan.UnaryToUnaryOperator;
-import io.rheem.rheem.core.types.DataSetType;
+import org.apache.incubator.wayang.core.function.FunctionDescriptor;
+import org.apache.incubator.wayang.core.function.TransformationDescriptor;
+import org.apache.incubator.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 /**
  * This is the auxiliary GroupBy operator, i.e., it behaves differently depending on its context. If it is followed
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/IntersectOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/IntersectOperator.java
index dbd8cdc..e79891d 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/IntersectOperator.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/IntersectOperator.java
@@ -1,11 +1,11 @@
-package io.rheem.rheem.basic.operators;
+package org.apache.incubator.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator;
-import io.rheem.rheem.core.optimizer.cardinality.DefaultCardinalityEstimator;
-import io.rheem.rheem.core.plan.rheemplan.BinaryToUnaryOperator;
-import io.rheem.rheem.core.types.DataSetType;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.incubator.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
+import org.apache.incubator.wayang.core.plan.wayangplan.BinaryToUnaryOperator;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/JoinOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/JoinOperator.java
index cbea3e0..dadae7f 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/JoinOperator.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/JoinOperator.java
@@ -1,14 +1,14 @@
-package io.rheem.rheem.basic.operators;
+package org.apache.incubator.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.basic.data.Tuple2;
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.function.FunctionDescriptor;
-import io.rheem.rheem.core.function.TransformationDescriptor;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator;
-import io.rheem.rheem.core.optimizer.cardinality.DefaultCardinalityEstimator;
-import io.rheem.rheem.core.plan.rheemplan.BinaryToUnaryOperator;
-import io.rheem.rheem.core.types.DataSetType;
+import org.apache.incubator.wayang.basic.data.Tuple2;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.function.FunctionDescriptor;
+import org.apache.incubator.wayang.core.function.TransformationDescriptor;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.incubator.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
+import org.apache.incubator.wayang.core.plan.wayangplan.BinaryToUnaryOperator;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/LocalCallbackSink.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/LocalCallbackSink.java
index df50fe0..b9ac3ca 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/LocalCallbackSink.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/LocalCallbackSink.java
@@ -1,13 +1,13 @@
-package io.rheem.rheem.basic.operators;
+package org.apache.incubator.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.function.ConsumerDescriptor;
-import io.rheem.rheem.core.function.FunctionDescriptor;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator;
-import io.rheem.rheem.core.plan.rheemplan.UnarySink;
-import io.rheem.rheem.core.types.BasicDataUnitType;
-import io.rheem.rheem.core.types.DataSetType;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.function.ConsumerDescriptor;
+import org.apache.incubator.wayang.core.function.FunctionDescriptor;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.incubator.wayang.core.plan.wayangplan.UnarySink;
+import org.apache.incubator.wayang.core.types.BasicDataUnitType;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 import java.util.Collection;
 import java.util.Optional;
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/LoopOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/LoopOperator.java
index c08e14b..8c9df0b 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/LoopOperator.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/LoopOperator.java
@@ -1,17 +1,17 @@
-package io.rheem.rheem.basic.operators;
-
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.function.PredicateDescriptor;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator;
-import io.rheem.rheem.core.optimizer.cardinality.SwitchForwardCardinalityEstimator;
-import io.rheem.rheem.core.plan.rheemplan.ElementaryOperator;
-import io.rheem.rheem.core.plan.rheemplan.InputSlot;
-import io.rheem.rheem.core.plan.rheemplan.LoopHeadOperator;
-import io.rheem.rheem.core.plan.rheemplan.Operator;
-import io.rheem.rheem.core.plan.rheemplan.OperatorBase;
-import io.rheem.rheem.core.plan.rheemplan.OutputSlot;
-import io.rheem.rheem.core.types.DataSetType;
-import io.rheem.rheem.core.util.ReflectionUtils;
+package org.apache.incubator.wayang.basic.operators;
+
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.function.PredicateDescriptor;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.incubator.wayang.core.optimizer.cardinality.SwitchForwardCardinalityEstimator;
+import org.apache.incubator.wayang.core.plan.wayangplan.ElementaryOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.LoopHeadOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.incubator.wayang.core.plan.wayangplan.OperatorBase;
+import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.incubator.wayang.core.util.ReflectionUtils;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/MapOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/MapOperator.java
index 61c203c..02dbe1f 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/MapOperator.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/MapOperator.java
@@ -1,16 +1,16 @@
-package io.rheem.rheem.basic.operators;
+package org.apache.incubator.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.basic.data.Record;
-import io.rheem.rheem.basic.function.ProjectionDescriptor;
-import io.rheem.rheem.basic.types.RecordType;
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.function.FunctionDescriptor;
-import io.rheem.rheem.core.function.TransformationDescriptor;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator;
-import io.rheem.rheem.core.optimizer.cardinality.DefaultCardinalityEstimator;
-import io.rheem.rheem.core.plan.rheemplan.UnaryToUnaryOperator;
-import io.rheem.rheem.core.types.DataSetType;
+import org.apache.incubator.wayang.basic.data.Record;
+import org.apache.incubator.wayang.basic.function.ProjectionDescriptor;
+import org.apache.incubator.wayang.basic.types.RecordType;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.function.FunctionDescriptor;
+import org.apache.incubator.wayang.core.function.TransformationDescriptor;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.incubator.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
+import org.apache.incubator.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/MapPartitionsOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/MapPartitionsOperator.java
index caf9d94..36bd211 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/MapPartitionsOperator.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/MapPartitionsOperator.java
@@ -1,20 +1,20 @@
-package io.rheem.rheem.basic.operators;
+package org.apache.incubator.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.function.FunctionDescriptor;
-import io.rheem.rheem.core.function.MapPartitionsDescriptor;
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.optimizer.ProbabilisticDoubleInterval;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimate;
-import io.rheem.rheem.core.plan.rheemplan.UnaryToUnaryOperator;
-import io.rheem.rheem.core.types.DataSetType;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.function.FunctionDescriptor;
+import org.apache.incubator.wayang.core.function.MapPartitionsDescriptor;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.incubator.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
 /**
  * This operator takes as input potentially multiple input data quanta and outputs multiple input data quanta.
- * <p>Since Rheem is not a physical execution engine, its notion of partitions is rather loose. Implementors
+ * <p>Since Wayang is not a physical execution engine, its notion of partitions is rather loose. Implementors
  * of this operator should guarantee that the partitions are distinct in their data quanta and that all partitions together
  * are complete w.r.t. the data quanta.</p>
  * <p>However, no further assumptions on partitions shall be made, such as: whether partitions can be iterated multiple
@@ -72,7 +72,7 @@ public class MapPartitionsOperator<InputType, OutputType> extends UnaryToUnaryOp
     }
 
     @Override
-    public Optional<io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator> createCardinalityEstimator(
+    public Optional<org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator> createCardinalityEstimator(
             final int outputIndex,
             final Configuration configuration) {
         Validate.inclusiveBetween(0, this.getNumOutputs() - 1, outputIndex);
@@ -80,9 +80,9 @@ public class MapPartitionsOperator<InputType, OutputType> extends UnaryToUnaryOp
     }
 
     /**
-     * Custom {@link io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator} for {@link FlatMapOperator}s.
+     * Custom {@link org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator} for {@link FlatMapOperator}s.
      */
-    private class CardinalityEstimator implements io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator {
+    private class CardinalityEstimator implements org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator {
 
         /**
          * The selectivity of this instance.
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/MaterializedGroupByOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/MaterializedGroupByOperator.java
index 518552a..0ff2496 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/MaterializedGroupByOperator.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/MaterializedGroupByOperator.java
@@ -1,13 +1,13 @@
-package io.rheem.rheem.basic.operators;
+package org.apache.incubator.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.function.FunctionDescriptor;
-import io.rheem.rheem.core.function.TransformationDescriptor;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator;
-import io.rheem.rheem.core.optimizer.cardinality.DefaultCardinalityEstimator;
-import io.rheem.rheem.core.plan.rheemplan.UnaryToUnaryOperator;
-import io.rheem.rheem.core.types.DataSetType;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.function.FunctionDescriptor;
+import org.apache.incubator.wayang.core.function.TransformationDescriptor;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.incubator.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
+import org.apache.incubator.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/PageRankOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/PageRankOperator.java
index 5e87ff3..e77217c 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/PageRankOperator.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/PageRankOperator.java
@@ -1,14 +1,14 @@
-package io.rheem.rheem.basic.operators;
-
-import io.rheem.rheem.basic.data.Tuple2;
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.optimizer.ProbabilisticDoubleInterval;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimate;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator;
-import io.rheem.rheem.core.plan.rheemplan.EstimationContextProperty;
-import io.rheem.rheem.core.plan.rheemplan.Operator;
-import io.rheem.rheem.core.plan.rheemplan.UnaryToUnaryOperator;
-import io.rheem.rheem.core.types.DataSetType;
+package org.apache.incubator.wayang.basic.operators;
+
+import org.apache.incubator.wayang.basic.data.Tuple2;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.incubator.wayang.core.plan.wayangplan.EstimationContextProperty;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.incubator.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/ReduceByOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/ReduceByOperator.java
index 96f78be..914734b 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/ReduceByOperator.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/ReduceByOperator.java
@@ -1,14 +1,14 @@
-package io.rheem.rheem.basic.operators;
+package org.apache.incubator.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.function.FunctionDescriptor;
-import io.rheem.rheem.core.function.ReduceDescriptor;
-import io.rheem.rheem.core.function.TransformationDescriptor;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator;
-import io.rheem.rheem.core.optimizer.cardinality.DefaultCardinalityEstimator;
-import io.rheem.rheem.core.plan.rheemplan.UnaryToUnaryOperator;
-import io.rheem.rheem.core.types.DataSetType;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.function.FunctionDescriptor;
+import org.apache.incubator.wayang.core.function.ReduceDescriptor;
+import org.apache.incubator.wayang.core.function.TransformationDescriptor;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.incubator.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
+import org.apache.incubator.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/ReduceOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/ReduceOperator.java
index 5ddf338..a6815f0 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/ReduceOperator.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/ReduceOperator.java
@@ -1,12 +1,12 @@
-package io.rheem.rheem.basic.operators;
+package org.apache.incubator.wayang.basic.operators;
 
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.function.FunctionDescriptor;
-import io.rheem.rheem.core.function.ReduceDescriptor;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator;
-import io.rheem.rheem.core.optimizer.cardinality.FixedSizeCardinalityEstimator;
-import io.rheem.rheem.core.plan.rheemplan.UnaryToUnaryOperator;
-import io.rheem.rheem.core.types.DataSetType;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.function.FunctionDescriptor;
+import org.apache.incubator.wayang.core.function.ReduceDescriptor;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.incubator.wayang.core.optimizer.cardinality.FixedSizeCardinalityEstimator;
+import org.apache.incubator.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/RepeatOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/RepeatOperator.java
index 01d7e74..4618567 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/RepeatOperator.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/RepeatOperator.java
@@ -1,15 +1,15 @@
-package io.rheem.rheem.basic.operators;
-
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator;
-import io.rheem.rheem.core.optimizer.cardinality.SwitchForwardCardinalityEstimator;
-import io.rheem.rheem.core.plan.rheemplan.ElementaryOperator;
-import io.rheem.rheem.core.plan.rheemplan.InputSlot;
-import io.rheem.rheem.core.plan.rheemplan.LoopHeadOperator;
-import io.rheem.rheem.core.plan.rheemplan.Operator;
-import io.rheem.rheem.core.plan.rheemplan.OperatorBase;
-import io.rheem.rheem.core.plan.rheemplan.OutputSlot;
-import io.rheem.rheem.core.types.DataSetType;
+package org.apache.incubator.wayang.basic.operators;
+
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.incubator.wayang.core.optimizer.cardinality.SwitchForwardCardinalityEstimator;
+import org.apache.incubator.wayang.core.plan.wayangplan.ElementaryOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.LoopHeadOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.incubator.wayang.core.plan.wayangplan.OperatorBase;
+import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/SampleOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/SampleOperator.java
index d528b9a..fa74510 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/SampleOperator.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/SampleOperator.java
@@ -1,12 +1,12 @@
-package io.rheem.rheem.basic.operators;
+package org.apache.incubator.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator;
-import io.rheem.rheem.core.optimizer.cardinality.FixedSizeCardinalityEstimator;
-import io.rheem.rheem.core.plan.rheemplan.UnaryToUnaryOperator;
-import io.rheem.rheem.core.types.DataSetType;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.incubator.wayang.core.optimizer.cardinality.FixedSizeCardinalityEstimator;
+import org.apache.incubator.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
+import org.apache.incubator.wayang.core.types.DataSetType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/SortOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/SortOperator.java
index 6218bd2..ad0c054 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/SortOperator.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/SortOperator.java
@@ -1,13 +1,13 @@
-package io.rheem.rheem.basic.operators;
+package org.apache.incubator.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.function.FunctionDescriptor;
-import io.rheem.rheem.core.function.TransformationDescriptor;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator;
-import io.rheem.rheem.core.optimizer.cardinality.DefaultCardinalityEstimator;
-import io.rheem.rheem.core.plan.rheemplan.UnaryToUnaryOperator;
-import io.rheem.rheem.core.types.DataSetType;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.function.FunctionDescriptor;
+import org.apache.incubator.wayang.core.function.TransformationDescriptor;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.incubator.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
+import org.apache.incubator.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/TableSource.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/TableSource.java
index bbbfac3..92953f1 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/TableSource.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/TableSource.java
@@ -1,9 +1,9 @@
-package io.rheem.rheem.basic.operators;
+package org.apache.incubator.wayang.basic.operators;
 
-import io.rheem.rheem.basic.data.Record;
-import io.rheem.rheem.basic.types.RecordType;
-import io.rheem.rheem.core.plan.rheemplan.UnarySource;
-import io.rheem.rheem.core.types.DataSetType;
+import org.apache.incubator.wayang.basic.data.Record;
+import org.apache.incubator.wayang.basic.types.RecordType;
+import org.apache.incubator.wayang.core.plan.wayangplan.UnarySource;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 /**
  * {@link UnarySource} that provides the tuples from a database table.
@@ -21,7 +21,7 @@ public class TableSource extends UnarySource<Record> {
      *
      * @param tableName   name of the table to be read
      * @param columnNames names of the columns in the tables; can be omitted but allows to inject schema information
-     *                    into Rheem, so as to allow specific optimizations
+     *                    into Wayang, so as to allow specific optimizations
      */
     public TableSource(String tableName, String... columnNames) {
         this(tableName, createOutputDataSetType(columnNames));
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/TextFileSink.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/TextFileSink.java
index c3aac54..e9a4a85 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/TextFileSink.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/TextFileSink.java
@@ -1,10 +1,10 @@
-package io.rheem.rheem.basic.operators;
+package org.apache.incubator.wayang.basic.operators;
 
-import io.rheem.rheem.core.function.TransformationDescriptor;
-import io.rheem.rheem.core.optimizer.costs.DefaultLoadEstimator;
-import io.rheem.rheem.core.optimizer.costs.NestableLoadProfileEstimator;
-import io.rheem.rheem.core.plan.rheemplan.UnarySink;
-import io.rheem.rheem.core.types.DataSetType;
+import org.apache.incubator.wayang.core.function.TransformationDescriptor;
+import org.apache.incubator.wayang.core.optimizer.costs.DefaultLoadEstimator;
+import org.apache.incubator.wayang.core.optimizer.costs.NestableLoadProfileEstimator;
+import org.apache.incubator.wayang.core.plan.wayangplan.UnarySink;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 import java.util.Objects;
 
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/TextFileSource.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/TextFileSource.java
index ec25579..76ff7b4 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/TextFileSource.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/TextFileSource.java
@@ -1,15 +1,15 @@
-package io.rheem.rheem.basic.operators;
+package org.apache.incubator.wayang.basic.operators;
 
 import de.hpi.isg.profiledb.store.model.TimeMeasurement;
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimate;
-import io.rheem.rheem.core.plan.rheemplan.UnarySource;
-import io.rheem.rheem.core.types.DataSetType;
-import io.rheem.rheem.core.util.LimitedInputStream;
-import io.rheem.rheem.core.util.fs.FileSystem;
-import io.rheem.rheem.core.util.fs.FileSystems;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.incubator.wayang.core.plan.wayangplan.UnarySource;
+import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.incubator.wayang.core.util.LimitedInputStream;
+import org.apache.incubator.wayang.core.util.fs.FileSystem;
+import org.apache.incubator.wayang.core.util.fs.FileSystems;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -57,7 +57,7 @@ public class TextFileSource extends UnarySource<String> {
     }
 
     @Override
-    public Optional<io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator> createCardinalityEstimator(
+    public Optional<org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator> createCardinalityEstimator(
             final int outputIndex,
             final Configuration configuration) {
         Validate.inclusiveBetween(0, this.getNumOutputs() - 1, outputIndex);
@@ -69,9 +69,9 @@ public class TextFileSource extends UnarySource<String> {
     }
 
     /**
-     * Custom {@link io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator} for {@link FlatMapOperator}s.
+     * Custom {@link org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator} for {@link FlatMapOperator}s.
      */
-    protected class CardinalityEstimator implements io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator {
+    protected class CardinalityEstimator implements org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator {
 
         public final CardinalityEstimate FALLBACK_ESTIMATE = new CardinalityEstimate(1000L, 100000000L, 0.7);
 
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/UnionAllOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/UnionAllOperator.java
index eb214ea..2e5947c 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/UnionAllOperator.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/UnionAllOperator.java
@@ -1,13 +1,13 @@
-package io.rheem.rheem.basic.operators;
+package org.apache.incubator.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator;
-import io.rheem.rheem.core.optimizer.cardinality.DefaultCardinalityEstimator;
-import io.rheem.rheem.core.plan.rheemplan.BinaryToUnaryOperator;
-import io.rheem.rheem.core.plan.rheemplan.Operator;
-import io.rheem.rheem.core.plan.rheemplan.OutputSlot;
-import io.rheem.rheem.core.types.DataSetType;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.incubator.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
+import org.apache.incubator.wayang.core.plan.wayangplan.BinaryToUnaryOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/ZipWithIdOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/ZipWithIdOperator.java
index 0161f86..d3cb5a2 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/ZipWithIdOperator.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/ZipWithIdOperator.java
@@ -1,12 +1,12 @@
-package io.rheem.rheem.basic.operators;
+package org.apache.incubator.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.basic.data.Tuple2;
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator;
-import io.rheem.rheem.core.optimizer.cardinality.DefaultCardinalityEstimator;
-import io.rheem.rheem.core.plan.rheemplan.UnaryToUnaryOperator;
-import io.rheem.rheem.core.types.DataSetType;
+import org.apache.incubator.wayang.basic.data.Tuple2;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.incubator.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
+import org.apache.incubator.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/plugin/WayangBasic.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/plugin/WayangBasic.java
index 776fb6b..7125862 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/plugin/WayangBasic.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/plugin/WayangBasic.java
@@ -1,27 +1,27 @@
-package io.rheem.rheem.basic.plugin;
+package org.apache.incubator.wayang.basic.plugin;
 
-import io.rheem.rheem.basic.mapping.Mappings;
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.mapping.Mapping;
-import io.rheem.rheem.core.optimizer.channels.ChannelConversion;
-import io.rheem.rheem.core.platform.Platform;
-import io.rheem.rheem.core.plugin.Plugin;
-import io.rheem.rheem.core.util.ReflectionUtils;
-import io.rheem.rheem.core.util.fs.LocalFileSystem;
+import org.apache.incubator.wayang.basic.mapping.Mappings;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.mapping.Mapping;
+import org.apache.incubator.wayang.core.optimizer.channels.ChannelConversion;
+import org.apache.incubator.wayang.core.platform.Platform;
+import org.apache.incubator.wayang.core.plugin.Plugin;
+import org.apache.incubator.wayang.core.util.ReflectionUtils;
+import org.apache.incubator.wayang.core.util.fs.LocalFileSystem;
 
 import java.io.File;
 import java.util.Collection;
 import java.util.Collections;
 
 /**
- * Activator for the basic Rheem package.
+ * Activator for the basic Wayang package.
  */
 @SuppressWarnings("unused") // It's loaded via reflection.
-public class RheemBasic implements Plugin {
+public class WayangBasic implements Plugin {
 
-    public static final String TEMP_DIR_PROPERTY = "rheem.basic.tempdir";
+    public static final String TEMP_DIR_PROPERTY = "wayang.basic.tempdir";
 
-    private static final String RHEEM_BASIC_DEFAULTS_PROPERTIES = "rheem-basic-defaults.properties";
+    private static final String RHEEM_BASIC_DEFAULTS_PROPERTIES = "wayang-basic-defaults.properties";
 
     @Override
     public void setProperties(Configuration configuration) {
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/plugin/WayangBasicGraph.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/plugin/WayangBasicGraph.java
index e3f72df..5b35553 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/plugin/WayangBasicGraph.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/plugin/WayangBasicGraph.java
@@ -1,20 +1,20 @@
-package io.rheem.rheem.basic.plugin;
+package org.apache.incubator.wayang.basic.plugin;
 
-import io.rheem.rheem.basic.mapping.Mappings;
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.mapping.Mapping;
-import io.rheem.rheem.core.optimizer.channels.ChannelConversion;
-import io.rheem.rheem.core.platform.Platform;
-import io.rheem.rheem.core.plugin.Plugin;
+import org.apache.incubator.wayang.basic.mapping.Mappings;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.mapping.Mapping;
+import org.apache.incubator.wayang.core.optimizer.channels.ChannelConversion;
+import org.apache.incubator.wayang.core.platform.Platform;
+import org.apache.incubator.wayang.core.plugin.Plugin;
 
 import java.util.Collection;
 import java.util.Collections;
 
 /**
- * Activator for graph operations being executed with Rheem's basic operators.
+ * Activator for graph operations being executed with Wayang's basic operators.
  */
 @SuppressWarnings("unused") // It's loaded via reflection.
-public class RheemBasicGraph implements Plugin {
+public class WayangBasicGraph implements Plugin {
 
     @Override
     public void setProperties(Configuration configuration) {
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/types/RecordType.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/types/RecordType.java
index 4124dbf..9424675 100644
--- a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/types/RecordType.java
+++ b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/types/RecordType.java
@@ -1,8 +1,8 @@
-package io.rheem.rheem.basic.types;
+package org.apache.incubator.wayang.basic.types;
 
 
-import io.rheem.rheem.basic.data.Record;
-import io.rheem.rheem.core.types.BasicDataUnitType;
+import org.apache.incubator.wayang.basic.data.Record;
+import org.apache.incubator.wayang.core.types.BasicDataUnitType;
 
 import java.util.Arrays;
 import java.util.Objects;
diff --git a/rheem-basic/src/main/resources/rheem-basic-defaults.properties b/rheem-basic/src/main/resources/rheem-basic-defaults.properties
index bc74037..bec43b1 100644
--- a/rheem-basic/src/main/resources/rheem-basic-defaults.properties
+++ b/rheem-basic/src/main/resources/rheem-basic-defaults.properties
@@ -1 +1 @@
-rheem.basic.tempdir = file:///tmp
+wayang.basic.tempdir = file:///tmp
diff --git a/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/function/ProjectionDescriptorTest.java b/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/function/ProjectionDescriptorTest.java
index 2178742..6460acb 100644
--- a/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/function/ProjectionDescriptorTest.java
+++ b/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/function/ProjectionDescriptorTest.java
@@ -1,9 +1,9 @@
-package io.rheem.rheem.basic.function;
+package org.apache.incubator.wayang.basic.function;
 
 import org.junit.Assert;
 import org.junit.Test;
-import io.rheem.rheem.basic.data.Record;
-import io.rheem.rheem.basic.types.RecordType;
+import org.apache.incubator.wayang.basic.data.Record;
+import org.apache.incubator.wayang.basic.types.RecordType;
 
 import java.util.function.Function;
 
diff --git a/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/mapping/ReduceByMappingTest.java b/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/mapping/ReduceByMappingTest.java
index fa98eea..38e3176 100644
--- a/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/mapping/ReduceByMappingTest.java
+++ b/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/mapping/ReduceByMappingTest.java
@@ -1,23 +1,23 @@
-package io.rheem.rheem.basic.mapping;
+package org.apache.incubator.wayang.basic.mapping;
 
 import org.junit.Assert;
 import org.junit.Test;
-import io.rheem.rheem.basic.data.Tuple2;
-import io.rheem.rheem.basic.function.ProjectionDescriptor;
-import io.rheem.rheem.basic.operators.GroupByOperator;
-import io.rheem.rheem.basic.operators.ReduceByOperator;
-import io.rheem.rheem.basic.operators.ReduceOperator;
-import io.rheem.rheem.basic.operators.test.TestSink;
-import io.rheem.rheem.basic.operators.test.TestSource;
-import io.rheem.rheem.core.function.ReduceDescriptor;
-import io.rheem.rheem.core.mapping.Mapping;
-import io.rheem.rheem.core.mapping.PlanTransformation;
-import io.rheem.rheem.core.plan.rheemplan.Operator;
-import io.rheem.rheem.core.plan.rheemplan.RheemPlan;
-import io.rheem.rheem.core.plan.rheemplan.UnarySink;
-import io.rheem.rheem.core.plan.rheemplan.UnarySource;
-import io.rheem.rheem.core.types.DataSetType;
-import io.rheem.rheem.core.types.DataUnitType;
+import org.apache.incubator.wayang.basic.data.Tuple2;
+import org.apache.incubator.wayang.basic.function.ProjectionDescriptor;
+import org.apache.incubator.wayang.basic.operators.GroupByOperator;
+import org.apache.incubator.wayang.basic.operators.ReduceByOperator;
+import org.apache.incubator.wayang.basic.operators.ReduceOperator;
+import org.apache.incubator.wayang.basic.operators.test.TestSink;
+import org.apache.incubator.wayang.basic.operators.test.TestSource;
+import org.apache.incubator.wayang.core.function.ReduceDescriptor;
+import org.apache.incubator.wayang.core.mapping.Mapping;
+import org.apache.incubator.wayang.core.mapping.PlanTransformation;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.incubator.wayang.core.plan.wayangplan.UnarySink;
+import org.apache.incubator.wayang.core.plan.wayangplan.UnarySource;
+import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.incubator.wayang.core.types.DataUnitType;
 
 /**
  * Test suite for the {@link ReduceByMapping}.
@@ -53,7 +53,7 @@ public class ReduceByMappingTest {
 
         UnarySink<Tuple2<String, Integer>> sink = new TestSink<>(DataSetType.createDefaultUnchecked(Tuple2.class));
         reduce.connectTo(0, sink, 0);
-        RheemPlan plan = new RheemPlan();
+        WayangPlan plan = new WayangPlan();
         plan.addSink(sink);
 
         // Apply our mapping.
diff --git a/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/operators/MaterializedGroupByOperatorTest.java b/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/operators/MaterializedGroupByOperatorTest.java
index 94f6e3e..db130ae 100644
--- a/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/operators/MaterializedGroupByOperatorTest.java
+++ b/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/operators/MaterializedGroupByOperatorTest.java
@@ -1,9 +1,9 @@
-package io.rheem.rheem.basic.operators;
+package org.apache.incubator.wayang.basic.operators;
 
 import org.junit.Test;
-import io.rheem.rheem.core.function.TransformationDescriptor;
-import io.rheem.rheem.core.types.DataSetType;
-import io.rheem.rheem.core.types.DataUnitType;
+import org.apache.incubator.wayang.core.function.TransformationDescriptor;
+import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.incubator.wayang.core.types.DataUnitType;
 
 import java.util.stream.StreamSupport;
 
diff --git a/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/operators/TextFileSourceTest.java b/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/operators/TextFileSourceTest.java
index fd6b956..c522531 100644
--- a/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/operators/TextFileSourceTest.java
+++ b/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/operators/TextFileSourceTest.java
@@ -1,15 +1,15 @@
-package io.rheem.rheem.basic.operators;
+package org.apache.incubator.wayang.basic.operators;
 
 import de.hpi.isg.profiledb.instrumentation.StopWatch;
 import de.hpi.isg.profiledb.store.model.Experiment;
 import de.hpi.isg.profiledb.store.model.Subject;
 import org.junit.Assert;
 import org.junit.Test;
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.api.Job;
-import io.rheem.rheem.core.optimizer.DefaultOptimizationContext;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimate;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.api.Job;
+import org.apache.incubator.wayang.core.optimizer.DefaultOptimizationContext;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/operators/test/TestSink.java b/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/operators/test/TestSink.java
index a094712..ed0584f 100644
--- a/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/operators/test/TestSink.java
+++ b/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/operators/test/TestSink.java
@@ -1,7 +1,7 @@
-package io.rheem.rheem.basic.operators.test;
+package org.apache.incubator.wayang.basic.operators.test;
 
-import io.rheem.rheem.core.plan.rheemplan.UnarySink;
-import io.rheem.rheem.core.types.DataSetType;
+import org.apache.incubator.wayang.core.plan.wayangplan.UnarySink;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 /**
  * Dummy sink for testing purposes.
diff --git a/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/operators/test/TestSource.java b/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/operators/test/TestSource.java
index af45c0a..fd20e95 100644
--- a/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/operators/test/TestSource.java
+++ b/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/operators/test/TestSource.java
@@ -1,7 +1,7 @@
-package io.rheem.rheem.basic.operators.test;
+package org.apache.incubator.wayang.basic.operators.test;
 
-import io.rheem.rheem.core.plan.rheemplan.UnarySource;
-import io.rheem.rheem.core.types.DataSetType;
+import org.apache.incubator.wayang.core.plan.wayangplan.UnarySource;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 /**
  * Dummy source for testing purposes.
diff --git a/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/types/RecordTypeTest.java b/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/types/RecordTypeTest.java
index a864417..6d6812f 100644
--- a/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/types/RecordTypeTest.java
+++ b/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/types/RecordTypeTest.java
@@ -1,9 +1,9 @@
-package io.rheem.rheem.basic.types;
+package org.apache.incubator.wayang.basic.types;
 
 import org.junit.Assert;
 import org.junit.Test;
-import io.rheem.rheem.basic.data.Record;
-import io.rheem.rheem.core.types.DataSetType;
+import org.apache.incubator.wayang.basic.data.Record;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 /**
  * Tests for the {@link RecordType}.
diff --git a/rheem-core/pom.xml b/rheem-core/pom.xml
index e5c1358..38f5a96 100644
--- a/rheem-core/pom.xml
+++ b/rheem-core/pom.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>rheem</artifactId>
-        <groupId>io.rheem.rheem</groupId>
+        <artifactId>wayang</artifactId>
+        <groupId>org.apache.incubator.wayang</groupId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>rheem-core</artifactId>
-    <description>This Rheem module contains all the base code that is used by all other modules.</description>
+    <artifactId>wayang-core</artifactId>
+    <description>This Wayang module contains all the base code that is used by all other modules.</description>
 
     <build>
         <plugins>
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/Configuration.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/Configuration.java
index e7a69c2..ca99135 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/Configuration.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/Configuration.java
@@ -1,45 +1,45 @@
-package io.rheem.rheem.core.api;
+package org.apache.incubator.wayang.core.api;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
-import io.rheem.rheem.core.api.configuration.CollectionProvider;
-import io.rheem.rheem.core.api.configuration.ConstantValueProvider;
-import io.rheem.rheem.core.api.configuration.ExplicitCollectionProvider;
-import io.rheem.rheem.core.api.configuration.FunctionalCollectionProvider;
-import io.rheem.rheem.core.api.configuration.FunctionalKeyValueProvider;
-import io.rheem.rheem.core.api.configuration.FunctionalValueProvider;
-import io.rheem.rheem.core.api.configuration.KeyValueProvider;
-import io.rheem.rheem.core.api.configuration.MapBasedKeyValueProvider;
-import io.rheem.rheem.core.api.configuration.ValueProvider;
-import io.rheem.rheem.core.api.exception.RheemException;
-import io.rheem.rheem.core.function.FlatMapDescriptor;
-import io.rheem.rheem.core.function.FunctionDescriptor;
-import io.rheem.rheem.core.function.MapPartitionsDescriptor;
-import io.rheem.rheem.core.function.PredicateDescriptor;
-import io.rheem.rheem.core.mapping.Mapping;
-import io.rheem.rheem.core.optimizer.ProbabilisticDoubleInterval;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimate;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator;
-import io.rheem.rheem.core.optimizer.cardinality.FallbackCardinalityEstimator;
-import io.rheem.rheem.core.optimizer.channels.ChannelConversion;
-import io.rheem.rheem.core.optimizer.costs.IntervalLoadEstimator;
-import io.rheem.rheem.core.optimizer.costs.LoadProfileEstimator;
-import io.rheem.rheem.core.optimizer.costs.LoadProfileToTimeConverter;
-import io.rheem.rheem.core.optimizer.costs.LoadToTimeConverter;
-import io.rheem.rheem.core.optimizer.costs.NestableLoadProfileEstimator;
-import io.rheem.rheem.core.optimizer.costs.TimeToCostConverter;
-import io.rheem.rheem.core.optimizer.enumeration.PlanEnumerationPruningStrategy;
-import io.rheem.rheem.core.plan.rheemplan.ElementaryOperator;
-import io.rheem.rheem.core.plan.rheemplan.ExecutionOperator;
-import io.rheem.rheem.core.plan.rheemplan.OutputSlot;
-import io.rheem.rheem.core.platform.Platform;
-import io.rheem.rheem.core.plugin.Plugin;
-import io.rheem.rheem.core.profiling.InstrumentationStrategy;
-import io.rheem.rheem.core.profiling.OutboundInstrumentationStrategy;
-import io.rheem.rheem.core.util.Actions;
-import io.rheem.rheem.core.util.ReflectionUtils;
-import io.rheem.rheem.core.util.fs.FileSystem;
-import io.rheem.rheem.core.util.fs.FileSystems;
+import org.apache.incubator.wayang.core.api.configuration.CollectionProvider;
+import org.apache.incubator.wayang.core.api.configuration.ConstantValueProvider;
+import org.apache.incubator.wayang.core.api.configuration.ExplicitCollectionProvider;
+import org.apache.incubator.wayang.core.api.configuration.FunctionalCollectionProvider;
+import org.apache.incubator.wayang.core.api.configuration.FunctionalKeyValueProvider;
+import org.apache.incubator.wayang.core.api.configuration.FunctionalValueProvider;
+import org.apache.incubator.wayang.core.api.configuration.KeyValueProvider;
+import org.apache.incubator.wayang.core.api.configuration.MapBasedKeyValueProvider;
+import org.apache.incubator.wayang.core.api.configuration.ValueProvider;
+import org.apache.incubator.wayang.core.api.exception.WayangException;
+import org.apache.incubator.wayang.core.function.FlatMapDescriptor;
+import org.apache.incubator.wayang.core.function.FunctionDescriptor;
+import org.apache.incubator.wayang.core.function.MapPartitionsDescriptor;
+import org.apache.incubator.wayang.core.function.PredicateDescriptor;
+import org.apache.incubator.wayang.core.mapping.Mapping;
+import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.incubator.wayang.core.optimizer.cardinality.FallbackCardinalityEstimator;
+import org.apache.incubator.wayang.core.optimizer.channels.ChannelConversion;
+import org.apache.incubator.wayang.core.optimizer.costs.IntervalLoadEstimator;
+import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileEstimator;
+import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileToTimeConverter;
+import org.apache.incubator.wayang.core.optimizer.costs.LoadToTimeConverter;
+import org.apache.incubator.wayang.core.optimizer.costs.NestableLoadProfileEstimator;
+import org.apache.incubator.wayang.core.optimizer.costs.TimeToCostConverter;
+import org.apache.incubator.wayang.core.optimizer.enumeration.PlanEnumerationPruningStrategy;
+import org.apache.incubator.wayang.core.plan.wayangplan.ElementaryOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.incubator.wayang.core.platform.Platform;
+import org.apache.incubator.wayang.core.plugin.Plugin;
+import org.apache.incubator.wayang.core.profiling.InstrumentationStrategy;
+import org.apache.incubator.wayang.core.profiling.OutboundInstrumentationStrategy;
+import org.apache.incubator.wayang.core.util.Actions;
+import org.apache.incubator.wayang.core.util.ReflectionUtils;
+import org.apache.incubator.wayang.core.util.fs.FileSystem;
+import org.apache.incubator.wayang.core.util.fs.FileSystems;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -59,16 +59,16 @@ import java.util.Properties;
 import java.util.Random;
 import java.util.function.ToDoubleFunction;
 
-import static io.rheem.rheem.core.util.ReflectionUtils.instantiateDefault;
+import static org.apache.incubator.wayang.core.util.ReflectionUtils.instantiateDefault;
 
 /**
- * Describes both the configuration of a {@link RheemContext} and {@link Job}s.
+ * Describes both the configuration of a {@link WayangContext} and {@link Job}s.
  */
 public class Configuration {
 
     private static final Logger logger = LoggerFactory.getLogger(Configuration.class);
 
-    private static final String DEFAULT_CONFIGURATION_FILE = "rheem-core-defaults.properties";
+    private static final String DEFAULT_CONFIGURATION_FILE = "wayang-core-defaults.properties";
 
     private static final Configuration defaultConfiguration = new Configuration((Configuration) null);
 
@@ -82,7 +82,7 @@ public class Configuration {
         Actions.doSafe(() -> bootstrapPlugins(defaultConfiguration));
     }
 
-    private static final String BASIC_PLUGIN = "io.rheem.rheem.basic.RheemBasics.defaultPlugin()";
+    private static final String BASIC_PLUGIN = "org.apache.incubator.wayang.basic.WayangBasics.defaultPlugin()";
 
     private String name = "(no name)";
 
@@ -188,13 +188,13 @@ public class Configuration {
     }
 
     private static String findUserConfigurationFile() {
-        final String systemProperty = System.getProperty("rheem.configuration");
+        final String systemProperty = System.getProperty("wayang.configuration");
         if (systemProperty != null) {
             logger.info("Using configuration at {}.", systemProperty);
             return systemProperty;
         }
 
-        final URL classPathResource = ReflectionUtils.getResourceURL("rheem.properties");
+        final URL classPathResource = ReflectionUtils.getResourceURL("wayang.properties");
         if (classPathResource != null) {
             logger.info("Using configuration at {}.", classPathResource);
             return classPathResource.toString();
@@ -212,12 +212,12 @@ public class Configuration {
     public void load(String configurationUrl) {
         final Optional<FileSystem> fileSystem = FileSystems.getFileSystem(configurationUrl);
         if (!fileSystem.isPresent()) {
-            throw new RheemException(String.format("Could not access %s.", configurationUrl));
+            throw new WayangException(String.format("Could not access %s.", configurationUrl));
         }
         try (InputStream configInputStream = fileSystem.get().open(configurationUrl)) {
             this.load(configInputStream);
         } catch (Exception e) {
-            throw new RheemException(String.format("Could not load configuration from %s.", configurationUrl), e);
+            throw new WayangException(String.format("Could not load configuration from %s.", configurationUrl), e);
         }
     }
 
@@ -236,7 +236,7 @@ public class Configuration {
                 this.handleConfigurationFileEntry(key, value);
             }
         } catch (IOException e) {
-            throw new RheemException("Could not load configuration.", e);
+            throw new WayangException("Could not load configuration.", e);
         } finally {
             IOUtils.closeQuietly(configInputStream);
         }
@@ -250,7 +250,7 @@ public class Configuration {
      */
     private void handleConfigurationFileEntry(String key, String value) {
         switch (key) {
-            case "rheem.core.optimizer.cost.squash":
+            case "wayang.core.optimizer.cost.squash":
                 if (!(this.costSquasherProvider instanceof ConstantValueProvider)) {
                     logger.warn("Cannot update cost estimate provider.");
                 } else if ("expectation".equals(value)) {
@@ -342,7 +342,7 @@ public class Configuration {
                                 } else if (functionDescriptor instanceof MapPartitionsDescriptor) {
                                     return new ProbabilisticDoubleInterval(0.1, 1, 0.9d);
                                 } else {
-                                    throw new RheemException("Cannot provide fallback selectivity for " + functionDescriptor);
+                                    throw new WayangException("Cannot provide fallback selectivity for " + functionDescriptor);
                                 }
                             },
                             configuration
@@ -373,16 +373,16 @@ public class Configuration {
                                 return new NestableLoadProfileEstimator(
                                         IntervalLoadEstimator.createIOLinearEstimator(
                                                 null,
-                                                conf.getLongProperty("rheem.core.fallback.udf.cpu.lower"),
-                                                conf.getLongProperty("rheem.core.fallback.udf.cpu.upper"),
-                                                conf.getDoubleProperty("rheem.core.fallback.udf.cpu.confidence"),
+                                                conf.getLongProperty("wayang.core.fallback.udf.cpu.lower"),
+                                                conf.getLongProperty("wayang.core.fallback.udf.cpu.upper"),
+                                                conf.getDoubleProperty("wayang.core.fallback.udf.cpu.confidence"),
                                                 CardinalityEstimate.EMPTY_ESTIMATE
                                         ),
                                         IntervalLoadEstimator.createIOLinearEstimator(
                                                 null,
-                                                conf.getLongProperty("rheem.core.fallback.udf.ram.lower"),
-                                                conf.getLongProperty("rheem.core.fallback.udf.ram.upper"),
-                                                conf.getDoubleProperty("rheem.core.fallback.udf.ram.confidence"),
+                                                conf.getLongProperty("wayang.core.fallback.udf.ram.lower"),
+                                                conf.getLongProperty("wayang.core.fallback.udf.ram.upper"),
+                                                conf.getDoubleProperty("wayang.core.fallback.udf.ram.confidence"),
                                                 CardinalityEstimate.EMPTY_ESTIMATE
                                         )
                                 );
@@ -412,16 +412,16 @@ public class Configuration {
                                 return new NestableLoadProfileEstimator(
                                         IntervalLoadEstimator.createIOLinearEstimator(
                                                 null,
-                                                conf.getLongProperty("rheem.core.fallback.operator.cpu.lower"),
-                                                conf.getLongProperty("rheem.core.fallback.operator.cpu.upper"),
-                                                conf.getDoubleProperty("rheem.core.fallback.operator.cpu.confidence"),
+                                                conf.getLongProperty("wayang.core.fallback.operator.cpu.lower"),
+                                                conf.getLongProperty("wayang.core.fallback.operator.cpu.upper"),
+                                                conf.getDoubleProperty("wayang.core.fallback.operator.cpu.confidence"),
                                                 CardinalityEstimate.EMPTY_ESTIMATE
                                         ),
                                         IntervalLoadEstimator.createIOLinearEstimator(
                                                 null,
-                                                conf.getLongProperty("rheem.core.fallback.operator.ram.lower"),
-                                                conf.getLongProperty("rheem.core.fallback.operator.ram.upper"),
-                                                conf.getDoubleProperty("rheem.core.fallback.operator.ram.confidence"),
+                                                conf.getLongProperty("wayang.core.fallback.operator.ram.lower"),
+                                                conf.getLongProperty("wayang.core.fallback.operator.ram.upper"),
+                                                conf.getDoubleProperty("wayang.core.fallback.operator.ram.confidence"),
                                                 CardinalityEstimate.EMPTY_ESTIMATE
                                         )
                                 );
@@ -502,11 +502,11 @@ public class Configuration {
 
     private static void bootstrapPruningProviders(Configuration configuration) {
         {
-            // By default, load pruning from the rheem.core.optimizer.pruning.strategies property.
+            // By default, load pruning from the wayang.core.optimizer.pruning.strategies property.
             CollectionProvider<Class<PlanEnumerationPruningStrategy>> propertyBasedProvider =
                     new FunctionalCollectionProvider<>(
                             config -> {
-                                final String strategyClassNames = config.getStringProperty("rheem.core.optimizer.pruning.strategies");
+                                final String strategyClassNames = config.getStringProperty("wayang.core.optimizer.pruning.strategies");
                                 if (strategyClassNames == null || strategyClassNames.isEmpty()) {
                                     return Collections.emptySet();
                                 }
@@ -542,7 +542,7 @@ public class Configuration {
                     new FunctionalValueProvider<>(
                             requestee -> {
                                 Optional<String> optInstrumentationtStrategyClass =
-                                        requestee.getConfiguration().getOptionalStringProperty("rheem.core.optimizer.instrumentation");
+                                        requestee.getConfiguration().getOptionalStringProperty("wayang.core.optimizer.instrumentation");
                                 if (!optInstrumentationtStrategyClass.isPresent()) {
                                     return null;
                                 }
@@ -562,12 +562,12 @@ public class Configuration {
         configuration.load(ReflectionUtils.loadResource(DEFAULT_CONFIGURATION_FILE));
 
         // Set some dynamic properties.
-        configuration.setProperty("rheem.core.log.cardinalities", StringUtils.join(
-                Arrays.asList(System.getProperty("user.home"), ".rheem", "cardinalities.json"),
+        configuration.setProperty("wayang.core.log.cardinalities", StringUtils.join(
+                Arrays.asList(System.getProperty("user.home"), ".wayang", "cardinalities.json"),
                 File.separator
         ));
-        configuration.setProperty("rheem.core.log.executions", StringUtils.join(
-                Arrays.asList(System.getProperty("user.home"), ".rheem", "executions.json"),
+        configuration.setProperty("wayang.core.log.executions", StringUtils.join(
+                Arrays.asList(System.getProperty("user.home"), ".wayang", "executions.json"),
                 File.separator
         ));
 
@@ -748,7 +748,7 @@ public class Configuration {
     public long getLongProperty(String key) {
         final OptionalLong optionalLongProperty = this.getOptionalLongProperty(key);
         if (!optionalLongProperty.isPresent()) {
-            throw new RheemException(String.format("No value for \"%s\".", key));
+            throw new WayangException(String.format("No value for \"%s\".", key));
         }
         return optionalLongProperty.getAsLong();
     }
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/Job.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/Job.java
index a257272..ef629d5 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/Job.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/Job.java
@@ -1,54 +1,54 @@
-package io.rheem.rheem.core.api;
+package org.apache.incubator.wayang.core.api;
 
 import de.hpi.isg.profiledb.instrumentation.StopWatch;
 import de.hpi.isg.profiledb.store.model.Experiment;
 import de.hpi.isg.profiledb.store.model.TimeMeasurement;
-import io.rheem.rheem.core.api.exception.RheemException;
-import io.rheem.rheem.core.mapping.PlanTransformation;
-import io.rheem.rheem.core.monitor.DisabledMonitor;
-import io.rheem.rheem.core.monitor.FileMonitor;
-import io.rheem.rheem.core.monitor.Monitor;
-import io.rheem.rheem.core.optimizer.DefaultOptimizationContext;
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.optimizer.ProbabilisticDoubleInterval;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimate;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimatorManager;
-import io.rheem.rheem.core.optimizer.costs.TimeEstimate;
-import io.rheem.rheem.core.optimizer.costs.TimeToCostConverter;
-import io.rheem.rheem.core.optimizer.enumeration.ExecutionTaskFlow;
-import io.rheem.rheem.core.optimizer.enumeration.PlanEnumeration;
-import io.rheem.rheem.core.optimizer.enumeration.PlanEnumerator;
-import io.rheem.rheem.core.optimizer.enumeration.PlanImplementation;
-import io.rheem.rheem.core.optimizer.enumeration.StageAssignmentTraversal;
-import io.rheem.rheem.core.plan.executionplan.Channel;
-import io.rheem.rheem.core.plan.executionplan.ExecutionPlan;
-import io.rheem.rheem.core.plan.executionplan.ExecutionStage;
-import io.rheem.rheem.core.plan.executionplan.ExecutionTask;
-import io.rheem.rheem.core.plan.rheemplan.ExecutionOperator;
-import io.rheem.rheem.core.plan.rheemplan.Operator;
-import io.rheem.rheem.core.plan.rheemplan.OutputSlot;
-import io.rheem.rheem.core.plan.rheemplan.PlanMetrics;
-import io.rheem.rheem.core.plan.rheemplan.RheemPlan;
-import io.rheem.rheem.core.platform.AtomicExecutionGroup;
-import io.rheem.rheem.core.platform.Breakpoint;
-import io.rheem.rheem.core.platform.CardinalityBreakpoint;
-import io.rheem.rheem.core.platform.ConjunctiveBreakpoint;
-import io.rheem.rheem.core.platform.CrossPlatformExecutor;
-import io.rheem.rheem.core.platform.ExecutionState;
-import io.rheem.rheem.core.platform.FixBreakpoint;
-import io.rheem.rheem.core.platform.NoIterationBreakpoint;
-import io.rheem.rheem.core.platform.PartialExecution;
-import io.rheem.rheem.core.platform.Platform;
-import io.rheem.rheem.core.profiling.CardinalityRepository;
-import io.rheem.rheem.core.profiling.CostMeasurement;
-import io.rheem.rheem.core.profiling.ExecutionLog;
-import io.rheem.rheem.core.profiling.ExecutionPlanMeasurement;
-import io.rheem.rheem.core.profiling.InstrumentationStrategy;
-import io.rheem.rheem.core.profiling.PartialExecutionMeasurement;
-import io.rheem.rheem.core.util.Formats;
-import io.rheem.rheem.core.util.OneTimeExecutable;
-import io.rheem.rheem.core.util.ReflectionUtils;
-import io.rheem.rheem.core.util.RheemCollections;
+import org.apache.incubator.wayang.core.api.exception.WayangException;
+import org.apache.incubator.wayang.core.mapping.PlanTransformation;
+import org.apache.incubator.wayang.core.monitor.DisabledMonitor;
+import org.apache.incubator.wayang.core.monitor.FileMonitor;
+import org.apache.incubator.wayang.core.monitor.Monitor;
+import org.apache.incubator.wayang.core.optimizer.DefaultOptimizationContext;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimatorManager;
+import org.apache.incubator.wayang.core.optimizer.costs.TimeEstimate;
+import org.apache.incubator.wayang.core.optimizer.costs.TimeToCostConverter;
+import org.apache.incubator.wayang.core.optimizer.enumeration.ExecutionTaskFlow;
+import org.apache.incubator.wayang.core.optimizer.enumeration.PlanEnumeration;
+import org.apache.incubator.wayang.core.optimizer.enumeration.PlanEnumerator;
+import org.apache.incubator.wayang.core.optimizer.enumeration.PlanImplementation;
+import org.apache.incubator.wayang.core.optimizer.enumeration.StageAssignmentTraversal;
+import org.apache.incubator.wayang.core.plan.executionplan.Channel;
+import org.apache.incubator.wayang.core.plan.executionplan.ExecutionPlan;
+import org.apache.incubator.wayang.core.plan.executionplan.ExecutionStage;
+import org.apache.incubator.wayang.core.plan.executionplan.ExecutionTask;
+import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.PlanMetrics;
+import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.incubator.wayang.core.platform.AtomicExecutionGroup;
+import org.apache.incubator.wayang.core.platform.Breakpoint;
+import org.apache.incubator.wayang.core.platform.CardinalityBreakpoint;
+import org.apache.incubator.wayang.core.platform.ConjunctiveBreakpoint;
+import org.apache.incubator.wayang.core.platform.CrossPlatformExecutor;
+import org.apache.incubator.wayang.core.platform.ExecutionState;
+import org.apache.incubator.wayang.core.platform.FixBreakpoint;
+import org.apache.incubator.wayang.core.platform.NoIterationBreakpoint;
+import org.apache.incubator.wayang.core.platform.PartialExecution;
+import org.apache.incubator.wayang.core.platform.Platform;
+import org.apache.incubator.wayang.core.profiling.CardinalityRepository;
+import org.apache.incubator.wayang.core.profiling.CostMeasurement;
+import org.apache.incubator.wayang.core.profiling.ExecutionLog;
+import org.apache.incubator.wayang.core.profiling.ExecutionPlanMeasurement;
+import org.apache.incubator.wayang.core.profiling.InstrumentationStrategy;
+import org.apache.incubator.wayang.core.profiling.PartialExecutionMeasurement;
+import org.apache.incubator.wayang.core.util.Formats;
+import org.apache.incubator.wayang.core.util.OneTimeExecutable;
+import org.apache.incubator.wayang.core.util.ReflectionUtils;
+import org.apache.incubator.wayang.core.util.WayangCollections;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -65,7 +65,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
 /**
- * Describes a job that is to be executed using Rheem.
+ * Describes a job that is to be executed using Wayang.
  */
 public class Job extends OneTimeExecutable {
 
@@ -77,22 +77,22 @@ public class Job extends OneTimeExecutable {
     private final AtomicBoolean hasBeenExecuted = new AtomicBoolean(false);
 
     /**
-     * References the {@link RheemContext} that spawned this instance.
+     * References the {@link WayangContext} that spawned this instance.
      */
-    private final RheemContext rheemContext;
+    private final WayangContext wayangContext;
 
     /**
-     * {@link Job}-level {@link Configuration} based on the {@link RheemContext}-level configuration.
+     * {@link Job}-level {@link Configuration} based on the {@link WayangContext}-level configuration.
      */
     private final Configuration configuration;
 
     /**
-     * The {@link RheemPlan} to be executed by this instance.
+     * The {@link WayangPlan} to be executed by this instance.
      */
-    private final RheemPlan rheemPlan;
+    private final WayangPlan wayangPlan;
 
     /**
-     * {@link OptimizationContext} for the {@link #rheemPlan}.
+     * {@link OptimizationContext} for the {@link #wayangPlan}.
      */
     private DefaultOptimizationContext optimizationContext;
 
@@ -107,7 +107,7 @@ public class Job extends OneTimeExecutable {
     private CrossPlatformExecutor crossPlatformExecutor;
 
     /**
-     * Manages the {@link CardinalityEstimate}s for the {@link #rheemPlan}.
+     * Manages the {@link CardinalityEstimate}s for the {@link #wayangPlan}.
      */
     private CardinalityEstimatorManager cardinalityEstimatorManager;
 
@@ -173,20 +173,20 @@ public class Job extends OneTimeExecutable {
      * @param experiment an {@link Experiment} for that profiling entries will be created
      * @param udfJars    paths to JAR files needed to run the UDFs (see {@link ReflectionUtils#getDeclaringJar(Class)})
      */
-    Job(RheemContext rheemContext, String name, Monitor monitor, RheemPlan rheemPlan, Experiment experiment, String... udfJars) {
-        this.rheemContext = rheemContext;
-        this.name = name == null ? "Rheem app" : name;
-        this.configuration = this.rheemContext.getConfiguration().fork(this.name);
-        this.rheemPlan = rheemPlan;
+    Job(WayangContext wayangContext, String name, Monitor monitor, WayangPlan wayangPlan, Experiment experiment, String... udfJars) {
+        this.wayangContext = wayangContext;
+        this.name = name == null ? "Wayang app" : name;
+        this.configuration = this.wayangContext.getConfiguration().fork(this.name);
+        this.wayangPlan = wayangPlan;
         for (String udfJar : udfJars) {
             this.addUdfJar(udfJar);
         }
 
         // Prepare re-optimization.
-        if (this.configuration.getBooleanProperty("rheem.core.optimizer.reoptimize")) {
+        if (this.configuration.getBooleanProperty("wayang.core.optimizer.reoptimize")) {
             this.cardinalityBreakpoint = new CardinalityBreakpoint(this.configuration);
             this.isProactiveReoptimization =
-                    this.configuration.getBooleanProperty("rheem.core.optimizer.reoptimize.proactive", false);
+                    this.configuration.getBooleanProperty("wayang.core.optimizer.reoptimize.proactive", false);
         } else {
             this.cardinalityBreakpoint = null;
             this.isProactiveReoptimization = false;
@@ -218,21 +218,21 @@ public class Job extends OneTimeExecutable {
     /**
      * Run this instance. Must only be called once.
      *
-     * @throws RheemException in case the execution fails for any reason
+     * @throws WayangException in case the execution fails for any reason
      */
     @Override
-    public void execute() throws RheemException {
+    public void execute() throws WayangException {
         try {
             super.execute();
-        } catch (RheemException e) {
+        } catch (WayangException e) {
             throw e;
         } catch (Throwable t) {
-            throw new RheemException("Job execution failed.", t);
+            throw new WayangException("Job execution failed.", t);
         }
     }
 
-    public ExecutionPlan buildInitialExecutionPlan() throws RheemException {
-        this.prepareRheemPlan();
+    public ExecutionPlan buildInitialExecutionPlan() throws WayangException {
+        this.prepareWayangPlan();
         this.estimateKeyFigures();
 
         // Get initial execution plan.
@@ -255,16 +255,16 @@ public class Job extends OneTimeExecutable {
     protected void doExecute() {
         // Make sure that each job is only executed once.
         if (this.hasBeenExecuted.getAndSet(true)) {
-            throw new RheemException("Job has already been executed.");
+            throw new WayangException("Job has already been executed.");
         }
 
         try {
 
-            // Prepare the #rheemPlan for the optimization.
+            // Prepare the #wayangPlan for the optimization.
             this.optimizationRound.start();
-            this.prepareRheemPlan();
+            this.prepareWayangPlan();
 
-            // Estimate cardinalities and execution times for the #rheemPlan.
+            // Estimate cardinalities and execution times for the #wayangPlan.
             this.estimateKeyFigures();
 
             // Get an execution plan.
@@ -303,13 +303,13 @@ public class Job extends OneTimeExecutable {
             }
 
             this.stopWatch.start("Post-processing");
-            if (this.configuration.getBooleanProperty("rheem.core.log.enabled")) {
+            if (this.configuration.getBooleanProperty("wayang.core.log.enabled")) {
                 this.logExecution();
             }
-        } catch (RheemException e) {
+        } catch (WayangException e) {
             throw e;
         } catch (Throwable t) {
-            throw new RheemException("Job execution failed.", t);
+            throw new WayangException("Job execution failed.", t);
         } finally {
             this.stopWatch.stopAll();
             this.stopWatch.start("Post-processing", "Release Resources");
@@ -320,25 +320,25 @@ public class Job extends OneTimeExecutable {
     }
 
     /**
-     * Prepares the {@link #rheemPlan}: prunes unused {@link Operator}s, isolates loops, and applies all available
+     * Prepares the {@link #wayangPlan}: prunes unused {@link Operator}s, isolates loops, and applies all available
      * {@link PlanTransformation}s.
      */
-    private void prepareRheemPlan() {
+    private void prepareWayangPlan() {
         this.logger.info("Preparing plan...");
 
-        // Prepare the RheemPlan for the optimization.
+        // Prepare the WayangPlan for the optimization.
         this.optimizationRound.start("Prepare", "Prune&Isolate");
-        this.rheemPlan.prepare();
+        this.wayangPlan.prepare();
         this.optimizationRound.stop("Prepare", "Prune&Isolate");
 
         // Apply the mappings to the plan to form a hyperplan.
         this.optimizationRound.start("Prepare", "Transformations");
         final Collection<PlanTransformation> transformations = this.gatherTransformations();
-        this.rheemPlan.applyTransformations(transformations);
+        this.wayangPlan.applyTransformations(transformations);
         this.optimizationRound.stop("Prepare", "Transformations");
 
         this.optimizationRound.start("Prepare", "Sanity");
-        assert this.rheemPlan.isSane();
+        assert this.wayangPlan.isSane();
         this.optimizationRound.stop("Prepare", "Sanity");
 
         this.optimizationRound.stop("Prepare");
@@ -348,7 +348,7 @@ public class Job extends OneTimeExecutable {
      * Gather all available {@link PlanTransformation}s from the {@link #configuration}.
      */
     private Collection<PlanTransformation> gatherTransformations() {
-        final Set<Platform> platforms = RheemCollections.asSet(this.configuration.getPlatformProvider().provideAll());
+        final Set<Platform> platforms = WayangCollections.asSet(this.configuration.getPlatformProvider().provideAll());
         return this.configuration.getMappingProvider().provideAll().stream()
                 .flatMap(mapping -> mapping.getTransformations().stream())
                 .filter(t -> t.getTargetPlatforms().isEmpty() || platforms.containsAll(t.getTargetPlatforms()))
@@ -357,7 +357,7 @@ public class Job extends OneTimeExecutable {
 
 
     /**
-     * Go over the given {@link RheemPlan} and estimate the cardinalities of data being passed between its
+     * Go over the given {@link WayangPlan} and estimate the cardinalities of data being passed between its
      * {@link Operator}s and the execution profile and time of {@link ExecutionOperator}s.
      */
     private void estimateKeyFigures() {
@@ -371,7 +371,7 @@ public class Job extends OneTimeExecutable {
 
             this.optimizationRound.start("Cardinality&Load Estimation", "Create CardinalityEstimationManager");
             this.cardinalityEstimatorManager = new CardinalityEstimatorManager(
-                    this.rheemPlan, this.optimizationContext, this.configuration);
+                    this.wayangPlan, this.optimizationContext, this.configuration);
             this.optimizationRound.stop("Cardinality&Load Estimation", "Create CardinalityEstimationManager");
         }
 
@@ -384,7 +384,7 @@ public class Job extends OneTimeExecutable {
 
 
     /**
-     * Determine a good/the best execution plan from a given {@link RheemPlan}.
+     * Determine a good/the best execution plan from a given {@link WayangPlan}.
      */
     private ExecutionPlan createInitialExecutionPlan() {
         this.logger.info("Enumerating execution plans...");
@@ -443,13 +443,13 @@ public class Job extends OneTimeExecutable {
                     final double t2 = p2.getSquashedCostEstimate();
                     return t1 < t2 ? p1 : p2;
                 })
-                .orElseThrow(() -> new RheemException("Could not find an execution plan."));
+                .orElseThrow(() -> new WayangException("Could not find an execution plan."));
         this.logger.info("Picked {} as best plan.", bestPlanImplementation);
         return this.planImplementation = bestPlanImplementation;
     }
 
     /**
-     * Go over the given {@link RheemPlan} and update the cardinalities of data being passed between its
+     * Go over the given {@link WayangPlan} and update the cardinalities of data being passed between its
      * {@link Operator}s using the given {@link ExecutionState}.
      *
      * @return whether any cardinalities have been updated
@@ -459,19 +459,19 @@ public class Job extends OneTimeExecutable {
     }
 
     /**
-     * Creates a new {@link PlanEnumerator} for the {@link #rheemPlan} and {@link #configuration}.
+     * Creates a new {@link PlanEnumerator} for the {@link #wayangPlan} and {@link #configuration}.
      */
     private PlanEnumerator createPlanEnumerator() {
         return this.createPlanEnumerator(null, null);
     }
 
     /**
-     * Creates a new {@link PlanEnumerator} for the {@link #rheemPlan} and {@link #configuration}.
+     * Creates a new {@link PlanEnumerator} for the {@link #wayangPlan} and {@link #configuration}.
      */
     private PlanEnumerator createPlanEnumerator(ExecutionPlan existingPlan, Set<Channel> openChannels) {
         return existingPlan == null ?
-                new PlanEnumerator(this.rheemPlan, this.optimizationContext) :
-                new PlanEnumerator(this.rheemPlan, this.optimizationContext, existingPlan, openChannels);
+                new PlanEnumerator(this.wayangPlan, this.optimizationContext) :
+                new PlanEnumerator(this.wayangPlan, this.optimizationContext, existingPlan, openChannels);
     }
 
     /**
@@ -491,10 +491,10 @@ public class Job extends OneTimeExecutable {
             this.crossPlatformExecutor = new CrossPlatformExecutor(this, instrumentation);
         }
 
-        if (this.configuration.getOptionalBooleanProperty("rheem.core.debug.skipexecution").orElse(false)) {
+        if (this.configuration.getOptionalBooleanProperty("wayang.core.debug.skipexecution").orElse(false)) {
             return true;
         }
-        if (this.configuration.getBooleanProperty("rheem.core.optimizer.reoptimize")) {
+        if (this.configuration.getBooleanProperty("wayang.core.optimizer.reoptimize")) {
             this.setUpBreakpoint(executionPlan, currentExecutionRound);
         }
 
@@ -595,7 +595,7 @@ public class Job extends OneTimeExecutable {
     }
 
     /**
-     * Enumerate possible execution plans from the given {@link RheemPlan} and determine the (seemingly) best one.
+     * Enumerate possible execution plans from the given {@link WayangPlan} and determine the (seemingly) best one.
      */
     private void updateExecutionPlan(ExecutionPlan executionPlan) {
         // Defines the plan that we want to use in the end.
@@ -639,7 +639,7 @@ public class Job extends OneTimeExecutable {
      * consistency of accessed resources.
      */
     private void releaseResources() {
-        this.rheemContext.getCardinalityRepository().sleep();
+        this.wayangContext.getCardinalityRepository().sleep();
         if (this.crossPlatformExecutor != null) this.crossPlatformExecutor.shutdown();
     }
 
@@ -648,7 +648,7 @@ public class Job extends OneTimeExecutable {
 
         // For the last time, update the cardinalities and store them.
         this.reestimateCardinalities(this.crossPlatformExecutor);
-        final CardinalityRepository cardinalityRepository = this.rheemContext.getCardinalityRepository();
+        final CardinalityRepository cardinalityRepository = this.wayangContext.getCardinalityRepository();
         cardinalityRepository.storeAll(this.crossPlatformExecutor, this.optimizationContext);
 
         // Execution times.
@@ -767,7 +767,7 @@ public class Job extends OneTimeExecutable {
         }
 
         // Log some plan metrics.
-        final PlanMetrics planMetrics = PlanMetrics.createFor(this.rheemPlan, "Plan Metrics");
+        final PlanMetrics planMetrics = PlanMetrics.createFor(this.wayangPlan, "Plan Metrics");
         this.logger.info("Plan metrics: {} virtual operators, {} execution operators, {} alternatives, {} combinations",
                 planMetrics.getNumVirtualOperators(),
                 planMetrics.getNumExecutionOperators(),
@@ -840,12 +840,12 @@ public class Job extends OneTimeExecutable {
     }
 
     /**
-     * Provide the {@link RheemPlan} executed by this instance.
+     * Provide the {@link WayangPlan} executed by this instance.
      *
-     * @return the {@link RheemPlan}
+     * @return the {@link WayangPlan}
      */
-    public RheemPlan getRheemPlan() {
-        return this.rheemPlan;
+    public WayangPlan getWayangPlan() {
+        return this.wayangPlan;
     }
 
     /**
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/WayangContext.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/WayangContext.java
index 3cbba30..17aa77d 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/WayangContext.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/WayangContext.java
@@ -1,21 +1,21 @@
-package io.rheem.rheem.core.api;
+package org.apache.incubator.wayang.core.api;
 
 import de.hpi.isg.profiledb.store.model.Experiment;
 import de.hpi.isg.profiledb.store.model.Subject;
-import io.rheem.rheem.core.monitor.Monitor;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator;
-import io.rheem.rheem.core.plan.executionplan.ExecutionPlan;
-import io.rheem.rheem.core.plan.rheemplan.RheemPlan;
-import io.rheem.rheem.core.plugin.Plugin;
-import io.rheem.rheem.core.profiling.CardinalityRepository;
-import io.rheem.rheem.core.util.ReflectionUtils;
+import org.apache.incubator.wayang.core.monitor.Monitor;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.incubator.wayang.core.plan.executionplan.ExecutionPlan;
+import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.incubator.wayang.core.plugin.Plugin;
+import org.apache.incubator.wayang.core.profiling.CardinalityRepository;
+import org.apache.incubator.wayang.core.util.ReflectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * This is the entry point for users to work with Rheem.
+ * This is the entry point for users to work with Wayang.
  */
-public class RheemContext {
+public class WayangContext {
 
     @SuppressWarnings("unused")
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -27,12 +27,12 @@ public class RheemContext {
 
     private final Configuration configuration;
 
-    public RheemContext() {
+    public WayangContext() {
         this(new Configuration());
     }
 
-    public RheemContext(Configuration configuration) {
-        this.configuration = configuration.fork(String.format("RheemContext(%s)", configuration.getName()));
+    public WayangContext(Configuration configuration) {
+        this.configuration = configuration.fork(String.format("WayangContext(%s)", configuration.getName()));
     }
 
     /**
@@ -41,7 +41,7 @@ public class RheemContext {
      * @param plugin the {@link Plugin} to register
      * @return this instance
      */
-    public RheemContext with(Plugin plugin) {
+    public WayangContext with(Plugin plugin) {
         this.register(plugin);
         return this;
     }
@@ -52,7 +52,7 @@ public class RheemContext {
      * @param plugin the {@link Plugin} to register
      * @return this instance
      */
-    public RheemContext withPlugin(Plugin plugin) {
+    public WayangContext withPlugin(Plugin plugin) {
         this.register(plugin);
         return this;
     }
@@ -70,89 +70,89 @@ public class RheemContext {
     /**
      * Execute a plan.
      *
-     * @param rheemPlan the plan to execute
+     * @param wayangPlan the plan to execute
      * @param udfJars   JARs that declare the code for the UDFs
      * @see ReflectionUtils#getDeclaringJar(Class)
      */
-    public void execute(RheemPlan rheemPlan, String... udfJars) {
-        this.execute(null, rheemPlan, udfJars);
+    public void execute(WayangPlan wayangPlan, String... udfJars) {
+        this.execute(null, wayangPlan, udfJars);
     }
 
     /**
      * Execute a plan.
      *
      * @param jobName   name of the {@link Job} or {@code null}
-     * @param rheemPlan the plan to execute
+     * @param wayangPlan the plan to execute
      * @param udfJars   JARs that declare the code for the UDFs
      * @see ReflectionUtils#getDeclaringJar(Class)
      */
-    public void execute(String jobName, RheemPlan rheemPlan, String... udfJars) {
-        this.execute(jobName, null, rheemPlan, udfJars);
+    public void execute(String jobName, WayangPlan wayangPlan, String... udfJars) {
+        this.execute(jobName, null, wayangPlan, udfJars);
     }
 
     /**
      * Execute a plan.
      *
      * @param jobName   name of the {@link Job} or {@code null}
-     * @param rheemPlan the plan to execute
+     * @param wayangPlan the plan to execute
      * @param udfJars   JARs that declare the code for the UDFs
      * @see ReflectionUtils#getDeclaringJar(Class)
      */
-    public void execute(String jobName, Monitor monitor, RheemPlan rheemPlan, String... udfJars) {
-        this.createJob(jobName, monitor, rheemPlan, udfJars).execute();
+    public void execute(String jobName, Monitor monitor, WayangPlan wayangPlan, String... udfJars) {
+        this.createJob(jobName, monitor, wayangPlan, udfJars).execute();
     }
 
     /**
      * Execute a plan.
      *
      * @param jobName    name of the {@link Job} or {@code null}
-     * @param rheemPlan  the plan to execute
+     * @param wayangPlan  the plan to execute
      * @param experiment {@link Experiment} for that profiling entries will be created
      * @param udfJars    JARs that declare the code for the UDFs
      * @see ReflectionUtils#getDeclaringJar(Class)
      */
-    public void execute(String jobName, RheemPlan rheemPlan, Experiment experiment, String... udfJars) {
-        this.createJob(jobName, rheemPlan, experiment, udfJars).execute();
+    public void execute(String jobName, WayangPlan wayangPlan, Experiment experiment, String... udfJars) {
+        this.createJob(jobName, wayangPlan, experiment, udfJars).execute();
     }
 
 
     /**
      * Build an execution plan.
      *
-     * @param rheemPlan the plan to translate
+     * @param wayangPlan the plan to translate
      * @param udfJars   JARs that declare the code for the UDFs
      * @see ReflectionUtils#getDeclaringJar(Class)
      */
-    public ExecutionPlan buildInitialExecutionPlan(String jobName, RheemPlan rheemPlan, String... udfJars) {
-        return this.createJob(jobName, null, rheemPlan, udfJars).buildInitialExecutionPlan();
+    public ExecutionPlan buildInitialExecutionPlan(String jobName, WayangPlan wayangPlan, String... udfJars) {
+        return this.createJob(jobName, null, wayangPlan, udfJars).buildInitialExecutionPlan();
     }
 
     /**
-     * Create a new {@link Job} that should execute the given {@link RheemPlan} eventually.
+     * Create a new {@link Job} that should execute the given {@link WayangPlan} eventually.
      *
      * @param experiment {@link Experiment} for that profiling entries will be created
      * @see ReflectionUtils#getDeclaringJar(Class)
      */
-    public Job createJob(String jobName, RheemPlan rheemPlan, Experiment experiment, String... udfJars) {
-        return new Job(this, jobName, null, rheemPlan, experiment, udfJars);
+    public Job createJob(String jobName, WayangPlan wayangPlan, Experiment experiment, String... udfJars) {
+        return new Job(this, jobName, null, wayangPlan, experiment, udfJars);
     }
 
     /**
-     * Create a new {@link Job} that should execute the given {@link RheemPlan} eventually.
+     * Create a new {@link Job} that should execute the given {@link WayangPlan} eventually.
      *
      * @see ReflectionUtils#getDeclaringJar(Class)
      */
-    public Job createJob(String jobName, RheemPlan rheemPlan, String... udfJars) {
-        return this.createJob(jobName, null, rheemPlan, udfJars);
+    public Job createJob(String jobName, WayangPlan wayangPlan, String... udfJars) {
+        return this.createJob(jobName, null, wayangPlan, udfJars);
     }
 
     /**
-     * Create a new {@link Job} that should execute the given {@link RheemPlan} eventually.
+     * Create a new {@link Job} that should execute the given {@link WayangPlan} eventually.
      *
      * @see ReflectionUtils#getDeclaringJar(Class)
      */
-    public Job createJob(String jobName, Monitor monitor, RheemPlan rheemPlan, String... udfJars) {
-        return new Job(this, jobName, monitor, rheemPlan, new Experiment("unknown", new Subject("unknown", "unknown")), udfJars);
+    public Job createJob(String jobName, Monitor monitor, WayangPlan wayangPlan, String... udfJars) {
+        return new Job(this, jobName, monitor, wayangPlan, new Experiment("unknown", new Subject("unknown", "unknown")), udfJars);
     }
 
     public Configuration getConfiguration() {
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/CollectionProvider.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/CollectionProvider.java
index 5aff4dc..cd12b63 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/CollectionProvider.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/CollectionProvider.java
@@ -1,6 +1,6 @@
-package io.rheem.rheem.core.api.configuration;
+package org.apache.incubator.wayang.core.api.configuration;
 
-import io.rheem.rheem.core.api.Configuration;
+import org.apache.incubator.wayang.core.api.Configuration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/ConstantValueProvider.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/ConstantValueProvider.java
index 6e051d8..cf1ad05 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/ConstantValueProvider.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/ConstantValueProvider.java
@@ -1,6 +1,6 @@
-package io.rheem.rheem.core.api.configuration;
+package org.apache.incubator.wayang.core.api.configuration;
 
-import io.rheem.rheem.core.api.Configuration;
+import org.apache.incubator.wayang.core.api.Configuration;
 
 /**
  * Used by {@link Configuration}s to provide some value.
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/ExplicitCollectionProvider.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/ExplicitCollectionProvider.java
index 6380ef5..7066edd 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/ExplicitCollectionProvider.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/ExplicitCollectionProvider.java
@@ -1,6 +1,6 @@
-package io.rheem.rheem.core.api.configuration;
+package org.apache.incubator.wayang.core.api.configuration;
 
-import io.rheem.rheem.core.api.Configuration;
+import org.apache.incubator.wayang.core.api.Configuration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/FunctionalCollectionProvider.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/FunctionalCollectionProvider.java
index 037fe17..dac542f 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/FunctionalCollectionProvider.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/FunctionalCollectionProvider.java
@@ -1,6 +1,6 @@
-package io.rheem.rheem.core.api.configuration;
+package org.apache.incubator.wayang.core.api.configuration;
 
-import io.rheem.rheem.core.api.Configuration;
+import org.apache.incubator.wayang.core.api.Configuration;
 
 import java.util.Collection;
 import java.util.HashSet;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/FunctionalKeyValueProvider.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/FunctionalKeyValueProvider.java
index 8a0167d..4d2c5c3 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/FunctionalKeyValueProvider.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/FunctionalKeyValueProvider.java
@@ -1,6 +1,6 @@
-package io.rheem.rheem.core.api.configuration;
+package org.apache.incubator.wayang.core.api.configuration;
 
-import io.rheem.rheem.core.api.Configuration;
+import org.apache.incubator.wayang.core.api.Configuration;
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/FunctionalValueProvider.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/FunctionalValueProvider.java
index 0ade7d6..8bdcee6 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/FunctionalValueProvider.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/FunctionalValueProvider.java
@@ -1,6 +1,6 @@
-package io.rheem.rheem.core.api.configuration;
+package org.apache.incubator.wayang.core.api.configuration;
 
-import io.rheem.rheem.core.api.Configuration;
+import org.apache.incubator.wayang.core.api.Configuration;
 
 import java.util.function.Function;
 
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/KeyValueProvider.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/KeyValueProvider.java
index f97c7ec..80f04e2 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/KeyValueProvider.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/KeyValueProvider.java
@@ -1,7 +1,7 @@
-package io.rheem.rheem.core.api.configuration;
+package org.apache.incubator.wayang.core.api.configuration;
 
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.api.exception.RheemException;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.api.exception.WayangException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -12,7 +12,7 @@ import java.util.Optional;
  */
 public abstract class KeyValueProvider<Key, Value> {
 
-    public static class NoSuchKeyException extends RheemException {
+    public static class NoSuchKeyException extends WayangException {
 
         public NoSuchKeyException(String message) {
             super(message);
@@ -113,7 +113,7 @@ public abstract class KeyValueProvider<Key, Value> {
     }
 
     public void set(Key key, Value value) {
-        throw new RheemException(String.format("Setting values not supported for %s.", this.getClass().getSimpleName()));
+        throw new WayangException(String.format("Setting values not supported for %s.", this.getClass().getSimpleName()));
     }
 
     public Configuration getConfiguration() {
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/MapBasedKeyValueProvider.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/MapBasedKeyValueProvider.java
index ac99a40..c364498 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/MapBasedKeyValueProvider.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/MapBasedKeyValueProvider.java
@@ -1,7 +1,7 @@
-package io.rheem.rheem.core.api.configuration;
+package org.apache.incubator.wayang.core.api.configuration;
 
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.core.api.Configuration;
+import org.apache.incubator.wayang.core.api.Configuration;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/ValueProvider.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/ValueProvider.java
index 85e1261..e8de0e1 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/ValueProvider.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/ValueProvider.java
@@ -1,7 +1,7 @@
-package io.rheem.rheem.core.api.configuration;
+package org.apache.incubator.wayang.core.api.configuration;
 
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.api.exception.RheemException;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.api.exception.WayangException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -12,7 +12,7 @@ import java.util.Optional;
  */
 public abstract class ValueProvider<Value> {
 
-    public static class NotAvailableException extends RheemException {
+    public static class NotAvailableException extends WayangException {
         public NotAvailableException(String message) {
             super(message);
         }
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/exception/WayangException.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/exception/WayangException.java
index d1cf36e..96c97aa 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/exception/WayangException.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/exception/WayangException.java
@@ -1,26 +1,26 @@
-package io.rheem.rheem.core.api.exception;
+package org.apache.incubator.wayang.core.api.exception;
 
 /**
- * Exception that declares a problem of Rheem.
+ * Exception that declares a problem of Wayang.
  */
-public class RheemException extends RuntimeException {
+public class WayangException extends RuntimeException {
 
-    public RheemException() {
+    public WayangException() {
     }
 
-    public RheemException(String message) {
+    public WayangException(String message) {
         super(message);
     }
 
-    public RheemException(String message, Throwable cause) {
+    public WayangException(String message, Throwable cause) {
         super(message, cause);
     }
 
-    public RheemException(Throwable cause) {
+    public WayangException(Throwable cause) {
         super(cause);
     }
 
-    public RheemException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+    public WayangException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
         super(message, cause, enableSuppression, writableStackTrace);
     }
 }
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/AggregationDescriptor.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/AggregationDescriptor.java
index c59767b..b3a785a 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/AggregationDescriptor.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/AggregationDescriptor.java
@@ -1,11 +1,11 @@
-package io.rheem.rheem.core.function;
+package org.apache.incubator.wayang.core.function;
 
-import io.rheem.rheem.core.optimizer.costs.LoadEstimator;
-import io.rheem.rheem.core.optimizer.costs.LoadProfileEstimator;
-import io.rheem.rheem.core.optimizer.costs.NestableLoadProfileEstimator;
-import io.rheem.rheem.core.types.BasicDataUnitType;
-import io.rheem.rheem.core.types.DataUnitGroupType;
-import io.rheem.rheem.core.types.DataUnitType;
+import org.apache.incubator.wayang.core.optimizer.costs.LoadEstimator;
+import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileEstimator;
+import org.apache.incubator.wayang.core.optimizer.costs.NestableLoadProfileEstimator;
+import org.apache.incubator.wayang.core.types.BasicDataUnitType;
+import org.apache.incubator.wayang.core.types.DataUnitGroupType;
+import org.apache.incubator.wayang.core.types.DataUnitType;
 
 import java.util.Iterator;
 
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/ConsumerDescriptor.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/ConsumerDescriptor.java
index 539b565..970e680 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/ConsumerDescriptor.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/ConsumerDescriptor.java
@@ -1,8 +1,8 @@
-package io.rheem.rheem.core.function;
+package org.apache.incubator.wayang.core.function;
 
-import io.rheem.rheem.core.optimizer.ProbabilisticDoubleInterval;
-import io.rheem.rheem.core.optimizer.costs.LoadProfileEstimator;
-import io.rheem.rheem.core.types.BasicDataUnitType;
+import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileEstimator;
+import org.apache.incubator.wayang.core.types.BasicDataUnitType;
 
 import java.util.Optional;
 
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/ExecutionContext.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/ExecutionContext.java
index 540f3de..2184534 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/ExecutionContext.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/ExecutionContext.java
@@ -1,7 +1,7 @@
-package io.rheem.rheem.core.function;
+package org.apache.incubator.wayang.core.function;
 
-import io.rheem.rheem.core.plan.rheemplan.LoopSubplan;
-import io.rheem.rheem.core.platform.Platform;
+import org.apache.incubator.wayang.core.plan.wayangplan.LoopSubplan;
+import org.apache.incubator.wayang.core.platform.Platform;
 
 import java.util.Collection;
 
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/ExtendedFunction.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/ExtendedFunction.java
index 970ab2b..0953afb 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/ExtendedFunction.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/ExtendedFunction.java
@@ -1,6 +1,6 @@
-package io.rheem.rheem.core.function;
+package org.apache.incubator.wayang.core.function;
 
-import io.rheem.rheem.core.plan.rheemplan.Operator;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
 
 /**
  * Used to enrich regular functions with additional life-cycle methods of {@link Operator}s.
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/FlatMapDescriptor.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/FlatMapDescriptor.java
index cf54c13..5b210df 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/FlatMapDescriptor.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/FlatMapDescriptor.java
@@ -1,9 +1,9 @@
-package io.rheem.rheem.core.function;
+package org.apache.incubator.wayang.core.function;
 
-import io.rheem.rheem.core.optimizer.ProbabilisticDoubleInterval;
-import io.rheem.rheem.core.optimizer.costs.LoadProfileEstimator;
-import io.rheem.rheem.core.types.BasicDataUnitType;
-import io.rheem.rheem.core.types.DataUnitType;
+import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileEstimator;
+import org.apache.incubator.wayang.core.types.BasicDataUnitType;
+import org.apache.incubator.wayang.core.types.DataUnitType;
 
 import java.util.Optional;
 import java.util.function.Function;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/FunctionDescriptor.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/FunctionDescriptor.java
index 0305a6c..1805942 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/FunctionDescriptor.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/FunctionDescriptor.java
@@ -1,9 +1,9 @@
-package io.rheem.rheem.core.function;
+package org.apache.incubator.wayang.core.function;
 
-import io.rheem.rheem.core.optimizer.ProbabilisticDoubleInterval;
-import io.rheem.rheem.core.optimizer.costs.LoadEstimator;
-import io.rheem.rheem.core.optimizer.costs.LoadProfileEstimator;
-import io.rheem.rheem.core.optimizer.costs.NestableLoadProfileEstimator;
+import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.incubator.wayang.core.optimizer.costs.LoadEstimator;
+import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileEstimator;
+import org.apache.incubator.wayang.core.optimizer.costs.NestableLoadProfileEstimator;
 
 import java.io.Serializable;
 import java.util.Optional;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/MapPartitionsDescriptor.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/MapPartitionsDescriptor.java
index 37c9858..42b335f 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/MapPartitionsDescriptor.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/MapPartitionsDescriptor.java
@@ -1,9 +1,9 @@
-package io.rheem.rheem.core.function;
+package org.apache.incubator.wayang.core.function;
 
-import io.rheem.rheem.core.optimizer.ProbabilisticDoubleInterval;
-import io.rheem.rheem.core.optimizer.costs.LoadProfileEstimator;
-import io.rheem.rheem.core.types.BasicDataUnitType;
-import io.rheem.rheem.core.types.DataUnitType;
+import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileEstimator;
+import org.apache.incubator.wayang.core.types.BasicDataUnitType;
+import org.apache.incubator.wayang.core.types.DataUnitType;
 
 import java.util.Optional;
 import java.util.function.Function;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/PredicateDescriptor.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/PredicateDescriptor.java
index 74ea494..d1db9ad 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/PredicateDescriptor.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/PredicateDescriptor.java
@@ -1,8 +1,8 @@
-package io.rheem.rheem.core.function;
+package org.apache.incubator.wayang.core.function;
 
-import io.rheem.rheem.core.optimizer.ProbabilisticDoubleInterval;
-import io.rheem.rheem.core.optimizer.costs.LoadProfileEstimator;
-import io.rheem.rheem.core.types.BasicDataUnitType;
+import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileEstimator;
+import org.apache.incubator.wayang.core.types.BasicDataUnitType;
 
 import java.util.Optional;
 
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/ReduceDescriptor.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/ReduceDescriptor.java
index bad7db6..5551a97 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/ReduceDescriptor.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/ReduceDescriptor.java
@@ -1,11 +1,11 @@
-package io.rheem.rheem.core.function;
+package org.apache.incubator.wayang.core.function;
 
-import io.rheem.rheem.core.optimizer.costs.LoadEstimator;
-import io.rheem.rheem.core.optimizer.costs.LoadProfileEstimator;
-import io.rheem.rheem.core.optimizer.costs.NestableLoadProfileEstimator;
-import io.rheem.rheem.core.types.BasicDataUnitType;
-import io.rheem.rheem.core.types.DataUnitGroupType;
-import io.rheem.rheem.core.types.DataUnitType;
+import org.apache.incubator.wayang.core.optimizer.costs.LoadEstimator;
+import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileEstimator;
+import org.apache.incubator.wayang.core.optimizer.costs.NestableLoadProfileEstimator;
+import org.apache.incubator.wayang.core.types.BasicDataUnitType;
+import org.apache.incubator.wayang.core.types.DataUnitGroupType;
+import org.apache.incubator.wayang.core.types.DataUnitType;
 
 import java.util.function.BinaryOperator;
 
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/TransformationDescriptor.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/TransformationDescriptor.java
index 07c8851..94aa3df 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/TransformationDescriptor.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/TransformationDescriptor.java
@@ -1,9 +1,9 @@
-package io.rheem.rheem.core.function;
+package org.apache.incubator.wayang.core.function;
 
-import io.rheem.rheem.core.optimizer.costs.LoadEstimator;
-import io.rheem.rheem.core.optimizer.costs.LoadProfileEstimator;
-import io.rheem.rheem.core.optimizer.costs.NestableLoadProfileEstimator;
-import io.rheem.rheem.core.types.BasicDataUnitType;
+import org.apache.incubator.wayang.core.optimizer.costs.LoadEstimator;
+import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileEstimator;
+import org.apache.incubator.wayang.core.optimizer.costs.NestableLoadProfileEstimator;
+import org.apache.incubator.wayang.core.types.BasicDataUnitType;
 
 import java.util.function.Function;
 
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/Mapping.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/Mapping.java
index aa7be8d..cfc142c 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/Mapping.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/Mapping.java
@@ -1,4 +1,4 @@
-package io.rheem.rheem.core.mapping;
+package org.apache.incubator.wayang.core.mapping;
 
 import java.util.Collection;
 
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/OperatorMatch.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/OperatorMatch.java
index 28baf9a..b3c5257 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/OperatorMatch.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/OperatorMatch.java
@@ -1,6 +1,6 @@
-package io.rheem.rheem.core.mapping;
+package org.apache.incubator.wayang.core.mapping;
 
-import io.rheem.rheem.core.plan.rheemplan.Operator;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
 
 /**
  * An operator match correlates an {@link OperatorPattern} to an actually matched {@link Operator}.
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/OperatorPattern.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/OperatorPattern.java
index 4520c77..70e9fd9 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/OperatorPattern.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/OperatorPattern.java
@@ -1,12 +1,12 @@
-package io.rheem.rheem.core.mapping;
-
-import io.rheem.rheem.core.plan.rheemplan.InputSlot;
-import io.rheem.rheem.core.plan.rheemplan.Operator;
-import io.rheem.rheem.core.plan.rheemplan.OperatorBase;
-import io.rheem.rheem.core.plan.rheemplan.OutputSlot;
-import io.rheem.rheem.core.plan.rheemplan.Slot;
-import io.rheem.rheem.core.plan.rheemplan.TopDownPlanVisitor;
-import io.rheem.rheem.core.types.DataSetType;
+package org.apache.incubator.wayang.core.mapping;
+
+import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.incubator.wayang.core.plan.wayangplan.OperatorBase;
+import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.Slot;
+import org.apache.incubator.wayang.core.plan.wayangplan.TopDownPlanVisitor;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 import java.util.Collection;
 import java.util.LinkedList;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/PlanTransformation.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/PlanTransformation.java
index dc66051..17b73c8 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/PlanTransformation.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/PlanTransformation.java
@@ -1,12 +1,12 @@
-package io.rheem.rheem.core.mapping;
-
-import io.rheem.rheem.core.plan.rheemplan.InputSlot;
-import io.rheem.rheem.core.plan.rheemplan.Operator;
-import io.rheem.rheem.core.plan.rheemplan.OperatorAlternative;
-import io.rheem.rheem.core.plan.rheemplan.OutputSlot;
-import io.rheem.rheem.core.plan.rheemplan.PlanTraversal;
-import io.rheem.rheem.core.plan.rheemplan.RheemPlan;
-import io.rheem.rheem.core.platform.Platform;
+package org.apache.incubator.wayang.core.mapping;
+
+import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.incubator.wayang.core.plan.wayangplan.OperatorAlternative;
+import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.PlanTraversal;
+import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.incubator.wayang.core.platform.Platform;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -16,7 +16,7 @@ import java.util.Collection;
 import java.util.List;
 
 /**
- * Looks for a {@link SubplanPattern} in a {@link RheemPlan} and replaces it with an alternative {@link Operator}s.
+ * Looks for a {@link SubplanPattern} in a {@link WayangPlan} and replaces it with an alternative {@link Operator}s.
  */
 public class PlanTransformation {
 
@@ -57,7 +57,7 @@ public class PlanTransformation {
      * @return the number of applied transformations
      * @see Operator#getEpoch()
      */
-    public int transform(RheemPlan plan, int epoch) {
+    public int transform(WayangPlan plan, int epoch) {
         int numTransformations = 0;
         List<SubplanMatch> matches = this.pattern.match(plan, epoch - 1);
         for (SubplanMatch match : matches) {
@@ -110,7 +110,7 @@ public class PlanTransformation {
         return match.getTargetPlatforms().get().containsAll(this.getTargetPlatforms());
     }
 
-    private void introduceAlternative(RheemPlan plan, SubplanMatch match, Operator replacement) {
+    private void introduceAlternative(WayangPlan plan, SubplanMatch match, Operator replacement) {
         // Wrap the match in an OperatorAlternative.
         final Operator originalOutputOperator = match.getOutputMatch().getOperator();
         boolean wasTopLevel = originalOutputOperator.getParent() == null;
@@ -126,9 +126,9 @@ public class PlanTransformation {
     }
 
     /**
-     * @deprecated use {@link #introduceAlternative(RheemPlan, SubplanMatch, Operator)}
+     * @deprecated use {@link #introduceAlternative(WayangPlan, SubplanMatch, Operator)}
      */
-    private void replace(RheemPlan plan, SubplanMatch match, Operator replacement) {
+    private void replace(WayangPlan plan, SubplanMatch match, Operator replacement) {
         // Disconnect the original input operator and insert the replacement input operator.
         final Operator originalInputOperator = match.getInputMatch().getOperator();
         for (int inputIndex = 0; inputIndex < originalInputOperator.getNumInputs(); inputIndex++) {
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/ReplacementSubplanFactory.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/ReplacementSubplanFactory.java
index b940e17..2b50099 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/ReplacementSubplanFactory.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/ReplacementSubplanFactory.java
@@ -1,13 +1,13 @@
-package io.rheem.rheem.core.mapping;
+package org.apache.incubator.wayang.core.mapping;
 
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.core.plan.rheemplan.ActualOperator;
-import io.rheem.rheem.core.plan.rheemplan.InputSlot;
-import io.rheem.rheem.core.plan.rheemplan.Operator;
-import io.rheem.rheem.core.plan.rheemplan.OperatorAlternative;
-import io.rheem.rheem.core.plan.rheemplan.OperatorBase;
-import io.rheem.rheem.core.plan.rheemplan.OutputSlot;
-import io.rheem.rheem.core.plan.rheemplan.Subplan;
+import org.apache.incubator.wayang.core.plan.wayangplan.ActualOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.incubator.wayang.core.plan.wayangplan.OperatorAlternative;
+import org.apache.incubator.wayang.core.plan.wayangplan.OperatorBase;
+import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.Subplan;
 
 import java.util.Map;
 import java.util.function.BiFunction;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/SubplanMatch.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/SubplanMatch.java
index 49b085a..d1b1946 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/SubplanMatch.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/SubplanMatch.java
@@ -1,7 +1,7 @@
-package io.rheem.rheem.core.mapping;
+package org.apache.incubator.wayang.core.mapping;
 
-import io.rheem.rheem.core.plan.rheemplan.Operator;
-import io.rheem.rheem.core.platform.Platform;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.incubator.wayang.core.platform.Platform;
 
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/SubplanPattern.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/SubplanPattern.java
index 9d7b02b..36f17b6 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/SubplanPattern.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/SubplanPattern.java
@@ -1,14 +1,14 @@
-package io.rheem.rheem.core.mapping;
+package org.apache.incubator.wayang.core.mapping;
 
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.core.api.exception.RheemException;
-import io.rheem.rheem.core.plan.rheemplan.InputSlot;
-import io.rheem.rheem.core.plan.rheemplan.Operator;
-import io.rheem.rheem.core.plan.rheemplan.OperatorBase;
-import io.rheem.rheem.core.plan.rheemplan.OutputSlot;
-import io.rheem.rheem.core.plan.rheemplan.PlanTraversal;
-import io.rheem.rheem.core.plan.rheemplan.RheemPlan;
-import io.rheem.rheem.core.plan.rheemplan.TopDownPlanVisitor;
+import org.apache.incubator.wayang.core.api.exception.WayangException;
+import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.incubator.wayang.core.plan.wayangplan.OperatorBase;
+import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.PlanTraversal;
+import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.incubator.wayang.core.plan.wayangplan.TopDownPlanVisitor;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -18,7 +18,7 @@ import java.util.Objects;
 import java.util.Set;
 
 /**
- * A subplan pattern describes a class of subplans in a {@link RheemPlan}.
+ * A subplan pattern describes a class of subplans in a {@link WayangPlan}.
  * <p><i>NB: Currently, only such patterns are tested and supported that form a chain of operators, i.e., no DAGs
  * are allowed and at most one input and one output operator.</i></p>
  */
@@ -67,7 +67,7 @@ public class SubplanPattern extends OperatorBase {
      * @param minEpoch the (inclusive) minimum epoch value for matched subplans
      * @return all matches
      */
-    public List<SubplanMatch> match(RheemPlan plan, int minEpoch) {
+    public List<SubplanMatch> match(WayangPlan plan, int minEpoch) {
         return new Matcher(minEpoch).match(plan);
     }
 
@@ -120,12 +120,12 @@ public class SubplanPattern extends OperatorBase {
         }
 
         /**
-         * Run this instance over the given {@link RheemPlan}.
+         * Run this instance over the given {@link WayangPlan}.
          *
          * @return a {@link List} of all {@link SubplanMatch}es established by the run
          */
-        public List<SubplanMatch> match(RheemPlan plan) {
-            // Start an attempt to match from each operator that is upstream-reachable from one of the RheemPlan sinks.
+        public List<SubplanMatch> match(WayangPlan plan) {
+            // Start an attempt to match from each operator that is upstream-reachable from one of the WayangPlan sinks.
             PlanTraversal.upstream().traversingHierarchically()
                     .withCallback(this::attemptMatchFrom)
                     .traverse(plan.getSinks());
@@ -164,7 +164,7 @@ public class SubplanPattern extends OperatorBase {
                             .map(InputSlot::getOccupant)
                             .filter(Objects::nonNull)
                             .count() > 1) {
-                throw new RheemException("Cannot match pattern: Operator with more than one occupied input not supported, yet.");
+                throw new WayangException("Cannot match pattern: Operator with more than one occupied input not supported, yet.");
             }
 
 
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/DisabledMonitor.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/DisabledMonitor.java
index 733b167..889b183 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/DisabledMonitor.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/DisabledMonitor.java
@@ -1,6 +1,6 @@
-package io.rheem.rheem.core.monitor;
+package org.apache.incubator.wayang.core.monitor;
 
-import io.rheem.rheem.core.api.Configuration;
+import org.apache.incubator.wayang.core.api.Configuration;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/FileMonitor.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/FileMonitor.java
index 105c7c2..0accea9 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/FileMonitor.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/FileMonitor.java
@@ -1,10 +1,10 @@
-package io.rheem.rheem.core.monitor;
+package org.apache.incubator.wayang.core.monitor;
 
 
 import org.json.JSONObject;
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.util.fs.FileSystem;
-import io.rheem.rheem.core.util.fs.FileSystems;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.util.fs.FileSystem;
+import org.apache.incubator.wayang.core.util.fs.FileSystems;
 
 import java.io.IOException;
 import java.io.OutputStreamWriter;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/HttpMonitor.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/HttpMonitor.java
index d70b485..6d63155 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/HttpMonitor.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/HttpMonitor.java
@@ -1,6 +1,6 @@
-package io.rheem.rheem.core.monitor;
+package org.apache.incubator.wayang.core.monitor;
 
-import io.rheem.rheem.core.api.Configuration;
+import org.apache.incubator.wayang.core.api.Configuration;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/Monitor.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/Monitor.java
index 0d7e471..829d65c 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/Monitor.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/Monitor.java
@@ -1,6 +1,6 @@
-package io.rheem.rheem.core.monitor;
+package org.apache.incubator.wayang.core.monitor;
 
-import io.rheem.rheem.core.api.Configuration;
+import org.apache.incubator.wayang.core.api.Configuration;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -22,7 +22,7 @@ public abstract class Monitor {
 
     public abstract void updateProgress(HashMap<String, Integer> partialProgress) throws IOException;
 
-    public static final String DEFAULT_MONITOR_BASE_URL = "file:///var/tmp/rheem/runs";
-    public static final String DEFAULT_MONITOR_BASE_URL_PROPERTY_KEY = "rheem.core.monitor.baseurl";
-    public static final String MONITOR_ENABLED_PROPERTY_KEY = "rheem.core.monitor.enabled";
+    public static final String DEFAULT_MONITOR_BASE_URL = "file:///var/tmp/wayang/runs";
+    public static final String DEFAULT_MONITOR_BASE_URL_PROPERTY_KEY = "wayang.core.monitor.baseurl";
+    public static final String MONITOR_ENABLED_PROPERTY_KEY = "wayang.core.monitor.enabled";
 }
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/ZeroMQMonitor.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/ZeroMQMonitor.java
index 2efdf83..239ffad 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/ZeroMQMonitor.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/ZeroMQMonitor.java
@@ -1,6 +1,6 @@
-package io.rheem.rheem.core.monitor;
+package org.apache.incubator.wayang.core.monitor;
 
-import io.rheem.rheem.core.api.Configuration;
+import org.apache.incubator.wayang.core.api.Configuration;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/AggregateOptimizationContext.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/AggregateOptimizationContext.java
index 9b743ac..ad07054 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/AggregateOptimizationContext.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/AggregateOptimizationContext.java
@@ -1,7 +1,7 @@
-package io.rheem.rheem.core.optimizer;
+package org.apache.incubator.wayang.core.optimizer;
 
-import io.rheem.rheem.core.plan.rheemplan.LoopSubplan;
-import io.rheem.rheem.core.plan.rheemplan.Operator;
+import org.apache.incubator.wayang.core.plan.wayangplan.LoopSubplan;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/DefaultOptimizationContext.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/DefaultOptimizationContext.java
index 8dcafa5..4fc794b 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/DefaultOptimizationContext.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/DefaultOptimizationContext.java
@@ -1,15 +1,15 @@
-package io.rheem.rheem.core.optimizer;
+package org.apache.incubator.wayang.core.optimizer;
 
-import io.rheem.rheem.core.api.Job;
-import io.rheem.rheem.core.optimizer.channels.ChannelConversionGraph;
-import io.rheem.rheem.core.optimizer.enumeration.PlanEnumerationPruningStrategy;
-import io.rheem.rheem.core.plan.rheemplan.LoopSubplan;
-import io.rheem.rheem.core.plan.rheemplan.Operator;
-import io.rheem.rheem.core.plan.rheemplan.OperatorAlternative;
-import io.rheem.rheem.core.plan.rheemplan.PlanTraversal;
-import io.rheem.rheem.core.plan.rheemplan.RheemPlan;
-import io.rheem.rheem.core.plan.rheemplan.Subplan;
-import io.rheem.rheem.core.util.RheemArrays;
+import org.apache.incubator.wayang.core.api.Job;
+import org.apache.incubator.wayang.core.optimizer.channels.ChannelConversionGraph;
+import org.apache.incubator.wayang.core.optimizer.enumeration.PlanEnumerationPruningStrategy;
+import org.apache.incubator.wayang.core.plan.wayangplan.LoopSubplan;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.incubator.wayang.core.plan.wayangplan.OperatorAlternative;
+import org.apache.incubator.wayang.core.plan.wayangplan.PlanTraversal;
+import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.incubator.wayang.core.plan.wayangplan.Subplan;
+import org.apache.incubator.wayang.core.util.WayangArrays;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -35,7 +35,7 @@ public class DefaultOptimizationContext extends OptimizationContext {
     private final Map<LoopSubplan, LoopContext> loopContexts = new HashMap<>();
 
     /**
-     * Create a new instance and adds all {@link Operator}s in the {@link RheemPlan}.
+     * Create a new instance and adds all {@link Operator}s in the {@link WayangPlan}.
      *
      * @param job the optimization task; loops should already be isolated
      */
@@ -43,7 +43,7 @@ public class DefaultOptimizationContext extends OptimizationContext {
         DefaultOptimizationContext instance = new DefaultOptimizationContext(job);
         PlanTraversal.upstream()
                 .withCallback(instance::addOneTimeOperator)
-                .traverse(job.getRheemPlan().getSinks());
+                .traverse(job.getWayangPlan().getSinks());
         return instance;
     }
 
@@ -180,7 +180,7 @@ public class DefaultOptimizationContext extends OptimizationContext {
         for (OperatorContext operatorContext : operatorContexts.values()) {
             if (operatorContext.getOperator().isExecutionOperator()
                     && operatorContext.timeEstimate == null
-                    && RheemArrays.anyMatch(operatorContext.getOutputCardinalities(), Objects::nonNull)) {
+                    && WayangArrays.anyMatch(operatorContext.getOutputCardinalities(), Objects::nonNull)) {
                 this.logger.warn("No TimeEstimate for {}.", operatorContext);
                 isComplete = false;
             }
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/OptimizationContext.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/OptimizationContext.java
index 7b4267e..25abc2b 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/OptimizationContext.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/OptimizationContext.java
@@ -1,32 +1,32 @@
-package io.rheem.rheem.core.optimizer;
-
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.api.Job;
-import io.rheem.rheem.core.api.exception.RheemException;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimate;
-import io.rheem.rheem.core.optimizer.channels.ChannelConversionGraph;
-import io.rheem.rheem.core.optimizer.costs.EstimationContext;
-import io.rheem.rheem.core.optimizer.costs.LoadProfile;
-import io.rheem.rheem.core.optimizer.costs.LoadProfileEstimator;
-import io.rheem.rheem.core.optimizer.costs.LoadProfileEstimators;
-import io.rheem.rheem.core.optimizer.costs.LoadProfileToTimeConverter;
-import io.rheem.rheem.core.optimizer.costs.TimeEstimate;
-import io.rheem.rheem.core.optimizer.costs.TimeToCostConverter;
-import io.rheem.rheem.core.optimizer.enumeration.PlanEnumerationPruningStrategy;
-import io.rheem.rheem.core.plan.rheemplan.CompositeOperator;
-import io.rheem.rheem.core.plan.rheemplan.ExecutionOperator;
-import io.rheem.rheem.core.plan.rheemplan.InputSlot;
-import io.rheem.rheem.core.plan.rheemplan.LoopHeadOperator;
-import io.rheem.rheem.core.plan.rheemplan.LoopSubplan;
-import io.rheem.rheem.core.plan.rheemplan.Operator;
-import io.rheem.rheem.core.plan.rheemplan.OperatorContainer;
-import io.rheem.rheem.core.plan.rheemplan.OutputSlot;
-import io.rheem.rheem.core.plan.rheemplan.PlanTraversal;
-import io.rheem.rheem.core.plan.rheemplan.RheemPlan;
-import io.rheem.rheem.core.plan.rheemplan.Slot;
-import io.rheem.rheem.core.platform.Platform;
-import io.rheem.rheem.core.platform.lineage.ExecutionLineageNode;
-import io.rheem.rheem.core.util.ReflectionUtils;
+package org.apache.incubator.wayang.core.optimizer;
+
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.api.Job;
+import org.apache.incubator.wayang.core.api.exception.WayangException;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.incubator.wayang.core.optimizer.channels.ChannelConversionGraph;
+import org.apache.incubator.wayang.core.optimizer.costs.EstimationContext;
+import org.apache.incubator.wayang.core.optimizer.costs.LoadProfile;
+import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileEstimator;
+import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileEstimators;
+import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileToTimeConverter;
+import org.apache.incubator.wayang.core.optimizer.costs.TimeEstimate;
+import org.apache.incubator.wayang.core.optimizer.costs.TimeToCostConverter;
+import org.apache.incubator.wayang.core.optimizer.enumeration.PlanEnumerationPruningStrategy;
+import org.apache.incubator.wayang.core.plan.wayangplan.CompositeOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.LoopHeadOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.LoopSubplan;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.incubator.wayang.core.plan.wayangplan.OperatorContainer;
+import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.PlanTraversal;
+import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.incubator.wayang.core.plan.wayangplan.Slot;
+import org.apache.incubator.wayang.core.platform.Platform;
+import org.apache.incubator.wayang.core.platform.lineage.ExecutionLineageNode;
+import org.apache.incubator.wayang.core.util.ReflectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -41,8 +41,8 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 /**
- * Manages contextual information required during the optimization of a {@link RheemPlan}.
- * <p>A single {@link Operator} can have multiple contexts in a {@link RheemPlan} - namely if it appears in a loop.
+ * Manages contextual information required during the optimization of a {@link WayangPlan}.
+ * <p>A single {@link Operator} can have multiple contexts in a {@link WayangPlan} - namely if it appears in a loop.
  * We manage these contexts in a hierarchical fashion.</p>
  */
 public abstract class OptimizationContext {
@@ -50,7 +50,7 @@ public abstract class OptimizationContext {
     protected final Logger logger = LoggerFactory.getLogger(this.getClass());
 
     /**
-     * The {@link Job} whose {@link RheemPlan} is to be optimized.
+     * The {@link Job} whose {@link WayangPlan} is to be optimized.
      */
     protected final Job job;
 
@@ -327,7 +327,7 @@ public abstract class OptimizationContext {
         try {
             return resultClass.cast(value);
         } catch (ClassCastException e) {
-            throw new RheemException("Job-cache value cannot be casted as requested.", e);
+            throw new WayangException("Job-cache value cannot be casted as requested.", e);
         }
     }
 
@@ -537,7 +537,7 @@ public abstract class OptimizationContext {
             try {
                 this.loadProfile = LoadProfileEstimators.estimateLoadProfile(this, loadProfileEstimator);
             } catch (Exception e) {
-                throw new RheemException(String.format("Load profile estimation for %s failed.", this.operator), e);
+                throw new WayangException(String.format("Load profile estimation for %s failed.", this.operator), e);
             }
 
             // Calculate the TimeEstimate.
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/OptimizationUtils.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/OptimizationUtils.java
index 232135e..c20aa2b 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/OptimizationUtils.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/OptimizationUtils.java
@@ -1,16 +1,16 @@
-package io.rheem.rheem.core.optimizer;
-
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.api.exception.RheemException;
-import io.rheem.rheem.core.optimizer.enumeration.PlanEnumerationPruningStrategy;
-import io.rheem.rheem.core.plan.executionplan.Channel;
-import io.rheem.rheem.core.plan.executionplan.ExecutionTask;
-import io.rheem.rheem.core.plan.rheemplan.ExecutionOperator;
-import io.rheem.rheem.core.plan.rheemplan.InputSlot;
-import io.rheem.rheem.core.plan.rheemplan.OutputSlot;
-import io.rheem.rheem.core.plan.rheemplan.RheemPlan;
-import io.rheem.rheem.core.plan.rheemplan.Slot;
-import io.rheem.rheem.core.plan.rheemplan.SlotMapping;
+package org.apache.incubator.wayang.core.optimizer;
+
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.api.exception.WayangException;
+import org.apache.incubator.wayang.core.optimizer.enumeration.PlanEnumerationPruningStrategy;
+import org.apache.incubator.wayang.core.plan.executionplan.Channel;
+import org.apache.incubator.wayang.core.plan.executionplan.ExecutionTask;
+import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.incubator.wayang.core.plan.wayangplan.Slot;
+import org.apache.incubator.wayang.core.plan.wayangplan.SlotMapping;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -25,10 +25,10 @@ public class OptimizationUtils {
 //    private static final Logger logger = LoggerFactory.getLogger(OptimizationUtils.class);
 
     /**
-     * Determine the producing {@link OutputSlot} of this {@link Channel} that lies within a {@link RheemPlan}.
-     * We follow non-RheemPlan {@link ExecutionOperator}s because they should merely forward data.
+     * Determine the producing {@link OutputSlot} of this {@link Channel} that lies within a {@link WayangPlan}.
+     * We follow non-WayangPlan {@link ExecutionOperator}s because they should merely forward data.
      */
-    public static OutputSlot<?> findRheemPlanOutputSlotFor(Channel openChannel) {
+    public static OutputSlot<?> findWayangPlanOutputSlotFor(Channel openChannel) {
         OutputSlot<?> producerOutput = null;
         Channel tracedChannel = openChannel;
         do {
@@ -69,7 +69,7 @@ public class OptimizationUtils {
             strategy.configure(configuration);
             return strategy;
         } catch (InstantiationException | IllegalAccessException e) {
-            throw new RheemException(String.format("Could not create pruning strategy for %s.", strategyClass.getCanonicalName()), e);
+            throw new WayangException(String.format("Could not create pruning strategy for %s.", strategyClass.getCanonicalName()), e);
         }
     }
 
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/ProbabilisticDoubleInterval.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/ProbabilisticDoubleInterval.java
index f611cb8..d897703 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/ProbabilisticDoubleInterval.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/ProbabilisticDoubleInterval.java
@@ -1,4 +1,4 @@
-package io.rheem.rheem.core.optimizer;
+package org.apache.incubator.wayang.core.optimizer;
 
 import java.util.Objects;
 
@@ -15,7 +15,7 @@ public class ProbabilisticDoubleInterval {
 
     /**
      * Probability of correctness between in the interval [0, 1]. This helps
-     * Rheem in situations with many estimates to pick the best one.
+     * Wayang in situations with many estimates to pick the best one.
      */
     private final double correctnessProb;
 
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/ProbabilisticIntervalEstimate.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/ProbabilisticIntervalEstimate.java
index a7d46d6..4cc66f8 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/ProbabilisticIntervalEstimate.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/ProbabilisticIntervalEstimate.java
@@ -1,6 +1,6 @@
-package io.rheem.rheem.core.optimizer;
+package org.apache.incubator.wayang.core.optimizer;
 
-import io.rheem.rheem.core.util.Formats;
+import org.apache.incubator.wayang.core.util.Formats;
 
 import java.util.Comparator;
 import java.util.Objects;
@@ -15,7 +15,7 @@ public class ProbabilisticIntervalEstimate {
 
     /**
      * Probability of correctness between in the interval [0, 1]. This helps
-     * Rheem in situations with many estimates to pick the best one.
+     * Wayang in situations with many estimates to pick the best one.
      */
     private final double correctnessProb;
 
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/SanityChecker.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/SanityChecker.java
index 9bfbc99..005d5ce 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/SanityChecker.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/SanityChecker.java
@@ -1,11 +1,11 @@
-package io.rheem.rheem.core.optimizer;
+package org.apache.incubator.wayang.core.optimizer;
 
-import io.rheem.rheem.core.plan.rheemplan.Operator;
-import io.rheem.rheem.core.plan.rheemplan.OperatorAlternative;
-import io.rheem.rheem.core.plan.rheemplan.PlanTraversal;
-import io.rheem.rheem.core.plan.rheemplan.RheemPlan;
-import io.rheem.rheem.core.plan.rheemplan.Subplan;
-import io.rheem.rheem.core.util.RheemCollections;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.incubator.wayang.core.plan.wayangplan.OperatorAlternative;
+import org.apache.incubator.wayang.core.plan.wayangplan.PlanTraversal;
+import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.incubator.wayang.core.plan.wayangplan.Subplan;
+import org.apache.incubator.wayang.core.util.WayangCollections;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -13,7 +13,7 @@ import java.util.Collection;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
- * This class checks a {@link RheemPlan} for several sanity criteria:
+ * This class checks a {@link WayangPlan} for several sanity criteria:
  * <ol>
  * <li>{@link Subplan}s must only be used as top-level {@link Operator} of {@link OperatorAlternative.Alternative}</li>
  * <li>{@link Subplan}s must contain more than one {@link Operator}</li>
@@ -29,15 +29,15 @@ public class SanityChecker {
     /**
      * Is subject to the sanity checks.
      */
-    private final RheemPlan rheemPlan;
+    private final WayangPlan wayangPlan;
 
     /**
      * Create a new instance
      *
-     * @param rheemPlan is subject to sanity checks
+     * @param wayangPlan is subject to sanity checks
      */
-    public SanityChecker(RheemPlan rheemPlan) {
-        this.rheemPlan = rheemPlan;
+    public SanityChecker(WayangPlan wayangPlan) {
+        this.wayangPlan = wayangPlan;
     }
 
     public boolean checkAllCriteria() {
@@ -56,7 +56,7 @@ public class SanityChecker {
         final AtomicBoolean testOutcome = new AtomicBoolean(true);
         PlanTraversal.upstream()
                 .withCallback(this.getProperSubplanCallback(testOutcome))
-                .traverse(this.rheemPlan.getSinks());
+                .traverse(this.wayangPlan.getSinks());
         return testOutcome.get();
     }
 
@@ -101,7 +101,7 @@ public class SanityChecker {
         AtomicBoolean testOutcome = new AtomicBoolean(true);
         new PlanTraversal(true, false)
                 .withCallback(this.getFlatAlternativeCallback(testOutcome))
-                .traverse(this.rheemPlan.getSinks());
+                .traverse(this.wayangPlan.getSinks());
         return testOutcome.get();
     }
 
@@ -112,7 +112,7 @@ public class SanityChecker {
                 for (OperatorAlternative.Alternative alternative : operatorAlternative.getAlternatives()) {
                     final Collection<Operator> containedOperators = alternative.getContainedOperators();
                     if (containedOperators.size() == 1) {
-                        Operator containedOperator = RheemCollections.getSingle(containedOperators);
+                        Operator containedOperator = WayangCollections.getSingle(containedOperators);
                         if (containedOperator.isAlternative()) {
                             this.logger.warn("Improper alternative {}: contains alternatives.", alternative);
                             testOutcome.set(false);
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/AbstractAlternativeCardinalityPusher.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/AbstractAlternativeCardinalityPusher.java
index b7b1c26..dd12931 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/AbstractAlternativeCardinalityPusher.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/AbstractAlternativeCardinalityPusher.java
@@ -1,10 +1,10 @@
-package io.rheem.rheem.core.optimizer.cardinality;
+package org.apache.incubator.wayang.core.optimizer.cardinality;
 
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.plan.rheemplan.Operator;
-import io.rheem.rheem.core.plan.rheemplan.OperatorAlternative;
-import io.rheem.rheem.core.plan.rheemplan.OutputSlot;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.incubator.wayang.core.plan.wayangplan.OperatorAlternative;
+import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
 
 /**
  * Abstract {@link CardinalityPusher} implementation for {@link OperatorAlternative}s and subclasses.
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/AggregatingCardinalityEstimator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/AggregatingCardinalityEstimator.java
index de84bde..13353cb 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/AggregatingCardinalityEstimator.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/AggregatingCardinalityEstimator.java
@@ -1,7 +1,7 @@
-package io.rheem.rheem.core.optimizer.cardinality;
+package org.apache.incubator.wayang.core.optimizer.cardinality;
 
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimate.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimate.java
index 2332300..0ff4b90 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimate.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimate.java
@@ -1,13 +1,13 @@
-package io.rheem.rheem.core.optimizer.cardinality;
+package org.apache.incubator.wayang.core.optimizer.cardinality;
 
 import org.json.JSONObject;
-import io.rheem.rheem.core.optimizer.ProbabilisticIntervalEstimate;
-import io.rheem.rheem.core.plan.rheemplan.RheemPlan;
-import io.rheem.rheem.core.util.Formats;
-import io.rheem.rheem.core.util.JsonSerializable;
+import org.apache.incubator.wayang.core.optimizer.ProbabilisticIntervalEstimate;
+import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.incubator.wayang.core.util.Formats;
+import org.apache.incubator.wayang.core.util.JsonSerializable;
 
 /**
- * An estimate of cardinality within a {@link RheemPlan} expressed as a {@link ProbabilisticIntervalEstimate}.
+ * An estimate of cardinality within a {@link WayangPlan} expressed as a {@link ProbabilisticIntervalEstimate}.
  */
 public class CardinalityEstimate extends ProbabilisticIntervalEstimate implements JsonSerializable {
 
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimationTraversal.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimationTraversal.java
index c96d25d..f1dfc92 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimationTraversal.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimationTraversal.java
@@ -1,15 +1,15 @@
-package io.rheem.rheem.core.optimizer.cardinality;
+package org.apache.incubator.wayang.core.optimizer.cardinality;
 
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.plan.rheemplan.InputSlot;
-import io.rheem.rheem.core.plan.rheemplan.Operator;
-import io.rheem.rheem.core.plan.rheemplan.OperatorContainer;
-import io.rheem.rheem.core.plan.rheemplan.OutputSlot;
-import io.rheem.rheem.core.plan.rheemplan.PlanTraversal;
-import io.rheem.rheem.core.util.OneTimeExecutable;
-import io.rheem.rheem.core.util.RheemCollections;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.incubator.wayang.core.plan.wayangplan.OperatorContainer;
+import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.PlanTraversal;
+import org.apache.incubator.wayang.core.util.OneTimeExecutable;
+import org.apache.incubator.wayang.core.util.WayangCollections;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -355,7 +355,7 @@ public class CardinalityEstimationTraversal {
          */
         private Builder(Collection<InputSlot<?>> inputSlots, Collection<InputSlot<?>> borderInputSlots, Collection<Operator> sourceOperators, Configuration configuration) {
             this.inputSlots = inputSlots;
-            this.borderInputSlots = RheemCollections.asSet(borderInputSlots);
+            this.borderInputSlots = WayangCollections.asSet(borderInputSlots);
             this.configuration = configuration;
             this.sourceOperators = sourceOperators;
         }
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimator.java
index 1498aa5..ba747e7 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimator.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimator.java
@@ -1,9 +1,9 @@
-package io.rheem.rheem.core.optimizer.cardinality;
+package org.apache.incubator.wayang.core.optimizer.cardinality;
 
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.plan.rheemplan.InputSlot;
-import io.rheem.rheem.core.plan.rheemplan.Operator;
-import io.rheem.rheem.core.plan.rheemplan.OutputSlot;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
 
 /**
  * Computes {@link CardinalityEstimate}s.
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimatorManager.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimatorManager.java
index bc5dae1..abddfb2 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimatorManager.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimatorManager.java
@@ -1,17 +1,17 @@
-package io.rheem.rheem.core.optimizer.cardinality;
-
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.optimizer.OptimizationUtils;
-import io.rheem.rheem.core.optimizer.enumeration.LoopImplementation;
-import io.rheem.rheem.core.optimizer.enumeration.PlanImplementation;
-import io.rheem.rheem.core.plan.rheemplan.LoopSubplan;
-import io.rheem.rheem.core.plan.rheemplan.Operator;
-import io.rheem.rheem.core.plan.rheemplan.OutputSlot;
-import io.rheem.rheem.core.plan.rheemplan.RheemPlan;
-import io.rheem.rheem.core.platform.ChannelInstance;
-import io.rheem.rheem.core.platform.ExecutionState;
-import io.rheem.rheem.core.platform.Junction;
+package org.apache.incubator.wayang.core.optimizer.cardinality;
+
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.optimizer.OptimizationUtils;
+import org.apache.incubator.wayang.core.optimizer.enumeration.LoopImplementation;
+import org.apache.incubator.wayang.core.optimizer.enumeration.PlanImplementation;
+import org.apache.incubator.wayang.core.plan.wayangplan.LoopSubplan;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.incubator.wayang.core.platform.ChannelInstance;
+import org.apache.incubator.wayang.core.platform.ExecutionState;
+import org.apache.incubator.wayang.core.platform.Junction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -19,16 +19,16 @@ import java.util.Collections;
 import java.util.Map;
 
 /**
- * Handles the {@link CardinalityEstimate}s of a {@link RheemPlan}.
+ * Handles the {@link CardinalityEstimate}s of a {@link WayangPlan}.
  */
 public class CardinalityEstimatorManager {
 
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
     /**
-     * The {@link RheemPlan} whose cardinalities are being managed.
+     * The {@link WayangPlan} whose cardinalities are being managed.
      */
-    private final RheemPlan rheemPlan;
+    private final WayangPlan wayangPlan;
 
     /**
      * Keeps the {@link CardinalityEstimate}s around.
@@ -42,16 +42,16 @@ public class CardinalityEstimatorManager {
 
     private CardinalityEstimationTraversal planTraversal;
 
-    public CardinalityEstimatorManager(RheemPlan rheemPlan,
+    public CardinalityEstimatorManager(WayangPlan wayangPlan,
                                        OptimizationContext optimizationContext,
                                        Configuration configuration) {
-        this.rheemPlan = rheemPlan;
+        this.wayangPlan = wayangPlan;
         this.optimizationContext = optimizationContext;
         this.configuration = configuration;
     }
 
     /**
-     * Traverse the {@link RheemPlan}, thereby updating {@link CardinalityEstimate}s.
+     * Traverse the {@link WayangPlan}, thereby updating {@link CardinalityEstimate}s.
      *
      * @return whether any {@link CardinalityEstimate}s have been updated
      */
@@ -62,7 +62,7 @@ public class CardinalityEstimatorManager {
     }
 
     /**
-     * Traverse the {@link RheemPlan}, thereby updating {@link CardinalityEstimate}s. Also update conversion
+     * Traverse the {@link WayangPlan}, thereby updating {@link CardinalityEstimate}s. Also update conversion
      * {@link Operator} cardinalities as provided by the {@link PlanImplementation}.
      *
      * @param planImplementation that has conversion {@link Operator}s
@@ -133,7 +133,7 @@ public class CardinalityEstimatorManager {
         if (this.planTraversal == null) {
             this.planTraversal = CardinalityEstimationTraversal.createPushTraversal(
                     Collections.emptyList(),
-                    this.rheemPlan.collectReachableTopLevelSources(),
+                    this.wayangPlan.collectReachableTopLevelSources(),
                     this.configuration
             );
         }
@@ -141,7 +141,7 @@ public class CardinalityEstimatorManager {
     }
 
     /**
-     * Injects the cardinalities of a current {@link ExecutionState} into its associated {@link RheemPlan}
+     * Injects the cardinalities of a current {@link ExecutionState} into its associated {@link WayangPlan}
      * (or its {@link OptimizationContext}, respectively) and then reperforms the cardinality estimation.
      *
      * @return whether any cardinalities have been injected
@@ -153,7 +153,7 @@ public class CardinalityEstimatorManager {
     }
 
     /**
-     * Injects the cardinalities of a current {@link ExecutionState} into its associated {@link RheemPlan}.
+     * Injects the cardinalities of a current {@link ExecutionState} into its associated {@link WayangPlan}.
      *
      * @return whether any cardinalities have been injected
      */
@@ -172,15 +172,15 @@ public class CardinalityEstimatorManager {
         // Obtain cardinality measurement.
         final long cardinality = channelInstance.getMeasuredCardinality().getAsLong();
 
-        // Try to inject into the RheemPlan Operator output.
-        final OutputSlot<?> rheemPlanOutput = OptimizationUtils.findRheemPlanOutputSlotFor(channelInstance.getChannel());
-        int outputIndex = rheemPlanOutput == null ? 0 : rheemPlanOutput.getIndex();
+        // Try to inject into the WayangPlan Operator output.
+        final OutputSlot<?> wayangPlanOutput = OptimizationUtils.findWayangPlanOutputSlotFor(channelInstance.getChannel());
+        int outputIndex = wayangPlanOutput == null ? 0 : wayangPlanOutput.getIndex();
         OptimizationContext optimizationContext = channelInstance.getProducerOperatorContext().getOptimizationContext();
-        final OptimizationContext.OperatorContext rheemPlanOperatorCtx = optimizationContext.getOperatorContext(rheemPlanOutput.getOwner());
-        if (rheemPlanOperatorCtx != null) {
-            this.injectMeasuredCardinality(cardinality, rheemPlanOperatorCtx, outputIndex);
+        final OptimizationContext.OperatorContext wayangPlanOperatorCtx = optimizationContext.getOperatorContext(wayangPlanOutput.getOwner());
+        if (wayangPlanOperatorCtx != null) {
+            this.injectMeasuredCardinality(cardinality, wayangPlanOperatorCtx, outputIndex);
         } else {
-            this.logger.warn("Could not inject cardinality measurement {} for {}.", cardinality, rheemPlanOutput);
+            this.logger.warn("Could not inject cardinality measurement {} for {}.", cardinality, wayangPlanOutput);
         }
     }
 
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityPusher.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityPusher.java
index a8b2111..ae2e1d4 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityPusher.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityPusher.java
@@ -1,10 +1,10 @@
-package io.rheem.rheem.core.optimizer.cardinality;
+package org.apache.incubator.wayang.core.optimizer.cardinality;
 
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.optimizer.costs.TimeEstimate;
-import io.rheem.rheem.core.plan.rheemplan.Operator;
-import io.rheem.rheem.core.util.RheemArrays;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.optimizer.costs.TimeEstimate;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.incubator.wayang.core.util.WayangArrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -24,7 +24,7 @@ public abstract class CardinalityPusher {
     protected final int[] relevantOutputIndices;
 
     protected CardinalityPusher(Operator operator) {
-        this(RheemArrays.range(operator.getNumInputs()), RheemArrays.range(operator.getNumOutputs()));
+        this(WayangArrays.range(operator.getNumInputs()), WayangArrays.range(operator.getNumOutputs()));
     }
 
     protected CardinalityPusher(int[] relevantInputIndices, int[] relevantOutputIndices) {
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/DefaultCardinalityEstimator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/DefaultCardinalityEstimator.java
index 158e303..e747f19 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/DefaultCardinalityEstimator.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/DefaultCardinalityEstimator.java
@@ -1,7 +1,7 @@
-package io.rheem.rheem.core.optimizer.cardinality;
+package org.apache.incubator.wayang.core.optimizer.cardinality;
 
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
 
 import java.util.Arrays;
 import java.util.function.ToLongBiFunction;
@@ -30,7 +30,7 @@ public class DefaultCardinalityEstimator implements CardinalityEstimator {
         this(certaintyProb,
                 numInputs,
                 isAllowMoreInputs,
-                (inputCards, rheemContext) -> singlePointEstimator.applyAsLong(inputCards));
+                (inputCards, wayangContext) -> singlePointEstimator.applyAsLong(inputCards));
     }
 
     public DefaultCardinalityEstimator(double certaintyProb,
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/DefaultCardinalityPusher.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/DefaultCardinalityPusher.java
index 9c0062d..c7b8797 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/DefaultCardinalityPusher.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/DefaultCardinalityPusher.java
@@ -1,10 +1,10 @@
-package io.rheem.rheem.core.optimizer.cardinality;
+package org.apache.incubator.wayang.core.optimizer.cardinality;
 
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.api.configuration.KeyValueProvider;
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.plan.rheemplan.Operator;
-import io.rheem.rheem.core.plan.rheemplan.OutputSlot;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.api.configuration.KeyValueProvider;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
 
 /**
  * Default {@link CardinalityPusher} implementation. Bundles all {@link CardinalityEstimator}s of an {@link Operator}.
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/FallbackCardinalityEstimator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/FallbackCardinalityEstimator.java
index 24659fd..f490163 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/FallbackCardinalityEstimator.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/FallbackCardinalityEstimator.java
@@ -1,6 +1,6 @@
-package io.rheem.rheem.core.optimizer.cardinality;
+package org.apache.incubator.wayang.core.optimizer.cardinality;
 
-import io.rheem.rheem.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
 
 /**
  * Assumes with a confidence of 50% that the output cardinality will be somewhere between 1 and the product of
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/FixedSizeCardinalityEstimator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/FixedSizeCardinalityEstimator.java
index 9ad6cbb..102a99f 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/FixedSizeCardinalityEstimator.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/FixedSizeCardinalityEstimator.java
@@ -1,7 +1,7 @@
-package io.rheem.rheem.core.optimizer.cardinality;
+package org.apache.incubator.wayang.core.optimizer.cardinality;
 
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.plan.rheemplan.Operator;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
 
 /**
  * {@link CardinalityEstimator} implementation for {@link Operator}s with a fix-sized output.
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/LoopHeadAlternativeCardinalityPusher.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/LoopHeadAlternativeCardinalityPusher.java
index 8272d6e..def72bf 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/LoopHeadAlternativeCardinalityPusher.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/LoopHeadAlternativeCardinalityPusher.java
@@ -1,14 +1,14 @@
-package io.rheem.rheem.core.optimizer.cardinality;
-
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.plan.rheemplan.InputSlot;
-import io.rheem.rheem.core.plan.rheemplan.LoopHeadAlternative;
-import io.rheem.rheem.core.plan.rheemplan.LoopHeadOperator;
-import io.rheem.rheem.core.plan.rheemplan.OperatorAlternative;
-import io.rheem.rheem.core.plan.rheemplan.OutputSlot;
-import io.rheem.rheem.core.plan.rheemplan.Slot;
-import io.rheem.rheem.core.util.Tuple;
+package org.apache.incubator.wayang.core.optimizer.cardinality;
+
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.LoopHeadAlternative;
+import org.apache.incubator.wayang.core.plan.wayangplan.LoopHeadOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.OperatorAlternative;
+import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.Slot;
+import org.apache.incubator.wayang.core.util.Tuple;
 
 import java.util.Collection;
 import java.util.function.BiFunction;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/LoopSubplanCardinalityPusher.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/LoopSubplanCardinalityPusher.java
index f43066e..9a838b1 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/LoopSubplanCardinalityPusher.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/LoopSubplanCardinalityPusher.java
@@ -1,12 +1,12 @@
-package io.rheem.rheem.core.optimizer.cardinality;
-
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.plan.rheemplan.InputSlot;
-import io.rheem.rheem.core.plan.rheemplan.LoopHeadOperator;
-import io.rheem.rheem.core.plan.rheemplan.LoopSubplan;
-import io.rheem.rheem.core.plan.rheemplan.Operator;
-import io.rheem.rheem.core.plan.rheemplan.OutputSlot;
+package org.apache.incubator.wayang.core.optimizer.cardinality;
+
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.LoopHeadOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.LoopSubplan;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
 
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/OperatorAlternativeCardinalityPusher.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/OperatorAlternativeCardinalityPusher.java
index d6735eb..94ea5b5 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/OperatorAlternativeCardinalityPusher.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/OperatorAlternativeCardinalityPusher.java
@@ -1,9 +1,9 @@
-package io.rheem.rheem.core.optimizer.cardinality;
+package org.apache.incubator.wayang.core.optimizer.cardinality;
 
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.plan.rheemplan.OperatorAlternative;
-import io.rheem.rheem.core.util.Tuple;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.plan.wayangplan.OperatorAlternative;
+import org.apache.incubator.wayang.core.util.Tuple;
 
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/SubplanCardinalityPusher.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/SubplanCardinalityPusher.java
index d7e8ae6..ac805f2 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/SubplanCardinalityPusher.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/SubplanCardinalityPusher.java
@@ -1,14 +1,14 @@
-package io.rheem.rheem.core.optimizer.cardinality;
+package org.apache.incubator.wayang.core.optimizer.cardinality;
 
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.plan.rheemplan.CompositeOperator;
-import io.rheem.rheem.core.plan.rheemplan.InputSlot;
-import io.rheem.rheem.core.plan.rheemplan.LoopSubplan;
-import io.rheem.rheem.core.plan.rheemplan.Operator;
-import io.rheem.rheem.core.plan.rheemplan.OperatorContainer;
-import io.rheem.rheem.core.plan.rheemplan.OutputSlot;
-import io.rheem.rheem.core.plan.rheemplan.Subplan;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.plan.wayangplan.CompositeOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.LoopSubplan;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.incubator.wayang.core.plan.wayangplan.OperatorContainer;
+import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.Subplan;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/SwitchForwardCardinalityEstimator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/SwitchForwardCardinalityEstimator.java
index 54adcbd..acf6b27 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/SwitchForwardCardinalityEstimator.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/SwitchForwardCardinalityEstimator.java
@@ -1,7 +1,7 @@
-package io.rheem.rheem.core.optimizer.cardinality;
+package org.apache.incubator.wayang.core.optimizer.cardinality;
 
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.plan.rheemplan.InputSlot;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
 import org.slf4j.LoggerFactory;
 
 /**
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/channels/ChannelConversion.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/channels/ChannelConversion.java
index 018505b..07ceead 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/channels/ChannelConversion.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/channels/ChannelConversion.java
@@ -1,12 +1,12 @@
-package io.rheem.rheem.core.optimizer.channels;
+package org.apache.incubator.wayang.core.optimizer.channels;
 
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.optimizer.ProbabilisticDoubleInterval;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimate;
-import io.rheem.rheem.core.plan.executionplan.Channel;
-import io.rheem.rheem.core.plan.rheemplan.Operator;
-import io.rheem.rheem.core.platform.ChannelDescriptor;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.incubator.wayang.core.plan.executionplan.Channel;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.incubator.wayang.core.platform.ChannelDescriptor;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/channels/ChannelConversionGraph.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/channels/ChannelConversionGraph.java
index 5674ac4..59e7e50 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/channels/ChannelConversionGraph.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/channels/ChannelConversionGraph.java
@@ -1,26 +1,26 @@
-package io.rheem.rheem.core.optimizer.channels;
-
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.optimizer.DefaultOptimizationContext;
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.optimizer.OptimizationUtils;
-import io.rheem.rheem.core.optimizer.ProbabilisticDoubleInterval;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimate;
-import io.rheem.rheem.core.optimizer.costs.TimeEstimate;
-import io.rheem.rheem.core.plan.executionplan.Channel;
-import io.rheem.rheem.core.plan.executionplan.ExecutionTask;
-import io.rheem.rheem.core.plan.rheemplan.ExecutionOperator;
-import io.rheem.rheem.core.plan.rheemplan.InputSlot;
-import io.rheem.rheem.core.plan.rheemplan.LoopHeadOperator;
-import io.rheem.rheem.core.plan.rheemplan.LoopSubplan;
-import io.rheem.rheem.core.plan.rheemplan.OutputSlot;
-import io.rheem.rheem.core.platform.ChannelDescriptor;
-import io.rheem.rheem.core.platform.Junction;
-import io.rheem.rheem.core.util.Bitmask;
-import io.rheem.rheem.core.util.OneTimeExecutable;
-import io.rheem.rheem.core.util.ReflectionUtils;
-import io.rheem.rheem.core.util.RheemCollections;
-import io.rheem.rheem.core.util.Tuple;
+package org.apache.incubator.wayang.core.optimizer.channels;
+
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.optimizer.DefaultOptimizationContext;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.optimizer.OptimizationUtils;
+import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.incubator.wayang.core.optimizer.costs.TimeEstimate;
+import org.apache.incubator.wayang.core.plan.executionplan.Channel;
+import org.apache.incubator.wayang.core.plan.executionplan.ExecutionTask;
+import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.LoopHeadOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.LoopSubplan;
+import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.incubator.wayang.core.platform.ChannelDescriptor;
+import org.apache.incubator.wayang.core.platform.Junction;
+import org.apache.incubator.wayang.core.util.Bitmask;
+import org.apache.incubator.wayang.core.util.OneTimeExecutable;
+import org.apache.incubator.wayang.core.util.ReflectionUtils;
+import org.apache.incubator.wayang.core.util.WayangCollections;
+import org.apache.incubator.wayang.core.util.Tuple;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -70,7 +70,7 @@ public class ChannelConversionGraph {
         this.costSquasher = configuration.getCostSquasherProvider().provide();
         configuration.getChannelConversionProvider().provideAll().forEach(this::add);
         String treeSelectionStrategyClassName = configuration.getStringProperty(
-                "rheem.core.optimizer.channels.selection",
+                "wayang.core.optimizer.channels.selection",
                 this.getClass().getCanonicalName() + '$' + CostbasedTreeSelectionStrategy.class.getSimpleName()
         );
         this.treeSelectionStrategy = ReflectionUtils.instantiateDefault(treeSelectionStrategyClassName);
@@ -350,7 +350,7 @@ public class ChannelConversionGraph {
 
             if (isOpenChannelsPresent) {
                 // Take any open channel and trace it back to the source channel.
-                Channel existingChannel = RheemCollections.getAny(openChannels);
+                Channel existingChannel = WayangCollections.getAny(openChannels);
                 while (existingChannel.getProducerSlot() != sourceOutput) {
                     existingChannel = OptimizationUtils.getPredecessorChannel(existingChannel);
                 }
@@ -377,7 +377,7 @@ public class ChannelConversionGraph {
 
 
             // Set up the destinations.
-            this.destChannelDescriptorSets = RheemCollections.map(destInputs, this::resolveSupportedChannels);
+            this.destChannelDescriptorSets = WayangCollections.map(destInputs, this::resolveSupportedChannels);
             assert this.destChannelDescriptorSets.stream().noneMatch(Collection::isEmpty);
             this.kernelizeChannelRequests();
 
@@ -461,7 +461,7 @@ public class ChannelConversionGraph {
                 // Loop input is needed in several iterations and must therefore be reusable.
                 return supportedInputChannels.stream().filter(ChannelDescriptor::isReusable).collect(Collectors.toSet());
             } else {
-                return RheemCollections.asSet(supportedInputChannels);
+                return WayangCollections.asSet(supportedInputChannels);
             }
         }
 
@@ -523,7 +523,7 @@ public class ChannelConversionGraph {
                 if (numReusableChannels == 0 && channelDescriptors.size() == 1) {
                     logger.warn(
                             "More than two target operators request only the non-reusable channel {}.",
-                            RheemCollections.getSingle(channelDescriptors)
+                            WayangCollections.getSingle(channelDescriptors)
                     );
                 }
                 if (channelDescriptors.size() - numReusableChannels == 1) {
@@ -731,11 +731,11 @@ public class ChannelConversionGraph {
 
                 if (numUnreachedDestinationSets >= 2) { // only combine when there is more than one destination left
                     final Collection<List<Collection<Tree>>> childSolutionSetCombinations =
-                            RheemCollections.createPowerList(childSolutionSets, numUnreachedDestinationSets);
+                            WayangCollections.createPowerList(childSolutionSets, numUnreachedDestinationSets);
                     for (List<Collection<Tree>> childSolutionSetCombination : childSolutionSetCombinations) {
                         if (childSolutionSetCombination.size() < 2)
                             continue; // only combine when we have more than on child solution
-                        for (List<Tree> solutionCombination : RheemCollections.streamedCrossProduct(childSolutionSetCombination)) {
+                        for (List<Tree> solutionCombination : WayangCollections.streamedCrossProduct(childSolutionSetCombination)) {
                             final Tree tree = ChannelConversionGraph.this.mergeTrees(solutionCombination);
                             if (tree != null) {
                                 newSolutions.merge(tree.settledDestinationIndices, tree, ChannelConversionGraph.this::selectPreferredTree);
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/channels/DefaultChannelConversion.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/channels/DefaultChannelConversion.java
index 09c99b9..87e21f3 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/channels/DefaultChannelConversion.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/channels/DefaultChannelConversion.java
@@ -1,14 +1,14 @@
-package io.rheem.rheem.core.optimizer.channels;
-
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.optimizer.ProbabilisticDoubleInterval;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimate;
-import io.rheem.rheem.core.plan.executionplan.Channel;
-import io.rheem.rheem.core.plan.executionplan.ExecutionTask;
-import io.rheem.rheem.core.plan.rheemplan.ExecutionOperator;
-import io.rheem.rheem.core.plan.rheemplan.OutputSlot;
-import io.rheem.rheem.core.platform.ChannelDescriptor;
+package org.apache.incubator.wayang.core.optimizer.channels;
+
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.incubator.wayang.core.plan.executionplan.Channel;
+import org.apache.incubator.wayang.core.plan.executionplan.ExecutionTask;
+import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.incubator.wayang.core.platform.ChannelDescriptor;
 
 import java.util.Collection;
 import java.util.function.BiFunction;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/ConstantLoadProfileEstimator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/ConstantLoadProfileEstimator.java
index 19770bc..0b25564 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/ConstantLoadProfileEstimator.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/ConstantLoadProfileEstimator.java
@@ -1,4 +1,4 @@
-package io.rheem.rheem.core.optimizer.costs;
+package org.apache.incubator.wayang.core.optimizer.costs;
 
 import java.util.Collection;
 import java.util.LinkedList;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/DefaultLoadEstimator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/DefaultLoadEstimator.java
index 615cc8b..cd1da47 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/DefaultLoadEstimator.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/DefaultLoadEstimator.java
@@ -1,8 +1,8 @@
-package io.rheem.rheem.core.optimizer.costs;
+package org.apache.incubator.wayang.core.optimizer.costs;
 
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimate;
-import io.rheem.rheem.core.plan.rheemplan.ExecutionOperator;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
 
 import java.util.Arrays;
 import java.util.function.ToDoubleBiFunction;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/EstimationContext.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/EstimationContext.java
index 2580530..f3f465f 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/EstimationContext.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/EstimationContext.java
@@ -1,10 +1,10 @@
-package io.rheem.rheem.core.optimizer.costs;
+package org.apache.incubator.wayang.core.optimizer.costs;
 
 import org.json.JSONObject;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimate;
-import io.rheem.rheem.core.plan.rheemplan.Operator;
-import io.rheem.rheem.core.util.JsonSerializables;
-import io.rheem.rheem.core.util.JsonSerializer;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.incubator.wayang.core.util.JsonSerializables;
+import org.apache.incubator.wayang.core.util.JsonSerializer;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/IntervalLoadEstimator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/IntervalLoadEstimator.java
index 379714e..405a512 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/IntervalLoadEstimator.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/IntervalLoadEstimator.java
@@ -1,8 +1,8 @@
-package io.rheem.rheem.core.optimizer.costs;
+package org.apache.incubator.wayang.core.optimizer.costs;
 
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimate;
-import io.rheem.rheem.core.plan.rheemplan.ExecutionOperator;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
 
 import java.util.Arrays;
 import java.util.function.ToDoubleBiFunction;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadEstimate.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadEstimate.java
index c0d2504..edc8c07 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadEstimate.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadEstimate.java
@@ -1,9 +1,9 @@
-package io.rheem.rheem.core.optimizer.costs;
+package org.apache.incubator.wayang.core.optimizer.costs;
 
 import org.json.JSONObject;
-import io.rheem.rheem.core.optimizer.ProbabilisticIntervalEstimate;
-import io.rheem.rheem.core.util.JsonSerializable;
-import io.rheem.rheem.core.util.JsonSerializables;
+import org.apache.incubator.wayang.core.optimizer.ProbabilisticIntervalEstimate;
+import org.apache.incubator.wayang.core.util.JsonSerializable;
+import org.apache.incubator.wayang.core.util.JsonSerializables;
 
 /**
  * An estimate of costs of some executable code expressed as a {@link ProbabilisticIntervalEstimate}.
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadEstimator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadEstimator.java
index 7656d84..fd754df 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadEstimator.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadEstimator.java
@@ -1,8 +1,8 @@
-package io.rheem.rheem.core.optimizer.costs;
+package org.apache.incubator.wayang.core.optimizer.costs;
 
-import io.rheem.rheem.core.function.FunctionDescriptor;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimate;
-import io.rheem.rheem.core.plan.rheemplan.ExecutionOperator;
+import org.apache.incubator.wayang.core.function.FunctionDescriptor;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
 
 import java.util.Arrays;
 
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfile.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfile.java
index cd5a9dc..0e2d2cf 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfile.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfile.java
@@ -1,10 +1,10 @@
-package io.rheem.rheem.core.optimizer.costs;
+package org.apache.incubator.wayang.core.optimizer.costs;
 
 import org.json.JSONObject;
-import io.rheem.rheem.core.function.FunctionDescriptor;
-import io.rheem.rheem.core.plan.rheemplan.Operator;
-import io.rheem.rheem.core.util.JsonSerializable;
-import io.rheem.rheem.core.util.JsonSerializables;
+import org.apache.incubator.wayang.core.function.FunctionDescriptor;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.incubator.wayang.core.util.JsonSerializable;
+import org.apache.incubator.wayang.core.util.JsonSerializables;
 
 import java.util.Collection;
 import java.util.LinkedList;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfileEstimator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfileEstimator.java
index 853084d..4578b12 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfileEstimator.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfileEstimator.java
@@ -1,6 +1,6 @@
-package io.rheem.rheem.core.optimizer.costs;
+package org.apache.incubator.wayang.core.optimizer.costs;
 
-import io.rheem.rheem.core.api.Configuration;
+import org.apache.incubator.wayang.core.api.Configuration;
 
 import java.util.Collection;
 import java.util.LinkedList;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfileEstimators.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfileEstimators.java
index d22eb9f..e87eaa5 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfileEstimators.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfileEstimators.java
@@ -1,20 +1,20 @@
-package io.rheem.rheem.core.optimizer.costs;
+package org.apache.incubator.wayang.core.optimizer.costs;
 
 import org.json.JSONObject;
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.api.exception.RheemException;
-import io.rheem.rheem.core.function.FunctionDescriptor;
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.optimizer.OptimizationUtils;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimate;
-import io.rheem.rheem.core.optimizer.costs.LoadEstimator.SinglePointEstimationFunction;
-import io.rheem.rheem.core.plan.rheemplan.ExecutionOperator;
-import io.rheem.rheem.core.util.JuelUtils;
-import io.rheem.rheem.core.util.mathex.Context;
-import io.rheem.rheem.core.util.mathex.DefaultContext;
-import io.rheem.rheem.core.util.mathex.Expression;
-import io.rheem.rheem.core.util.mathex.ExpressionBuilder;
-import io.rheem.rheem.core.util.mathex.exceptions.EvaluationException;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.api.exception.WayangException;
+import org.apache.incubator.wayang.core.function.FunctionDescriptor;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.optimizer.OptimizationUtils;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.incubator.wayang.core.optimizer.costs.LoadEstimator.SinglePointEstimationFunction;
+import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.incubator.wayang.core.util.JuelUtils;
+import org.apache.incubator.wayang.core.util.mathex.Context;
+import org.apache.incubator.wayang.core.util.mathex.DefaultContext;
+import org.apache.incubator.wayang.core.util.mathex.Expression;
+import org.apache.incubator.wayang.core.util.mathex.ExpressionBuilder;
+import org.apache.incubator.wayang.core.util.mathex.exceptions.EvaluationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -84,7 +84,7 @@ public class LoadProfileEstimators {
     /**
      * Creates a new instance from a specification {@link String}. Valid specifications are as follows:
      * <pre>
-     *     {"type":&lt;*juel*, io.rheem.rheem.core.util.mathex.mathex&gt;,
+     *     {"type":&lt;*juel*, org.apache.incubator.wayang.core.util.mathex.mathex&gt;,
      *      "cpu":&lt;mathematical expression&gt;,
      *      "ram":&lt;mathematical expression&gt;,
      *      "disk":&lt;mathematical expression&gt;,
@@ -112,10 +112,10 @@ public class LoadProfileEstimators {
             } else if ("mathex".equalsIgnoreCase(spec.getString("type"))) {
                 return createFromMathExSpecification(configKey, spec);
             } else {
-                throw new RheemException(String.format("Unknown specification type: %s", spec.get("type")));
+                throw new WayangException(String.format("Unknown specification type: %s", spec.get("type")));
             }
         } catch (Exception e) {
-            throw new RheemException(String.format("Could not initialize from specification \"%s\".", specification), e);
+            throw new WayangException(String.format("Could not initialize from specification \"%s\".", specification), e);
         }
     }
 
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfileToTimeConverter.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfileToTimeConverter.java
index cadca4c..8e9080f 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfileToTimeConverter.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfileToTimeConverter.java
@@ -1,4 +1,4 @@
-package io.rheem.rheem.core.optimizer.costs;
+package org.apache.incubator.wayang.core.optimizer.costs;
 
 import java.util.Objects;
 import java.util.function.Function;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadToTimeConverter.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadToTimeConverter.java
index af8432d..94b3164 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadToTimeConverter.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadToTimeConverter.java
@@ -1,4 +1,4 @@
-package io.rheem.rheem.core.optimizer.costs;
+package org.apache.incubator.wayang.core.optimizer.costs;
 
 /**
  * Converts a {@link LoadEstimate} into a time estimate.
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/NestableLoadProfileEstimator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/NestableLoadProfileEstimator.java
index 478871f..7f97d77 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/NestableLoadProfileEstimator.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/NestableLoadProfileEstimator.java
@@ -1,8 +1,8 @@
-package io.rheem.rheem.core.optimizer.costs;
+package org.apache.incubator.wayang.core.optimizer.costs;
 
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.api.exception.RheemException;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.api.exception.WayangException;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
 
 import java.util.Collection;
 import java.util.LinkedList;
@@ -165,7 +165,7 @@ public class NestableLoadProfileEstimator implements LoadProfileEstimator {
                     this.getOverheadMillis()
             );
         } catch (Exception e) {
-             throw new RheemException(String.format("Failed estimating on %s.", this, context), e);
+             throw new WayangException(String.format("Failed estimating on %s.", this, context), e);
         }
     }
 
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/SimpleEstimationContext.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/SimpleEstimationContext.java
index 8f1a4db..e19fc3b 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/SimpleEstimationContext.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/SimpleEstimationContext.java
@@ -1,11 +1,11 @@
-package io.rheem.rheem.core.optimizer.costs;
+package org.apache.incubator.wayang.core.optimizer.costs;
 
 import gnu.trove.map.TObjectDoubleMap;
 import gnu.trove.map.hash.TObjectDoubleHashMap;
 import org.json.JSONObject;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimate;
-import io.rheem.rheem.core.util.JsonSerializables;
-import io.rheem.rheem.core.util.JsonSerializer;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.incubator.wayang.core.util.JsonSerializables;
+import org.apache.incubator.wayang.core.util.JsonSerializer;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/TimeEstimate.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/TimeEstimate.java
index a477169..925c432 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/TimeEstimate.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/TimeEstimate.java
@@ -1,7 +1,7 @@
-package io.rheem.rheem.core.optimizer.costs;
+package org.apache.incubator.wayang.core.optimizer.costs;
 
-import io.rheem.rheem.core.optimizer.ProbabilisticIntervalEstimate;
-import io.rheem.rheem.core.util.Formats;
+import org.apache.incubator.wayang.core.optimizer.ProbabilisticIntervalEstimate;
+import org.apache.incubator.wayang.core.util.Formats;
 
 /**
  * An estimate of time (in <b>milliseconds</b>) expressed as a {@link ProbabilisticIntervalEstimate}.
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/TimeToCostConverter.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/TimeToCostConverter.java
index bcc20db..353f13a 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/TimeToCostConverter.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/TimeToCostConverter.java
@@ -1,6 +1,6 @@
-package io.rheem.rheem.core.optimizer.costs;
+package org.apache.incubator.wayang.core.optimizer.costs;
 
-import io.rheem.rheem.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
 
 /**
  * This (linear) converter turns {@link TimeEstimate}s into cost estimates.
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/ExecutionTaskFlow.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/ExecutionTaskFlow.java
index c901452..15b8bec 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/ExecutionTaskFlow.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/ExecutionTaskFlow.java
@@ -1,12 +1,12 @@
-package io.rheem.rheem.core.optimizer.enumeration;
+package org.apache.incubator.wayang.core.optimizer.enumeration;
 
-import io.rheem.rheem.core.plan.executionplan.Channel;
-import io.rheem.rheem.core.plan.executionplan.ExecutionPlan;
-import io.rheem.rheem.core.plan.executionplan.ExecutionStage;
-import io.rheem.rheem.core.plan.executionplan.ExecutionTask;
-import io.rheem.rheem.core.plan.executionplan.PlatformExecution;
-import io.rheem.rheem.core.plan.rheemplan.ExecutionOperator;
-import io.rheem.rheem.core.plan.rheemplan.traversal.AbstractTopologicalTraversal;
+import org.apache.incubator.wayang.core.plan.executionplan.Channel;
+import org.apache.incubator.wayang.core.plan.executionplan.ExecutionPlan;
+import org.apache.incubator.wayang.core.plan.executionplan.ExecutionStage;
+import org.apache.incubator.wayang.core.plan.executionplan.ExecutionTask;
+import org.apache.incubator.wayang.core.plan.executionplan.PlatformExecution;
+import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.traversal.AbstractTopologicalTraversal;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/ExecutionTaskFlowCompiler.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/ExecutionTaskFlowCompiler.java
index 546ed62..76725bd 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/ExecutionTaskFlowCompiler.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/ExecutionTaskFlowCompiler.java
@@ -1,20 +1,20 @@
-package io.rheem.rheem.core.optimizer.enumeration;
-
-import io.rheem.rheem.core.optimizer.OptimizationUtils;
-import io.rheem.rheem.core.plan.executionplan.Channel;
-import io.rheem.rheem.core.plan.executionplan.ExecutionPlan;
-import io.rheem.rheem.core.plan.executionplan.ExecutionStage;
-import io.rheem.rheem.core.plan.executionplan.ExecutionTask;
-import io.rheem.rheem.core.plan.rheemplan.ExecutionOperator;
-import io.rheem.rheem.core.plan.rheemplan.InputSlot;
-import io.rheem.rheem.core.plan.rheemplan.LoopSubplan;
-import io.rheem.rheem.core.plan.rheemplan.Operator;
-import io.rheem.rheem.core.plan.rheemplan.OperatorAlternative;
-import io.rheem.rheem.core.plan.rheemplan.OutputSlot;
-import io.rheem.rheem.core.plan.rheemplan.RheemPlan;
-import io.rheem.rheem.core.plan.rheemplan.traversal.AbstractTopologicalTraversal;
-import io.rheem.rheem.core.platform.Junction;
-import io.rheem.rheem.core.platform.Platform;
+package org.apache.incubator.wayang.core.optimizer.enumeration;
+
+import org.apache.incubator.wayang.core.optimizer.OptimizationUtils;
+import org.apache.incubator.wayang.core.plan.executionplan.Channel;
+import org.apache.incubator.wayang.core.plan.executionplan.ExecutionPlan;
+import org.apache.incubator.wayang.core.plan.executionplan.ExecutionStage;
+import org.apache.incubator.wayang.core.plan.executionplan.ExecutionTask;
+import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.LoopSubplan;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.incubator.wayang.core.plan.wayangplan.OperatorAlternative;
+import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.incubator.wayang.core.plan.wayangplan.traversal.AbstractTopologicalTraversal;
+import org.apache.incubator.wayang.core.platform.Junction;
+import org.apache.incubator.wayang.core.platform.Platform;
 import org.slf4j.LoggerFactory;
 
 import java.util.Collection;
@@ -106,7 +106,7 @@ public class ExecutionTaskFlowCompiler
         this.startActivations = new LinkedList<>();
         for (Channel channel : openChannels) {
             // Detect the Slot connections that have yet to be fulfilled by this Channel.
-            OutputSlot<?> producerOutput = OptimizationUtils.findRheemPlanOutputSlotFor(channel);
+            OutputSlot<?> producerOutput = OptimizationUtils.findWayangPlanOutputSlotFor(channel);
             assert producerOutput != null : String.format("No producing output for %s.", channel);
 
             final LoopImplementation.IterationImplementation producerIterationImplementation =
@@ -137,7 +137,7 @@ public class ExecutionTaskFlowCompiler
             }
 
 //            // Now find all InputSlots that are fed by the OutputSlot and whose Operators have not yet been executed.
-//            Collection<InputSlot<?>> consumerInputs = this.findRheemPlanInputSlotFor(producerOutput);
+//            Collection<InputSlot<?>> consumerInputs = this.findWayangPlanInputSlotFor(producerOutput);
 //
 //            // Finally, produce Activations.
 //            if (!consumerInputs.isEmpty()) {
@@ -174,7 +174,7 @@ public class ExecutionTaskFlowCompiler
         }
     }
 
-    private Collection<InputSlot<?>> findRheemPlanInputSlotFor(OutputSlot<?> producerOutput) {
+    private Collection<InputSlot<?>> findWayangPlanInputSlotFor(OutputSlot<?> producerOutput) {
         return producerOutput.getOwner().getOutermostOutputSlots(producerOutput).stream()
                 .flatMap(outputSlot -> outputSlot.getOccupiedSlots().stream())
                 .flatMap(this::findExecutionOperatorInputs)
@@ -246,11 +246,11 @@ public class ExecutionTaskFlowCompiler
 
 
     /**
-     * Determine the consuming {@link InputSlot}s of the given {@link Channel} that lie within a {@link RheemPlan} and
+     * Determine the consuming {@link InputSlot}s of the given {@link Channel} that lie within a {@link WayangPlan} and
      * have not been executed yet.
-     * We follow non-RheemPlan {@link ExecutionOperator}s because they should merely forward data.
+     * We follow non-WayangPlan {@link ExecutionOperator}s because they should merely forward data.
      */
-    private Collection<InputSlot<?>> findRheemPlanInputSlotFor(Channel channel, Set<ExecutionStage> executedStages) {
+    private Collection<InputSlot<?>> findWayangPlanInputSlotFor(Channel channel, Set<ExecutionStage> executedStages) {
         Collection<InputSlot<?>> result = new LinkedList<>();
         for (ExecutionTask consumerTask : channel.getConsumers()) {
             if (executedStages.contains(consumerTask.getStage())) continue;
@@ -258,7 +258,7 @@ public class ExecutionTaskFlowCompiler
                 result.add(consumerTask.getInputSlotFor(channel));
             } else {
                 for (Channel consumerOutputChannel : consumerTask.getOutputChannels()) {
-                    result.addAll(this.findRheemPlanInputSlotFor(consumerOutputChannel, executedStages));
+                    result.addAll(this.findWayangPlanInputSlotFor(consumerOutputChannel, executedStages));
                 }
             }
         }
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/LatentOperatorPruningStrategy.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/LatentOperatorPruningStrategy.java
index 98eb391..b469752 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/LatentOperatorPruningStrategy.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/LatentOperatorPruningStrategy.java
@@ -1,11 +1,11 @@
-package io.rheem.rheem.core.optimizer.enumeration;
+package org.apache.incubator.wayang.core.optimizer.enumeration;
 
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.api.exception.RheemException;
-import io.rheem.rheem.core.plan.rheemplan.ExecutionOperator;
-import io.rheem.rheem.core.plan.rheemplan.Slot;
-import io.rheem.rheem.core.platform.Platform;
-import io.rheem.rheem.core.util.Tuple;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.api.exception.WayangException;
+import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.Slot;
+import org.apache.incubator.wayang.core.platform.Platform;
+import org.apache.incubator.wayang.core.util.Tuple;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -60,7 +60,7 @@ public class LatentOperatorPruningStrategy implements PlanEnumerationPruningStra
         assert !planImplementation.isEmpty();
         return planImplementation.stream()
                 .reduce(this::selectBestPlanBinary)
-                .orElseThrow(() -> new RheemException("No plan was selected."));
+                .orElseThrow(() -> new WayangException("No plan was selected."));
     }
 
     private PlanImplementation selectBestPlanBinary(PlanImplementation p1,
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/LoopEnumerator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/LoopEnumerator.java
index 67fe5fd..385be60 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/LoopEnumerator.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/LoopEnumerator.java
@@ -1,13 +1,13 @@
-package io.rheem.rheem.core.optimizer.enumeration;
-
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.plan.rheemplan.InputSlot;
-import io.rheem.rheem.core.plan.rheemplan.LoopHeadOperator;
-import io.rheem.rheem.core.plan.rheemplan.LoopSubplan;
-import io.rheem.rheem.core.plan.rheemplan.OutputSlot;
-import io.rheem.rheem.core.platform.Junction;
-import io.rheem.rheem.core.util.OneTimeExecutable;
-import io.rheem.rheem.core.util.Tuple;
+package org.apache.incubator.wayang.core.optimizer.enumeration;
+
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.LoopHeadOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.LoopSubplan;
+import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.incubator.wayang.core.platform.Junction;
+import org.apache.incubator.wayang.core.util.OneTimeExecutable;
+import org.apache.incubator.wayang.core.util.Tuple;
 import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/LoopImplementation.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/LoopImplementation.java
index 1b0db42..ff780c4 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/LoopImplementation.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/LoopImplementation.java
@@ -1,13 +1,13 @@
-package io.rheem.rheem.core.optimizer.enumeration;
+package org.apache.incubator.wayang.core.optimizer.enumeration;
 
-import io.rheem.rheem.core.optimizer.ProbabilisticDoubleInterval;
-import io.rheem.rheem.core.optimizer.costs.TimeEstimate;
-import io.rheem.rheem.core.plan.rheemplan.ExecutionOperator;
-import io.rheem.rheem.core.plan.rheemplan.LoopHeadOperator;
-import io.rheem.rheem.core.plan.rheemplan.LoopSubplan;
-import io.rheem.rheem.core.plan.rheemplan.Operator;
-import io.rheem.rheem.core.plan.rheemplan.OutputSlot;
-import io.rheem.rheem.core.platform.Junction;
+import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.incubator.wayang.core.optimizer.costs.TimeEstimate;
+import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.LoopHeadOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.LoopSubplan;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.incubator.wayang.core.platform.Junction;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -97,7 +97,7 @@ public class LoopImplementation {
     }
 
     /**
-     * Originally, only a single {@link IterationImplementation} is supported by Rheem. This method explicitly
+     * Originally, only a single {@link IterationImplementation} is supported by Wayang. This method explicitly
      * captures this assumption.
      *
      * @return the single {@link IterationImplementation}
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanEnumeration.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanEnumeration.java
index 803bdf3..96aaedf 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanEnumeration.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanEnumeration.java
@@ -1,21 +1,21 @@
-package io.rheem.rheem.core.optimizer.enumeration;
+package org.apache.incubator.wayang.core.optimizer.enumeration;
 
 import de.hpi.isg.profiledb.store.model.TimeMeasurement;
-import io.rheem.rheem.core.api.Job;
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.optimizer.channels.ChannelConversionGraph;
-import io.rheem.rheem.core.plan.executionplan.Channel;
-import io.rheem.rheem.core.plan.executionplan.ExecutionTask;
-import io.rheem.rheem.core.plan.rheemplan.ExecutionOperator;
-import io.rheem.rheem.core.plan.rheemplan.InputSlot;
-import io.rheem.rheem.core.plan.rheemplan.Operator;
-import io.rheem.rheem.core.plan.rheemplan.OperatorAlternative;
-import io.rheem.rheem.core.plan.rheemplan.OutputSlot;
-import io.rheem.rheem.core.plan.rheemplan.RheemPlan;
-import io.rheem.rheem.core.platform.Junction;
-import io.rheem.rheem.core.util.MultiMap;
-import io.rheem.rheem.core.util.RheemCollections;
-import io.rheem.rheem.core.util.Tuple;
+import org.apache.incubator.wayang.core.api.Job;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.optimizer.channels.ChannelConversionGraph;
+import org.apache.incubator.wayang.core.plan.executionplan.Channel;
+import org.apache.incubator.wayang.core.plan.executionplan.ExecutionTask;
+import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.incubator.wayang.core.plan.wayangplan.OperatorAlternative;
+import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.incubator.wayang.core.platform.Junction;
+import org.apache.incubator.wayang.core.util.MultiMap;
+import org.apache.incubator.wayang.core.util.WayangCollections;
+import org.apache.incubator.wayang.core.util.Tuple;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -32,10 +32,10 @@ import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 /**
- * Represents a collection of {@link PlanImplementation}s that all implement the same section of a {@link RheemPlan} (which
+ * Represents a collection of {@link PlanImplementation}s that all implement the same section of a {@link WayangPlan} (which
  * is assumed to contain {@link OperatorAlternative}s in general).
  * <p>Instances can be mutated and combined in algebraic manner. In particular, instances can be unioned if they implement
- * the same part of the {@link RheemPlan}, concatenated if there are contact points, and pruned.</p>
+ * the same part of the {@link WayangPlan}, concatenated if there are contact points, and pruned.</p>
  */
 public class PlanEnumeration {
 
@@ -160,7 +160,7 @@ public class PlanEnumeration {
     }
 
     /**
-     * Asserts that two given instances enumerate the same part of a {@link RheemPlan}.
+     * Asserts that two given instances enumerate the same part of a {@link WayangPlan}.
      */
     private static void assertMatchingInterface(PlanEnumeration instance1, PlanEnumeration instance2) {
         if (!instance1.requestedInputSlots.equals(instance2.requestedInputSlots)) {
@@ -326,7 +326,7 @@ public class PlanEnumeration {
 
         // Handle cases where this instance is not a target enumeration.
         if (!targetEnumerationGroups.containsKey(this)) {
-            List<InputSlot<?>> emptyGroupInputs = RheemCollections.createNullFilledArrayList(inputs.size());
+            List<InputSlot<?>> emptyGroupInputs = WayangCollections.createNullFilledArrayList(inputs.size());
             for (PlanImplementation planImplementation : this.getPlanImplementations()) {
                 PlanImplementation.ConcatenationDescriptor concatDescriptor =
                         planImplementation.createConcatenationDescriptor(openOutputSlot, emptyGroupInputs);
@@ -352,12 +352,12 @@ public class PlanEnumeration {
         for (PlanEnumeration enumeration : orderedEnumerations) {
             orderedConcatGroups.add(enum2concatGroup.get(enumeration));
         }
-        for (List<PlanImplementation.ConcatenationGroupDescriptor> concatGroupCombo : RheemCollections.streamedCrossProduct(orderedConcatGroups)) {
+        for (List<PlanImplementation.ConcatenationGroupDescriptor> concatGroupCombo : WayangCollections.streamedCrossProduct(orderedConcatGroups)) {
             // Determine the execution output along with its OptimizationContext.
             PlanImplementation.ConcatenationGroupDescriptor baseConcatGroup = concatGroupCombo.get(0);
             final OutputSlot<?> execOutput = baseConcatGroup.execOutput;
             Set<PlanImplementation.ConcatenationDescriptor> baseConcatDescriptors = concatGroup2concatDescriptor.get(baseConcatGroup);
-            final PlanImplementation innerPlanImplementation = RheemCollections.getAny(baseConcatDescriptors).execOutputPlanImplementation;
+            final PlanImplementation innerPlanImplementation = WayangCollections.getAny(baseConcatDescriptors).execOutputPlanImplementation;
             // The output should reside in the same OptimizationContext in all PlanImplementations.
             assert baseConcatDescriptors.stream()
                     .map(cd -> cd.execOutputPlanImplementation)
@@ -393,7 +393,7 @@ public class PlanEnumeration {
             if (junction == null) continue;
 
             // If we found a junction, then we can enumerate all PlanImplementation combinations.
-            final List<Set<PlanImplementation>> groupPlans = RheemCollections.map(
+            final List<Set<PlanImplementation>> groupPlans = WayangCollections.map(
                     concatGroupCombo,
                     concatGroup -> {
                         Set<PlanImplementation.ConcatenationDescriptor> concatDescriptors = concatGroup2concatDescriptor.get(concatGroup);
@@ -404,7 +404,7 @@ public class PlanEnumeration {
                         return planImplementations;
                     });
 
-            for (List<PlanImplementation> planCombo : RheemCollections.streamedCrossProduct(groupPlans)) {
+            for (List<PlanImplementation> planCombo : WayangCollections.streamedCrossProduct(groupPlans)) {
                 PlanImplementation basePlan = planCombo.get(0);
                 List<PlanImplementation> targetPlans = planCombo.subList(0, planCombo.size());
                 PlanImplementation concatenatedPlan = basePlan.concatenate(targetPlans, junction, basePlan, concatenationEnumeration);
@@ -435,7 +435,7 @@ public class PlanEnumeration {
             final Collection<Tuple<OutputSlot<?>, PlanImplementation>> execOpOutputsWithContext =
                     basePlanImplementation.findExecutionOperatorOutputWithContext(output);
             final Tuple<OutputSlot<?>, PlanImplementation> execOpOutputWithCtx =
-                    RheemCollections.getSingleOrNull(execOpOutputsWithContext);
+                    WayangCollections.getSingleOrNull(execOpOutputsWithContext);
             assert execOpOutputsWithContext != null && !execOpOutputsWithContext.isEmpty()
                     : String.format("No outputs found for %s.", output);
 
@@ -472,7 +472,7 @@ public class PlanEnumeration {
             MultiMap<Set<InputSlot<?>>, PlanImplementation> targetPlanGroups = new MultiMap<>();
             for (PlanImplementation planImpl : targetEnumeration.getPlanImplementations()) {
                 final Collection<InputSlot<?>> openInput = planImpl.findExecutionOperatorInputs(requestedInput);
-                targetPlanGroups.putSingle(RheemCollections.asSet(openInput), planImpl);
+                targetPlanGroups.putSingle(WayangCollections.asSet(openInput), planImpl);
             }
             targetPlanGroupList.add(targetPlanGroups);
         }
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanEnumerationPruningStrategy.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanEnumerationPruningStrategy.java
index d61dd65..32d3b2d 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanEnumerationPruningStrategy.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanEnumerationPruningStrategy.java
@@ -1,6 +1,6 @@
-package io.rheem.rheem.core.optimizer.enumeration;
+package org.apache.incubator.wayang.core.optimizer.enumeration;
 
-import io.rheem.rheem.core.api.Configuration;
+import org.apache.incubator.wayang.core.api.Configuration;
 
 /**
  * A strategy to prune {@link PlanImplementation}s from a {@link PlanEnumeration}.
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanEnumerator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanEnumerator.java
index 9e0a1ec..0db0105 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanEnumerator.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanEnumerator.java
@@ -1,26 +1,26 @@
-package io.rheem.rheem.core.optimizer.enumeration;
+package org.apache.incubator.wayang.core.optimizer.enumeration;
 
 import de.hpi.isg.profiledb.store.model.TimeMeasurement;
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.api.exception.RheemException;
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.optimizer.OptimizationUtils;
-import io.rheem.rheem.core.plan.executionplan.Channel;
-import io.rheem.rheem.core.plan.executionplan.ExecutionPlan;
-import io.rheem.rheem.core.plan.executionplan.ExecutionTask;
-import io.rheem.rheem.core.plan.rheemplan.ExecutionOperator;
-import io.rheem.rheem.core.plan.rheemplan.InputSlot;
-import io.rheem.rheem.core.plan.rheemplan.LoopHeadOperator;
-import io.rheem.rheem.core.plan.rheemplan.LoopSubplan;
-import io.rheem.rheem.core.plan.rheemplan.Operator;
-import io.rheem.rheem.core.plan.rheemplan.OperatorAlternative;
-import io.rheem.rheem.core.plan.rheemplan.OperatorContainer;
-import io.rheem.rheem.core.plan.rheemplan.Operators;
-import io.rheem.rheem.core.plan.rheemplan.OutputSlot;
-import io.rheem.rheem.core.plan.rheemplan.RheemPlan;
-import io.rheem.rheem.core.plan.rheemplan.Slot;
-import io.rheem.rheem.core.util.RheemCollections;
-import io.rheem.rheem.core.util.Tuple;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.api.exception.WayangException;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.optimizer.OptimizationUtils;
+import org.apache.incubator.wayang.core.plan.executionplan.Channel;
+import org.apache.incubator.wayang.core.plan.executionplan.ExecutionPlan;
+import org.apache.incubator.wayang.core.plan.executionplan.ExecutionTask;
+import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.LoopHeadOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.LoopSubplan;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.incubator.wayang.core.plan.wayangplan.OperatorAlternative;
+import org.apache.incubator.wayang.core.plan.wayangplan.OperatorContainer;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operators;
+import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.incubator.wayang.core.plan.wayangplan.Slot;
+import org.apache.incubator.wayang.core.util.WayangCollections;
+import org.apache.incubator.wayang.core.util.Tuple;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -43,7 +43,7 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 /**
- * The plan partitioner recursively dissects a {@link RheemPlan} into {@link PlanEnumeration}s and then assembles
+ * The plan partitioner recursively dissects a {@link WayangPlan} into {@link PlanEnumeration}s and then assembles
  * them.
  */
 public class PlanEnumerator {
@@ -132,11 +132,11 @@ public class PlanEnumerator {
     /**
      * Creates a new instance.
      *
-     * @param rheemPlan a hyperplan that should be used for enumeration.
+     * @param wayangPlan a hyperplan that should be used for enumeration.
      */
-    public PlanEnumerator(RheemPlan rheemPlan,
+    public PlanEnumerator(WayangPlan wayangPlan,
                           OptimizationContext optimizationContext) {
-        this(rheemPlan.collectReachableTopLevelSources(),
+        this(wayangPlan.collectReachableTopLevelSources(),
                 optimizationContext,
                 null,
                 Collections.emptyMap(),
@@ -145,17 +145,17 @@ public class PlanEnumerator {
     }
 
     /**
-     * Creates a new instance, thereby encorporating already executed parts of the {@code rheemPlan}.
+     * Creates a new instance, thereby encorporating already executed parts of the {@code wayangPlan}.
      *
-     * @param rheemPlan a hyperplan that should be used for enumeration.
+     * @param wayangPlan a hyperplan that should be used for enumeration.
      * @param baseplan  an {@link ExecutionPlan} that has been already executed (for re-optimization)
      */
-    public PlanEnumerator(RheemPlan rheemPlan,
+    public PlanEnumerator(WayangPlan wayangPlan,
                           OptimizationContext optimizationContext,
                           ExecutionPlan baseplan,
                           Set<Channel> openChannels) {
 
-        this(rheemPlan.collectReachableTopLevelSources(),
+        this(wayangPlan.collectReachableTopLevelSources(),
                 optimizationContext,
                 null,
                 new HashMap<>(),
@@ -173,9 +173,9 @@ public class PlanEnumerator {
                 .forEach(alternative -> this.presettledAlternatives.put(alternative.toOperator(), alternative));
 
         // Index the existing Channels by their user-specified Operator's OutputSlot.
-        // Note that we must always take the outermost OutputSlots because only those will be connected if the RheemPlan is sane.
+        // Note that we must always take the outermost OutputSlots because only those will be connected if the WayangPlan is sane.
         for (Channel openChannel : openChannels) {
-            final OutputSlot<?> outputSlot = OptimizationUtils.findRheemPlanOutputSlotFor(openChannel);
+            final OutputSlot<?> outputSlot = OptimizationUtils.findWayangPlanOutputSlotFor(openChannel);
             if (outputSlot != null) {
                 for (OutputSlot<?> outerOutput : outputSlot.getOwner().getOutermostOutputSlots(outputSlot)) {
                     final Collection<Channel> channelSet = this.openChannels.computeIfAbsent(outerOutput, k -> new HashSet<>(1));
@@ -213,12 +213,12 @@ public class PlanEnumerator {
         // Configure the enumeration.
         final Configuration configuration = this.optimizationContext.getConfiguration();
         this.isEnumeratingBranchesFirst = configuration.getBooleanProperty(
-                "rheem.core.optimizer.enumeration.branchesfirst", true
+                "wayang.core.optimizer.enumeration.branchesfirst", true
         );
 
         // Configure the concatenations.
         final String priorityFunctionName = configuration.getStringProperty(
-                "rheem.core.optimizer.enumeration.concatenationprio"
+                "wayang.core.optimizer.enumeration.concatenationprio"
         );
         ToDoubleFunction<ConcatenationActivator> concatenationPriorityFunction;
         switch (priorityFunctionName) {
@@ -243,11 +243,11 @@ public class PlanEnumerator {
                 concatenationPriorityFunction = activator -> 0d;
                 break;
             default:
-                throw new RheemException("Unknown concatenation priority function: " + priorityFunctionName);
+                throw new WayangException("Unknown concatenation priority function: " + priorityFunctionName);
         }
 
         boolean isInvertConcatenationPriorities = configuration.getBooleanProperty(
-                "rheem.core.optimizer.enumeration.invertconcatenations", false
+                "wayang.core.optimizer.enumeration.invertconcatenations", false
         );
         this.concatenationPriorityFunction = isInvertConcatenationPriorities ?
                 activator -> -concatenationPriorityFunction.applyAsDouble(activator) :
@@ -284,7 +284,7 @@ public class PlanEnumerator {
                     .filter(activator -> !activator.wasExecuted())
                     .collect(Collectors.toList())
             );
-            throw new RheemException("Could not find a single execution plan.");
+            throw new WayangException("Could not find a single execution plan.");
         }
         return comprehensiveEnumeration;
     }
@@ -396,7 +396,7 @@ public class PlanEnumerator {
                 if (loopHeadOperator.getLoopBodyOutputs().size() != 1) {
                     break;
                 }
-                followableOutput = RheemCollections.getSingle(loopHeadOperator.getLoopBodyOutputs());
+                followableOutput = WayangCollections.getSingle(loopHeadOperator.getLoopBodyOutputs());
 
             } else {
                 if (currentOperator.getNumOutputs() != 1) {
@@ -470,7 +470,7 @@ public class PlanEnumerator {
 
             if (operatorEnumeration.getPlanImplementations().isEmpty()) {
                 if (this.isTopLevel()) {
-                    throw new RheemException(String.format("No implementations enumerated for %s.", operator));
+                    throw new WayangException(String.format("No implementations enumerated for %s.", operator));
                 } else {
                     this.logger.warn("No implementations enumerated for {}.", operator);
                 }
@@ -489,7 +489,7 @@ public class PlanEnumerator {
 
                 if (branchEnumeration.getPlanImplementations().isEmpty()) {
                     if (this.isTopLevel()) {
-                        throw new RheemException(String.format("Could not concatenate %s to %s.", lastOperator, operator));
+                        throw new WayangException(String.format("Could not concatenate %s to %s.", lastOperator, operator));
                     } else {
                         this.logger.warn("Could not concatenate {} to {}.", lastOperator, operator);
                     }
@@ -586,7 +586,7 @@ public class PlanEnumerator {
         if (concatenatedEnumeration.getPlanImplementations().isEmpty()) {
             this.logger.warn("No implementations enumerated after concatenating {}.", concatenationActivator.outputSlot);
             if (this.isTopLevel()) {
-                throw new RheemException(String.format("No implementations that concatenate %s with %s.",
+                throw new WayangException(String.format("No implementations that concatenate %s with %s.",
                         concatenationActivator.outputSlot,
                         concatenationActivator.outputSlot.getOccupiedSlots()
                 ));
@@ -761,7 +761,7 @@ public class PlanEnumerator {
      * did not allow to construct a valid {@link PlanEnumeration}.
      */
     private void constructResultEnumeration() {
-        final PlanEnumeration resultEnumeration = RheemCollections.getSingleOrNull(this.completedEnumerations);
+        final PlanEnumeration resultEnumeration = WayangCollections.getSingleOrNull(this.completedEnumerations);
         this.resultReference = new AtomicReference<>(resultEnumeration);
     }
 
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanImplementation.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanImplementation.java
index 1ca7417..4f4cfef 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanImplementation.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanImplementation.java
@@ -1,27 +1,27 @@
-package io.rheem.rheem.core.optimizer.enumeration;
+package org.apache.incubator.wayang.core.optimizer.enumeration;
 
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.optimizer.ProbabilisticDoubleInterval;
-import io.rheem.rheem.core.optimizer.costs.TimeEstimate;
-import io.rheem.rheem.core.optimizer.costs.TimeToCostConverter;
-import io.rheem.rheem.core.plan.executionplan.Channel;
-import io.rheem.rheem.core.plan.executionplan.ExecutionTask;
-import io.rheem.rheem.core.plan.rheemplan.ElementaryOperator;
-import io.rheem.rheem.core.plan.rheemplan.ExecutionOperator;
-import io.rheem.rheem.core.plan.rheemplan.InputSlot;
-import io.rheem.rheem.core.plan.rheemplan.LoopSubplan;
-import io.rheem.rheem.core.plan.rheemplan.Operator;
-import io.rheem.rheem.core.plan.rheemplan.OperatorAlternative;
-import io.rheem.rheem.core.plan.rheemplan.OutputSlot;
-import io.rheem.rheem.core.plan.rheemplan.RheemPlan;
-import io.rheem.rheem.core.plan.rheemplan.Slot;
-import io.rheem.rheem.core.platform.Junction;
-import io.rheem.rheem.core.platform.Platform;
-import io.rheem.rheem.core.util.Canonicalizer;
-import io.rheem.rheem.core.util.RheemCollections;
-import io.rheem.rheem.core.util.Tuple;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.incubator.wayang.core.optimizer.costs.TimeEstimate;
+import org.apache.incubator.wayang.core.optimizer.costs.TimeToCostConverter;
+import org.apache.incubator.wayang.core.plan.executionplan.Channel;
+import org.apache.incubator.wayang.core.plan.executionplan.ExecutionTask;
+import org.apache.incubator.wayang.core.plan.wayangplan.ElementaryOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.LoopSubplan;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.incubator.wayang.core.plan.wayangplan.OperatorAlternative;
+import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.incubator.wayang.core.plan.wayangplan.Slot;
+import org.apache.incubator.wayang.core.platform.Junction;
+import org.apache.incubator.wayang.core.platform.Platform;
+import org.apache.incubator.wayang.core.util.Canonicalizer;
+import org.apache.incubator.wayang.core.util.WayangCollections;
+import org.apache.incubator.wayang.core.util.Tuple;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -167,7 +167,7 @@ public class PlanImplementation {
      * <p>Note that we require that this instance either provides all or no {@link ExecutionOperator}s necessary to
      * implement the {@link InputSlot}.</p>
      *
-     * @param someInput any {@link InputSlot} of the original {@link RheemPlan}
+     * @param someInput any {@link InputSlot} of the original {@link WayangPlan}
      * @return the representing {@link InputSlot}s or {@code null} if this instance has no {@link ExecutionOperator}
      * backing the given {@link InputSlot}
      */
@@ -236,7 +236,7 @@ public class PlanImplementation {
     /**
      * Find the {@link OutputSlot}s of already picked {@link ExecutionOperator}s that represent the given {@link OutputSlot}.
      *
-     * @param someOutput any {@link OutputSlot} of the original {@link RheemPlan}
+     * @param someOutput any {@link OutputSlot} of the original {@link WayangPlan}
      * @return the representing {@link OutputSlot}s
      */
     Collection<OutputSlot<?>> findExecutionOperatorOutput(OutputSlot<?> someOutput) {
@@ -248,7 +248,7 @@ public class PlanImplementation {
     /**
      * Find the {@link OutputSlot}s of already picked {@link ExecutionOperator}s that represent the given {@link OutputSlot}.
      *
-     * @param someOutput any {@link OutputSlot} of the original {@link RheemPlan}
+     * @param someOutput any {@link OutputSlot} of the original {@link WayangPlan}
      * @return the representing {@link OutputSlot}s together with their enclosing {@link PlanImplementation}
      */
     Collection<Tuple<OutputSlot<?>, PlanImplementation>> findExecutionOperatorOutputWithContext(
@@ -591,7 +591,7 @@ public class PlanImplementation {
      */
     public ProbabilisticDoubleInterval getCostEstimate() {
 
-        if (this.optimizationContext.getConfiguration().getBooleanProperty("rheem.core.optimizer.enumeration.parallel-tasks")) {
+        if (this.optimizationContext.getConfiguration().getBooleanProperty("wayang.core.optimizer.enumeration.parallel-tasks")) {
             return this.getParallelCostEstimate(true);
         } else {
             return this.getCostEstimate(true);
@@ -636,7 +636,7 @@ public class PlanImplementation {
      */
     public double getSquashedCostEstimate() {
         // Check if the parallel cost calculation is enabled in the configuration file
-        if (this.optimizationContext.getConfiguration().getBooleanProperty("rheem.core.optimizer.enumeration.parallel-tasks")) {
+        if (this.optimizationContext.getConfiguration().getBooleanProperty("wayang.core.optimizer.enumeration.parallel-tasks")) {
             return this.getSquashedParallelCostEstimate(true);
         } else {
             return this.getSquashedCostEstimate(true);
@@ -1023,7 +1023,7 @@ public class PlanImplementation {
                 Collection<Tuple<OutputSlot<?>, PlanImplementation>> execOpOutputsWithContext =
                         PlanImplementation.this.findExecutionOperatorOutputWithContext(output);
                 final Tuple<OutputSlot<?>, PlanImplementation> execOpOutputWithCtx =
-                        RheemCollections.getSingleOrNull(execOpOutputsWithContext);
+                        WayangCollections.getSingleOrNull(execOpOutputsWithContext);
                 assert execOpOutputsWithContext != null : String.format("No outputs found for %s.", output);
                 execOutput = execOpOutputWithCtx.field0;
                 execOutputPlanImplementation = execOpOutputWithCtx.field1;
@@ -1035,7 +1035,7 @@ public class PlanImplementation {
                 if (input == null) {
                     execInputs.add(null);
                 } else {
-                    execInputs.add(RheemCollections.asSet(PlanImplementation.this.findExecutionOperatorInputs(input)));
+                    execInputs.add(WayangCollections.asSet(PlanImplementation.this.findExecutionOperatorInputs(input)));
                 }
             }
 
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/RandomPruningStrategy.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/RandomPruningStrategy.java
index 5406967..5b45190 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/RandomPruningStrategy.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/RandomPruningStrategy.java
@@ -1,6 +1,6 @@
-package io.rheem.rheem.core.optimizer.enumeration;
+package org.apache.incubator.wayang.core.optimizer.enumeration;
 
-import io.rheem.rheem.core.api.Configuration;
+import org.apache.incubator.wayang.core.api.Configuration;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -18,8 +18,8 @@ public class RandomPruningStrategy implements PlanEnumerationPruningStrategy {
 
     @Override
     public void configure(Configuration configuration) {
-        this.numRetainedPlans = (int) configuration.getLongProperty("rheem.core.optimizer.pruning.random.retain", 1);
-        long seed = configuration.getLongProperty("rheem.core.optimizer.pruning.random.seed", System.currentTimeMillis());
+        this.numRetainedPlans = (int) configuration.getLongProperty("wayang.core.optimizer.pruning.random.retain", 1);
+        long seed = configuration.getLongProperty("wayang.core.optimizer.pruning.random.seed", System.currentTimeMillis());
         this.random = new Random(seed);
     }
 
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/SinglePlatformPruningStrategy.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/SinglePlatformPruningStrategy.java
index 66be8f5..530a448 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/SinglePlatformPruningStrategy.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/SinglePlatformPruningStrategy.java
@@ -1,15 +1,15 @@
-package io.rheem.rheem.core.optimizer.enumeration;
+package org.apache.incubator.wayang.core.optimizer.enumeration;
 
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.platform.Platform;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.platform.Platform;
 
 /**
  * This {@link PlanEnumerationPruningStrategy} retains only the best {@link PlanImplementation}s employing a single
  * {@link Platform} only.
  * <p>There is one caveat, though: If for some reason the most efficient way to communicate for two
- * {@link io.rheem.rheem.core.plan.rheemplan.ExecutionOperator}s from the same {@link Platform} goes over another
+ * {@link org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator}s from the same {@link Platform} goes over another
  * {@link Platform}, then we will prune the corresponding {@link PlanImplementation}. The more complete way is to
- * look only for non-cross-platform {@link io.rheem.rheem.core.platform.Junction}s. We neglect this issue for now.</p>
+ * look only for non-cross-platform {@link org.apache.incubator.wayang.core.platform.Junction}s. We neglect this issue for now.</p>
  */
 @SuppressWarnings("unused")
 public class SinglePlatformPruningStrategy implements PlanEnumerationPruningStrategy {
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/StageAssignmentTraversal.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/StageAssignmentTraversal.java
index 19178af..cfbb01f 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/StageAssignmentTraversal.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/StageAssignmentTraversal.java
@@ -1,21 +1,21 @@
-package io.rheem.rheem.core.optimizer.enumeration;
+package org.apache.incubator.wayang.core.optimizer.enumeration;
 
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.core.plan.executionplan.Channel;
-import io.rheem.rheem.core.plan.executionplan.ExecutionPlan;
-import io.rheem.rheem.core.plan.executionplan.ExecutionStage;
-import io.rheem.rheem.core.plan.executionplan.ExecutionStageLoop;
-import io.rheem.rheem.core.plan.executionplan.ExecutionTask;
-import io.rheem.rheem.core.plan.executionplan.PlatformExecution;
-import io.rheem.rheem.core.plan.rheemplan.ExecutionOperator;
-import io.rheem.rheem.core.plan.rheemplan.InputSlot;
-import io.rheem.rheem.core.plan.rheemplan.LoopHeadOperator;
-import io.rheem.rheem.core.plan.rheemplan.LoopSubplan;
-import io.rheem.rheem.core.plan.rheemplan.OutputSlot;
-import io.rheem.rheem.core.platform.Platform;
-import io.rheem.rheem.core.util.Iterators;
-import io.rheem.rheem.core.util.OneTimeExecutable;
-import io.rheem.rheem.core.util.Tuple;
+import org.apache.incubator.wayang.core.plan.executionplan.Channel;
+import org.apache.incubator.wayang.core.plan.executionplan.ExecutionPlan;
+import org.apache.incubator.wayang.core.plan.executionplan.ExecutionStage;
+import org.apache.incubator.wayang.core.plan.executionplan.ExecutionStageLoop;
+import org.apache.incubator.wayang.core.plan.executionplan.ExecutionTask;
+import org.apache.incubator.wayang.core.plan.executionplan.PlatformExecution;
+import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.LoopHeadOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.LoopSubplan;
+import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.incubator.wayang.core.platform.Platform;
+import org.apache.incubator.wayang.core.util.Iterators;
+import org.apache.incubator.wayang.core.util.OneTimeExecutable;
+import org.apache.incubator.wayang.core.util.Tuple;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -132,7 +132,7 @@ public class StageAssignmentTraversal extends OneTimeExecutable {
     }
 
     /**
-     * Tells whether the given {@link Channel} lends itself to a {@link io.rheem.rheem.core.platform.Breakpoint}. In
+     * Tells whether the given {@link Channel} lends itself to a {@link org.apache.incubator.wayang.core.platform.Breakpoint}. In
      * that case, we might want to split an {@link ExecutionStage} here.
      *
      * @see StageSplittingCriterion#shouldSplit(ExecutionTask, Channel, ExecutionTask)
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/TopKPruningStrategy.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/TopKPruningStrategy.java
index d8d405b..190ebb2 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/TopKPruningStrategy.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/TopKPruningStrategy.java
@@ -1,6 +1,6 @@
-package io.rheem.rheem.core.optimizer.enumeration;
+package org.apache.incubator.wayang.core.optimizer.enumeration;
 
-import io.rheem.rheem.core.api.Configuration;
+import org.apache.incubator.wayang.core.api.Configuration;
 
 import java.util.ArrayList;
 
@@ -13,7 +13,7 @@ public class TopKPruningStrategy implements PlanEnumerationPruningStrategy {
 
     @Override
     public void configure(Configuration configuration) {
-        this.k = (int) configuration.getLongProperty("rheem.core.optimizer.pruning.topk", 5);
+        this.k = (int) configuration.getLongProperty("wayang.core.optimizer.pruning.topk", 5);
     }
 
     @Override
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/partition/EnumerationAlternative.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/partition/EnumerationAlternative.java
index ff167b9..3ee40f2 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/partition/EnumerationAlternative.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/partition/EnumerationAlternative.java
@@ -1,4 +1,4 @@
-package io.rheem.rheem.core.optimizer.partition;
+package org.apache.incubator.wayang.core.optimizer.partition;
 
 /**
  * An enumeration alternative is embedded within an {@link EnumerationBranch}.
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/partition/EnumerationBranch.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/partition/EnumerationBranch.java
index 8127aaa..1476763 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/partition/EnumerationBranch.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/partition/EnumerationBranch.java
@@ -1,10 +1,10 @@
-package io.rheem.rheem.core.optimizer.partition;
+package org.apache.incubator.wayang.core.optimizer.partition;
 
-import io.rheem.rheem.core.plan.executionplan.ExecutionPlan;
-import io.rheem.rheem.core.plan.rheemplan.RheemPlan;
+import org.apache.incubator.wayang.core.plan.executionplan.ExecutionPlan;
+import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
 
 /**
- * An enumeration branch is the basic unit for enumeration, i.e., translation from a {@link RheemPlan} to an
+ * An enumeration branch is the basic unit for enumeration, i.e., translation from a {@link WayangPlan} to an
  * {@link ExecutionPlan}.
  */
 public class EnumerationBranch {
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/Channel.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/Channel.java
index d0784a9..3e2e649 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/Channel.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/Channel.java
@@ -1,18 +1,18 @@
-package io.rheem.rheem.core.plan.executionplan;
-
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimate;
-import io.rheem.rheem.core.plan.rheemplan.ExecutionOperator;
-import io.rheem.rheem.core.plan.rheemplan.InputSlot;
-import io.rheem.rheem.core.plan.rheemplan.OutputSlot;
-import io.rheem.rheem.core.plan.rheemplan.RheemPlan;
-import io.rheem.rheem.core.plan.rheemplan.Slot;
-import io.rheem.rheem.core.platform.Breakpoint;
-import io.rheem.rheem.core.platform.ChannelDescriptor;
-import io.rheem.rheem.core.platform.ChannelInstance;
-import io.rheem.rheem.core.platform.Executor;
-import io.rheem.rheem.core.platform.Platform;
-import io.rheem.rheem.core.types.DataSetType;
+package org.apache.incubator.wayang.core.plan.executionplan;
+
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.incubator.wayang.core.plan.wayangplan.Slot;
+import org.apache.incubator.wayang.core.platform.Breakpoint;
+import org.apache.incubator.wayang.core.platform.ChannelDescriptor;
+import org.apache.incubator.wayang.core.platform.ChannelInstance;
+import org.apache.incubator.wayang.core.platform.Executor;
+import org.apache.incubator.wayang.core.platform.Platform;
+import org.apache.incubator.wayang.core.types.DataSetType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -67,7 +67,7 @@ public abstract class Channel {
 
     /**
      * Other {@link Channel}s that represent the same {@link OutputSlot}-to-{@link InputSlot} connection from a
-     * {@link RheemPlan} and share properties such as {@link #getCardinalityEstimate(OptimizationContext)} and {@link #getDataSetType()}.
+     * {@link WayangPlan} and share properties such as {@link #getCardinalityEstimate(OptimizationContext)} and {@link #getDataSetType()}.
      */
     private Set<Channel> siblings = new HashSet<>(2);
 
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ChannelInitializer.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ChannelInitializer.java
index 6926f97..9e1fb1e 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ChannelInitializer.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ChannelInitializer.java
@@ -1,12 +1,12 @@
-package io.rheem.rheem.core.plan.executionplan;
+package org.apache.incubator.wayang.core.plan.executionplan;
 
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.plan.rheemplan.ExecutionOperator;
-import io.rheem.rheem.core.plan.rheemplan.Operator;
-import io.rheem.rheem.core.plan.rheemplan.OutputSlot;
-import io.rheem.rheem.core.platform.ChannelDescriptor;
-import io.rheem.rheem.core.platform.Platform;
-import io.rheem.rheem.core.util.Tuple;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.incubator.wayang.core.platform.ChannelDescriptor;
+import org.apache.incubator.wayang.core.platform.Platform;
+import org.apache.incubator.wayang.core.util.Tuple;
 
 /**
  * Sets up the usage of {@link Channel} in an {@link ExecutionPlan} for a given {@link Platform}.
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionPlan.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionPlan.java
index 215caa4..ca0aa99 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionPlan.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionPlan.java
@@ -1,8 +1,8 @@
-package io.rheem.rheem.core.plan.executionplan;
+package org.apache.incubator.wayang.core.plan.executionplan;
 
-import io.rheem.rheem.core.optimizer.enumeration.ExecutionTaskFlow;
-import io.rheem.rheem.core.optimizer.enumeration.StageAssignmentTraversal;
-import io.rheem.rheem.core.util.Counter;
+import org.apache.incubator.wayang.core.optimizer.enumeration.ExecutionTaskFlow;
+import org.apache.incubator.wayang.core.optimizer.enumeration.StageAssignmentTraversal;
+import org.apache.incubator.wayang.core.util.Counter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionStage.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionStage.java
index 9a92d35..9704468 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionStage.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionStage.java
@@ -1,9 +1,9 @@
-package io.rheem.rheem.core.plan.executionplan;
+package org.apache.incubator.wayang.core.plan.executionplan;
 
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.core.plan.rheemplan.LoopHeadOperator;
-import io.rheem.rheem.core.platform.Platform;
-import io.rheem.rheem.core.util.RheemCollections;
+import org.apache.incubator.wayang.core.plan.wayangplan.LoopHeadOperator;
+import org.apache.incubator.wayang.core.platform.Platform;
+import org.apache.incubator.wayang.core.util.WayangCollections;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -18,11 +18,11 @@ import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
- * Resides within a {@link PlatformExecution} and represents the minimum execution unit that is controlled by Rheem.
+ * Resides within a {@link PlatformExecution} and represents the minimum execution unit that is controlled by Wayang.
  * <p>The purpose of stages is to allow to do only a part of work that is to be done by a single
  * {@link PlatformExecution} and invoke a further {@link PlatformExecution} to proceed working with the results
  * of this stage. Also, this allows to consume data with a {@link PlatformExecution} only when it is needed, i.e.,
- * at a deferred stage. However, the level of control that can be imposed by Rheem can vary between {@link Platform}s</p>
+ * at a deferred stage. However, the level of control that can be imposed by Wayang can vary between {@link Platform}s</p>
  * <p>Note that this class is immutable, i.e., it does not comprise any execution state.</p>
  */
 public class ExecutionStage {
@@ -143,7 +143,7 @@ public class ExecutionStage {
      */
     public ExecutionTask getLoopHeadTask() {
         assert this.isLoopHead();
-        return RheemCollections.getSingle(this.getAllTasks());
+        return WayangCollections.getSingle(this.getAllTasks());
     }
 
     /**
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionStageLoop.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionStageLoop.java
index 6709c4c..e3aadb9 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionStageLoop.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionStageLoop.java
@@ -1,8 +1,8 @@
-package io.rheem.rheem.core.plan.executionplan;
+package org.apache.incubator.wayang.core.plan.executionplan;
 
-import io.rheem.rheem.core.plan.rheemplan.ExecutionOperator;
-import io.rheem.rheem.core.plan.rheemplan.LoopHeadOperator;
-import io.rheem.rheem.core.plan.rheemplan.LoopSubplan;
+import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.LoopHeadOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.LoopSubplan;
 
 import java.util.Collection;
 import java.util.HashSet;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionTask.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionTask.java
index 17470bd..b0b7950 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionTask.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionTask.java
@@ -1,15 +1,15 @@
-package io.rheem.rheem.core.plan.executionplan;
+package org.apache.incubator.wayang.core.plan.executionplan;
 
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.plan.rheemplan.ExecutionOperator;
-import io.rheem.rheem.core.plan.rheemplan.InputSlot;
-import io.rheem.rheem.core.plan.rheemplan.OutputSlot;
-import io.rheem.rheem.core.plan.rheemplan.RheemPlan;
-import io.rheem.rheem.core.platform.ChannelDescriptor;
-import io.rheem.rheem.core.platform.Platform;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.incubator.wayang.core.platform.ChannelDescriptor;
+import org.apache.incubator.wayang.core.platform.Platform;
 
 /**
- * Serves as an adapter to include {@link ExecutionOperator}s, which are usually parts of {@link RheemPlan}s, in
+ * Serves as an adapter to include {@link ExecutionOperator}s, which are usually parts of {@link WayangPlan}s, in
  * {@link ExecutionPlan}s.
  */
 public class ExecutionTask {
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/PlatformExecution.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/PlatformExecution.java
index c07c359..003b3d5 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/PlatformExecution.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/PlatformExecution.java
@@ -1,7 +1,7 @@
-package io.rheem.rheem.core.plan.executionplan;
+package org.apache.incubator.wayang.core.plan.executionplan;
 
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.core.platform.Platform;
+import org.apache.incubator.wayang.core.platform.Platform;
 
 import java.util.Collection;
 import java.util.LinkedList;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/ActualOperator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/ActualOperator.java
index 54962ae..a207683 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/ActualOperator.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/ActualOperator.java
@@ -1,4 +1,4 @@
-package io.rheem.rheem.core.plan.rheemplan;
+package org.apache.incubator.wayang.core.plan.wayangplan;
 
 /**
  * Operator free of ambiguities.
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/BinaryToUnaryOperator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/BinaryToUnaryOperator.java
index c00ed51..76334f8 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/BinaryToUnaryOperator.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/BinaryToUnaryOperator.java
@@ -1,6 +1,6 @@
-package io.rheem.rheem.core.plan.rheemplan;
+package org.apache.incubator.wayang.core.plan.wayangplan;
 
-import io.rheem.rheem.core.types.DataSetType;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 /**
  * This operator has two inputs and a single output.
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/CompositeOperator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/CompositeOperator.java
index efb29de..575a342 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/CompositeOperator.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/CompositeOperator.java
@@ -1,4 +1,4 @@
-package io.rheem.rheem.core.plan.rheemplan;
+package org.apache.incubator.wayang.core.plan.wayangplan;
 
 import java.util.Collection;
 
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/ElementaryOperator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/ElementaryOperator.java
index 22446b3..1ee107b 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/ElementaryOperator.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/ElementaryOperator.java
@@ -1,8 +1,8 @@
-package io.rheem.rheem.core.plan.rheemplan;
+package org.apache.incubator.wayang.core.plan.wayangplan;
 
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
 
 import java.util.Optional;
 
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/EstimationContextProperty.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/EstimationContextProperty.java
index d1dee27..3d652d1 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/EstimationContextProperty.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/EstimationContextProperty.java
@@ -1,6 +1,6 @@
-package io.rheem.rheem.core.plan.rheemplan;
+package org.apache.incubator.wayang.core.plan.wayangplan;
 
-import io.rheem.rheem.core.optimizer.costs.EstimationContext;
+import org.apache.incubator.wayang.core.optimizer.costs.EstimationContext;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/ExecutionOperator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/ExecutionOperator.java
index 9c4eb95..3431c2c 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/ExecutionOperator.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/ExecutionOperator.java
@@ -1,20 +1,20 @@
-package io.rheem.rheem.core.plan.rheemplan;
+package org.apache.incubator.wayang.core.plan.wayangplan;
 
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimate;
-import io.rheem.rheem.core.optimizer.costs.LoadProfile;
-import io.rheem.rheem.core.optimizer.costs.LoadProfileEstimator;
-import io.rheem.rheem.core.optimizer.costs.LoadProfileEstimators;
-import io.rheem.rheem.core.plan.executionplan.Channel;
-import io.rheem.rheem.core.plan.executionplan.ExecutionTask;
-import io.rheem.rheem.core.platform.ChannelDescriptor;
-import io.rheem.rheem.core.platform.ChannelInstance;
-import io.rheem.rheem.core.platform.Executor;
-import io.rheem.rheem.core.platform.Platform;
-import io.rheem.rheem.core.platform.lineage.ExecutionLineageNode;
-import io.rheem.rheem.core.platform.lineage.LazyExecutionLineageNode;
-import io.rheem.rheem.core.util.Tuple;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.incubator.wayang.core.optimizer.costs.LoadProfile;
+import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileEstimator;
+import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileEstimators;
+import org.apache.incubator.wayang.core.plan.executionplan.Channel;
+import org.apache.incubator.wayang.core.plan.executionplan.ExecutionTask;
+import org.apache.incubator.wayang.core.platform.ChannelDescriptor;
+import org.apache.incubator.wayang.core.platform.ChannelInstance;
+import org.apache.incubator.wayang.core.platform.Executor;
+import org.apache.incubator.wayang.core.platform.Platform;
+import org.apache.incubator.wayang.core.platform.lineage.ExecutionLineageNode;
+import org.apache.incubator.wayang.core.platform.lineage.LazyExecutionLineageNode;
+import org.apache.incubator.wayang.core.util.Tuple;
 import org.slf4j.LoggerFactory;
 
 import java.util.Collection;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/InputSlot.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/InputSlot.java
index 0ed8194..1a9942f 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/InputSlot.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/InputSlot.java
@@ -1,6 +1,6 @@
-package io.rheem.rheem.core.plan.rheemplan;
+package org.apache.incubator.wayang.core.plan.wayangplan;
 
-import io.rheem.rheem.core.types.DataSetType;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 import java.util.List;
 
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/LoopHeadAlternative.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/LoopHeadAlternative.java
index 308a7f1..d64c0f5 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/LoopHeadAlternative.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/LoopHeadAlternative.java
@@ -1,9 +1,9 @@
-package io.rheem.rheem.core.plan.rheemplan;
+package org.apache.incubator.wayang.core.plan.wayangplan;
 
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityPusher;
-import io.rheem.rheem.core.optimizer.cardinality.LoopHeadAlternativeCardinalityPusher;
-import io.rheem.rheem.core.util.RheemCollections;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityPusher;
+import org.apache.incubator.wayang.core.optimizer.cardinality.LoopHeadAlternativeCardinalityPusher;
+import org.apache.incubator.wayang.core.util.WayangCollections;
 
 import java.util.Collection;
 import java.util.Objects;
@@ -45,12 +45,12 @@ public class LoopHeadAlternative extends OperatorAlternative implements LoopHead
                     .collect(Collectors.toList());
             this.loopBodyOutputs = this.originalLoopHead.getLoopBodyOutputs().stream()
                     .map(originalAlternative.getSlotMapping()::resolveDownstream)
-                    .map(RheemCollections::getSingleOrNull)
+                    .map(WayangCollections::getSingleOrNull)
                     .filter(Objects::nonNull)
                     .collect(Collectors.toList());
             this.finalLoopOutputs = this.originalLoopHead.getFinalLoopOutputs().stream()
                     .map(originalAlternative.getSlotMapping()::resolveDownstream)
-                    .map(RheemCollections::getSingleOrNull)
+                    .map(WayangCollections::getSingleOrNull)
                     .filter(Objects::nonNull)
                     .collect(Collectors.toList());
         }
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/LoopHeadOperator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/LoopHeadOperator.java
index 8cf8911..e343ae1 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/LoopHeadOperator.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/LoopHeadOperator.java
@@ -1,8 +1,8 @@
-package io.rheem.rheem.core.plan.rheemplan;
+package org.apache.incubator.wayang.core.plan.wayangplan;
 
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityPusher;
-import io.rheem.rheem.core.optimizer.cardinality.DefaultCardinalityPusher;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityPusher;
+import org.apache.incubator.wayang.core.optimizer.cardinality.DefaultCardinalityPusher;
 
 import java.util.Collection;
 
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/LoopIsolator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/LoopIsolator.java
index aaf8066..8c5ce38 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/LoopIsolator.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/LoopIsolator.java
@@ -1,7 +1,7 @@
-package io.rheem.rheem.core.plan.rheemplan;
+package org.apache.incubator.wayang.core.plan.wayangplan;
 
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.core.util.OneTimeExecutable;
+import org.apache.incubator.wayang.core.util.OneTimeExecutable;
 import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
@@ -10,20 +10,20 @@ import java.util.HashSet;
 import java.util.List;
 
 /**
- * Goes over a {@link RheemPlan} and isolates its loops.
+ * Goes over a {@link WayangPlan} and isolates its loops.
  */
 public class LoopIsolator extends OneTimeExecutable {
 
     // Refactor: We don't need the OneTimeExecutable here (as of now).
 
-    private final RheemPlan rheemPlan;
+    private final WayangPlan wayangPlan;
 
-    private LoopIsolator(RheemPlan rheemPlan) {
-        this.rheemPlan = rheemPlan;
+    private LoopIsolator(WayangPlan wayangPlan) {
+        this.wayangPlan = wayangPlan;
     }
 
-    public static void isolateLoops(RheemPlan rheemPlan) {
-        new LoopIsolator(rheemPlan).run();
+    public static void isolateLoops(WayangPlan wayangPlan) {
+        new LoopIsolator(wayangPlan).run();
     }
 
     private void run() {
@@ -32,15 +32,15 @@ public class LoopIsolator extends OneTimeExecutable {
 
     @Override
     protected void doExecute() {
-        if (this.rheemPlan.isLoopsIsolated()) return;
+        if (this.wayangPlan.isLoopsIsolated()) return;
         @SuppressWarnings("unchecked")
         final Collection<LoopHeadOperator> loopHeads =
                 (Collection<LoopHeadOperator>) (Collection) PlanTraversal.upstream()
-                        .traverse(this.rheemPlan.getSinks())
+                        .traverse(this.wayangPlan.getSinks())
                         .getTraversedNodesWith(Operator::isLoopHead);
 
         loopHeads.forEach(LoopIsolator::isolate);
-        this.rheemPlan.setLoopsIsolated();
+        this.wayangPlan.setLoopsIsolated();
     }
 
     /**
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/LoopSubplan.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/LoopSubplan.java
index b2240fe..301e162 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/LoopSubplan.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/LoopSubplan.java
@@ -1,9 +1,9 @@
-package io.rheem.rheem.core.plan.rheemplan;
+package org.apache.incubator.wayang.core.plan.wayangplan;
 
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityPusher;
-import io.rheem.rheem.core.optimizer.cardinality.LoopSubplanCardinalityPusher;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityPusher;
+import org.apache.incubator.wayang.core.optimizer.cardinality.LoopSubplanCardinalityPusher;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/Operator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/Operator.java
index df56c74..935903f 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/Operator.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/Operator.java
@@ -1,12 +1,12 @@
-package io.rheem.rheem.core.plan.rheemplan;
+package org.apache.incubator.wayang.core.plan.wayangplan;
 
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimate;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityPusher;
-import io.rheem.rheem.core.optimizer.cardinality.DefaultCardinalityPusher;
-import io.rheem.rheem.core.platform.Platform;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityPusher;
+import org.apache.incubator.wayang.core.optimizer.cardinality.DefaultCardinalityPusher;
+import org.apache.incubator.wayang.core.platform.Platform;
 
 import java.lang.reflect.Field;
 import java.util.Arrays;
@@ -20,7 +20,7 @@ import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
- * An operator is any node that within a {@link RheemPlan}.
+ * An operator is any node that within a {@link WayangPlan}.
  * <p>An operator is basically determined by
  * <ul>
  * <li>its type,</li>
@@ -30,7 +30,7 @@ import java.util.stream.Collectors;
  * </ul>
  * The former two aspects are handled by subclassed, the latter two are basic features of every operator.
  * <p>{@link Slot}s are typed input and output declarations of each operator and can be connected to each other
- * to form a full {@link RheemPlan}. Moreover, we distinguish between two kinds of {@link InputSlot}s:
+ * to form a full {@link WayangPlan}. Moreover, we distinguish between two kinds of {@link InputSlot}s:
  * <ol>
  * <li><b>Regular.</b>Each operator will have set up these {@link InputSlot}s already during its creation.
  * They are indexed from 0 to the number of {@link InputSlot}s - 1.</li>
@@ -353,7 +353,7 @@ public interface Operator {
 
     /**
      * Checks whether this instance is not connected to any other instance via its {@link Slot}s. This is a typical
-     * property of instances used for {@link io.rheem.rheem.core.optimizer.channels.ChannelConversion}s.
+     * property of instances used for {@link org.apache.incubator.wayang.core.optimizer.channels.ChannelConversion}s.
      *
      * @return whether this instance is unconnected
      */
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OperatorAlternative.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OperatorAlternative.java
index 781818f..a663a32 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OperatorAlternative.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OperatorAlternative.java
@@ -1,10 +1,10 @@
-package io.rheem.rheem.core.plan.rheemplan;
+package org.apache.incubator.wayang.core.plan.wayangplan;
 
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityPusher;
-import io.rheem.rheem.core.optimizer.cardinality.OperatorAlternativeCardinalityPusher;
-import io.rheem.rheem.core.util.RheemCollections;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityPusher;
+import org.apache.incubator.wayang.core.optimizer.cardinality.OperatorAlternativeCardinalityPusher;
+import org.apache.incubator.wayang.core.util.WayangCollections;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -175,7 +175,7 @@ public class OperatorAlternative extends OperatorBase implements CompositeOperat
         return String.format("%s[%dx ~%s, %x]",
                 this.getSimpleClassName(),
                 this.alternatives.size(),
-                RheemCollections.getAnyOptional(this.alternatives).orElse(null),
+                WayangCollections.getAnyOptional(this.alternatives).orElse(null),
                 this.hashCode());
     }
 
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OperatorBase.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OperatorBase.java
index 975db6c..57665d2 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OperatorBase.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OperatorBase.java
@@ -1,4 +1,4 @@
-package io.rheem.rheem.core.plan.rheemplan;
+package org.apache.incubator.wayang.core.plan.wayangplan;
 
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
@@ -9,17 +9,17 @@ import com.google.gson.JsonParseException;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.core.function.FlatMapDescriptor;
-import io.rheem.rheem.core.function.FunctionDescriptor;
-import io.rheem.rheem.core.function.PredicateDescriptor;
-import io.rheem.rheem.core.function.ReduceDescriptor;
-import io.rheem.rheem.core.function.TransformationDescriptor;
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimate;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator;
-import io.rheem.rheem.core.platform.Platform;
-import io.rheem.rheem.core.types.DataSetType;
-import io.rheem.rheem.core.util.Tuple;
+import org.apache.incubator.wayang.core.function.FlatMapDescriptor;
+import org.apache.incubator.wayang.core.function.FunctionDescriptor;
+import org.apache.incubator.wayang.core.function.PredicateDescriptor;
+import org.apache.incubator.wayang.core.function.ReduceDescriptor;
+import org.apache.incubator.wayang.core.function.TransformationDescriptor;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.incubator.wayang.core.platform.Platform;
+import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.incubator.wayang.core.util.Tuple;
 
 import java.lang.reflect.Type;
 import java.util.Arrays;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OperatorContainer.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OperatorContainer.java
index 02ef6c2..1d3ddc1 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OperatorContainer.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OperatorContainer.java
@@ -1,8 +1,8 @@
-package io.rheem.rheem.core.plan.rheemplan;
+package org.apache.incubator.wayang.core.plan.wayangplan;
 
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimate;
-import io.rheem.rheem.core.util.RheemCollections;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.incubator.wayang.core.util.WayangCollections;
 import org.slf4j.LoggerFactory;
 
 import java.util.Collection;
@@ -238,7 +238,7 @@ public interface OperatorContainer {
      * @return the encased {@link Operator}s
      */
     default Operator getContainedOperator() {
-        return RheemCollections.getSingleOrNull(this.getContainedOperators());
+        return WayangCollections.getSingleOrNull(this.getContainedOperators());
     }
 
     /**
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OperatorContainers.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OperatorContainers.java
index 4077717..c29ad3d 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OperatorContainers.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OperatorContainers.java
@@ -1,4 +1,4 @@
-package io.rheem.rheem.core.plan.rheemplan;
+package org.apache.incubator.wayang.core.plan.wayangplan;
 
 import org.apache.commons.lang3.Validate;
 
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/Operators.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/Operators.java
index f6060e0..f77f5ff 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/Operators.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/Operators.java
@@ -1,4 +1,4 @@
-package io.rheem.rheem.core.plan.rheemplan;
+package org.apache.incubator.wayang.core.plan.wayangplan;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OutputSlot.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OutputSlot.java
index 192f90d..e824f0d 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OutputSlot.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OutputSlot.java
@@ -1,6 +1,6 @@
-package io.rheem.rheem.core.plan.rheemplan;
+package org.apache.incubator.wayang.core.plan.wayangplan;
 
-import io.rheem.rheem.core.types.DataSetType;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/PlanMetrics.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/PlanMetrics.java
index 197a052..6938bf4 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/PlanMetrics.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/PlanMetrics.java
@@ -1,4 +1,4 @@
-package io.rheem.rheem.core.plan.rheemplan;
+package org.apache.incubator.wayang.core.plan.wayangplan;
 
 import de.hpi.isg.profiledb.store.model.Measurement;
 import de.hpi.isg.profiledb.store.model.Type;
@@ -6,21 +6,21 @@ import de.hpi.isg.profiledb.store.model.Type;
 import java.util.Collection;
 
 /**
- * This class collects metrics for {@link RheemPlan}s.
+ * This class collects metrics for {@link WayangPlan}s.
  */
 @Type("planmetrics")
 public class PlanMetrics extends Measurement {
 
     /**
-     * Creates a new instance and collects metrics from the given {@link RheemPlan}.
+     * Creates a new instance and collects metrics from the given {@link WayangPlan}.
      *
-     * @param rheemPlan the {@link RheemPlan}
+     * @param wayangPlan the {@link WayangPlan}
      * @param id        for the new instance
      * @return the new instance
      */
-    public static PlanMetrics createFor(RheemPlan rheemPlan, String id) {
+    public static PlanMetrics createFor(WayangPlan wayangPlan, String id) {
         PlanMetrics planMetrics = new PlanMetrics(id);
-        planMetrics.collectFrom(rheemPlan);
+        planMetrics.collectFrom(wayangPlan);
         return planMetrics;
     }
 
@@ -30,7 +30,7 @@ public class PlanMetrics extends Measurement {
     private int numVirtualOperators, numExecutionOperators, numAlternatives;
 
     /**
-     * Number of possible combinations of {@link ExecutionOperator}s in the {@link RheemPlan}.
+     * Number of possible combinations of {@link ExecutionOperator}s in the {@link WayangPlan}.
      */
     private long numCombinations;
 
@@ -52,10 +52,10 @@ public class PlanMetrics extends Measurement {
     /**
      * Collects metrics.
      *
-     * @param rheemPlan on which the metrics should be collected
+     * @param wayangPlan on which the metrics should be collected
      */
-    private void collectFrom(RheemPlan rheemPlan) {
-        final Collection<Operator> operators = PlanTraversal.upstream().traverse(rheemPlan.getSinks()).getTraversedNodes();
+    private void collectFrom(WayangPlan wayangPlan) {
+        final Collection<Operator> operators = PlanTraversal.upstream().traverse(wayangPlan.getSinks()).getTraversedNodes();
         this.numCombinations = this.collectFrom(operators);
     }
 
@@ -103,7 +103,7 @@ public class PlanMetrics extends Measurement {
     }
 
     /**
-     * Provide the number of virtual {@link Operator}s in the {@link RheemPlan}.
+     * Provide the number of virtual {@link Operator}s in the {@link WayangPlan}.
      *
      * @return the number of virtual {@link Operator}s
      */
@@ -112,7 +112,7 @@ public class PlanMetrics extends Measurement {
     }
 
     /**
-     * Provide the number of {@link ExecutionOperator}s in the {@link RheemPlan}.
+     * Provide the number of {@link ExecutionOperator}s in the {@link WayangPlan}.
      *
      * @return the number of {@link ExecutionOperator}s
      */
@@ -121,7 +121,7 @@ public class PlanMetrics extends Measurement {
     }
 
     /**
-     * Provide the number of {@link OperatorAlternative}s in the {@link RheemPlan}.
+     * Provide the number of {@link OperatorAlternative}s in the {@link WayangPlan}.
      *
      * @return the number of {@link OperatorAlternative}s
      */
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/PlanTraversal.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/PlanTraversal.java
index 04b27e4..7e77e4b 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/PlanTraversal.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/PlanTraversal.java
@@ -1,4 +1,4 @@
-package io.rheem.rheem.core.plan.rheemplan;
+package org.apache.incubator.wayang.core.plan.wayangplan;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/Slot.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/Slot.java
index 8673994..f4f39e7 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/Slot.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/Slot.java
@@ -1,7 +1,7 @@
-package io.rheem.rheem.core.plan.rheemplan;
+package org.apache.incubator.wayang.core.plan.wayangplan;
 
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimate;
-import io.rheem.rheem.core.types.DataSetType;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 import java.util.Collection;
 
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/SlotMapping.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/SlotMapping.java
index 9ea8119..13f41d2 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/SlotMapping.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/SlotMapping.java
@@ -1,6 +1,6 @@
-package io.rheem.rheem.core.plan.rheemplan;
+package org.apache.incubator.wayang.core.plan.wayangplan;
 
-import io.rheem.rheem.core.util.RheemCollections;
+import org.apache.incubator.wayang.core.util.WayangCollections;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -217,7 +217,7 @@ public class SlotMapping {
                 if (outerOutputs == null) continue;
 
                 // We cannot have multiple OutputSlots, we could not map them downstream to a single OutputSlot.
-                final OutputSlot<?> newOutput = RheemCollections.getSingleOrNull(
+                final OutputSlot<?> newOutput = WayangCollections.getSingleOrNull(
                         (Collection<OutputSlot<?>>) oldToNewSlotMapping
                                 .getOrCreateDownstreamMapping()
                                 .getOrDefault(oldOutput, Collections.emptySet())
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/Subplan.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/Subplan.java
index eaafe73..ce73590 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/Subplan.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/Subplan.java
@@ -1,10 +1,10 @@
-package io.rheem.rheem.core.plan.rheemplan;
+package org.apache.incubator.wayang.core.plan.wayangplan;
 
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityPusher;
-import io.rheem.rheem.core.optimizer.cardinality.SubplanCardinalityPusher;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityPusher;
+import org.apache.incubator.wayang.core.optimizer.cardinality.SubplanCardinalityPusher;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/TopDownPlanVisitor.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/TopDownPlanVisitor.java
index 09db035..72b19f5 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/TopDownPlanVisitor.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/TopDownPlanVisitor.java
@@ -1,9 +1,9 @@
-package io.rheem.rheem.core.plan.rheemplan;
+package org.apache.incubator.wayang.core.plan.wayangplan;
 
 import java.util.Optional;
 
 /**
- * Visitor (as in the Visitor Pattern) for {@link RheemPlan}s.
+ * Visitor (as in the Visitor Pattern) for {@link WayangPlan}s.
  */
 public abstract class TopDownPlanVisitor<Payload, Return> {
 
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/UnarySink.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/UnarySink.java
index 4e9be63..bf0f2cb 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/UnarySink.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/UnarySink.java
@@ -1,6 +1,6 @@
-package io.rheem.rheem.core.plan.rheemplan;
+package org.apache.incubator.wayang.core.plan.wayangplan;
 
-import io.rheem.rheem.core.types.DataSetType;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 /**
  * Abstract base-class for sinks with a single input.
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/UnarySource.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/UnarySource.java
index efd9110..eb9f10b 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/UnarySource.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/UnarySource.java
@@ -1,6 +1,6 @@
-package io.rheem.rheem.core.plan.rheemplan;
+package org.apache.incubator.wayang.core.plan.wayangplan;
 
-import io.rheem.rheem.core.types.DataSetType;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 /**
  * Abstract base class for sources with a single output.
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/UnaryToUnaryOperator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/UnaryToUnaryOperator.java
index f8a32f5..e48d292 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/UnaryToUnaryOperator.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/UnaryToUnaryOperator.java
@@ -1,6 +1,6 @@
-package io.rheem.rheem.core.plan.rheemplan;
+package org.apache.incubator.wayang.core.plan.wayangplan;
 
-import io.rheem.rheem.core.types.DataSetType;
+import org.apache.incubator.wayang.core.types.DataSetType;
 
 /**
  * This operator has a single input and a single output.
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/WayangPlan.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/WayangPlan.java
index 199b489..546f24e 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/WayangPlan.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/WayangPlan.java
@@ -1,10 +1,10 @@
-package io.rheem.rheem.core.plan.rheemplan;
+package org.apache.incubator.wayang.core.plan.wayangplan;
 
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.core.api.exception.RheemException;
-import io.rheem.rheem.core.mapping.PlanTransformation;
-import io.rheem.rheem.core.optimizer.SanityChecker;
-import io.rheem.rheem.core.util.RheemCollections;
+import org.apache.incubator.wayang.core.api.exception.WayangException;
+import org.apache.incubator.wayang.core.mapping.PlanTransformation;
+import org.apache.incubator.wayang.core.optimizer.SanityChecker;
+import org.apache.incubator.wayang.core.util.WayangCollections;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -15,9 +15,9 @@ import java.util.LinkedList;
 import java.util.Set;
 
 /**
- * A Rheem plan consists of a set of {@link Operator}s.
+ * A Wayang plan consists of a set of {@link Operator}s.
  */
-public class RheemPlan {
+public class WayangPlan {
 
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
@@ -29,7 +29,7 @@ public class RheemPlan {
 
 
     /**
-     * Prepares this {@link RheemPlan} for the optimization process if not already done.
+     * Prepares this {@link WayangPlan} for the optimization process if not already done.
      */
     public void prepare() {
         this.prune();
@@ -41,14 +41,14 @@ public class RheemPlan {
      *
      * @param sinks the sinks of the new instance
      */
-    public RheemPlan(Operator... sinks) {
+    public WayangPlan(Operator... sinks) {
         for (Operator sink : sinks) {
             this.addSink(sink);
         }
     }
 
     /**
-     * @deprecated Use {@link RheemPlan#RheemPlan(Operator...)}.
+     * @deprecated Use {@link WayangPlan#WayangPlan(Operator...)}.
      */
     @Deprecated
     public void addSink(Operator sink) {
@@ -105,10 +105,10 @@ public class RheemPlan {
      *
      * @param name the name of the {@link Operator}s
      * @return the matching {@link Operator} or {@code null} if none
-     * @throws RheemException if there is more than one such {@link Operator}
+     * @throws WayangException if there is more than one such {@link Operator}
      */
-    public Operator collectTopLevelOperatorByName(String name) throws RheemException{
-        return RheemCollections.getSingleOrNull(this.collectTopLevelOperatorsByName(name));
+    public Operator collectTopLevelOperatorByName(String name) throws WayangException{
+        return WayangCollections.getSingleOrNull(this.collectTopLevelOperatorsByName(name));
     }
 
     /**
@@ -122,7 +122,7 @@ public class RheemPlan {
                 .withCallback((operator, input, output) -> {
                     reachableOperators.add(operator);
                     if (!operator.isElementary()) {
-                        this.logger.warn("Not yet considering nested operators during Rheem plan pruning.");
+                        this.logger.warn("Not yet considering nested operators during Wayang plan pruning.");
                     }
                 })
                 .traverse(this.sinks);
@@ -143,7 +143,7 @@ public class RheemPlan {
             new ArrayList<>(output.getOccupiedSlots()).stream()
                     .filter(occupiedInput -> !reachableOperators.contains(occupiedInput.getOwner()))
                     .forEach(occupiedInput -> {
-                        this.logger.warn("Pruning unreachable {} from Rheem plan.", occupiedInput.getOwner());
+                        this.logger.warn("Pruning unreachable {} from Wayang plan.", occupiedInput.getOwner());
                         output.unchecked().disconnectFrom(occupiedInput.unchecked());
                     });
         }
@@ -178,7 +178,7 @@ public class RheemPlan {
     }
 
     /**
-     * Check that the given {@link RheemPlan} is as we expect it to be in the following steps.
+     * Check that the given {@link WayangPlan} is as we expect it to be in the following steps.
      */
     public boolean isSane() {
         // We make some assumptions on the hyperplan. Make sure that they hold. After all, the transformations might
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/traversal/AbstractTopologicalTraversal.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/traversal/AbstractTopologicalTraversal.java
index 3421d27..574bd70 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/traversal/AbstractTopologicalTraversal.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/traversal/AbstractTopologicalTraversal.java
@@ -1,10 +1,10 @@
-package io.rheem.rheem.core.plan.rheemplan.traversal;
+package org.apache.incubator.wayang.core.plan.wayangplan.traversal;
 
-import io.rheem.rheem.core.api.exception.RheemException;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimate;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimator;
-import io.rheem.rheem.core.plan.rheemplan.Operator;
-import io.rheem.rheem.core.plan.rheemplan.RheemPlan;
+import org.apache.incubator.wayang.core.api.exception.WayangException;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -13,7 +13,7 @@ import java.util.LinkedList;
 import java.util.Queue;
 
 /**
- * Encapsulates logic to traverse a {@link RheemPlan} in a topological, bottom-up manner.
+ * Encapsulates logic to traverse a {@link WayangPlan} in a topological, bottom-up manner.
  * <p>In a topological traversal, before a node of a DAG is visited, all it predecessors are visited. Moreover,
  * every node is visited only once. Finally, the nodes can propagate information from predecessor to successor.</p>
  */
@@ -144,7 +144,7 @@ public abstract class AbstractTopologicalTraversal<
     /**
      * Declares that the current traversal should be aborted.
      */
-    public static class AbortException extends RheemException {
+    public static class AbortException extends WayangException {
 
         public AbortException(String message) {
             super(message);
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/AbstractChannelInstance.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/AbstractChannelInstance.java
index d6c0326..63380eb 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/AbstractChannelInstance.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/AbstractChannelInstance.java
@@ -1,9 +1,9 @@
-package io.rheem.rheem.core.platform;
+package org.apache.incubator.wayang.core.platform;
 
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.plan.executionplan.ExecutionTask;
-import io.rheem.rheem.core.plan.rheemplan.ExecutionOperator;
-import io.rheem.rheem.core.platform.lineage.ChannelLineageNode;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.plan.executionplan.ExecutionTask;
+import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.incubator.wayang.core.platform.lineage.ChannelLineageNode;
 import org.slf4j.LoggerFactory;
 
 import java.util.OptionalLong;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/AtomicExecution.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/AtomicExecution.java
index 811cd4f..8d7507f 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/AtomicExecution.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/AtomicExecution.java
@@ -1,19 +1,19 @@
-package io.rheem.rheem.core.platform;
+package org.apache.incubator.wayang.core.platform;
 
 import org.apache.commons.lang3.SerializationException;
 import org.json.JSONArray;
 import org.json.JSONObject;
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.optimizer.costs.ConstantLoadProfileEstimator;
-import io.rheem.rheem.core.optimizer.costs.EstimationContext;
-import io.rheem.rheem.core.optimizer.costs.LoadProfile;
-import io.rheem.rheem.core.optimizer.costs.LoadProfileEstimator;
-import io.rheem.rheem.core.optimizer.costs.LoadProfileEstimators;
-import io.rheem.rheem.core.util.JsonSerializables;
-import io.rheem.rheem.core.util.JsonSerializer;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.optimizer.costs.ConstantLoadProfileEstimator;
+import org.apache.incubator.wayang.core.optimizer.costs.EstimationContext;
+import org.apache.incubator.wayang.core.optimizer.costs.LoadProfile;
+import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileEstimator;
+import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileEstimators;
+import org.apache.incubator.wayang.core.util.JsonSerializables;
+import org.apache.incubator.wayang.core.util.JsonSerializer;
 
 /**
- * An atomic execution describes the smallest work unit considered by Rheem's cost model.
+ * An atomic execution describes the smallest work unit considered by Wayang's cost model.
  */
 public class AtomicExecution {
 
@@ -42,7 +42,7 @@ public class AtomicExecution {
     }
 
     /**
-     * This {@link JsonSerializer} stores the given instances via their {@link io.rheem.rheem.core.api.Configuration}
+     * This {@link JsonSerializer} stores the given instances via their {@link org.apache.incubator.wayang.core.api.Configuration}
      * key, if any, or else by the {@link LoadProfile} that they estimate.
      */
     public static class KeyOrLoadSerializer implements JsonSerializer<AtomicExecution> {
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/AtomicExecutionGroup.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/AtomicExecutionGroup.java
index 945c623..7541504 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/AtomicExecutionGroup.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/AtomicExecutionGroup.java
@@ -1,14 +1,14 @@
-package io.rheem.rheem.core.platform;
+package org.apache.incubator.wayang.core.platform;
 
 import org.json.JSONObject;
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.optimizer.costs.EstimationContext;
-import io.rheem.rheem.core.optimizer.costs.LoadProfile;
-import io.rheem.rheem.core.optimizer.costs.LoadProfileToTimeConverter;
-import io.rheem.rheem.core.optimizer.costs.SimpleEstimationContext;
-import io.rheem.rheem.core.optimizer.costs.TimeEstimate;
-import io.rheem.rheem.core.util.JsonSerializables;
-import io.rheem.rheem.core.util.JsonSerializer;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.optimizer.costs.EstimationContext;
+import org.apache.incubator.wayang.core.optimizer.costs.LoadProfile;
+import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileToTimeConverter;
+import org.apache.incubator.wayang.core.optimizer.costs.SimpleEstimationContext;
+import org.apache.incubator.wayang.core.optimizer.costs.TimeEstimate;
+import org.apache.incubator.wayang.core.util.JsonSerializables;
+import org.apache.incubator.wayang.core.util.JsonSerializer;
 
 import java.util.Collection;
 
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/Breakpoint.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/Breakpoint.java
index 17eb103..f5962b4 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/Breakpoint.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/Breakpoint.java
@@ -1,8 +1,8 @@
-package io.rheem.rheem.core.platform;
+package org.apache.incubator.wayang.core.platform;
 
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.plan.executionplan.ExecutionPlan;
-import io.rheem.rheem.core.plan.executionplan.ExecutionStage;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.plan.executionplan.ExecutionPlan;
+import org.apache.incubator.wayang.core.plan.executionplan.ExecutionStage;
 
 /**
  * Describes when to interrupt the execution of an {@link ExecutionPlan}.
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/CardinalityBreakpoint.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/CardinalityBreakpoint.java
index 12352fb..f2ae6d5 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/CardinalityBreakpoint.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/CardinalityBreakpoint.java
@@ -1,14 +1,14 @@
-package io.rheem.rheem.core.platform;
+package org.apache.incubator.wayang.core.platform;
 
 import org.apache.commons.lang3.Validate;
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.optimizer.cardinality.CardinalityEstimate;
-import io.rheem.rheem.core.plan.executionplan.Channel;
-import io.rheem.rheem.core.plan.executionplan.ExecutionStage;
-import io.rheem.rheem.core.plan.rheemplan.InputSlot;
-import io.rheem.rheem.core.plan.rheemplan.OutputSlot;
-import io.rheem.rheem.core.plan.rheemplan.Slot;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.incubator.wayang.core.plan.executionplan.Channel;
+import org.apache.incubator.wayang.core.plan.executionplan.ExecutionStage;
+import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.incubator.wayang.core.plan.wayangplan.Slot;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -34,9 +34,9 @@ public class CardinalityBreakpoint implements Breakpoint {
      */
     public CardinalityBreakpoint(Configuration configuration) {
         this(
-                configuration.getDoubleProperty("rheem.core.optimizer.cardinality.minconfidence"),
-                configuration.getDoubleProperty("rheem.core.optimizer.cardinality.maxspread"),
-                configuration.getDoubleProperty("rheem.core.optimizer.cardinality.spreadsmoothing")
+                configuration.getDoubleProperty("wayang.core.optimizer.cardinality.minconfidence"),
+                configuration.getDoubleProperty("wayang.core.optimizer.cardinality.maxspread"),
+                configuration.getDoubleProperty("wayang.core.optimizer.cardinality.spreadsmoothing")
         );
     }
 
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/ChannelDescriptor.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/ChannelDescriptor.java
index 154c4d2..fcd7a25 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/ChannelDescriptor.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/ChannelDescriptor.java
@@ -1,9 +1,9 @@
-package io.rheem.rheem.core.platform;
+package org.apache.incubator.wayang.core.platform;
 
-import io.rheem.rheem.core.api.Configuration;
-import io.rheem.rheem.core.plan.executionplan.Channel;
-import io.rheem.rheem.core.plan.executionplan.ExecutionStage;
-import io.rheem.rheem.core.plan.rheemplan.OutputSlot;
+import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.incubator.wayang.core.plan.executionplan.Channel;
+import org.apache.incubator.wayang.core.plan.executionplan.ExecutionStage;
+import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
 
 import java.lang.reflect.Constructor;
 import java.util.Objects;
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/ChannelInstance.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/ChannelInstance.java
index 918777f..48e1ba7 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/ChannelInstance.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/ChannelInstance.java
@@ -1,9 +1,9 @@
-package io.rheem.rheem.core.platform;
+package org.apache.incubator.wayang.core.platform;
 
-import io.rheem.rheem.core.optimizer.OptimizationContext;
-import io.rheem.rheem.core.plan.executionplan.Channel;
-import io.rheem.rheem.core.plan.rheemplan.ExecutionOperator;
-import io.rheem.rheem.core.platform.lineage.ChannelLineageNode;
+import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.incubator.wayang.core.plan.executionplan.Channel;
+import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.incubator.wayang.core.platform.lineage.ChannelLineageNode;
 
 import java.util.OptionalLong;
 
@@ -40,7 +40,7 @@ public interface ChannelInstance extends ExecutionResource {
 
     /**
      * Provides a {@link ChannelLineageNode} that keeps around (at least) all non-executed predecessor
-     * {@link ChannelInstance}s and {@link io.rheem.rheem.core.optimizer.OptimizationContext.OperatorContext}s.
+     * {@link ChannelInstance}s and {@link org.apache.incubator.wayang.core.optimizer.OptimizationContext.OperatorContext}s.
      *
      * @return the {@link ChannelLineageNode}
      */
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/CompositeExecutionResource.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/CompositeExecutionResource.java
index c49b398..ce9a841 100644
--- a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/CompositeExecutionResource.java
+++ b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/CompositeExecutionResource.java
@@ -1,4 +1,4 @@
-package io.rheem.rheem.core.platform;
+package org.apache.incubator.wayang.core.platform;
... 24924 lines suppressed ...


[incubator-wayang] 01/05: files changes

Posted by be...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bertty pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-wayang.git

commit 086908f7185d84af2505b1b43a685cc0abb076d6
Author: Bertty Contreras-Rojas <be...@scalytics.io>
AuthorDate: Fri Dec 18 12:11:23 2020 -0300

    files changes
---
 .../{io/rheem/rheem => org/apache/incubator/wayang}/api/DataQuanta.scala  | 0
 .../rheem => org/apache/incubator/wayang}/api/DataQuantaBuilder.scala     | 0
 .../rheem/rheem => org/apache/incubator/wayang}/api/JavaPlanBuilder.scala | 0
 .../{io/rheem/rheem => org/apache/incubator/wayang}/api/PlanBuilder.scala | 0
 .../rheem => org/apache/incubator/wayang}/api/RecordDataQuanta.scala      | 0
 .../apache/incubator/wayang}/api/RecordDataQuantaBuilder.scala            | 0
 .../{io/rheem/rheem => org/apache/incubator/wayang}/api/graph/Edge.scala  | 0
 .../rheem => org/apache/incubator/wayang}/api/graph/EdgeDataQuanta.scala  | 0
 .../apache/incubator/wayang}/api/graph/EdgeDataQuantaBuilder.scala        | 0
 .../rheem/rheem => org/apache/incubator/wayang}/api/graph/package.scala   | 0
 .../{io/rheem/rheem => org/apache/incubator/wayang}/api/package.scala     | 0
 .../apache/incubator/wayang}/api/util/DataQuantaBuilderCache.scala        | 0
 .../apache/incubator/wayang}/api/util/DataQuantaBuilderDecorator.scala    | 0
 .../rheem/rheem => org/apache/incubator/wayang}/api/util/TypeTrap.scala   | 0
 .../{io/rheem/rheem => org/apache/incubator/wayang}/api/JavaApiTest.java  | 0
 .../{io/rheem/rheem => org/apache/incubator/wayang}/api/ApiTest.scala     | 0
 .../apache/incubator/wayang/basic/WayangBasics.java}                      | 0
 .../rheem => org/apache/incubator/wayang}/basic/channels/FileChannel.java | 0
 .../rheem/rheem => org/apache/incubator/wayang}/basic/data/Record.java    | 0
 .../rheem/rheem => org/apache/incubator/wayang}/basic/data/Tuple2.java    | 0
 .../rheem/rheem => org/apache/incubator/wayang}/basic/data/Tuple5.java    | 0
 .../apache/incubator/wayang}/basic/function/ProjectionDescriptor.java     | 0
 .../apache/incubator/wayang}/basic/mapping/GlobalReduceMapping.java       | 0
 .../rheem => org/apache/incubator/wayang}/basic/mapping/Mappings.java     | 0
 .../incubator/wayang}/basic/mapping/MaterializedGroupByMapping.java       | 0
 .../apache/incubator/wayang}/basic/mapping/PageRankMapping.java           | 0
 .../apache/incubator/wayang}/basic/mapping/ReduceByMapping.java           | 0
 .../apache/incubator/wayang}/basic/mapping/RepeatMapping.java             | 0
 .../apache/incubator/wayang}/basic/operators/CartesianOperator.java       | 0
 .../apache/incubator/wayang}/basic/operators/CoGroupOperator.java         | 0
 .../apache/incubator/wayang}/basic/operators/CollectionSource.java        | 0
 .../apache/incubator/wayang}/basic/operators/CountOperator.java           | 0
 .../apache/incubator/wayang}/basic/operators/DistinctOperator.java        | 0
 .../apache/incubator/wayang}/basic/operators/DoWhileOperator.java         | 0
 .../apache/incubator/wayang}/basic/operators/FilterOperator.java          | 0
 .../apache/incubator/wayang}/basic/operators/FlatMapOperator.java         | 0
 .../wayang}/basic/operators/GlobalMaterializedGroupOperator.java          | 0
 .../apache/incubator/wayang}/basic/operators/GlobalReduceOperator.java    | 0
 .../apache/incubator/wayang}/basic/operators/GroupByOperator.java         | 0
 .../apache/incubator/wayang}/basic/operators/IntersectOperator.java       | 0
 .../apache/incubator/wayang}/basic/operators/JoinOperator.java            | 0
 .../apache/incubator/wayang}/basic/operators/LocalCallbackSink.java       | 0
 .../apache/incubator/wayang}/basic/operators/LoopOperator.java            | 0
 .../apache/incubator/wayang}/basic/operators/MapOperator.java             | 0
 .../apache/incubator/wayang}/basic/operators/MapPartitionsOperator.java   | 0
 .../incubator/wayang}/basic/operators/MaterializedGroupByOperator.java    | 0
 .../apache/incubator/wayang}/basic/operators/PageRankOperator.java        | 0
 .../apache/incubator/wayang}/basic/operators/ReduceByOperator.java        | 0
 .../apache/incubator/wayang}/basic/operators/ReduceOperator.java          | 0
 .../apache/incubator/wayang}/basic/operators/RepeatOperator.java          | 0
 .../apache/incubator/wayang}/basic/operators/SampleOperator.java          | 0
 .../apache/incubator/wayang}/basic/operators/SortOperator.java            | 0
 .../apache/incubator/wayang}/basic/operators/TableSource.java             | 0
 .../apache/incubator/wayang}/basic/operators/TextFileSink.java            | 0
 .../apache/incubator/wayang}/basic/operators/TextFileSource.java          | 0
 .../apache/incubator/wayang}/basic/operators/UnionAllOperator.java        | 0
 .../apache/incubator/wayang}/basic/operators/ZipWithIdOperator.java       | 0
 .../apache/incubator/wayang/basic/plugin/WayangBasic.java}                | 0
 .../apache/incubator/wayang/basic/plugin/WayangBasicGraph.java}           | 0
 .../rheem => org/apache/incubator/wayang}/basic/types/RecordType.java     | 0
 .../apache/incubator/wayang}/basic/function/ProjectionDescriptorTest.java | 0
 .../apache/incubator/wayang}/basic/mapping/ReduceByMappingTest.java       | 0
 .../wayang}/basic/operators/MaterializedGroupByOperatorTest.java          | 0
 .../apache/incubator/wayang}/basic/operators/TextFileSourceTest.java      | 0
 .../apache/incubator/wayang}/basic/operators/test/TestSink.java           | 0
 .../apache/incubator/wayang}/basic/operators/test/TestSource.java         | 0
 .../rheem => org/apache/incubator/wayang}/basic/types/RecordTypeTest.java | 0
 .../{io/rheem/rheem => org/apache/incubator/wayang}/core/mathex/MathEx.g4 | 0
 .../rheem => org/apache/incubator/wayang}/core/api/Configuration.java     | 0
 .../{io/rheem/rheem => org/apache/incubator/wayang}/core/api/Job.java     | 0
 .../apache/incubator/wayang/core/api/WayangContext.java}                  | 0
 .../incubator/wayang}/core/api/configuration/CollectionProvider.java      | 0
 .../incubator/wayang}/core/api/configuration/ConstantValueProvider.java   | 0
 .../wayang}/core/api/configuration/ExplicitCollectionProvider.java        | 0
 .../wayang}/core/api/configuration/FunctionalCollectionProvider.java      | 0
 .../wayang}/core/api/configuration/FunctionalKeyValueProvider.java        | 0
 .../incubator/wayang}/core/api/configuration/FunctionalValueProvider.java | 0
 .../apache/incubator/wayang}/core/api/configuration/KeyValueProvider.java | 0
 .../wayang}/core/api/configuration/MapBasedKeyValueProvider.java          | 0
 .../apache/incubator/wayang}/core/api/configuration/ValueProvider.java    | 0
 .../apache/incubator/wayang/core/api/exception/WayangException.java}      | 0
 .../apache/incubator/wayang}/core/function/AggregationDescriptor.java     | 0
 .../apache/incubator/wayang}/core/function/ConsumerDescriptor.java        | 0
 .../apache/incubator/wayang}/core/function/ExecutionContext.java          | 0
 .../apache/incubator/wayang}/core/function/ExtendedFunction.java          | 0
 .../apache/incubator/wayang}/core/function/FlatMapDescriptor.java         | 0
 .../apache/incubator/wayang}/core/function/FunctionDescriptor.java        | 0
 .../apache/incubator/wayang}/core/function/MapPartitionsDescriptor.java   | 0
 .../apache/incubator/wayang}/core/function/PredicateDescriptor.java       | 0
 .../apache/incubator/wayang}/core/function/ReduceDescriptor.java          | 0
 .../apache/incubator/wayang}/core/function/TransformationDescriptor.java  | 0
 .../rheem/rheem => org/apache/incubator/wayang}/core/mapping/Mapping.java | 0
 .../rheem => org/apache/incubator/wayang}/core/mapping/OperatorMatch.java | 0
 .../apache/incubator/wayang}/core/mapping/OperatorPattern.java            | 0
 .../apache/incubator/wayang}/core/mapping/PlanTransformation.java         | 0
 .../apache/incubator/wayang}/core/mapping/ReplacementSubplanFactory.java  | 0
 .../rheem => org/apache/incubator/wayang}/core/mapping/SubplanMatch.java  | 0
 .../apache/incubator/wayang}/core/mapping/SubplanPattern.java             | 0
 .../apache/incubator/wayang}/core/monitor/DisabledMonitor.java            | 0
 .../rheem => org/apache/incubator/wayang}/core/monitor/FileMonitor.java   | 0
 .../rheem => org/apache/incubator/wayang}/core/monitor/HttpMonitor.java   | 0
 .../rheem/rheem => org/apache/incubator/wayang}/core/monitor/Monitor.java | 0
 .../rheem => org/apache/incubator/wayang}/core/monitor/ZeroMQMonitor.java | 0
 .../incubator/wayang}/core/optimizer/AggregateOptimizationContext.java    | 0
 .../incubator/wayang}/core/optimizer/DefaultOptimizationContext.java      | 0
 .../apache/incubator/wayang}/core/optimizer/OptimizationContext.java      | 0
 .../apache/incubator/wayang}/core/optimizer/OptimizationUtils.java        | 0
 .../incubator/wayang}/core/optimizer/ProbabilisticDoubleInterval.java     | 0
 .../incubator/wayang}/core/optimizer/ProbabilisticIntervalEstimate.java   | 0
 .../apache/incubator/wayang}/core/optimizer/SanityChecker.java            | 0
 .../core/optimizer/cardinality/AbstractAlternativeCardinalityPusher.java  | 0
 .../core/optimizer/cardinality/AggregatingCardinalityEstimator.java       | 0
 .../incubator/wayang}/core/optimizer/cardinality/CardinalityEstimate.java | 0
 .../core/optimizer/cardinality/CardinalityEstimationTraversal.java        | 0
 .../wayang}/core/optimizer/cardinality/CardinalityEstimator.java          | 0
 .../wayang}/core/optimizer/cardinality/CardinalityEstimatorManager.java   | 0
 .../incubator/wayang}/core/optimizer/cardinality/CardinalityPusher.java   | 0
 .../wayang}/core/optimizer/cardinality/DefaultCardinalityEstimator.java   | 0
 .../wayang}/core/optimizer/cardinality/DefaultCardinalityPusher.java      | 0
 .../wayang}/core/optimizer/cardinality/FallbackCardinalityEstimator.java  | 0
 .../wayang}/core/optimizer/cardinality/FixedSizeCardinalityEstimator.java | 0
 .../core/optimizer/cardinality/LoopHeadAlternativeCardinalityPusher.java  | 0
 .../wayang}/core/optimizer/cardinality/LoopSubplanCardinalityPusher.java  | 0
 .../core/optimizer/cardinality/OperatorAlternativeCardinalityPusher.java  | 0
 .../wayang}/core/optimizer/cardinality/SubplanCardinalityPusher.java      | 0
 .../core/optimizer/cardinality/SwitchForwardCardinalityEstimator.java     | 0
 .../incubator/wayang}/core/optimizer/channels/ChannelConversion.java      | 0
 .../incubator/wayang}/core/optimizer/channels/ChannelConversionGraph.java | 0
 .../wayang}/core/optimizer/channels/DefaultChannelConversion.java         | 0
 .../wayang}/core/optimizer/costs/ConstantLoadProfileEstimator.java        | 0
 .../incubator/wayang}/core/optimizer/costs/DefaultLoadEstimator.java      | 0
 .../apache/incubator/wayang}/core/optimizer/costs/EstimationContext.java  | 0
 .../incubator/wayang}/core/optimizer/costs/IntervalLoadEstimator.java     | 0
 .../apache/incubator/wayang}/core/optimizer/costs/LoadEstimate.java       | 0
 .../apache/incubator/wayang}/core/optimizer/costs/LoadEstimator.java      | 0
 .../apache/incubator/wayang}/core/optimizer/costs/LoadProfile.java        | 0
 .../incubator/wayang}/core/optimizer/costs/LoadProfileEstimator.java      | 0
 .../incubator/wayang}/core/optimizer/costs/LoadProfileEstimators.java     | 0
 .../wayang}/core/optimizer/costs/LoadProfileToTimeConverter.java          | 0
 .../incubator/wayang}/core/optimizer/costs/LoadToTimeConverter.java       | 0
 .../wayang}/core/optimizer/costs/NestableLoadProfileEstimator.java        | 0
 .../incubator/wayang}/core/optimizer/costs/SimpleEstimationContext.java   | 0
 .../apache/incubator/wayang}/core/optimizer/costs/TimeEstimate.java       | 0
 .../incubator/wayang}/core/optimizer/costs/TimeToCostConverter.java       | 0
 .../incubator/wayang}/core/optimizer/enumeration/ExecutionTaskFlow.java   | 0
 .../wayang}/core/optimizer/enumeration/ExecutionTaskFlowCompiler.java     | 0
 .../wayang}/core/optimizer/enumeration/LatentOperatorPruningStrategy.java | 0
 .../incubator/wayang}/core/optimizer/enumeration/LoopEnumerator.java      | 0
 .../incubator/wayang}/core/optimizer/enumeration/LoopImplementation.java  | 0
 .../incubator/wayang}/core/optimizer/enumeration/PlanEnumeration.java     | 0
 .../core/optimizer/enumeration/PlanEnumerationPruningStrategy.java        | 0
 .../incubator/wayang}/core/optimizer/enumeration/PlanEnumerator.java      | 0
 .../incubator/wayang}/core/optimizer/enumeration/PlanImplementation.java  | 0
 .../wayang}/core/optimizer/enumeration/RandomPruningStrategy.java         | 0
 .../wayang}/core/optimizer/enumeration/SinglePlatformPruningStrategy.java | 0
 .../wayang}/core/optimizer/enumeration/StageAssignmentTraversal.java      | 0
 .../incubator/wayang}/core/optimizer/enumeration/TopKPruningStrategy.java | 0
 .../wayang}/core/optimizer/partition/EnumerationAlternative.java          | 0
 .../incubator/wayang}/core/optimizer/partition/EnumerationBranch.java     | 0
 .../apache/incubator/wayang}/core/plan/executionplan/Channel.java         | 0
 .../incubator/wayang}/core/plan/executionplan/ChannelInitializer.java     | 0
 .../apache/incubator/wayang}/core/plan/executionplan/ExecutionPlan.java   | 0
 .../apache/incubator/wayang}/core/plan/executionplan/ExecutionStage.java  | 0
 .../incubator/wayang}/core/plan/executionplan/ExecutionStageLoop.java     | 0
 .../apache/incubator/wayang}/core/plan/executionplan/ExecutionTask.java   | 0
 .../incubator/wayang}/core/plan/executionplan/PlatformExecution.java      | 0
 .../apache/incubator/wayang}/core/plan/rheemplan/ActualOperator.java      | 0
 .../incubator/wayang}/core/plan/rheemplan/BinaryToUnaryOperator.java      | 0
 .../apache/incubator/wayang}/core/plan/rheemplan/CompositeOperator.java   | 0
 .../apache/incubator/wayang}/core/plan/rheemplan/ElementaryOperator.java  | 0
 .../incubator/wayang}/core/plan/rheemplan/EstimationContextProperty.java  | 0
 .../apache/incubator/wayang}/core/plan/rheemplan/ExecutionOperator.java   | 0
 .../apache/incubator/wayang}/core/plan/rheemplan/InputSlot.java           | 0
 .../apache/incubator/wayang}/core/plan/rheemplan/LoopHeadAlternative.java | 0
 .../apache/incubator/wayang}/core/plan/rheemplan/LoopHeadOperator.java    | 0
 .../apache/incubator/wayang}/core/plan/rheemplan/LoopIsolator.java        | 0
 .../apache/incubator/wayang}/core/plan/rheemplan/LoopSubplan.java         | 0
 .../apache/incubator/wayang}/core/plan/rheemplan/Operator.java            | 0
 .../apache/incubator/wayang}/core/plan/rheemplan/OperatorAlternative.java | 0
 .../apache/incubator/wayang}/core/plan/rheemplan/OperatorBase.java        | 0
 .../apache/incubator/wayang}/core/plan/rheemplan/OperatorContainer.java   | 0
 .../apache/incubator/wayang}/core/plan/rheemplan/OperatorContainers.java  | 0
 .../apache/incubator/wayang}/core/plan/rheemplan/Operators.java           | 0
 .../apache/incubator/wayang}/core/plan/rheemplan/OutputSlot.java          | 0
 .../apache/incubator/wayang}/core/plan/rheemplan/PlanMetrics.java         | 0
 .../apache/incubator/wayang}/core/plan/rheemplan/PlanTraversal.java       | 0
 .../rheem => org/apache/incubator/wayang}/core/plan/rheemplan/Slot.java   | 0
 .../apache/incubator/wayang}/core/plan/rheemplan/SlotMapping.java         | 0
 .../apache/incubator/wayang}/core/plan/rheemplan/Subplan.java             | 0
 .../apache/incubator/wayang}/core/plan/rheemplan/TopDownPlanVisitor.java  | 0
 .../apache/incubator/wayang}/core/plan/rheemplan/UnarySink.java           | 0
 .../apache/incubator/wayang}/core/plan/rheemplan/UnarySource.java         | 0
 .../incubator/wayang}/core/plan/rheemplan/UnaryToUnaryOperator.java       | 0
 .../apache/incubator/wayang/core/plan/rheemplan/WayangPlan.java}          | 0
 .../core/plan/rheemplan/traversal/AbstractTopologicalTraversal.java       | 0
 .../apache/incubator/wayang}/core/platform/AbstractChannelInstance.java   | 0
 .../apache/incubator/wayang}/core/platform/AtomicExecution.java           | 0
 .../apache/incubator/wayang}/core/platform/AtomicExecutionGroup.java      | 0
 .../rheem => org/apache/incubator/wayang}/core/platform/Breakpoint.java   | 0
 .../apache/incubator/wayang}/core/platform/CardinalityBreakpoint.java     | 0
 .../apache/incubator/wayang}/core/platform/ChannelDescriptor.java         | 0
 .../apache/incubator/wayang}/core/platform/ChannelInstance.java           | 0
 .../incubator/wayang}/core/platform/CompositeExecutionResource.java       | 0
 .../apache/incubator/wayang}/core/platform/ConjunctiveBreakpoint.java     | 0
 .../apache/incubator/wayang}/core/platform/CrossPlatformExecutor.java     | 0
 .../apache/incubator/wayang}/core/platform/ExecutionResource.java         | 0
 .../apache/incubator/wayang}/core/platform/ExecutionResourceTemplate.java | 0
 .../apache/incubator/wayang}/core/platform/ExecutionState.java            | 0
 .../rheem => org/apache/incubator/wayang}/core/platform/Executor.java     | 0
 .../apache/incubator/wayang}/core/platform/ExecutorTemplate.java          | 0
 .../apache/incubator/wayang}/core/platform/FixBreakpoint.java             | 0
 .../rheem => org/apache/incubator/wayang}/core/platform/Junction.java     | 0
 .../apache/incubator/wayang}/core/platform/NoIterationBreakpoint.java     | 0
 .../apache/incubator/wayang}/core/platform/PartialExecution.java          | 0
 .../rheem => org/apache/incubator/wayang}/core/platform/Platform.java     | 0
 .../apache/incubator/wayang}/core/platform/PushExecutorTemplate.java      | 0
 .../incubator/wayang}/core/platform/lineage/ChannelLineageNode.java       | 0
 .../incubator/wayang}/core/platform/lineage/ExecutionLineageNode.java     | 0
 .../incubator/wayang}/core/platform/lineage/LazyExecutionLineageNode.java | 0
 .../rheem => org/apache/incubator/wayang}/core/plugin/DynamicPlugin.java  | 0
 .../rheem/rheem => org/apache/incubator/wayang}/core/plugin/Plugin.java   | 0
 .../apache/incubator/wayang}/core/profiling/CardinalityRepository.java    | 0
 .../apache/incubator/wayang}/core/profiling/CostMeasurement.java          | 0
 .../apache/incubator/wayang}/core/profiling/ExecutionLog.java             | 0
 .../apache/incubator/wayang}/core/profiling/ExecutionPlanMeasurement.java | 0
 .../incubator/wayang}/core/profiling/FullInstrumentationStrategy.java     | 0
 .../apache/incubator/wayang}/core/profiling/InstrumentationStrategy.java  | 0
 .../incubator/wayang}/core/profiling/NoInstrumentationStrategy.java       | 0
 .../incubator/wayang}/core/profiling/OutboundInstrumentationStrategy.java | 0
 .../incubator/wayang}/core/profiling/PartialExecutionMeasurement.java     | 0
 .../rheem => org/apache/incubator/wayang}/core/profiling/ProfileDBs.java  | 0
 .../apache/incubator/wayang}/core/types/BasicDataUnitType.java            | 0
 .../rheem => org/apache/incubator/wayang}/core/types/DataSetType.java     | 0
 .../apache/incubator/wayang}/core/types/DataUnitGroupType.java            | 0
 .../rheem => org/apache/incubator/wayang}/core/types/DataUnitType.java    | 0
 .../apache/incubator/wayang}/core/util/AbstractReferenceCountable.java    | 0
 .../{io/rheem/rheem => org/apache/incubator/wayang}/core/util/Action.java | 0
 .../rheem/rheem => org/apache/incubator/wayang}/core/util/Actions.java    | 0
 .../rheem/rheem => org/apache/incubator/wayang}/core/util/Bitmask.java    | 0
 .../rheem => org/apache/incubator/wayang}/core/util/Canonicalizer.java    | 0
 .../apache/incubator/wayang}/core/util/ConsumerIteratorAdapter.java       | 0
 .../rheem/rheem => org/apache/incubator/wayang}/core/util/Copyable.java   | 0
 .../rheem/rheem => org/apache/incubator/wayang}/core/util/Counter.java    | 0
 .../apache/incubator/wayang}/core/util/CrossProductIterable.java          | 0
 .../rheem/rheem => org/apache/incubator/wayang}/core/util/Formats.java    | 0
 .../rheem/rheem => org/apache/incubator/wayang}/core/util/Iterators.java  | 0
 .../rheem => org/apache/incubator/wayang}/core/util/JsonSerializable.java | 0
 .../apache/incubator/wayang}/core/util/JsonSerializables.java             | 0
 .../rheem => org/apache/incubator/wayang}/core/util/JsonSerializer.java   | 0
 .../rheem/rheem => org/apache/incubator/wayang}/core/util/JuelUtils.java  | 0
 .../apache/incubator/wayang}/core/util/LimitedInputStream.java            | 0
 .../rheem/rheem => org/apache/incubator/wayang}/core/util/Logging.java    | 0
 .../rheem/rheem => org/apache/incubator/wayang}/core/util/LruCache.java   | 0
 .../rheem/rheem => org/apache/incubator/wayang}/core/util/MultiMap.java   | 0
 .../apache/incubator/wayang}/core/util/OneTimeExecutable.java             | 0
 .../rheem/rheem => org/apache/incubator/wayang}/core/util/Optional.java   | 0
 .../apache/incubator/wayang}/core/util/ReferenceCountable.java            | 0
 .../rheem => org/apache/incubator/wayang}/core/util/ReflectionUtils.java  | 0
 .../{io/rheem/rheem => org/apache/incubator/wayang}/core/util/Tuple.java  | 0
 .../apache/incubator/wayang/core/util/WayangArrays.java}                  | 0
 .../apache/incubator/wayang/core/util/WayangCollections.java}             | 0
 .../rheem => org/apache/incubator/wayang}/core/util/fs/FileSystem.java    | 0
 .../rheem => org/apache/incubator/wayang}/core/util/fs/FileSystems.java   | 0
 .../rheem => org/apache/incubator/wayang}/core/util/fs/FileUtils.java     | 0
 .../apache/incubator/wayang}/core/util/fs/HadoopFileSystem.java           | 0
 .../apache/incubator/wayang}/core/util/fs/LocalFileSystem.java            | 0
 .../rheem => org/apache/incubator/wayang}/core/util/mathex/Context.java   | 0
 .../apache/incubator/wayang}/core/util/mathex/DefaultContext.java         | 0
 .../apache/incubator/wayang}/core/util/mathex/Expression.java             | 0
 .../apache/incubator/wayang}/core/util/mathex/ExpressionBuilder.java      | 0
 .../wayang}/core/util/mathex/exceptions/EvaluationException.java          | 0
 .../incubator/wayang}/core/util/mathex/exceptions/MathExException.java    | 0
 .../incubator/wayang}/core/util/mathex/exceptions/ParseException.java     | 0
 .../apache/incubator/wayang}/core/util/mathex/model/BinaryOperation.java  | 0
 .../apache/incubator/wayang}/core/util/mathex/model/CompiledFunction.java | 0
 .../apache/incubator/wayang}/core/util/mathex/model/Constant.java         | 0
 .../apache/incubator/wayang}/core/util/mathex/model/NamedFunction.java    | 0
 .../apache/incubator/wayang}/core/util/mathex/model/UnaryOperation.java   | 0
 .../apache/incubator/wayang}/core/util/mathex/model/Variable.java         | 0
 .../{io/rheem/rheem => org/apache/incubator/wayang}/core/SlotTest.java    | 0
 .../apache/incubator/wayang}/core/mapping/OperatorPatternTest.java        | 0
 .../apache/incubator/wayang}/core/mapping/PlanTransformationTest.java     | 0
 .../apache/incubator/wayang}/core/mapping/SubplanPatternTest.java         | 0
 .../apache/incubator/wayang}/core/mapping/test/TestSinkMapping.java       | 0
 .../incubator/wayang}/core/mapping/test/TestSinkToTestSink2Factory.java   | 0
 .../core/optimizer/cardinality/AggregatingCardinalityEstimatorTest.java   | 0
 .../core/optimizer/cardinality/DefaultCardinalityEstimatorTest.java       | 0
 .../core/optimizer/cardinality/LoopSubplanCardinalityPusherTest.java      | 0
 .../wayang}/core/optimizer/cardinality/SubplanCardinalityPusherTest.java  | 0
 .../wayang}/core/optimizer/channels/ChannelConversionGraphTest.java       | 0
 .../wayang}/core/optimizer/costs/NestableLoadProfileEstimatorTest.java    | 0
 .../wayang}/core/optimizer/enumeration/StageAssignmentTraversalTest.java  | 0
 .../incubator/wayang}/core/plan/executionplan/test/TestChannel.java       | 0
 .../apache/incubator/wayang}/core/plan/rheemplan/LoopIsolatorTest.java    | 0
 .../apache/incubator/wayang}/core/plan/rheemplan/OperatorTest.java        | 0
 .../apache/incubator/wayang}/core/plan/rheemplan/SlotMappingTest.java     | 0
 .../incubator/wayang}/core/plan/rheemplan/test/TestCustomMapOperator.java | 0
 .../incubator/wayang}/core/plan/rheemplan/test/TestFilterOperator.java    | 0
 .../apache/incubator/wayang}/core/plan/rheemplan/test/TestJoin.java       | 0
 .../apache/incubator/wayang}/core/plan/rheemplan/test/TestLoopHead.java   | 0
 .../incubator/wayang}/core/plan/rheemplan/test/TestMapOperator.java       | 0
 .../apache/incubator/wayang}/core/plan/rheemplan/test/TestSink.java       | 0
 .../apache/incubator/wayang}/core/plan/rheemplan/test/TestSink2.java      | 0
 .../apache/incubator/wayang}/core/plan/rheemplan/test/TestSource.java     | 0
 .../apache/incubator/wayang}/core/platform/PartialExecutionTest.java      | 0
 .../apache/incubator/wayang}/core/plugin/DynamicPluginTest.java           | 0
 .../apache/incubator/wayang}/core/test/DummyExecutionOperator.java        | 0
 .../apache/incubator/wayang}/core/test/DummyExternalReusableChannel.java  | 0
 .../apache/incubator/wayang}/core/test/DummyNonReusableChannel.java       | 0
 .../rheem => org/apache/incubator/wayang}/core/test/DummyPlatform.java    | 0
 .../apache/incubator/wayang}/core/test/DummyReusableChannel.java          | 0
 .../rheem => org/apache/incubator/wayang}/core/test/MockFactory.java      | 0
 .../incubator/wayang}/core/test/SerializableDummyExecutionOperator.java   | 0
 .../rheem => org/apache/incubator/wayang}/core/test/TestDataUnit.java     | 0
 .../rheem => org/apache/incubator/wayang}/core/test/TestDataUnit2.java    | 0
 .../rheem => org/apache/incubator/wayang}/core/util/BitmaskTest.java      | 0
 .../apache/incubator/wayang}/core/util/ConsumerIteratorAdapterTest.java   | 0
 .../apache/incubator/wayang}/core/util/CrossProductIterableTest.java      | 0
 .../apache/incubator/wayang}/core/util/LimitedInputStreamTest.java        | 0
 .../apache/incubator/wayang}/core/util/ReflectionUtilsTest.java           | 0
 .../apache/incubator/wayang/core/util/WayangCollectionsTest.java}         | 0
 .../apache/incubator/wayang}/core/util/mathex/ExpressionBuilderTest.java  | 0
 .../apache/incubator/wayang}/core/util/mathex/ExpressionTest.java         | 0
 .../{io/rheem/rheem => org/apache/incubator/wayang}/iejoin/IEJoin.java    | 0
 .../{io/rheem/rheem => org/apache/incubator/wayang}/iejoin/data/Data.java | 0
 .../rheem => org/apache/incubator/wayang}/iejoin/mapping/Mappings.java    | 0
 .../apache/incubator/wayang}/iejoin/mapping/java/IEJoinMapping.java       | 0
 .../apache/incubator/wayang}/iejoin/mapping/java/IESelfJoinMapping.java   | 0
 .../apache/incubator/wayang}/iejoin/mapping/spark/IEJoinMapping.java      | 0
 .../apache/incubator/wayang}/iejoin/mapping/spark/IESelfJoinMapping.java  | 0
 .../apache/incubator/wayang}/iejoin/operators/IEJoinMasterOperator.java   | 0
 .../apache/incubator/wayang}/iejoin/operators/IEJoinOperator.java         | 0
 .../apache/incubator/wayang}/iejoin/operators/IESelfJoinOperator.java     | 0
 .../apache/incubator/wayang}/iejoin/operators/JavaIEJoinOperator.java     | 0
 .../apache/incubator/wayang}/iejoin/operators/JavaIESelfJoinOperator.java | 0
 .../apache/incubator/wayang}/iejoin/operators/SparkIEJoinOperator.java    | 0
 .../incubator/wayang}/iejoin/operators/SparkIESelfJoinOperator.java       | 0
 .../incubator/wayang}/iejoin/operators/java_helpers/BitSetJoin.java       | 0
 .../incubator/wayang}/iejoin/operators/java_helpers/DataComparator.java   | 0
 .../incubator/wayang}/iejoin/operators/java_helpers/extractData.java      | 0
 .../incubator/wayang}/iejoin/operators/java_helpers/myMergeSort.java      | 0
 .../wayang}/iejoin/operators/java_helpers/revDataComparator.java          | 0
 .../incubator/wayang}/iejoin/operators/spark_helpers/BitSetJoin.java      | 0
 .../iejoin/operators/spark_helpers/List2AttributesObjectSkinny.java       | 0
 .../incubator/wayang}/iejoin/operators/spark_helpers/addUniqueID.java     | 0
 .../wayang}/iejoin/operators/spark_helpers/build2ListObject.java          | 0
 .../incubator/wayang}/iejoin/operators/spark_helpers/extractData.java     | 0
 .../wayang}/iejoin/operators/spark_helpers/filterUnwantedBlocks.java      | 0
 .../incubator/wayang}/iejoin/operators/spark_helpers/myMergeSort.java     | 0
 .../wayang}/iejoin/operators/spark_helpers/revDataComparator.java         | 0
 .../incubator/wayang}/iejoin/operators/JavaExecutionOperatorTestBase.java | 0
 .../apache/incubator/wayang}/iejoin/operators/JavaIEJoinOperatorTest.java | 0
 .../incubator/wayang}/iejoin/operators/SparkIEJoinOperatorTest.java       | 0
 .../incubator/wayang}/iejoin/operators/SparkIEJoinOperatorTest2.java      | 0
 .../incubator/wayang}/iejoin/operators/SparkIEJoinOperatorTest3.java      | 0
 .../incubator/wayang}/iejoin/operators/SparkIEJoinOperatorTest4.java      | 0
 .../incubator/wayang}/iejoin/operators/SparkIESelfJoinOperatorTest.java   | 0
 .../apache/incubator/wayang}/iejoin/operators/SparkOperatorTestBase.java  | 0
 .../rheem => org/apache/incubator/wayang}/iejoin/test/ChannelFactory.java | 0
 .../java/{io/rheem/rheem => org/apache/incubator/wayang}/flink/Flink.java | 0
 .../apache/incubator/wayang}/flink/channels/ChannelConversions.java       | 0
 .../apache/incubator/wayang}/flink/channels/DataSetChannel.java           | 0
 .../apache/incubator/wayang}/flink/compiler/FlinkCoGroupFunction.java     | 0
 .../apache/incubator/wayang}/flink/compiler/FunctionCompiler.java         | 0
 .../apache/incubator/wayang}/flink/compiler/KeySelectorDistinct.java      | 0
 .../apache/incubator/wayang}/flink/compiler/KeySelectorFunction.java      | 0
 .../apache/incubator/wayang}/flink/compiler/OutputFormatConsumer.java     | 0
 .../apache/incubator/wayang/flink/compiler/WayangFileOutputFormat.java}   | 0
 .../apache/incubator/wayang}/flink/compiler/criterion/DummyFilter.java    | 0
 .../apache/incubator/wayang}/flink/compiler/criterion/DummyMap.java       | 0
 .../incubator/wayang/flink/compiler/criterion/WayangAggregator.java}      | 0
 .../wayang/flink/compiler/criterion/WayangConvergenceCriterion.java}      | 0
 .../incubator/wayang/flink/compiler/criterion/WayangFilterCriterion.java} | 0
 .../incubator/wayang/flink/compiler/criterion/WayangListValue.java}       | 0
 .../apache/incubator/wayang/flink/compiler/criterion/WayangValue.java}    | 0
 .../apache/incubator/wayang}/flink/execution/FlinkContextReference.java   | 0
 .../apache/incubator/wayang}/flink/execution/FlinkExecutionContext.java   | 0
 .../apache/incubator/wayang}/flink/execution/FlinkExecutor.java           | 0
 .../apache/incubator/wayang}/flink/mapping/CartesianMapping.java          | 0
 .../apache/incubator/wayang}/flink/mapping/CoGroupMapping.java            | 0
 .../apache/incubator/wayang}/flink/mapping/CollectionSourceMapping.java   | 0
 .../rheem => org/apache/incubator/wayang}/flink/mapping/CountMapping.java | 0
 .../apache/incubator/wayang}/flink/mapping/DistinctMapping.java           | 0
 .../apache/incubator/wayang}/flink/mapping/DoWhileMapping.java            | 0
 .../apache/incubator/wayang}/flink/mapping/FilterMapping.java             | 0
 .../apache/incubator/wayang}/flink/mapping/FlatMapMapping.java            | 0
 .../incubator/wayang}/flink/mapping/GlobalMaterializedGroupMapping.java   | 0
 .../apache/incubator/wayang}/flink/mapping/GlobalReduceMapping.java       | 0
 .../apache/incubator/wayang}/flink/mapping/GroupByMapping.java            | 0
 .../apache/incubator/wayang}/flink/mapping/IntersectMapping.java          | 0
 .../rheem => org/apache/incubator/wayang}/flink/mapping/JoinMapping.java  | 0
 .../apache/incubator/wayang}/flink/mapping/LocalCallbackSinkMapping.java  | 0
 .../rheem => org/apache/incubator/wayang}/flink/mapping/LoopMapping.java  | 0
 .../rheem => org/apache/incubator/wayang}/flink/mapping/MapMapping.java   | 0
 .../apache/incubator/wayang}/flink/mapping/MapPartitionsMapping.java      | 0
 .../rheem => org/apache/incubator/wayang}/flink/mapping/Mappings.java     | 0
 .../incubator/wayang}/flink/mapping/MaterializedGroupByMapping.java       | 0
 .../apache/incubator/wayang}/flink/mapping/PageRankMapping.java           | 0
 .../apache/incubator/wayang}/flink/mapping/ReduceByMapping.java           | 0
 .../apache/incubator/wayang}/flink/mapping/RepeatMapping.java             | 0
 .../apache/incubator/wayang}/flink/mapping/SampleMapping.java             | 0
 .../rheem => org/apache/incubator/wayang}/flink/mapping/SortMapping.java  | 0
 .../apache/incubator/wayang}/flink/mapping/TextFileSinkMapping.java       | 0
 .../apache/incubator/wayang}/flink/mapping/TextFileSourceMapping.java     | 0
 .../apache/incubator/wayang}/flink/mapping/UnionAllMapping.java           | 0
 .../apache/incubator/wayang}/flink/mapping/ZipWithIdMapping.java          | 0
 .../apache/incubator/wayang}/flink/operators/FlinkCartesianOperator.java  | 0
 .../apache/incubator/wayang}/flink/operators/FlinkCoGroupOperator.java    | 0
 .../apache/incubator/wayang}/flink/operators/FlinkCollectionSink.java     | 0
 .../apache/incubator/wayang}/flink/operators/FlinkCollectionSource.java   | 0
 .../apache/incubator/wayang}/flink/operators/FlinkCountOperator.java      | 0
 .../apache/incubator/wayang}/flink/operators/FlinkDistinctOperator.java   | 0
 .../apache/incubator/wayang}/flink/operators/FlinkDoWhileOperator.java    | 0
 .../apache/incubator/wayang}/flink/operators/FlinkExecutionOperator.java  | 0
 .../apache/incubator/wayang}/flink/operators/FlinkFilterOperator.java     | 0
 .../apache/incubator/wayang}/flink/operators/FlinkFlatMapOperator.java    | 0
 .../wayang}/flink/operators/FlinkGlobalMaterializedGroupOperator.java     | 0
 .../incubator/wayang}/flink/operators/FlinkGlobalReduceOperator.java      | 0
 .../apache/incubator/wayang}/flink/operators/FlinkGroupByOperator.java    | 0
 .../apache/incubator/wayang}/flink/operators/FlinkIntersectOperator.java  | 0
 .../apache/incubator/wayang}/flink/operators/FlinkJoinOperator.java       | 0
 .../apache/incubator/wayang}/flink/operators/FlinkLocalCallbackSink.java  | 0
 .../apache/incubator/wayang}/flink/operators/FlinkLoopOperator.java       | 0
 .../apache/incubator/wayang}/flink/operators/FlinkMapOperator.java        | 0
 .../incubator/wayang}/flink/operators/FlinkMapPartitionsOperator.java     | 0
 .../wayang}/flink/operators/FlinkMaterializedGroupByOperator.java         | 0
 .../apache/incubator/wayang}/flink/operators/FlinkObjectFileSink.java     | 0
 .../apache/incubator/wayang}/flink/operators/FlinkObjectFileSource.java   | 0
 .../apache/incubator/wayang}/flink/operators/FlinkPageRankOperator.java   | 0
 .../apache/incubator/wayang}/flink/operators/FlinkReduceByOperator.java   | 0
 .../incubator/wayang}/flink/operators/FlinkRepeatExpandedOperator.java    | 0
 .../apache/incubator/wayang}/flink/operators/FlinkRepeatOperator.java     | 0
 .../apache/incubator/wayang}/flink/operators/FlinkSampleOperator.java     | 0
 .../apache/incubator/wayang}/flink/operators/FlinkSortOperator.java       | 0
 .../apache/incubator/wayang}/flink/operators/FlinkTextFileSink.java       | 0
 .../apache/incubator/wayang}/flink/operators/FlinkTextFileSource.java     | 0
 .../apache/incubator/wayang}/flink/operators/FlinkTsvFileSink.java        | 0
 .../apache/incubator/wayang}/flink/operators/FlinkUnionAllOperator.java   | 0
 .../apache/incubator/wayang}/flink/operators/FlinkZipWithIdOperator.java  | 0
 .../apache/incubator/wayang}/flink/platform/FlinkPlatform.java            | 0
 .../apache/incubator/wayang}/flink/plugin/FlinkBasicPlugin.java           | 0
 .../apache/incubator/wayang}/flink/plugin/FlinkConversionPlugin.java      | 0
 .../apache/incubator/wayang}/flink/plugin/FlinkGraphPlugin.java           | 0
 .../apache/incubator/wayang}/giraph/Algorithm/PageRankAlgorithm.java      | 0
 .../apache/incubator/wayang}/giraph/Algorithm/PageRankParameters.java     | 0
 .../{io/rheem/rheem => org/apache/incubator/wayang}/giraph/Giraph.java    | 0
 .../apache/incubator/wayang}/giraph/channels/ChannelConversions.java      | 0
 .../apache/incubator/wayang}/giraph/execution/GiraphExecutor.java         | 0
 .../rheem => org/apache/incubator/wayang}/giraph/mappings/Mappings.java   | 0
 .../apache/incubator/wayang}/giraph/mappings/PageRankMapping.java         | 0
 .../incubator/wayang}/giraph/operators/GiraphExecutionOperator.java       | 0
 .../apache/incubator/wayang}/giraph/operators/GiraphPageRankOperator.java | 0
 .../apache/incubator/wayang}/giraph/platform/GiraphPlatform.java          | 0
 .../rheem => org/apache/incubator/wayang}/giraph/plugin/GiraphPlugin.java | 0
 .../incubator/wayang}/giraph/operators/GiraphPagaRankOperatorTest.java    | 0
 .../rheem/rheem => org/apache/incubator/wayang}/graphchi/GraphChi.java    | 0
 .../apache/incubator/wayang}/graphchi/channels/ChannelConversions.java    | 0
 .../apache/incubator/wayang}/graphchi/execution/GraphChiExecutor.java     | 0
 .../rheem => org/apache/incubator/wayang}/graphchi/mappings/Mappings.java | 0
 .../apache/incubator/wayang}/graphchi/mappings/PageRankMapping.java       | 0
 .../incubator/wayang}/graphchi/operators/GraphChiExecutionOperator.java   | 0
 .../incubator/wayang}/graphchi/operators/GraphChiPageRankOperator.java    | 0
 .../apache/incubator/wayang}/graphchi/platform/GraphChiPlatform.java      | 0
 .../apache/incubator/wayang}/graphchi/plugin/GraphChiPlugin.java          | 0
 .../wayang}/graphchi/operators/GraphChiPageRankOperatorTest.java          | 0
 .../java/{io/rheem/rheem => org/apache/incubator/wayang}/java/Java.java   | 0
 .../apache/incubator/wayang}/java/channels/ChannelConversions.java        | 0
 .../apache/incubator/wayang}/java/channels/CollectionChannel.java         | 0
 .../apache/incubator/wayang}/java/channels/JavaChannelInstance.java       | 0
 .../apache/incubator/wayang}/java/channels/StreamChannel.java             | 0
 .../apache/incubator/wayang}/java/compiler/FunctionCompiler.java          | 0
 .../apache/incubator/wayang}/java/execution/JavaExecutionContext.java     | 0
 .../apache/incubator/wayang}/java/execution/JavaExecutor.java             | 0
 .../apache/incubator/wayang}/java/mapping/CartesianMapping.java           | 0
 .../apache/incubator/wayang}/java/mapping/CoGroupMapping.java             | 0
 .../apache/incubator/wayang}/java/mapping/CollectionSourceMapping.java    | 0
 .../rheem => org/apache/incubator/wayang}/java/mapping/CountMapping.java  | 0
 .../apache/incubator/wayang}/java/mapping/DistinctMapping.java            | 0
 .../apache/incubator/wayang}/java/mapping/DoWhileMapping.java             | 0
 .../rheem => org/apache/incubator/wayang}/java/mapping/FilterMapping.java | 0
 .../apache/incubator/wayang}/java/mapping/FlatMapMapping.java             | 0
 .../incubator/wayang}/java/mapping/GlobalMaterializedGroupMapping.java    | 0
 .../apache/incubator/wayang}/java/mapping/GlobalReduceMapping.java        | 0
 .../apache/incubator/wayang}/java/mapping/IntersectMapping.java           | 0
 .../rheem => org/apache/incubator/wayang}/java/mapping/JoinMapping.java   | 0
 .../apache/incubator/wayang}/java/mapping/LocalCallbackSinkMapping.java   | 0
 .../rheem => org/apache/incubator/wayang}/java/mapping/LoopMapping.java   | 0
 .../rheem => org/apache/incubator/wayang}/java/mapping/MapMapping.java    | 0
 .../apache/incubator/wayang}/java/mapping/MapPartitionsMapping.java       | 0
 .../rheem => org/apache/incubator/wayang}/java/mapping/Mappings.java      | 0
 .../apache/incubator/wayang}/java/mapping/MaterializedGroupByMapping.java | 0
 .../apache/incubator/wayang}/java/mapping/ReduceByMapping.java            | 0
 .../rheem => org/apache/incubator/wayang}/java/mapping/RepeatMapping.java | 0
 .../rheem => org/apache/incubator/wayang}/java/mapping/SampleMapping.java | 0
 .../rheem => org/apache/incubator/wayang}/java/mapping/SortMapping.java   | 0
 .../apache/incubator/wayang}/java/mapping/TextFileSinkMapping.java        | 0
 .../apache/incubator/wayang}/java/mapping/TextFileSourceMapping.java      | 0
 .../apache/incubator/wayang}/java/mapping/UnionAllMapping.java            | 0
 .../apache/incubator/wayang}/java/mapping/ZipWithIdMapping.java           | 0
 .../apache/incubator/wayang}/java/mapping/graph/PageRankMapping.java      | 0
 .../apache/incubator/wayang}/java/operators/JavaCartesianOperator.java    | 0
 .../apache/incubator/wayang}/java/operators/JavaCoGroupOperator.java      | 0
 .../apache/incubator/wayang}/java/operators/JavaCollectOperator.java      | 0
 .../apache/incubator/wayang}/java/operators/JavaCollectionSource.java     | 0
 .../apache/incubator/wayang}/java/operators/JavaCountOperator.java        | 0
 .../apache/incubator/wayang}/java/operators/JavaDistinctOperator.java     | 0
 .../apache/incubator/wayang}/java/operators/JavaDoWhileOperator.java      | 0
 .../apache/incubator/wayang}/java/operators/JavaExecutionOperator.java    | 0
 .../apache/incubator/wayang}/java/operators/JavaFilterOperator.java       | 0
 .../apache/incubator/wayang}/java/operators/JavaFlatMapOperator.java      | 0
 .../wayang}/java/operators/JavaGlobalMaterializedGroupOperator.java       | 0
 .../apache/incubator/wayang}/java/operators/JavaGlobalReduceOperator.java | 0
 .../apache/incubator/wayang}/java/operators/JavaIntersectOperator.java    | 0
 .../apache/incubator/wayang}/java/operators/JavaJoinOperator.java         | 0
 .../apache/incubator/wayang}/java/operators/JavaLocalCallbackSink.java    | 0
 .../apache/incubator/wayang}/java/operators/JavaLoopOperator.java         | 0
 .../apache/incubator/wayang}/java/operators/JavaMapOperator.java          | 0
 .../incubator/wayang}/java/operators/JavaMapPartitionsOperator.java       | 0
 .../incubator/wayang}/java/operators/JavaMaterializedGroupByOperator.java | 0
 .../apache/incubator/wayang}/java/operators/JavaObjectFileSink.java       | 0
 .../apache/incubator/wayang}/java/operators/JavaObjectFileSource.java     | 0
 .../apache/incubator/wayang}/java/operators/JavaRandomSampleOperator.java | 0
 .../apache/incubator/wayang}/java/operators/JavaReduceByOperator.java     | 0
 .../apache/incubator/wayang}/java/operators/JavaRepeatOperator.java       | 0
 .../incubator/wayang}/java/operators/JavaReservoirSampleOperator.java     | 0
 .../apache/incubator/wayang}/java/operators/JavaSortOperator.java         | 0
 .../apache/incubator/wayang}/java/operators/JavaTextFileSink.java         | 0
 .../apache/incubator/wayang}/java/operators/JavaTextFileSource.java       | 0
 .../apache/incubator/wayang}/java/operators/JavaTsvFileSink.java          | 0
 .../apache/incubator/wayang}/java/operators/JavaTsvFileSource.java        | 0
 .../apache/incubator/wayang}/java/operators/JavaUnionAllOperator.java     | 0
 .../incubator/wayang}/java/operators/graph/JavaPageRankOperator.java      | 0
 .../rheem => org/apache/incubator/wayang}/java/platform/JavaPlatform.java | 0
 .../apache/incubator/wayang}/java/plugin/JavaBasicPlugin.java             | 0
 .../apache/incubator/wayang}/java/plugin/JavaChannelConversionPlugin.java | 0
 .../apache/incubator/wayang}/java/plugin/JavaGraphPlugin.java             | 0
 .../apache/incubator/wayang}/java/execution/JavaExecutorTest.java         | 0
 .../incubator/wayang}/java/operators/JavaCartesianOperatorTest.java       | 0
 .../apache/incubator/wayang}/java/operators/JavaCoGroupOperatorTest.java  | 0
 .../apache/incubator/wayang}/java/operators/JavaCollectionSourceTest.java | 0
 .../apache/incubator/wayang}/java/operators/JavaCountOperatorTest.java    | 0
 .../apache/incubator/wayang}/java/operators/JavaDistinctOperatorTest.java | 0
 .../incubator/wayang}/java/operators/JavaExecutionOperatorTestBase.java   | 0
 .../apache/incubator/wayang}/java/operators/JavaFilterOperatorTest.java   | 0
 .../wayang}/java/operators/JavaGlobalMaterializedGroupOperatorTest.java   | 0
 .../incubator/wayang}/java/operators/JavaGlobalReduceOperatorTest.java    | 0
 .../apache/incubator/wayang}/java/operators/JavaJoinOperatorTest.java     | 0
 .../incubator/wayang}/java/operators/JavaLocalCallbackSinkTest.java       | 0
 .../wayang}/java/operators/JavaMaterializedGroupByOperatorTest.java       | 0
 .../apache/incubator/wayang}/java/operators/JavaObjectFileSinkTest.java   | 0
 .../apache/incubator/wayang}/java/operators/JavaObjectFileSourceTest.java | 0
 .../incubator/wayang}/java/operators/JavaRandomSampleOperatorTest.java    | 0
 .../apache/incubator/wayang}/java/operators/JavaReduceByOperatorTest.java | 0
 .../incubator/wayang}/java/operators/JavaReservoirSampleOperatorTest.java | 0
 .../apache/incubator/wayang}/java/operators/JavaSortOperatorTest.java     | 0
 .../apache/incubator/wayang}/java/operators/JavaTextFileSinkTest.java     | 0
 .../apache/incubator/wayang}/java/operators/JavaUnionAllOperatorTest.java | 0
 .../rheem => org/apache/incubator/wayang}/java/test/ChannelFactory.java   | 0
 .../apache/incubator/wayang}/jdbc/channels/SqlQueryChannel.java           | 0
 .../apache/incubator/wayang}/jdbc/compiler/FunctionCompiler.java          | 0
 .../apache/incubator/wayang}/jdbc/execution/DatabaseDescriptor.java       | 0
 .../apache/incubator/wayang}/jdbc/execution/JdbcExecutor.java             | 0
 .../apache/incubator/wayang}/jdbc/operators/JdbcExecutionOperator.java    | 0
 .../apache/incubator/wayang}/jdbc/operators/JdbcFilterOperator.java       | 0
 .../apache/incubator/wayang}/jdbc/operators/JdbcProjectionOperator.java   | 0
 .../apache/incubator/wayang}/jdbc/operators/JdbcTableSource.java          | 0
 .../apache/incubator/wayang}/jdbc/operators/SqlToStreamOperator.java      | 0
 .../apache/incubator/wayang}/jdbc/platform/JdbcPlatformTemplate.java      | 0
 .../apache/incubator/wayang}/jdbc/execution/JdbcExecutorTest.java         | 0
 .../apache/incubator/wayang}/jdbc/operators/JdbcTableSourceTest.java      | 0
 .../apache/incubator/wayang}/jdbc/operators/OperatorTestBase.java         | 0
 .../apache/incubator/wayang}/jdbc/operators/SqlToStreamOperatorTest.java  | 0
 .../apache/incubator/wayang}/jdbc/test/HsqldbFilterOperator.java          | 0
 .../rheem => org/apache/incubator/wayang}/jdbc/test/HsqldbPlatform.java   | 0
 .../apache/incubator/wayang}/jdbc/test/HsqldbProjectionOperator.java      | 0
 .../apache/incubator/wayang}/jdbc/test/HsqldbTableSource.java             | 0
 .../rheem/rheem => org/apache/incubator/wayang}/postgres/Postgres.java    | 0
 .../apache/incubator/wayang}/postgres/channels/ChannelConversions.java    | 0
 .../apache/incubator/wayang}/postgres/mapping/FilterMapping.java          | 0
 .../rheem => org/apache/incubator/wayang}/postgres/mapping/Mappings.java  | 0
 .../apache/incubator/wayang}/postgres/mapping/ProjectionMapping.java      | 0
 .../incubator/wayang}/postgres/operators/PostgresExecutionOperator.java   | 0
 .../incubator/wayang}/postgres/operators/PostgresFilterOperator.java      | 0
 .../incubator/wayang}/postgres/operators/PostgresProjectionOperator.java  | 0
 .../apache/incubator/wayang}/postgres/operators/PostgresTableSource.java  | 0
 .../apache/incubator/wayang}/postgres/platform/PostgresPlatform.java      | 0
 .../incubator/wayang}/postgres/plugin/PostgresConversionsPlugin.java      | 0
 .../apache/incubator/wayang}/postgres/plugin/PostgresPlugin.java          | 0
 .../java/{io/rheem/rheem => org/apache/incubator/wayang}/spark/Spark.java | 0
 .../apache/incubator/wayang}/spark/channels/BroadcastChannel.java         | 0
 .../apache/incubator/wayang}/spark/channels/ChannelConversions.java       | 0
 .../apache/incubator/wayang}/spark/channels/FileChannels.java             | 0
 .../rheem => org/apache/incubator/wayang}/spark/channels/RddChannel.java  | 0
 .../apache/incubator/wayang}/spark/compiler/BinaryOperatorAdapter.java    | 0
 .../incubator/wayang}/spark/compiler/ExtendedBinaryOperatorAdapter.java   | 0
 .../incubator/wayang}/spark/compiler/ExtendedFlatMapFunctionAdapter.java  | 0
 .../apache/incubator/wayang}/spark/compiler/ExtendedFunction.java         | 0
 .../incubator/wayang}/spark/compiler/ExtendedMapFunctionAdapter.java      | 0
 .../wayang}/spark/compiler/ExtendedMapPartitionsFunctionAdapter.java      | 0
 .../incubator/wayang}/spark/compiler/ExtendedPredicateAdapater.java       | 0
 .../apache/incubator/wayang}/spark/compiler/FlatMapFunctionAdapter.java   | 0
 .../apache/incubator/wayang}/spark/compiler/FunctionCompiler.java         | 0
 .../apache/incubator/wayang}/spark/compiler/MapFunctionAdapter.java       | 0
 .../incubator/wayang}/spark/compiler/MapPartitionsFunctionAdapter.java    | 0
 .../apache/incubator/wayang}/spark/compiler/PredicateAdapter.java         | 0
 .../apache/incubator/wayang}/spark/execution/SparkContextReference.java   | 0
 .../apache/incubator/wayang}/spark/execution/SparkExecutionContext.java   | 0
 .../apache/incubator/wayang}/spark/execution/SparkExecutor.java           | 0
 .../apache/incubator/wayang}/spark/mapping/CartesianMapping.java          | 0
 .../apache/incubator/wayang}/spark/mapping/CoGroupMapping.java            | 0
 .../apache/incubator/wayang}/spark/mapping/CollectionSourceMapping.java   | 0
 .../rheem => org/apache/incubator/wayang}/spark/mapping/CountMapping.java | 0
 .../apache/incubator/wayang}/spark/mapping/DistinctMapping.java           | 0
 .../apache/incubator/wayang}/spark/mapping/DoWhileMapping.java            | 0
 .../apache/incubator/wayang}/spark/mapping/FilterMapping.java             | 0
 .../apache/incubator/wayang}/spark/mapping/FlatMapMapping.java            | 0
 .../incubator/wayang}/spark/mapping/GlobalMaterializedGroupMapping.java   | 0
 .../apache/incubator/wayang}/spark/mapping/GlobalReduceMapping.java       | 0
 .../apache/incubator/wayang}/spark/mapping/IntersectMapping.java          | 0
 .../rheem => org/apache/incubator/wayang}/spark/mapping/JoinMapping.java  | 0
 .../apache/incubator/wayang}/spark/mapping/LocalCallbackSinkMapping.java  | 0
 .../rheem => org/apache/incubator/wayang}/spark/mapping/LoopMapping.java  | 0
 .../rheem => org/apache/incubator/wayang}/spark/mapping/MapMapping.java   | 0
 .../apache/incubator/wayang}/spark/mapping/MapPartitionsMapping.java      | 0
 .../rheem => org/apache/incubator/wayang}/spark/mapping/Mappings.java     | 0
 .../incubator/wayang}/spark/mapping/MaterializedGroupByMapping.java       | 0
 .../apache/incubator/wayang}/spark/mapping/ReduceByMapping.java           | 0
 .../apache/incubator/wayang}/spark/mapping/RepeatMapping.java             | 0
 .../apache/incubator/wayang}/spark/mapping/SampleMapping.java             | 0
 .../rheem => org/apache/incubator/wayang}/spark/mapping/SortMapping.java  | 0
 .../apache/incubator/wayang}/spark/mapping/TextFileSinkMapping.java       | 0
 .../apache/incubator/wayang}/spark/mapping/TextFileSourceMapping.java     | 0
 .../apache/incubator/wayang}/spark/mapping/UnionAllMapping.java           | 0
 .../apache/incubator/wayang}/spark/mapping/ZipWithIdMapping.java          | 0
 .../apache/incubator/wayang}/spark/mapping/graph/PageRankMapping.java     | 0
 .../incubator/wayang}/spark/operators/SparkBernoulliSampleOperator.java   | 0
 .../apache/incubator/wayang}/spark/operators/SparkBroadcastOperator.java  | 0
 .../apache/incubator/wayang}/spark/operators/SparkCacheOperator.java      | 0
 .../apache/incubator/wayang}/spark/operators/SparkCartesianOperator.java  | 0
 .../apache/incubator/wayang}/spark/operators/SparkCoGroupOperator.java    | 0
 .../apache/incubator/wayang}/spark/operators/SparkCollectOperator.java    | 0
 .../apache/incubator/wayang}/spark/operators/SparkCollectionSource.java   | 0
 .../apache/incubator/wayang}/spark/operators/SparkCountOperator.java      | 0
 .../apache/incubator/wayang}/spark/operators/SparkDistinctOperator.java   | 0
 .../apache/incubator/wayang}/spark/operators/SparkDoWhileOperator.java    | 0
 .../apache/incubator/wayang}/spark/operators/SparkExecutionOperator.java  | 0
 .../apache/incubator/wayang}/spark/operators/SparkFilterOperator.java     | 0
 .../apache/incubator/wayang}/spark/operators/SparkFlatMapOperator.java    | 0
 .../wayang}/spark/operators/SparkGlobalMaterializedGroupOperator.java     | 0
 .../incubator/wayang}/spark/operators/SparkGlobalReduceOperator.java      | 0
 .../apache/incubator/wayang}/spark/operators/SparkIntersectOperator.java  | 0
 .../apache/incubator/wayang}/spark/operators/SparkJoinOperator.java       | 0
 .../apache/incubator/wayang}/spark/operators/SparkLocalCallbackSink.java  | 0
 .../apache/incubator/wayang}/spark/operators/SparkLoopOperator.java       | 0
 .../apache/incubator/wayang}/spark/operators/SparkMapOperator.java        | 0
 .../incubator/wayang}/spark/operators/SparkMapPartitionsOperator.java     | 0
 .../wayang}/spark/operators/SparkMaterializedGroupByOperator.java         | 0
 .../apache/incubator/wayang}/spark/operators/SparkObjectFileSink.java     | 0
 .../apache/incubator/wayang}/spark/operators/SparkObjectFileSource.java   | 0
 .../wayang}/spark/operators/SparkRandomPartitionSampleOperator.java       | 0
 .../apache/incubator/wayang}/spark/operators/SparkReduceByOperator.java   | 0
 .../apache/incubator/wayang}/spark/operators/SparkRepeatOperator.java     | 0
 .../wayang}/spark/operators/SparkShufflePartitionSampleOperator.java      | 0
 .../apache/incubator/wayang}/spark/operators/SparkSortOperator.java       | 0
 .../apache/incubator/wayang}/spark/operators/SparkTextFileSink.java       | 0
 .../apache/incubator/wayang}/spark/operators/SparkTextFileSource.java     | 0
 .../apache/incubator/wayang}/spark/operators/SparkTsvFileSink.java        | 0
 .../apache/incubator/wayang}/spark/operators/SparkTsvFileSource.java      | 0
 .../apache/incubator/wayang}/spark/operators/SparkUnionAllOperator.java   | 0
 .../apache/incubator/wayang}/spark/operators/SparkZipWithIdOperator.java  | 0
 .../apache/incubator/wayang}/spark/platform/SparkPlatform.java            | 0
 .../apache/incubator/wayang}/spark/plugin/SparkBasicPlugin.java           | 0
 .../apache/incubator/wayang}/spark/plugin/SparkConversionPlugin.java      | 0
 .../apache/incubator/wayang}/spark/plugin/SparkGraphPlugin.java           | 0
 .../incubator/wayang}/spark/operators/graph/SparkPageRankOperator.scala   | 0
 .../wayang}/spark/operators/SparkBernoulliSampleOperatorTest.java         | 0
 .../incubator/wayang}/spark/operators/SparkCartesianOperatorTest.java     | 0
 .../incubator/wayang}/spark/operators/SparkCoGroupOperatorTest.java       | 0
 .../incubator/wayang}/spark/operators/SparkCollectionSourceTest.java      | 0
 .../apache/incubator/wayang}/spark/operators/SparkCountOperatorTest.java  | 0
 .../incubator/wayang}/spark/operators/SparkDistinctOperatorTest.java      | 0
 .../apache/incubator/wayang}/spark/operators/SparkFilterOperatorTest.java | 0
 .../incubator/wayang}/spark/operators/SparkFlatMapOperatorTest.java       | 0
 .../wayang}/spark/operators/SparkGlobalMaterializedGroupOperatorTest.java | 0
 .../incubator/wayang}/spark/operators/SparkGlobalReduceOperatorTest.java  | 0
 .../apache/incubator/wayang}/spark/operators/SparkJoinOperatorTest.java   | 0
 .../incubator/wayang}/spark/operators/SparkMapPartitionsOperatorTest.java | 0
 .../wayang}/spark/operators/SparkMaterializedGroupByOperatorTest.java     | 0
 .../apache/incubator/wayang}/spark/operators/SparkObjectFileSinkTest.java | 0
 .../incubator/wayang}/spark/operators/SparkObjectFileSourceTest.java      | 0
 .../apache/incubator/wayang}/spark/operators/SparkOperatorTestBase.java   | 0
 .../wayang}/spark/operators/SparkRandomPartitionSampleOperatorTest.java   | 0
 .../incubator/wayang}/spark/operators/SparkReduceByOperatorTest.java      | 0
 .../wayang}/spark/operators/SparkShufflePartitionSampleOperatorTest.java  | 0
 .../apache/incubator/wayang}/spark/operators/SparkSortOperatorTest.java   | 0
 .../apache/incubator/wayang}/spark/operators/SparkTextFileSinkTest.java   | 0
 .../incubator/wayang}/spark/operators/SparkUnionAllOperatorTest.java      | 0
 .../rheem => org/apache/incubator/wayang}/spark/test/ChannelFactory.java  | 0
 .../{io/rheem/rheem => org/apache/incubator/wayang}/sqlite3/Sqlite3.java  | 0
 .../apache/incubator/wayang}/sqlite3/channels/ChannelConversions.java     | 0
 .../apache/incubator/wayang}/sqlite3/mapping/FilterMapping.java           | 0
 .../rheem => org/apache/incubator/wayang}/sqlite3/mapping/Mappings.java   | 0
 .../apache/incubator/wayang}/sqlite3/mapping/ProjectionMapping.java       | 0
 .../apache/incubator/wayang}/sqlite3/operators/Sqlite3FilterOperator.java | 0
 .../incubator/wayang}/sqlite3/operators/Sqlite3ProjectionOperator.java    | 0
 .../apache/incubator/wayang}/sqlite3/operators/Sqlite3TableSource.java    | 0
 .../apache/incubator/wayang}/sqlite3/platform/Sqlite3Platform.java        | 0
 .../apache/incubator/wayang}/sqlite3/plugin/Sqlite3ConversionPlugin.java  | 0
 .../apache/incubator/wayang}/sqlite3/plugin/Sqlite3Plugin.java            | 0
 .../apache/incubator/wayang}/profiler/data/DataGenerators.java            | 0
 .../apache/incubator/wayang}/profiler/hardware/DiskProfiler.java          | 0
 .../apache/incubator/wayang}/profiler/java/BinaryOperatorProfiler.java    | 0
 .../incubator/wayang}/profiler/java/JavaCollectionSourceProfiler.java     | 0
 .../incubator/wayang}/profiler/java/JavaTextFileSourceProfiler.java       | 0
 .../apache/incubator/wayang}/profiler/java/OperatorProfiler.java          | 0
 .../apache/incubator/wayang}/profiler/java/OperatorProfilers.java         | 0
 .../rheem => org/apache/incubator/wayang}/profiler/java/Profiler.java     | 0
 .../rheem => org/apache/incubator/wayang}/profiler/java/SinkProfiler.java | 0
 .../apache/incubator/wayang}/profiler/java/SourceProfiler.java            | 0
 .../apache/incubator/wayang}/profiler/java/UnaryOperatorProfiler.java     | 0
 .../apache/incubator/wayang}/profiler/log/DynamicEstimationContext.java   | 0
 .../apache/incubator/wayang}/profiler/log/DynamicLoadEstimator.java       | 0
 .../incubator/wayang}/profiler/log/DynamicLoadProfileEstimator.java       | 0
 .../incubator/wayang}/profiler/log/DynamicLoadProfileEstimators.java      | 0
 .../apache/incubator/wayang}/profiler/log/GeneticOptimizer.java           | 0
 .../apache/incubator/wayang}/profiler/log/GeneticOptimizerApp.java        | 0
 .../rheem => org/apache/incubator/wayang}/profiler/log/Individual.java    | 0
 .../rheem => org/apache/incubator/wayang}/profiler/log/LogEvaluator.java  | 0
 .../apache/incubator/wayang}/profiler/log/OptimizationSpace.java          | 0
 .../rheem => org/apache/incubator/wayang}/profiler/log/Variable.java      | 0
 .../apache/incubator/wayang}/profiler/log/sampling/Battle.java            | 0
 .../apache/incubator/wayang}/profiler/log/sampling/ReservoirSampler.java  | 0
 .../apache/incubator/wayang}/profiler/log/sampling/Sampler.java           | 0
 .../apache/incubator/wayang}/profiler/log/sampling/TournamentSampler.java | 0
 .../apache/incubator/wayang}/profiler/spark/BinaryOperatorProfiler.java   | 0
 .../rheem/rheem => org/apache/incubator/wayang}/profiler/spark/Main.java  | 0
 .../apache/incubator/wayang}/profiler/spark/OperatorProfilers.java        | 0
 .../apache/incubator/wayang}/profiler/spark/SinkProfiler.java             | 0
 .../incubator/wayang}/profiler/spark/SparkCollectionSourceProfiler.java   | 0
 .../apache/incubator/wayang}/profiler/spark/SparkOperatorProfiler.java    | 0
 .../apache/incubator/wayang}/profiler/spark/SparkSourceProfiler.java      | 0
 .../incubator/wayang}/profiler/spark/SparkTextFileSourceProfiler.java     | 0
 .../incubator/wayang}/profiler/spark/SparkUnaryOperatorProfiler.java      | 0
 .../apache/incubator/wayang}/profiler/util/ProfilingUtils.java            | 0
 .../rheem => org/apache/incubator/wayang}/profiler/util/RrdAccessor.java  | 0
 .../org/apache/incubator/wayang}/tests/FlinkIntegrationIT.java            | 0
 .../org/apache/incubator/wayang}/tests/FullIntegrationIT.java             | 0
 .../org/apache/incubator/wayang}/tests/GiraphIntegrationIT.java           | 0
 .../org/apache/incubator/wayang}/tests/GraphChiIntegrationIT.java         | 0
 .../org/apache/incubator/wayang}/tests/JavaIntegrationIT.java             | 0
 .../org/apache/incubator/wayang}/tests/PostgresIntegrationIT.java         | 0
 .../rheem => org/org/apache/incubator/wayang}/tests/RegressionIT.java     | 0
 .../org/apache/incubator/wayang}/tests/SparkIntegrationIT.java            | 0
 .../org/apache/incubator/wayang/tests/WayangPlans.java}                   | 0
 .../org/apache/incubator/wayang/tests/WayangPlansOperators.java}          | 0
 .../rheem => org/org/apache/incubator/wayang}/tests/WordCountIT.java      | 0
 .../org/apache/incubator/wayang}/tests/platform/MyMadeUpPlatform.java     | 0
 757 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/rheem-api/src/main/scala/io/rheem/rheem/api/DataQuanta.scala b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/DataQuanta.scala
similarity index 100%
rename from rheem-api/src/main/scala/io/rheem/rheem/api/DataQuanta.scala
rename to rheem-api/src/main/scala/org/apache/incubator/wayang/api/DataQuanta.scala
diff --git a/rheem-api/src/main/scala/io/rheem/rheem/api/DataQuantaBuilder.scala b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/DataQuantaBuilder.scala
similarity index 100%
rename from rheem-api/src/main/scala/io/rheem/rheem/api/DataQuantaBuilder.scala
rename to rheem-api/src/main/scala/org/apache/incubator/wayang/api/DataQuantaBuilder.scala
diff --git a/rheem-api/src/main/scala/io/rheem/rheem/api/JavaPlanBuilder.scala b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/JavaPlanBuilder.scala
similarity index 100%
rename from rheem-api/src/main/scala/io/rheem/rheem/api/JavaPlanBuilder.scala
rename to rheem-api/src/main/scala/org/apache/incubator/wayang/api/JavaPlanBuilder.scala
diff --git a/rheem-api/src/main/scala/io/rheem/rheem/api/PlanBuilder.scala b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/PlanBuilder.scala
similarity index 100%
rename from rheem-api/src/main/scala/io/rheem/rheem/api/PlanBuilder.scala
rename to rheem-api/src/main/scala/org/apache/incubator/wayang/api/PlanBuilder.scala
diff --git a/rheem-api/src/main/scala/io/rheem/rheem/api/RecordDataQuanta.scala b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/RecordDataQuanta.scala
similarity index 100%
rename from rheem-api/src/main/scala/io/rheem/rheem/api/RecordDataQuanta.scala
rename to rheem-api/src/main/scala/org/apache/incubator/wayang/api/RecordDataQuanta.scala
diff --git a/rheem-api/src/main/scala/io/rheem/rheem/api/RecordDataQuantaBuilder.scala b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/RecordDataQuantaBuilder.scala
similarity index 100%
rename from rheem-api/src/main/scala/io/rheem/rheem/api/RecordDataQuantaBuilder.scala
rename to rheem-api/src/main/scala/org/apache/incubator/wayang/api/RecordDataQuantaBuilder.scala
diff --git a/rheem-api/src/main/scala/io/rheem/rheem/api/graph/Edge.scala b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/graph/Edge.scala
similarity index 100%
rename from rheem-api/src/main/scala/io/rheem/rheem/api/graph/Edge.scala
rename to rheem-api/src/main/scala/org/apache/incubator/wayang/api/graph/Edge.scala
diff --git a/rheem-api/src/main/scala/io/rheem/rheem/api/graph/EdgeDataQuanta.scala b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/graph/EdgeDataQuanta.scala
similarity index 100%
rename from rheem-api/src/main/scala/io/rheem/rheem/api/graph/EdgeDataQuanta.scala
rename to rheem-api/src/main/scala/org/apache/incubator/wayang/api/graph/EdgeDataQuanta.scala
diff --git a/rheem-api/src/main/scala/io/rheem/rheem/api/graph/EdgeDataQuantaBuilder.scala b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/graph/EdgeDataQuantaBuilder.scala
similarity index 100%
rename from rheem-api/src/main/scala/io/rheem/rheem/api/graph/EdgeDataQuantaBuilder.scala
rename to rheem-api/src/main/scala/org/apache/incubator/wayang/api/graph/EdgeDataQuantaBuilder.scala
diff --git a/rheem-api/src/main/scala/io/rheem/rheem/api/graph/package.scala b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/graph/package.scala
similarity index 100%
rename from rheem-api/src/main/scala/io/rheem/rheem/api/graph/package.scala
rename to rheem-api/src/main/scala/org/apache/incubator/wayang/api/graph/package.scala
diff --git a/rheem-api/src/main/scala/io/rheem/rheem/api/package.scala b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/package.scala
similarity index 100%
rename from rheem-api/src/main/scala/io/rheem/rheem/api/package.scala
rename to rheem-api/src/main/scala/org/apache/incubator/wayang/api/package.scala
diff --git a/rheem-api/src/main/scala/io/rheem/rheem/api/util/DataQuantaBuilderCache.scala b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/util/DataQuantaBuilderCache.scala
similarity index 100%
rename from rheem-api/src/main/scala/io/rheem/rheem/api/util/DataQuantaBuilderCache.scala
rename to rheem-api/src/main/scala/org/apache/incubator/wayang/api/util/DataQuantaBuilderCache.scala
diff --git a/rheem-api/src/main/scala/io/rheem/rheem/api/util/DataQuantaBuilderDecorator.scala b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/util/DataQuantaBuilderDecorator.scala
similarity index 100%
rename from rheem-api/src/main/scala/io/rheem/rheem/api/util/DataQuantaBuilderDecorator.scala
rename to rheem-api/src/main/scala/org/apache/incubator/wayang/api/util/DataQuantaBuilderDecorator.scala
diff --git a/rheem-api/src/main/scala/io/rheem/rheem/api/util/TypeTrap.scala b/rheem-api/src/main/scala/org/apache/incubator/wayang/api/util/TypeTrap.scala
similarity index 100%
rename from rheem-api/src/main/scala/io/rheem/rheem/api/util/TypeTrap.scala
rename to rheem-api/src/main/scala/org/apache/incubator/wayang/api/util/TypeTrap.scala
diff --git a/rheem-api/src/test/java/io/rheem/rheem/api/JavaApiTest.java b/rheem-api/src/test/java/org/apache/incubator/wayang/api/JavaApiTest.java
similarity index 100%
rename from rheem-api/src/test/java/io/rheem/rheem/api/JavaApiTest.java
rename to rheem-api/src/test/java/org/apache/incubator/wayang/api/JavaApiTest.java
diff --git a/rheem-api/src/test/scala/io/rheem/rheem/api/ApiTest.scala b/rheem-api/src/test/scala/org/apache/incubator/wayang/api/ApiTest.scala
similarity index 100%
rename from rheem-api/src/test/scala/io/rheem/rheem/api/ApiTest.scala
rename to rheem-api/src/test/scala/org/apache/incubator/wayang/api/ApiTest.scala
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/RheemBasics.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/WayangBasics.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/RheemBasics.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/WayangBasics.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/channels/FileChannel.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/channels/FileChannel.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/channels/FileChannel.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/channels/FileChannel.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/data/Record.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/data/Record.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/data/Record.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/data/Record.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/data/Tuple2.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/data/Tuple2.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/data/Tuple2.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/data/Tuple2.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/data/Tuple5.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/data/Tuple5.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/data/Tuple5.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/data/Tuple5.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/function/ProjectionDescriptor.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/function/ProjectionDescriptor.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/function/ProjectionDescriptor.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/function/ProjectionDescriptor.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/mapping/GlobalReduceMapping.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/GlobalReduceMapping.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/mapping/GlobalReduceMapping.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/GlobalReduceMapping.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/mapping/Mappings.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/Mappings.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/mapping/Mappings.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/Mappings.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/mapping/MaterializedGroupByMapping.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/MaterializedGroupByMapping.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/mapping/MaterializedGroupByMapping.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/MaterializedGroupByMapping.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/mapping/PageRankMapping.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/PageRankMapping.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/mapping/PageRankMapping.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/PageRankMapping.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/mapping/ReduceByMapping.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/ReduceByMapping.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/mapping/ReduceByMapping.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/ReduceByMapping.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/mapping/RepeatMapping.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/RepeatMapping.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/mapping/RepeatMapping.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/RepeatMapping.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/operators/CartesianOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CartesianOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/operators/CartesianOperator.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CartesianOperator.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/operators/CoGroupOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CoGroupOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/operators/CoGroupOperator.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CoGroupOperator.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/operators/CollectionSource.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CollectionSource.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/operators/CollectionSource.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CollectionSource.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/operators/CountOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CountOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/operators/CountOperator.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CountOperator.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/operators/DistinctOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/DistinctOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/operators/DistinctOperator.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/DistinctOperator.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/operators/DoWhileOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/DoWhileOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/operators/DoWhileOperator.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/DoWhileOperator.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/operators/FilterOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/FilterOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/operators/FilterOperator.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/FilterOperator.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/operators/FlatMapOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/FlatMapOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/operators/FlatMapOperator.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/FlatMapOperator.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/operators/GlobalMaterializedGroupOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/GlobalMaterializedGroupOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/operators/GlobalMaterializedGroupOperator.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/GlobalMaterializedGroupOperator.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/operators/GlobalReduceOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/GlobalReduceOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/operators/GlobalReduceOperator.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/GlobalReduceOperator.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/operators/GroupByOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/GroupByOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/operators/GroupByOperator.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/GroupByOperator.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/operators/IntersectOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/IntersectOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/operators/IntersectOperator.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/IntersectOperator.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/operators/JoinOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/JoinOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/operators/JoinOperator.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/JoinOperator.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/operators/LocalCallbackSink.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/LocalCallbackSink.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/operators/LocalCallbackSink.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/LocalCallbackSink.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/operators/LoopOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/LoopOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/operators/LoopOperator.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/LoopOperator.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/operators/MapOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/MapOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/operators/MapOperator.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/MapOperator.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/operators/MapPartitionsOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/MapPartitionsOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/operators/MapPartitionsOperator.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/MapPartitionsOperator.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/operators/MaterializedGroupByOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/MaterializedGroupByOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/operators/MaterializedGroupByOperator.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/MaterializedGroupByOperator.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/operators/PageRankOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/PageRankOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/operators/PageRankOperator.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/PageRankOperator.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/operators/ReduceByOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/ReduceByOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/operators/ReduceByOperator.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/ReduceByOperator.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/operators/ReduceOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/ReduceOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/operators/ReduceOperator.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/ReduceOperator.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/operators/RepeatOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/RepeatOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/operators/RepeatOperator.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/RepeatOperator.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/operators/SampleOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/SampleOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/operators/SampleOperator.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/SampleOperator.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/operators/SortOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/SortOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/operators/SortOperator.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/SortOperator.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/operators/TableSource.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/TableSource.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/operators/TableSource.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/TableSource.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/operators/TextFileSink.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/TextFileSink.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/operators/TextFileSink.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/TextFileSink.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/operators/TextFileSource.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/TextFileSource.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/operators/TextFileSource.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/TextFileSource.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/operators/UnionAllOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/UnionAllOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/operators/UnionAllOperator.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/UnionAllOperator.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/operators/ZipWithIdOperator.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/ZipWithIdOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/operators/ZipWithIdOperator.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/ZipWithIdOperator.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/plugin/RheemBasic.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/plugin/WayangBasic.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/plugin/RheemBasic.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/plugin/WayangBasic.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/plugin/RheemBasicGraph.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/plugin/WayangBasicGraph.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/plugin/RheemBasicGraph.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/plugin/WayangBasicGraph.java
diff --git a/rheem-basic/src/main/java/io/rheem/rheem/basic/types/RecordType.java b/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/types/RecordType.java
similarity index 100%
rename from rheem-basic/src/main/java/io/rheem/rheem/basic/types/RecordType.java
rename to rheem-basic/src/main/java/org/apache/incubator/wayang/basic/types/RecordType.java
diff --git a/rheem-basic/src/test/java/io/rheem/rheem/basic/function/ProjectionDescriptorTest.java b/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/function/ProjectionDescriptorTest.java
similarity index 100%
rename from rheem-basic/src/test/java/io/rheem/rheem/basic/function/ProjectionDescriptorTest.java
rename to rheem-basic/src/test/java/org/apache/incubator/wayang/basic/function/ProjectionDescriptorTest.java
diff --git a/rheem-basic/src/test/java/io/rheem/rheem/basic/mapping/ReduceByMappingTest.java b/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/mapping/ReduceByMappingTest.java
similarity index 100%
rename from rheem-basic/src/test/java/io/rheem/rheem/basic/mapping/ReduceByMappingTest.java
rename to rheem-basic/src/test/java/org/apache/incubator/wayang/basic/mapping/ReduceByMappingTest.java
diff --git a/rheem-basic/src/test/java/io/rheem/rheem/basic/operators/MaterializedGroupByOperatorTest.java b/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/operators/MaterializedGroupByOperatorTest.java
similarity index 100%
rename from rheem-basic/src/test/java/io/rheem/rheem/basic/operators/MaterializedGroupByOperatorTest.java
rename to rheem-basic/src/test/java/org/apache/incubator/wayang/basic/operators/MaterializedGroupByOperatorTest.java
diff --git a/rheem-basic/src/test/java/io/rheem/rheem/basic/operators/TextFileSourceTest.java b/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/operators/TextFileSourceTest.java
similarity index 100%
rename from rheem-basic/src/test/java/io/rheem/rheem/basic/operators/TextFileSourceTest.java
rename to rheem-basic/src/test/java/org/apache/incubator/wayang/basic/operators/TextFileSourceTest.java
diff --git a/rheem-basic/src/test/java/io/rheem/rheem/basic/operators/test/TestSink.java b/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/operators/test/TestSink.java
similarity index 100%
rename from rheem-basic/src/test/java/io/rheem/rheem/basic/operators/test/TestSink.java
rename to rheem-basic/src/test/java/org/apache/incubator/wayang/basic/operators/test/TestSink.java
diff --git a/rheem-basic/src/test/java/io/rheem/rheem/basic/operators/test/TestSource.java b/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/operators/test/TestSource.java
similarity index 100%
rename from rheem-basic/src/test/java/io/rheem/rheem/basic/operators/test/TestSource.java
rename to rheem-basic/src/test/java/org/apache/incubator/wayang/basic/operators/test/TestSource.java
diff --git a/rheem-basic/src/test/java/io/rheem/rheem/basic/types/RecordTypeTest.java b/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/types/RecordTypeTest.java
similarity index 100%
rename from rheem-basic/src/test/java/io/rheem/rheem/basic/types/RecordTypeTest.java
rename to rheem-basic/src/test/java/org/apache/incubator/wayang/basic/types/RecordTypeTest.java
diff --git a/rheem-core/src/main/antlr4/io/rheem/rheem/core/mathex/MathEx.g4 b/rheem-core/src/main/antlr4/org/apache/incubator/wayang/core/mathex/MathEx.g4
similarity index 100%
rename from rheem-core/src/main/antlr4/io/rheem/rheem/core/mathex/MathEx.g4
rename to rheem-core/src/main/antlr4/org/apache/incubator/wayang/core/mathex/MathEx.g4
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/api/Configuration.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/Configuration.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/api/Configuration.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/api/Configuration.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/api/Job.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/Job.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/api/Job.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/api/Job.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/api/RheemContext.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/WayangContext.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/api/RheemContext.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/api/WayangContext.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/api/configuration/CollectionProvider.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/CollectionProvider.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/api/configuration/CollectionProvider.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/CollectionProvider.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/api/configuration/ConstantValueProvider.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/ConstantValueProvider.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/api/configuration/ConstantValueProvider.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/ConstantValueProvider.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/api/configuration/ExplicitCollectionProvider.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/ExplicitCollectionProvider.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/api/configuration/ExplicitCollectionProvider.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/ExplicitCollectionProvider.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/api/configuration/FunctionalCollectionProvider.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/FunctionalCollectionProvider.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/api/configuration/FunctionalCollectionProvider.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/FunctionalCollectionProvider.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/api/configuration/FunctionalKeyValueProvider.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/FunctionalKeyValueProvider.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/api/configuration/FunctionalKeyValueProvider.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/FunctionalKeyValueProvider.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/api/configuration/FunctionalValueProvider.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/FunctionalValueProvider.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/api/configuration/FunctionalValueProvider.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/FunctionalValueProvider.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/api/configuration/KeyValueProvider.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/KeyValueProvider.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/api/configuration/KeyValueProvider.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/KeyValueProvider.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/api/configuration/MapBasedKeyValueProvider.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/MapBasedKeyValueProvider.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/api/configuration/MapBasedKeyValueProvider.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/MapBasedKeyValueProvider.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/api/configuration/ValueProvider.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/ValueProvider.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/api/configuration/ValueProvider.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/ValueProvider.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/api/exception/RheemException.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/exception/WayangException.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/api/exception/RheemException.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/api/exception/WayangException.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/function/AggregationDescriptor.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/AggregationDescriptor.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/function/AggregationDescriptor.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/function/AggregationDescriptor.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/function/ConsumerDescriptor.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/ConsumerDescriptor.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/function/ConsumerDescriptor.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/function/ConsumerDescriptor.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/function/ExecutionContext.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/ExecutionContext.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/function/ExecutionContext.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/function/ExecutionContext.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/function/ExtendedFunction.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/ExtendedFunction.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/function/ExtendedFunction.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/function/ExtendedFunction.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/function/FlatMapDescriptor.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/FlatMapDescriptor.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/function/FlatMapDescriptor.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/function/FlatMapDescriptor.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/function/FunctionDescriptor.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/FunctionDescriptor.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/function/FunctionDescriptor.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/function/FunctionDescriptor.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/function/MapPartitionsDescriptor.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/MapPartitionsDescriptor.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/function/MapPartitionsDescriptor.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/function/MapPartitionsDescriptor.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/function/PredicateDescriptor.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/PredicateDescriptor.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/function/PredicateDescriptor.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/function/PredicateDescriptor.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/function/ReduceDescriptor.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/ReduceDescriptor.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/function/ReduceDescriptor.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/function/ReduceDescriptor.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/function/TransformationDescriptor.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/TransformationDescriptor.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/function/TransformationDescriptor.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/function/TransformationDescriptor.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/mapping/Mapping.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/Mapping.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/mapping/Mapping.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/Mapping.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/mapping/OperatorMatch.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/OperatorMatch.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/mapping/OperatorMatch.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/OperatorMatch.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/mapping/OperatorPattern.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/OperatorPattern.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/mapping/OperatorPattern.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/OperatorPattern.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/mapping/PlanTransformation.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/PlanTransformation.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/mapping/PlanTransformation.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/PlanTransformation.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/mapping/ReplacementSubplanFactory.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/ReplacementSubplanFactory.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/mapping/ReplacementSubplanFactory.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/ReplacementSubplanFactory.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/mapping/SubplanMatch.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/SubplanMatch.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/mapping/SubplanMatch.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/SubplanMatch.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/mapping/SubplanPattern.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/SubplanPattern.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/mapping/SubplanPattern.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/SubplanPattern.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/monitor/DisabledMonitor.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/DisabledMonitor.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/monitor/DisabledMonitor.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/DisabledMonitor.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/monitor/FileMonitor.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/FileMonitor.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/monitor/FileMonitor.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/FileMonitor.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/monitor/HttpMonitor.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/HttpMonitor.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/monitor/HttpMonitor.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/HttpMonitor.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/monitor/Monitor.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/Monitor.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/monitor/Monitor.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/Monitor.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/monitor/ZeroMQMonitor.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/ZeroMQMonitor.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/monitor/ZeroMQMonitor.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/ZeroMQMonitor.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/AggregateOptimizationContext.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/AggregateOptimizationContext.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/AggregateOptimizationContext.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/AggregateOptimizationContext.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/DefaultOptimizationContext.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/DefaultOptimizationContext.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/DefaultOptimizationContext.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/DefaultOptimizationContext.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/OptimizationContext.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/OptimizationContext.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/OptimizationContext.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/OptimizationContext.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/OptimizationUtils.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/OptimizationUtils.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/OptimizationUtils.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/OptimizationUtils.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/ProbabilisticDoubleInterval.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/ProbabilisticDoubleInterval.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/ProbabilisticDoubleInterval.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/ProbabilisticDoubleInterval.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/ProbabilisticIntervalEstimate.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/ProbabilisticIntervalEstimate.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/ProbabilisticIntervalEstimate.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/ProbabilisticIntervalEstimate.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/SanityChecker.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/SanityChecker.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/SanityChecker.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/SanityChecker.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/cardinality/AbstractAlternativeCardinalityPusher.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/AbstractAlternativeCardinalityPusher.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/cardinality/AbstractAlternativeCardinalityPusher.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/AbstractAlternativeCardinalityPusher.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/cardinality/AggregatingCardinalityEstimator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/AggregatingCardinalityEstimator.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/cardinality/AggregatingCardinalityEstimator.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/AggregatingCardinalityEstimator.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/cardinality/CardinalityEstimate.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimate.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/cardinality/CardinalityEstimate.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimate.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/cardinality/CardinalityEstimationTraversal.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimationTraversal.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/cardinality/CardinalityEstimationTraversal.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimationTraversal.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/cardinality/CardinalityEstimator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimator.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/cardinality/CardinalityEstimator.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimator.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/cardinality/CardinalityEstimatorManager.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimatorManager.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/cardinality/CardinalityEstimatorManager.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimatorManager.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/cardinality/CardinalityPusher.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityPusher.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/cardinality/CardinalityPusher.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityPusher.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/cardinality/DefaultCardinalityEstimator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/DefaultCardinalityEstimator.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/cardinality/DefaultCardinalityEstimator.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/DefaultCardinalityEstimator.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/cardinality/DefaultCardinalityPusher.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/DefaultCardinalityPusher.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/cardinality/DefaultCardinalityPusher.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/DefaultCardinalityPusher.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/cardinality/FallbackCardinalityEstimator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/FallbackCardinalityEstimator.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/cardinality/FallbackCardinalityEstimator.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/FallbackCardinalityEstimator.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/cardinality/FixedSizeCardinalityEstimator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/FixedSizeCardinalityEstimator.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/cardinality/FixedSizeCardinalityEstimator.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/FixedSizeCardinalityEstimator.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/cardinality/LoopHeadAlternativeCardinalityPusher.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/LoopHeadAlternativeCardinalityPusher.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/cardinality/LoopHeadAlternativeCardinalityPusher.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/LoopHeadAlternativeCardinalityPusher.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/cardinality/LoopSubplanCardinalityPusher.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/LoopSubplanCardinalityPusher.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/cardinality/LoopSubplanCardinalityPusher.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/LoopSubplanCardinalityPusher.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/cardinality/OperatorAlternativeCardinalityPusher.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/OperatorAlternativeCardinalityPusher.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/cardinality/OperatorAlternativeCardinalityPusher.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/OperatorAlternativeCardinalityPusher.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/cardinality/SubplanCardinalityPusher.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/SubplanCardinalityPusher.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/cardinality/SubplanCardinalityPusher.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/SubplanCardinalityPusher.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/cardinality/SwitchForwardCardinalityEstimator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/SwitchForwardCardinalityEstimator.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/cardinality/SwitchForwardCardinalityEstimator.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/SwitchForwardCardinalityEstimator.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/channels/ChannelConversion.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/channels/ChannelConversion.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/channels/ChannelConversion.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/channels/ChannelConversion.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/channels/ChannelConversionGraph.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/channels/ChannelConversionGraph.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/channels/ChannelConversionGraph.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/channels/ChannelConversionGraph.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/channels/DefaultChannelConversion.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/channels/DefaultChannelConversion.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/channels/DefaultChannelConversion.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/channels/DefaultChannelConversion.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/costs/ConstantLoadProfileEstimator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/ConstantLoadProfileEstimator.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/costs/ConstantLoadProfileEstimator.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/ConstantLoadProfileEstimator.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/costs/DefaultLoadEstimator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/DefaultLoadEstimator.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/costs/DefaultLoadEstimator.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/DefaultLoadEstimator.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/costs/EstimationContext.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/EstimationContext.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/costs/EstimationContext.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/EstimationContext.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/costs/IntervalLoadEstimator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/IntervalLoadEstimator.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/costs/IntervalLoadEstimator.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/IntervalLoadEstimator.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/costs/LoadEstimate.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadEstimate.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/costs/LoadEstimate.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadEstimate.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/costs/LoadEstimator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadEstimator.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/costs/LoadEstimator.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadEstimator.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/costs/LoadProfile.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfile.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/costs/LoadProfile.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfile.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/costs/LoadProfileEstimator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfileEstimator.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/costs/LoadProfileEstimator.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfileEstimator.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/costs/LoadProfileEstimators.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfileEstimators.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/costs/LoadProfileEstimators.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfileEstimators.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/costs/LoadProfileToTimeConverter.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfileToTimeConverter.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/costs/LoadProfileToTimeConverter.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfileToTimeConverter.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/costs/LoadToTimeConverter.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadToTimeConverter.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/costs/LoadToTimeConverter.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadToTimeConverter.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/costs/NestableLoadProfileEstimator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/NestableLoadProfileEstimator.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/costs/NestableLoadProfileEstimator.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/NestableLoadProfileEstimator.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/costs/SimpleEstimationContext.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/SimpleEstimationContext.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/costs/SimpleEstimationContext.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/SimpleEstimationContext.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/costs/TimeEstimate.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/TimeEstimate.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/costs/TimeEstimate.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/TimeEstimate.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/costs/TimeToCostConverter.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/TimeToCostConverter.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/costs/TimeToCostConverter.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/TimeToCostConverter.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/enumeration/ExecutionTaskFlow.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/ExecutionTaskFlow.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/enumeration/ExecutionTaskFlow.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/ExecutionTaskFlow.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/enumeration/ExecutionTaskFlowCompiler.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/ExecutionTaskFlowCompiler.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/enumeration/ExecutionTaskFlowCompiler.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/ExecutionTaskFlowCompiler.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/enumeration/LatentOperatorPruningStrategy.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/LatentOperatorPruningStrategy.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/enumeration/LatentOperatorPruningStrategy.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/LatentOperatorPruningStrategy.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/enumeration/LoopEnumerator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/LoopEnumerator.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/enumeration/LoopEnumerator.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/LoopEnumerator.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/enumeration/LoopImplementation.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/LoopImplementation.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/enumeration/LoopImplementation.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/LoopImplementation.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/enumeration/PlanEnumeration.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanEnumeration.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/enumeration/PlanEnumeration.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanEnumeration.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/enumeration/PlanEnumerationPruningStrategy.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanEnumerationPruningStrategy.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/enumeration/PlanEnumerationPruningStrategy.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanEnumerationPruningStrategy.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/enumeration/PlanEnumerator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanEnumerator.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/enumeration/PlanEnumerator.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanEnumerator.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/enumeration/PlanImplementation.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanImplementation.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/enumeration/PlanImplementation.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanImplementation.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/enumeration/RandomPruningStrategy.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/RandomPruningStrategy.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/enumeration/RandomPruningStrategy.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/RandomPruningStrategy.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/enumeration/SinglePlatformPruningStrategy.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/SinglePlatformPruningStrategy.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/enumeration/SinglePlatformPruningStrategy.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/SinglePlatformPruningStrategy.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/enumeration/StageAssignmentTraversal.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/StageAssignmentTraversal.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/enumeration/StageAssignmentTraversal.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/StageAssignmentTraversal.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/enumeration/TopKPruningStrategy.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/TopKPruningStrategy.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/enumeration/TopKPruningStrategy.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/TopKPruningStrategy.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/partition/EnumerationAlternative.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/partition/EnumerationAlternative.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/partition/EnumerationAlternative.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/partition/EnumerationAlternative.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/optimizer/partition/EnumerationBranch.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/partition/EnumerationBranch.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/optimizer/partition/EnumerationBranch.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/partition/EnumerationBranch.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plan/executionplan/Channel.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/Channel.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plan/executionplan/Channel.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/Channel.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plan/executionplan/ChannelInitializer.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ChannelInitializer.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plan/executionplan/ChannelInitializer.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ChannelInitializer.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plan/executionplan/ExecutionPlan.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionPlan.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plan/executionplan/ExecutionPlan.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionPlan.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plan/executionplan/ExecutionStage.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionStage.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plan/executionplan/ExecutionStage.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionStage.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plan/executionplan/ExecutionStageLoop.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionStageLoop.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plan/executionplan/ExecutionStageLoop.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionStageLoop.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plan/executionplan/ExecutionTask.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionTask.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plan/executionplan/ExecutionTask.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionTask.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plan/executionplan/PlatformExecution.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/PlatformExecution.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plan/executionplan/PlatformExecution.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/PlatformExecution.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/ActualOperator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/ActualOperator.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/ActualOperator.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/ActualOperator.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/BinaryToUnaryOperator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/BinaryToUnaryOperator.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/BinaryToUnaryOperator.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/BinaryToUnaryOperator.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/CompositeOperator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/CompositeOperator.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/CompositeOperator.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/CompositeOperator.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/ElementaryOperator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/ElementaryOperator.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/ElementaryOperator.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/ElementaryOperator.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/EstimationContextProperty.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/EstimationContextProperty.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/EstimationContextProperty.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/EstimationContextProperty.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/ExecutionOperator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/ExecutionOperator.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/ExecutionOperator.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/ExecutionOperator.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/InputSlot.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/InputSlot.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/InputSlot.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/InputSlot.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/LoopHeadAlternative.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/LoopHeadAlternative.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/LoopHeadAlternative.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/LoopHeadAlternative.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/LoopHeadOperator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/LoopHeadOperator.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/LoopHeadOperator.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/LoopHeadOperator.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/LoopIsolator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/LoopIsolator.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/LoopIsolator.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/LoopIsolator.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/LoopSubplan.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/LoopSubplan.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/LoopSubplan.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/LoopSubplan.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/Operator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/Operator.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/Operator.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/Operator.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/OperatorAlternative.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OperatorAlternative.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/OperatorAlternative.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OperatorAlternative.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/OperatorBase.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OperatorBase.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/OperatorBase.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OperatorBase.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/OperatorContainer.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OperatorContainer.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/OperatorContainer.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OperatorContainer.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/OperatorContainers.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OperatorContainers.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/OperatorContainers.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OperatorContainers.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/Operators.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/Operators.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/Operators.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/Operators.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/OutputSlot.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OutputSlot.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/OutputSlot.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OutputSlot.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/PlanMetrics.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/PlanMetrics.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/PlanMetrics.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/PlanMetrics.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/PlanTraversal.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/PlanTraversal.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/PlanTraversal.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/PlanTraversal.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/Slot.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/Slot.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/Slot.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/Slot.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/SlotMapping.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/SlotMapping.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/SlotMapping.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/SlotMapping.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/Subplan.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/Subplan.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/Subplan.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/Subplan.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/TopDownPlanVisitor.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/TopDownPlanVisitor.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/TopDownPlanVisitor.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/TopDownPlanVisitor.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/UnarySink.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/UnarySink.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/UnarySink.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/UnarySink.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/UnarySource.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/UnarySource.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/UnarySource.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/UnarySource.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/UnaryToUnaryOperator.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/UnaryToUnaryOperator.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/UnaryToUnaryOperator.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/UnaryToUnaryOperator.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/RheemPlan.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/WayangPlan.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/RheemPlan.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/WayangPlan.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/traversal/AbstractTopologicalTraversal.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/traversal/AbstractTopologicalTraversal.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plan/rheemplan/traversal/AbstractTopologicalTraversal.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/traversal/AbstractTopologicalTraversal.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/platform/AbstractChannelInstance.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/AbstractChannelInstance.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/platform/AbstractChannelInstance.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/AbstractChannelInstance.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/platform/AtomicExecution.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/AtomicExecution.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/platform/AtomicExecution.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/AtomicExecution.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/platform/AtomicExecutionGroup.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/AtomicExecutionGroup.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/platform/AtomicExecutionGroup.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/AtomicExecutionGroup.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/platform/Breakpoint.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/Breakpoint.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/platform/Breakpoint.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/Breakpoint.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/platform/CardinalityBreakpoint.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/CardinalityBreakpoint.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/platform/CardinalityBreakpoint.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/CardinalityBreakpoint.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/platform/ChannelDescriptor.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/ChannelDescriptor.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/platform/ChannelDescriptor.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/ChannelDescriptor.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/platform/ChannelInstance.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/ChannelInstance.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/platform/ChannelInstance.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/ChannelInstance.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/platform/CompositeExecutionResource.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/CompositeExecutionResource.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/platform/CompositeExecutionResource.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/CompositeExecutionResource.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/platform/ConjunctiveBreakpoint.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/ConjunctiveBreakpoint.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/platform/ConjunctiveBreakpoint.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/ConjunctiveBreakpoint.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/platform/CrossPlatformExecutor.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/CrossPlatformExecutor.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/platform/CrossPlatformExecutor.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/CrossPlatformExecutor.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/platform/ExecutionResource.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/ExecutionResource.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/platform/ExecutionResource.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/ExecutionResource.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/platform/ExecutionResourceTemplate.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/ExecutionResourceTemplate.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/platform/ExecutionResourceTemplate.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/ExecutionResourceTemplate.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/platform/ExecutionState.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/ExecutionState.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/platform/ExecutionState.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/ExecutionState.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/platform/Executor.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/Executor.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/platform/Executor.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/Executor.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/platform/ExecutorTemplate.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/ExecutorTemplate.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/platform/ExecutorTemplate.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/ExecutorTemplate.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/platform/FixBreakpoint.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/FixBreakpoint.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/platform/FixBreakpoint.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/FixBreakpoint.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/platform/Junction.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/Junction.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/platform/Junction.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/Junction.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/platform/NoIterationBreakpoint.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/NoIterationBreakpoint.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/platform/NoIterationBreakpoint.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/NoIterationBreakpoint.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/platform/PartialExecution.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/PartialExecution.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/platform/PartialExecution.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/PartialExecution.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/platform/Platform.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/Platform.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/platform/Platform.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/Platform.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/platform/PushExecutorTemplate.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/PushExecutorTemplate.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/platform/PushExecutorTemplate.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/PushExecutorTemplate.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/platform/lineage/ChannelLineageNode.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/lineage/ChannelLineageNode.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/platform/lineage/ChannelLineageNode.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/lineage/ChannelLineageNode.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/platform/lineage/ExecutionLineageNode.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/lineage/ExecutionLineageNode.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/platform/lineage/ExecutionLineageNode.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/lineage/ExecutionLineageNode.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/platform/lineage/LazyExecutionLineageNode.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/lineage/LazyExecutionLineageNode.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/platform/lineage/LazyExecutionLineageNode.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/lineage/LazyExecutionLineageNode.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plugin/DynamicPlugin.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plugin/DynamicPlugin.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plugin/DynamicPlugin.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plugin/DynamicPlugin.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/plugin/Plugin.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/plugin/Plugin.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/plugin/Plugin.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/plugin/Plugin.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/profiling/CardinalityRepository.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/CardinalityRepository.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/profiling/CardinalityRepository.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/CardinalityRepository.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/profiling/CostMeasurement.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/CostMeasurement.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/profiling/CostMeasurement.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/CostMeasurement.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/profiling/ExecutionLog.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/ExecutionLog.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/profiling/ExecutionLog.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/ExecutionLog.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/profiling/ExecutionPlanMeasurement.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/ExecutionPlanMeasurement.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/profiling/ExecutionPlanMeasurement.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/ExecutionPlanMeasurement.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/profiling/FullInstrumentationStrategy.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/FullInstrumentationStrategy.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/profiling/FullInstrumentationStrategy.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/FullInstrumentationStrategy.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/profiling/InstrumentationStrategy.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/InstrumentationStrategy.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/profiling/InstrumentationStrategy.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/InstrumentationStrategy.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/profiling/NoInstrumentationStrategy.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/NoInstrumentationStrategy.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/profiling/NoInstrumentationStrategy.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/NoInstrumentationStrategy.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/profiling/OutboundInstrumentationStrategy.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/OutboundInstrumentationStrategy.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/profiling/OutboundInstrumentationStrategy.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/OutboundInstrumentationStrategy.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/profiling/PartialExecutionMeasurement.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/PartialExecutionMeasurement.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/profiling/PartialExecutionMeasurement.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/PartialExecutionMeasurement.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/profiling/ProfileDBs.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/ProfileDBs.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/profiling/ProfileDBs.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/ProfileDBs.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/types/BasicDataUnitType.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/types/BasicDataUnitType.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/types/BasicDataUnitType.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/types/BasicDataUnitType.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/types/DataSetType.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/types/DataSetType.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/types/DataSetType.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/types/DataSetType.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/types/DataUnitGroupType.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/types/DataUnitGroupType.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/types/DataUnitGroupType.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/types/DataUnitGroupType.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/types/DataUnitType.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/types/DataUnitType.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/types/DataUnitType.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/types/DataUnitType.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/AbstractReferenceCountable.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/AbstractReferenceCountable.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/AbstractReferenceCountable.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/AbstractReferenceCountable.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/Action.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Action.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/Action.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Action.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/Actions.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Actions.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/Actions.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Actions.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/Bitmask.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Bitmask.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/Bitmask.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Bitmask.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/Canonicalizer.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Canonicalizer.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/Canonicalizer.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Canonicalizer.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/ConsumerIteratorAdapter.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/ConsumerIteratorAdapter.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/ConsumerIteratorAdapter.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/ConsumerIteratorAdapter.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/Copyable.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Copyable.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/Copyable.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Copyable.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/Counter.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Counter.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/Counter.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Counter.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/CrossProductIterable.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/CrossProductIterable.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/CrossProductIterable.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/CrossProductIterable.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/Formats.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Formats.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/Formats.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Formats.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/Iterators.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Iterators.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/Iterators.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Iterators.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/JsonSerializable.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/JsonSerializable.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/JsonSerializable.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/JsonSerializable.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/JsonSerializables.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/JsonSerializables.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/JsonSerializables.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/JsonSerializables.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/JsonSerializer.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/JsonSerializer.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/JsonSerializer.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/JsonSerializer.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/JuelUtils.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/JuelUtils.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/JuelUtils.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/JuelUtils.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/LimitedInputStream.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/LimitedInputStream.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/LimitedInputStream.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/LimitedInputStream.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/Logging.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Logging.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/Logging.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Logging.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/LruCache.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/LruCache.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/LruCache.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/LruCache.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/MultiMap.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/MultiMap.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/MultiMap.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/MultiMap.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/OneTimeExecutable.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/OneTimeExecutable.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/OneTimeExecutable.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/OneTimeExecutable.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/Optional.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Optional.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/Optional.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Optional.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/ReferenceCountable.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/ReferenceCountable.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/ReferenceCountable.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/ReferenceCountable.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/ReflectionUtils.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/ReflectionUtils.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/ReflectionUtils.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/ReflectionUtils.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/Tuple.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Tuple.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/Tuple.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Tuple.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/RheemArrays.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/WayangArrays.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/RheemArrays.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/WayangArrays.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/RheemCollections.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/WayangCollections.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/RheemCollections.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/WayangCollections.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/fs/FileSystem.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/fs/FileSystem.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/fs/FileSystem.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/fs/FileSystem.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/fs/FileSystems.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/fs/FileSystems.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/fs/FileSystems.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/fs/FileSystems.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/fs/FileUtils.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/fs/FileUtils.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/fs/FileUtils.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/fs/FileUtils.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/fs/HadoopFileSystem.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/fs/HadoopFileSystem.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/fs/HadoopFileSystem.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/fs/HadoopFileSystem.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/fs/LocalFileSystem.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/fs/LocalFileSystem.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/fs/LocalFileSystem.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/fs/LocalFileSystem.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/mathex/Context.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/Context.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/mathex/Context.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/Context.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/mathex/DefaultContext.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/DefaultContext.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/mathex/DefaultContext.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/DefaultContext.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/mathex/Expression.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/Expression.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/mathex/Expression.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/Expression.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/mathex/ExpressionBuilder.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/ExpressionBuilder.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/mathex/ExpressionBuilder.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/ExpressionBuilder.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/mathex/exceptions/EvaluationException.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/exceptions/EvaluationException.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/mathex/exceptions/EvaluationException.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/exceptions/EvaluationException.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/mathex/exceptions/MathExException.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/exceptions/MathExException.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/mathex/exceptions/MathExException.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/exceptions/MathExException.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/mathex/exceptions/ParseException.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/exceptions/ParseException.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/mathex/exceptions/ParseException.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/exceptions/ParseException.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/mathex/model/BinaryOperation.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/BinaryOperation.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/mathex/model/BinaryOperation.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/BinaryOperation.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/mathex/model/CompiledFunction.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/CompiledFunction.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/mathex/model/CompiledFunction.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/CompiledFunction.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/mathex/model/Constant.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/Constant.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/mathex/model/Constant.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/Constant.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/mathex/model/NamedFunction.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/NamedFunction.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/mathex/model/NamedFunction.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/NamedFunction.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/mathex/model/UnaryOperation.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/UnaryOperation.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/mathex/model/UnaryOperation.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/UnaryOperation.java
diff --git a/rheem-core/src/main/java/io/rheem/rheem/core/util/mathex/model/Variable.java b/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/Variable.java
similarity index 100%
rename from rheem-core/src/main/java/io/rheem/rheem/core/util/mathex/model/Variable.java
rename to rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/Variable.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/SlotTest.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/SlotTest.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/SlotTest.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/SlotTest.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/mapping/OperatorPatternTest.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/mapping/OperatorPatternTest.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/mapping/OperatorPatternTest.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/mapping/OperatorPatternTest.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/mapping/PlanTransformationTest.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/mapping/PlanTransformationTest.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/mapping/PlanTransformationTest.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/mapping/PlanTransformationTest.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/mapping/SubplanPatternTest.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/mapping/SubplanPatternTest.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/mapping/SubplanPatternTest.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/mapping/SubplanPatternTest.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/mapping/test/TestSinkMapping.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/mapping/test/TestSinkMapping.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/mapping/test/TestSinkMapping.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/mapping/test/TestSinkMapping.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/mapping/test/TestSinkToTestSink2Factory.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/mapping/test/TestSinkToTestSink2Factory.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/mapping/test/TestSinkToTestSink2Factory.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/mapping/test/TestSinkToTestSink2Factory.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/optimizer/cardinality/AggregatingCardinalityEstimatorTest.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/optimizer/cardinality/AggregatingCardinalityEstimatorTest.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/optimizer/cardinality/AggregatingCardinalityEstimatorTest.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/optimizer/cardinality/AggregatingCardinalityEstimatorTest.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/optimizer/cardinality/DefaultCardinalityEstimatorTest.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/optimizer/cardinality/DefaultCardinalityEstimatorTest.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/optimizer/cardinality/DefaultCardinalityEstimatorTest.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/optimizer/cardinality/DefaultCardinalityEstimatorTest.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/optimizer/cardinality/LoopSubplanCardinalityPusherTest.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/optimizer/cardinality/LoopSubplanCardinalityPusherTest.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/optimizer/cardinality/LoopSubplanCardinalityPusherTest.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/optimizer/cardinality/LoopSubplanCardinalityPusherTest.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/optimizer/cardinality/SubplanCardinalityPusherTest.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/optimizer/cardinality/SubplanCardinalityPusherTest.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/optimizer/cardinality/SubplanCardinalityPusherTest.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/optimizer/cardinality/SubplanCardinalityPusherTest.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/optimizer/channels/ChannelConversionGraphTest.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/optimizer/channels/ChannelConversionGraphTest.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/optimizer/channels/ChannelConversionGraphTest.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/optimizer/channels/ChannelConversionGraphTest.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/optimizer/costs/NestableLoadProfileEstimatorTest.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/optimizer/costs/NestableLoadProfileEstimatorTest.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/optimizer/costs/NestableLoadProfileEstimatorTest.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/optimizer/costs/NestableLoadProfileEstimatorTest.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/optimizer/enumeration/StageAssignmentTraversalTest.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/optimizer/enumeration/StageAssignmentTraversalTest.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/optimizer/enumeration/StageAssignmentTraversalTest.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/optimizer/enumeration/StageAssignmentTraversalTest.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/plan/executionplan/test/TestChannel.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/executionplan/test/TestChannel.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/plan/executionplan/test/TestChannel.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/executionplan/test/TestChannel.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/plan/rheemplan/LoopIsolatorTest.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/LoopIsolatorTest.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/plan/rheemplan/LoopIsolatorTest.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/LoopIsolatorTest.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/plan/rheemplan/OperatorTest.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/OperatorTest.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/plan/rheemplan/OperatorTest.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/OperatorTest.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/plan/rheemplan/SlotMappingTest.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/SlotMappingTest.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/plan/rheemplan/SlotMappingTest.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/SlotMappingTest.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/plan/rheemplan/test/TestCustomMapOperator.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/test/TestCustomMapOperator.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/plan/rheemplan/test/TestCustomMapOperator.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/test/TestCustomMapOperator.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/plan/rheemplan/test/TestFilterOperator.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/test/TestFilterOperator.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/plan/rheemplan/test/TestFilterOperator.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/test/TestFilterOperator.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/plan/rheemplan/test/TestJoin.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/test/TestJoin.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/plan/rheemplan/test/TestJoin.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/test/TestJoin.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/plan/rheemplan/test/TestLoopHead.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/test/TestLoopHead.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/plan/rheemplan/test/TestLoopHead.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/test/TestLoopHead.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/plan/rheemplan/test/TestMapOperator.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/test/TestMapOperator.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/plan/rheemplan/test/TestMapOperator.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/test/TestMapOperator.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/plan/rheemplan/test/TestSink.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/test/TestSink.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/plan/rheemplan/test/TestSink.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/test/TestSink.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/plan/rheemplan/test/TestSink2.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/test/TestSink2.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/plan/rheemplan/test/TestSink2.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/test/TestSink2.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/plan/rheemplan/test/TestSource.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/test/TestSource.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/plan/rheemplan/test/TestSource.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/test/TestSource.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/platform/PartialExecutionTest.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/platform/PartialExecutionTest.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/platform/PartialExecutionTest.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/platform/PartialExecutionTest.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/plugin/DynamicPluginTest.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/plugin/DynamicPluginTest.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/plugin/DynamicPluginTest.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/plugin/DynamicPluginTest.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/test/DummyExecutionOperator.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/test/DummyExecutionOperator.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/test/DummyExecutionOperator.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/test/DummyExecutionOperator.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/test/DummyExternalReusableChannel.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/test/DummyExternalReusableChannel.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/test/DummyExternalReusableChannel.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/test/DummyExternalReusableChannel.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/test/DummyNonReusableChannel.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/test/DummyNonReusableChannel.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/test/DummyNonReusableChannel.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/test/DummyNonReusableChannel.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/test/DummyPlatform.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/test/DummyPlatform.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/test/DummyPlatform.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/test/DummyPlatform.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/test/DummyReusableChannel.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/test/DummyReusableChannel.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/test/DummyReusableChannel.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/test/DummyReusableChannel.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/test/MockFactory.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/test/MockFactory.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/test/MockFactory.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/test/MockFactory.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/test/SerializableDummyExecutionOperator.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/test/SerializableDummyExecutionOperator.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/test/SerializableDummyExecutionOperator.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/test/SerializableDummyExecutionOperator.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/test/TestDataUnit.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/test/TestDataUnit.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/test/TestDataUnit.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/test/TestDataUnit.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/test/TestDataUnit2.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/test/TestDataUnit2.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/test/TestDataUnit2.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/test/TestDataUnit2.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/util/BitmaskTest.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/util/BitmaskTest.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/util/BitmaskTest.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/util/BitmaskTest.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/util/ConsumerIteratorAdapterTest.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/util/ConsumerIteratorAdapterTest.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/util/ConsumerIteratorAdapterTest.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/util/ConsumerIteratorAdapterTest.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/util/CrossProductIterableTest.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/util/CrossProductIterableTest.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/util/CrossProductIterableTest.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/util/CrossProductIterableTest.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/util/LimitedInputStreamTest.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/util/LimitedInputStreamTest.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/util/LimitedInputStreamTest.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/util/LimitedInputStreamTest.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/util/ReflectionUtilsTest.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/util/ReflectionUtilsTest.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/util/ReflectionUtilsTest.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/util/ReflectionUtilsTest.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/util/RheemCollectionsTest.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/util/WayangCollectionsTest.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/util/RheemCollectionsTest.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/util/WayangCollectionsTest.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/util/mathex/ExpressionBuilderTest.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/util/mathex/ExpressionBuilderTest.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/util/mathex/ExpressionBuilderTest.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/util/mathex/ExpressionBuilderTest.java
diff --git a/rheem-core/src/test/java/io/rheem/rheem/core/util/mathex/ExpressionTest.java b/rheem-core/src/test/java/org/apache/incubator/wayang/core/util/mathex/ExpressionTest.java
similarity index 100%
rename from rheem-core/src/test/java/io/rheem/rheem/core/util/mathex/ExpressionTest.java
rename to rheem-core/src/test/java/org/apache/incubator/wayang/core/util/mathex/ExpressionTest.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/IEJoin.java b/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/IEJoin.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/IEJoin.java
rename to rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/IEJoin.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/data/Data.java b/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/data/Data.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/data/Data.java
rename to rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/data/Data.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/mapping/Mappings.java b/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/Mappings.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/mapping/Mappings.java
rename to rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/Mappings.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/mapping/java/IEJoinMapping.java b/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/java/IEJoinMapping.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/mapping/java/IEJoinMapping.java
rename to rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/java/IEJoinMapping.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/mapping/java/IESelfJoinMapping.java b/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/java/IESelfJoinMapping.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/mapping/java/IESelfJoinMapping.java
rename to rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/java/IESelfJoinMapping.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/mapping/spark/IEJoinMapping.java b/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/spark/IEJoinMapping.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/mapping/spark/IEJoinMapping.java
rename to rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/spark/IEJoinMapping.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/mapping/spark/IESelfJoinMapping.java b/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/spark/IESelfJoinMapping.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/mapping/spark/IESelfJoinMapping.java
rename to rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/spark/IESelfJoinMapping.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/IEJoinMasterOperator.java b/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/IEJoinMasterOperator.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/IEJoinMasterOperator.java
rename to rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/IEJoinMasterOperator.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/IEJoinOperator.java b/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/IEJoinOperator.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/IEJoinOperator.java
rename to rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/IEJoinOperator.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/IESelfJoinOperator.java b/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/IESelfJoinOperator.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/IESelfJoinOperator.java
rename to rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/IESelfJoinOperator.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/JavaIEJoinOperator.java b/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/JavaIEJoinOperator.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/JavaIEJoinOperator.java
rename to rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/JavaIEJoinOperator.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/JavaIESelfJoinOperator.java b/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/JavaIESelfJoinOperator.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/JavaIESelfJoinOperator.java
rename to rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/JavaIESelfJoinOperator.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/SparkIEJoinOperator.java b/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperator.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/SparkIEJoinOperator.java
rename to rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperator.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/SparkIESelfJoinOperator.java b/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/SparkIESelfJoinOperator.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/SparkIESelfJoinOperator.java
rename to rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/SparkIESelfJoinOperator.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/java_helpers/BitSetJoin.java b/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/BitSetJoin.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/java_helpers/BitSetJoin.java
rename to rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/BitSetJoin.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/java_helpers/DataComparator.java b/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/DataComparator.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/java_helpers/DataComparator.java
rename to rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/DataComparator.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/java_helpers/extractData.java b/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/extractData.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/java_helpers/extractData.java
rename to rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/extractData.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/java_helpers/myMergeSort.java b/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/myMergeSort.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/java_helpers/myMergeSort.java
rename to rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/myMergeSort.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/java_helpers/revDataComparator.java b/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/revDataComparator.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/java_helpers/revDataComparator.java
rename to rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/revDataComparator.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/spark_helpers/BitSetJoin.java b/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/BitSetJoin.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/spark_helpers/BitSetJoin.java
rename to rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/BitSetJoin.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/spark_helpers/List2AttributesObjectSkinny.java b/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/List2AttributesObjectSkinny.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/spark_helpers/List2AttributesObjectSkinny.java
rename to rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/List2AttributesObjectSkinny.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/spark_helpers/addUniqueID.java b/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/addUniqueID.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/spark_helpers/addUniqueID.java
rename to rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/addUniqueID.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/spark_helpers/build2ListObject.java b/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/build2ListObject.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/spark_helpers/build2ListObject.java
rename to rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/build2ListObject.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/spark_helpers/extractData.java b/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/extractData.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/spark_helpers/extractData.java
rename to rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/extractData.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/spark_helpers/filterUnwantedBlocks.java b/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/filterUnwantedBlocks.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/spark_helpers/filterUnwantedBlocks.java
rename to rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/filterUnwantedBlocks.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/spark_helpers/myMergeSort.java b/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/myMergeSort.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/spark_helpers/myMergeSort.java
rename to rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/myMergeSort.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/spark_helpers/revDataComparator.java b/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/revDataComparator.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/io/rheem/rheem/iejoin/operators/spark_helpers/revDataComparator.java
rename to rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/revDataComparator.java
diff --git a/rheem-extensions/rheem-iejoin/src/test/java/io/rheem/rheem/iejoin/operators/JavaExecutionOperatorTestBase.java b/rheem-extensions/rheem-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/JavaExecutionOperatorTestBase.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/test/java/io/rheem/rheem/iejoin/operators/JavaExecutionOperatorTestBase.java
rename to rheem-extensions/rheem-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/JavaExecutionOperatorTestBase.java
diff --git a/rheem-extensions/rheem-iejoin/src/test/java/io/rheem/rheem/iejoin/operators/JavaIEJoinOperatorTest.java b/rheem-extensions/rheem-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/JavaIEJoinOperatorTest.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/test/java/io/rheem/rheem/iejoin/operators/JavaIEJoinOperatorTest.java
rename to rheem-extensions/rheem-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/JavaIEJoinOperatorTest.java
diff --git a/rheem-extensions/rheem-iejoin/src/test/java/io/rheem/rheem/iejoin/operators/SparkIEJoinOperatorTest.java b/rheem-extensions/rheem-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperatorTest.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/test/java/io/rheem/rheem/iejoin/operators/SparkIEJoinOperatorTest.java
rename to rheem-extensions/rheem-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperatorTest.java
diff --git a/rheem-extensions/rheem-iejoin/src/test/java/io/rheem/rheem/iejoin/operators/SparkIEJoinOperatorTest2.java b/rheem-extensions/rheem-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperatorTest2.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/test/java/io/rheem/rheem/iejoin/operators/SparkIEJoinOperatorTest2.java
rename to rheem-extensions/rheem-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperatorTest2.java
diff --git a/rheem-extensions/rheem-iejoin/src/test/java/io/rheem/rheem/iejoin/operators/SparkIEJoinOperatorTest3.java b/rheem-extensions/rheem-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperatorTest3.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/test/java/io/rheem/rheem/iejoin/operators/SparkIEJoinOperatorTest3.java
rename to rheem-extensions/rheem-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperatorTest3.java
diff --git a/rheem-extensions/rheem-iejoin/src/test/java/io/rheem/rheem/iejoin/operators/SparkIEJoinOperatorTest4.java b/rheem-extensions/rheem-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperatorTest4.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/test/java/io/rheem/rheem/iejoin/operators/SparkIEJoinOperatorTest4.java
rename to rheem-extensions/rheem-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperatorTest4.java
diff --git a/rheem-extensions/rheem-iejoin/src/test/java/io/rheem/rheem/iejoin/operators/SparkIESelfJoinOperatorTest.java b/rheem-extensions/rheem-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIESelfJoinOperatorTest.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/test/java/io/rheem/rheem/iejoin/operators/SparkIESelfJoinOperatorTest.java
rename to rheem-extensions/rheem-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIESelfJoinOperatorTest.java
diff --git a/rheem-extensions/rheem-iejoin/src/test/java/io/rheem/rheem/iejoin/operators/SparkOperatorTestBase.java b/rheem-extensions/rheem-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkOperatorTestBase.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/test/java/io/rheem/rheem/iejoin/operators/SparkOperatorTestBase.java
rename to rheem-extensions/rheem-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkOperatorTestBase.java
diff --git a/rheem-extensions/rheem-iejoin/src/test/java/io/rheem/rheem/iejoin/test/ChannelFactory.java b/rheem-extensions/rheem-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/test/ChannelFactory.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/test/java/io/rheem/rheem/iejoin/test/ChannelFactory.java
rename to rheem-extensions/rheem-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/test/ChannelFactory.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/Flink.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/Flink.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/Flink.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/Flink.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/channels/ChannelConversions.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/channels/ChannelConversions.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/channels/ChannelConversions.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/channels/ChannelConversions.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/channels/DataSetChannel.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/channels/DataSetChannel.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/channels/DataSetChannel.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/channels/DataSetChannel.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/compiler/FlinkCoGroupFunction.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/FlinkCoGroupFunction.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/compiler/FlinkCoGroupFunction.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/FlinkCoGroupFunction.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/compiler/FunctionCompiler.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/FunctionCompiler.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/compiler/FunctionCompiler.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/FunctionCompiler.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/compiler/KeySelectorDistinct.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/KeySelectorDistinct.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/compiler/KeySelectorDistinct.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/KeySelectorDistinct.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/compiler/KeySelectorFunction.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/KeySelectorFunction.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/compiler/KeySelectorFunction.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/KeySelectorFunction.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/compiler/OutputFormatConsumer.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/OutputFormatConsumer.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/compiler/OutputFormatConsumer.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/OutputFormatConsumer.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/compiler/RheemFileOutputFormat.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/WayangFileOutputFormat.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/compiler/RheemFileOutputFormat.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/WayangFileOutputFormat.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/compiler/criterion/DummyFilter.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/DummyFilter.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/compiler/criterion/DummyFilter.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/DummyFilter.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/compiler/criterion/DummyMap.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/DummyMap.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/compiler/criterion/DummyMap.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/DummyMap.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/compiler/criterion/RheemAggregator.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangAggregator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/compiler/criterion/RheemAggregator.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangAggregator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/compiler/criterion/RheemConvergenceCriterion.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangConvergenceCriterion.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/compiler/criterion/RheemConvergenceCriterion.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangConvergenceCriterion.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/compiler/criterion/RheemFilterCriterion.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangFilterCriterion.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/compiler/criterion/RheemFilterCriterion.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangFilterCriterion.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/compiler/criterion/RheemListValue.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangListValue.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/compiler/criterion/RheemListValue.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangListValue.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/compiler/criterion/RheemValue.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangValue.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/compiler/criterion/RheemValue.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangValue.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/execution/FlinkContextReference.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/execution/FlinkContextReference.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/execution/FlinkContextReference.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/execution/FlinkContextReference.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/execution/FlinkExecutionContext.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/execution/FlinkExecutionContext.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/execution/FlinkExecutionContext.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/execution/FlinkExecutionContext.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/execution/FlinkExecutor.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/execution/FlinkExecutor.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/execution/FlinkExecutor.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/execution/FlinkExecutor.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/CartesianMapping.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/CartesianMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/CartesianMapping.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/CartesianMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/CoGroupMapping.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/CoGroupMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/CoGroupMapping.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/CoGroupMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/CollectionSourceMapping.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/CollectionSourceMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/CollectionSourceMapping.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/CollectionSourceMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/CountMapping.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/CountMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/CountMapping.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/CountMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/DistinctMapping.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/DistinctMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/DistinctMapping.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/DistinctMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/DoWhileMapping.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/DoWhileMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/DoWhileMapping.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/DoWhileMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/FilterMapping.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/FilterMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/FilterMapping.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/FilterMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/FlatMapMapping.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/FlatMapMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/FlatMapMapping.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/FlatMapMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/GlobalMaterializedGroupMapping.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/GlobalMaterializedGroupMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/GlobalMaterializedGroupMapping.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/GlobalMaterializedGroupMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/GlobalReduceMapping.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/GlobalReduceMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/GlobalReduceMapping.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/GlobalReduceMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/GroupByMapping.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/GroupByMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/GroupByMapping.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/GroupByMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/IntersectMapping.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/IntersectMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/IntersectMapping.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/IntersectMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/JoinMapping.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/JoinMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/JoinMapping.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/JoinMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/LocalCallbackSinkMapping.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/LocalCallbackSinkMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/LocalCallbackSinkMapping.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/LocalCallbackSinkMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/LoopMapping.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/LoopMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/LoopMapping.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/LoopMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/MapMapping.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/MapMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/MapMapping.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/MapMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/MapPartitionsMapping.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/MapPartitionsMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/MapPartitionsMapping.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/MapPartitionsMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/Mappings.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/Mappings.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/Mappings.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/Mappings.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/MaterializedGroupByMapping.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/MaterializedGroupByMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/MaterializedGroupByMapping.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/MaterializedGroupByMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/PageRankMapping.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/PageRankMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/PageRankMapping.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/PageRankMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/ReduceByMapping.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/ReduceByMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/ReduceByMapping.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/ReduceByMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/RepeatMapping.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/RepeatMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/RepeatMapping.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/RepeatMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/SampleMapping.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/SampleMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/SampleMapping.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/SampleMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/SortMapping.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/SortMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/SortMapping.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/SortMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/TextFileSinkMapping.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/TextFileSinkMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/TextFileSinkMapping.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/TextFileSinkMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/TextFileSourceMapping.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/TextFileSourceMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/TextFileSourceMapping.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/TextFileSourceMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/UnionAllMapping.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/UnionAllMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/UnionAllMapping.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/UnionAllMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/ZipWithIdMapping.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/ZipWithIdMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/mapping/ZipWithIdMapping.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/ZipWithIdMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkCartesianOperator.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCartesianOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkCartesianOperator.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCartesianOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkCoGroupOperator.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCoGroupOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkCoGroupOperator.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCoGroupOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkCollectionSink.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCollectionSink.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkCollectionSink.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCollectionSink.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkCollectionSource.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCollectionSource.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkCollectionSource.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCollectionSource.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkCountOperator.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCountOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkCountOperator.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCountOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkDistinctOperator.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkDistinctOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkDistinctOperator.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkDistinctOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkDoWhileOperator.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkDoWhileOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkDoWhileOperator.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkDoWhileOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkExecutionOperator.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkExecutionOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkExecutionOperator.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkExecutionOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkFilterOperator.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkFilterOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkFilterOperator.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkFilterOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkFlatMapOperator.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkFlatMapOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkFlatMapOperator.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkFlatMapOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkGlobalMaterializedGroupOperator.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkGlobalMaterializedGroupOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkGlobalMaterializedGroupOperator.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkGlobalMaterializedGroupOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkGlobalReduceOperator.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkGlobalReduceOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkGlobalReduceOperator.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkGlobalReduceOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkGroupByOperator.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkGroupByOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkGroupByOperator.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkGroupByOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkIntersectOperator.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkIntersectOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkIntersectOperator.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkIntersectOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkJoinOperator.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkJoinOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkJoinOperator.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkJoinOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkLocalCallbackSink.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkLocalCallbackSink.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkLocalCallbackSink.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkLocalCallbackSink.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkLoopOperator.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkLoopOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkLoopOperator.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkLoopOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkMapOperator.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkMapOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkMapOperator.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkMapOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkMapPartitionsOperator.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkMapPartitionsOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkMapPartitionsOperator.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkMapPartitionsOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkMaterializedGroupByOperator.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkMaterializedGroupByOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkMaterializedGroupByOperator.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkMaterializedGroupByOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkObjectFileSink.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkObjectFileSink.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkObjectFileSink.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkObjectFileSink.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkObjectFileSource.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkObjectFileSource.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkObjectFileSource.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkObjectFileSource.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkPageRankOperator.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkPageRankOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkPageRankOperator.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkPageRankOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkReduceByOperator.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkReduceByOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkReduceByOperator.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkReduceByOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkRepeatExpandedOperator.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkRepeatExpandedOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkRepeatExpandedOperator.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkRepeatExpandedOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkRepeatOperator.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkRepeatOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkRepeatOperator.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkRepeatOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkSampleOperator.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkSampleOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkSampleOperator.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkSampleOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkSortOperator.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkSortOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkSortOperator.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkSortOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkTextFileSink.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkTextFileSink.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkTextFileSink.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkTextFileSink.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkTextFileSource.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkTextFileSource.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkTextFileSource.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkTextFileSource.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkTsvFileSink.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkTsvFileSink.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkTsvFileSink.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkTsvFileSink.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkUnionAllOperator.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkUnionAllOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkUnionAllOperator.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkUnionAllOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkZipWithIdOperator.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkZipWithIdOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/operators/FlinkZipWithIdOperator.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkZipWithIdOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/platform/FlinkPlatform.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/platform/FlinkPlatform.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/platform/FlinkPlatform.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/platform/FlinkPlatform.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/plugin/FlinkBasicPlugin.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/plugin/FlinkBasicPlugin.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/plugin/FlinkBasicPlugin.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/plugin/FlinkBasicPlugin.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/plugin/FlinkConversionPlugin.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/plugin/FlinkConversionPlugin.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/plugin/FlinkConversionPlugin.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/plugin/FlinkConversionPlugin.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/plugin/FlinkGraphPlugin.java b/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/plugin/FlinkGraphPlugin.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/io/rheem/rheem/flink/plugin/FlinkGraphPlugin.java
rename to rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/plugin/FlinkGraphPlugin.java
diff --git a/rheem-platforms/rheem-giraph/src/main/java/io/rheem/rheem/giraph/Algorithm/PageRankAlgorithm.java b/rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/Algorithm/PageRankAlgorithm.java
similarity index 100%
rename from rheem-platforms/rheem-giraph/src/main/java/io/rheem/rheem/giraph/Algorithm/PageRankAlgorithm.java
rename to rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/Algorithm/PageRankAlgorithm.java
diff --git a/rheem-platforms/rheem-giraph/src/main/java/io/rheem/rheem/giraph/Algorithm/PageRankParameters.java b/rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/Algorithm/PageRankParameters.java
similarity index 100%
rename from rheem-platforms/rheem-giraph/src/main/java/io/rheem/rheem/giraph/Algorithm/PageRankParameters.java
rename to rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/Algorithm/PageRankParameters.java
diff --git a/rheem-platforms/rheem-giraph/src/main/java/io/rheem/rheem/giraph/Giraph.java b/rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/Giraph.java
similarity index 100%
rename from rheem-platforms/rheem-giraph/src/main/java/io/rheem/rheem/giraph/Giraph.java
rename to rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/Giraph.java
diff --git a/rheem-platforms/rheem-giraph/src/main/java/io/rheem/rheem/giraph/channels/ChannelConversions.java b/rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/channels/ChannelConversions.java
similarity index 100%
rename from rheem-platforms/rheem-giraph/src/main/java/io/rheem/rheem/giraph/channels/ChannelConversions.java
rename to rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/channels/ChannelConversions.java
diff --git a/rheem-platforms/rheem-giraph/src/main/java/io/rheem/rheem/giraph/execution/GiraphExecutor.java b/rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/execution/GiraphExecutor.java
similarity index 100%
rename from rheem-platforms/rheem-giraph/src/main/java/io/rheem/rheem/giraph/execution/GiraphExecutor.java
rename to rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/execution/GiraphExecutor.java
diff --git a/rheem-platforms/rheem-giraph/src/main/java/io/rheem/rheem/giraph/mappings/Mappings.java b/rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/mappings/Mappings.java
similarity index 100%
rename from rheem-platforms/rheem-giraph/src/main/java/io/rheem/rheem/giraph/mappings/Mappings.java
rename to rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/mappings/Mappings.java
diff --git a/rheem-platforms/rheem-giraph/src/main/java/io/rheem/rheem/giraph/mappings/PageRankMapping.java b/rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/mappings/PageRankMapping.java
similarity index 100%
rename from rheem-platforms/rheem-giraph/src/main/java/io/rheem/rheem/giraph/mappings/PageRankMapping.java
rename to rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/mappings/PageRankMapping.java
diff --git a/rheem-platforms/rheem-giraph/src/main/java/io/rheem/rheem/giraph/operators/GiraphExecutionOperator.java b/rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/operators/GiraphExecutionOperator.java
similarity index 100%
rename from rheem-platforms/rheem-giraph/src/main/java/io/rheem/rheem/giraph/operators/GiraphExecutionOperator.java
rename to rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/operators/GiraphExecutionOperator.java
diff --git a/rheem-platforms/rheem-giraph/src/main/java/io/rheem/rheem/giraph/operators/GiraphPageRankOperator.java b/rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/operators/GiraphPageRankOperator.java
similarity index 100%
rename from rheem-platforms/rheem-giraph/src/main/java/io/rheem/rheem/giraph/operators/GiraphPageRankOperator.java
rename to rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/operators/GiraphPageRankOperator.java
diff --git a/rheem-platforms/rheem-giraph/src/main/java/io/rheem/rheem/giraph/platform/GiraphPlatform.java b/rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/platform/GiraphPlatform.java
similarity index 100%
rename from rheem-platforms/rheem-giraph/src/main/java/io/rheem/rheem/giraph/platform/GiraphPlatform.java
rename to rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/platform/GiraphPlatform.java
diff --git a/rheem-platforms/rheem-giraph/src/main/java/io/rheem/rheem/giraph/plugin/GiraphPlugin.java b/rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/plugin/GiraphPlugin.java
similarity index 100%
rename from rheem-platforms/rheem-giraph/src/main/java/io/rheem/rheem/giraph/plugin/GiraphPlugin.java
rename to rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/plugin/GiraphPlugin.java
diff --git a/rheem-platforms/rheem-giraph/src/test/java/io/rheem/rheem/giraph/operators/GiraphPagaRankOperatorTest.java b/rheem-platforms/rheem-giraph/src/test/java/org/apache/incubator/wayang/giraph/operators/GiraphPagaRankOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-giraph/src/test/java/io/rheem/rheem/giraph/operators/GiraphPagaRankOperatorTest.java
rename to rheem-platforms/rheem-giraph/src/test/java/org/apache/incubator/wayang/giraph/operators/GiraphPagaRankOperatorTest.java
diff --git a/rheem-platforms/rheem-graphchi/src/main/java/io/rheem/rheem/graphchi/GraphChi.java b/rheem-platforms/rheem-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/GraphChi.java
similarity index 100%
rename from rheem-platforms/rheem-graphchi/src/main/java/io/rheem/rheem/graphchi/GraphChi.java
rename to rheem-platforms/rheem-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/GraphChi.java
diff --git a/rheem-platforms/rheem-graphchi/src/main/java/io/rheem/rheem/graphchi/channels/ChannelConversions.java b/rheem-platforms/rheem-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/channels/ChannelConversions.java
similarity index 100%
rename from rheem-platforms/rheem-graphchi/src/main/java/io/rheem/rheem/graphchi/channels/ChannelConversions.java
rename to rheem-platforms/rheem-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/channels/ChannelConversions.java
diff --git a/rheem-platforms/rheem-graphchi/src/main/java/io/rheem/rheem/graphchi/execution/GraphChiExecutor.java b/rheem-platforms/rheem-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/execution/GraphChiExecutor.java
similarity index 100%
rename from rheem-platforms/rheem-graphchi/src/main/java/io/rheem/rheem/graphchi/execution/GraphChiExecutor.java
rename to rheem-platforms/rheem-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/execution/GraphChiExecutor.java
diff --git a/rheem-platforms/rheem-graphchi/src/main/java/io/rheem/rheem/graphchi/mappings/Mappings.java b/rheem-platforms/rheem-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/mappings/Mappings.java
similarity index 100%
rename from rheem-platforms/rheem-graphchi/src/main/java/io/rheem/rheem/graphchi/mappings/Mappings.java
rename to rheem-platforms/rheem-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/mappings/Mappings.java
diff --git a/rheem-platforms/rheem-graphchi/src/main/java/io/rheem/rheem/graphchi/mappings/PageRankMapping.java b/rheem-platforms/rheem-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/mappings/PageRankMapping.java
similarity index 100%
rename from rheem-platforms/rheem-graphchi/src/main/java/io/rheem/rheem/graphchi/mappings/PageRankMapping.java
rename to rheem-platforms/rheem-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/mappings/PageRankMapping.java
diff --git a/rheem-platforms/rheem-graphchi/src/main/java/io/rheem/rheem/graphchi/operators/GraphChiExecutionOperator.java b/rheem-platforms/rheem-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/operators/GraphChiExecutionOperator.java
similarity index 100%
rename from rheem-platforms/rheem-graphchi/src/main/java/io/rheem/rheem/graphchi/operators/GraphChiExecutionOperator.java
rename to rheem-platforms/rheem-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/operators/GraphChiExecutionOperator.java
diff --git a/rheem-platforms/rheem-graphchi/src/main/java/io/rheem/rheem/graphchi/operators/GraphChiPageRankOperator.java b/rheem-platforms/rheem-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/operators/GraphChiPageRankOperator.java
similarity index 100%
rename from rheem-platforms/rheem-graphchi/src/main/java/io/rheem/rheem/graphchi/operators/GraphChiPageRankOperator.java
rename to rheem-platforms/rheem-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/operators/GraphChiPageRankOperator.java
diff --git a/rheem-platforms/rheem-graphchi/src/main/java/io/rheem/rheem/graphchi/platform/GraphChiPlatform.java b/rheem-platforms/rheem-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/platform/GraphChiPlatform.java
similarity index 100%
rename from rheem-platforms/rheem-graphchi/src/main/java/io/rheem/rheem/graphchi/platform/GraphChiPlatform.java
rename to rheem-platforms/rheem-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/platform/GraphChiPlatform.java
diff --git a/rheem-platforms/rheem-graphchi/src/main/java/io/rheem/rheem/graphchi/plugin/GraphChiPlugin.java b/rheem-platforms/rheem-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/plugin/GraphChiPlugin.java
similarity index 100%
rename from rheem-platforms/rheem-graphchi/src/main/java/io/rheem/rheem/graphchi/plugin/GraphChiPlugin.java
rename to rheem-platforms/rheem-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/plugin/GraphChiPlugin.java
diff --git a/rheem-platforms/rheem-graphchi/src/test/java/io/rheem/rheem/graphchi/operators/GraphChiPageRankOperatorTest.java b/rheem-platforms/rheem-graphchi/src/test/java/org/apache/incubator/wayang/graphchi/operators/GraphChiPageRankOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-graphchi/src/test/java/io/rheem/rheem/graphchi/operators/GraphChiPageRankOperatorTest.java
rename to rheem-platforms/rheem-graphchi/src/test/java/org/apache/incubator/wayang/graphchi/operators/GraphChiPageRankOperatorTest.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/Java.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/Java.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/Java.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/Java.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/channels/ChannelConversions.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/channels/ChannelConversions.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/channels/ChannelConversions.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/channels/ChannelConversions.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/channels/CollectionChannel.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/channels/CollectionChannel.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/channels/CollectionChannel.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/channels/CollectionChannel.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/channels/JavaChannelInstance.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/channels/JavaChannelInstance.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/channels/JavaChannelInstance.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/channels/JavaChannelInstance.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/channels/StreamChannel.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/channels/StreamChannel.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/channels/StreamChannel.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/channels/StreamChannel.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/compiler/FunctionCompiler.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/compiler/FunctionCompiler.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/compiler/FunctionCompiler.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/compiler/FunctionCompiler.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/execution/JavaExecutionContext.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/execution/JavaExecutionContext.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/execution/JavaExecutionContext.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/execution/JavaExecutionContext.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/execution/JavaExecutor.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/execution/JavaExecutor.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/execution/JavaExecutor.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/execution/JavaExecutor.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/CartesianMapping.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/CartesianMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/CartesianMapping.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/CartesianMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/CoGroupMapping.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/CoGroupMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/CoGroupMapping.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/CoGroupMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/CollectionSourceMapping.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/CollectionSourceMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/CollectionSourceMapping.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/CollectionSourceMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/CountMapping.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/CountMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/CountMapping.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/CountMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/DistinctMapping.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/DistinctMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/DistinctMapping.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/DistinctMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/DoWhileMapping.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/DoWhileMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/DoWhileMapping.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/DoWhileMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/FilterMapping.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/FilterMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/FilterMapping.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/FilterMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/FlatMapMapping.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/FlatMapMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/FlatMapMapping.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/FlatMapMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/GlobalMaterializedGroupMapping.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/GlobalMaterializedGroupMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/GlobalMaterializedGroupMapping.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/GlobalMaterializedGroupMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/GlobalReduceMapping.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/GlobalReduceMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/GlobalReduceMapping.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/GlobalReduceMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/IntersectMapping.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/IntersectMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/IntersectMapping.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/IntersectMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/JoinMapping.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/JoinMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/JoinMapping.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/JoinMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/LocalCallbackSinkMapping.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/LocalCallbackSinkMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/LocalCallbackSinkMapping.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/LocalCallbackSinkMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/LoopMapping.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/LoopMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/LoopMapping.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/LoopMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/MapMapping.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/MapMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/MapMapping.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/MapMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/MapPartitionsMapping.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/MapPartitionsMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/MapPartitionsMapping.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/MapPartitionsMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/Mappings.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/Mappings.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/Mappings.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/Mappings.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/MaterializedGroupByMapping.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/MaterializedGroupByMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/MaterializedGroupByMapping.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/MaterializedGroupByMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/ReduceByMapping.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/ReduceByMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/ReduceByMapping.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/ReduceByMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/RepeatMapping.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/RepeatMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/RepeatMapping.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/RepeatMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/SampleMapping.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/SampleMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/SampleMapping.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/SampleMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/SortMapping.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/SortMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/SortMapping.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/SortMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/TextFileSinkMapping.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/TextFileSinkMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/TextFileSinkMapping.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/TextFileSinkMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/TextFileSourceMapping.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/TextFileSourceMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/TextFileSourceMapping.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/TextFileSourceMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/UnionAllMapping.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/UnionAllMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/UnionAllMapping.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/UnionAllMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/ZipWithIdMapping.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/ZipWithIdMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/ZipWithIdMapping.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/ZipWithIdMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/graph/PageRankMapping.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/graph/PageRankMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/mapping/graph/PageRankMapping.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/graph/PageRankMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaCartesianOperator.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCartesianOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaCartesianOperator.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCartesianOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaCoGroupOperator.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCoGroupOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaCoGroupOperator.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCoGroupOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaCollectOperator.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCollectOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaCollectOperator.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCollectOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaCollectionSource.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCollectionSource.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaCollectionSource.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCollectionSource.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaCountOperator.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCountOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaCountOperator.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCountOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaDistinctOperator.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaDistinctOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaDistinctOperator.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaDistinctOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaDoWhileOperator.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaDoWhileOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaDoWhileOperator.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaDoWhileOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaExecutionOperator.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaExecutionOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaExecutionOperator.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaExecutionOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaFilterOperator.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaFilterOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaFilterOperator.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaFilterOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaFlatMapOperator.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaFlatMapOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaFlatMapOperator.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaFlatMapOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaGlobalMaterializedGroupOperator.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaGlobalMaterializedGroupOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaGlobalMaterializedGroupOperator.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaGlobalMaterializedGroupOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaGlobalReduceOperator.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaGlobalReduceOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaGlobalReduceOperator.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaGlobalReduceOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaIntersectOperator.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaIntersectOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaIntersectOperator.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaIntersectOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaJoinOperator.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaJoinOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaJoinOperator.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaJoinOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaLocalCallbackSink.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaLocalCallbackSink.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaLocalCallbackSink.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaLocalCallbackSink.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaLoopOperator.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaLoopOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaLoopOperator.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaLoopOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaMapOperator.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaMapOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaMapOperator.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaMapOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaMapPartitionsOperator.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaMapPartitionsOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaMapPartitionsOperator.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaMapPartitionsOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaMaterializedGroupByOperator.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaMaterializedGroupByOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaMaterializedGroupByOperator.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaMaterializedGroupByOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaObjectFileSink.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaObjectFileSink.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaObjectFileSink.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaObjectFileSink.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaObjectFileSource.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaObjectFileSource.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaObjectFileSource.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaObjectFileSource.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaRandomSampleOperator.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaRandomSampleOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaRandomSampleOperator.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaRandomSampleOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaReduceByOperator.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaReduceByOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaReduceByOperator.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaReduceByOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaRepeatOperator.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaRepeatOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaRepeatOperator.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaRepeatOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaReservoirSampleOperator.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaReservoirSampleOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaReservoirSampleOperator.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaReservoirSampleOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaSortOperator.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaSortOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaSortOperator.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaSortOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaTextFileSink.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaTextFileSink.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaTextFileSink.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaTextFileSink.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaTextFileSource.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaTextFileSource.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaTextFileSource.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaTextFileSource.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaTsvFileSink.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaTsvFileSink.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaTsvFileSink.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaTsvFileSink.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaTsvFileSource.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaTsvFileSource.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaTsvFileSource.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaTsvFileSource.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaUnionAllOperator.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaUnionAllOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/JavaUnionAllOperator.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaUnionAllOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/graph/JavaPageRankOperator.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/graph/JavaPageRankOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/operators/graph/JavaPageRankOperator.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/graph/JavaPageRankOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/platform/JavaPlatform.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/platform/JavaPlatform.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/platform/JavaPlatform.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/platform/JavaPlatform.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/plugin/JavaBasicPlugin.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/plugin/JavaBasicPlugin.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/plugin/JavaBasicPlugin.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/plugin/JavaBasicPlugin.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/plugin/JavaChannelConversionPlugin.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/plugin/JavaChannelConversionPlugin.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/plugin/JavaChannelConversionPlugin.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/plugin/JavaChannelConversionPlugin.java
diff --git a/rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/plugin/JavaGraphPlugin.java b/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/plugin/JavaGraphPlugin.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/io/rheem/rheem/java/plugin/JavaGraphPlugin.java
rename to rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/plugin/JavaGraphPlugin.java
diff --git a/rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/execution/JavaExecutorTest.java b/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/execution/JavaExecutorTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/execution/JavaExecutorTest.java
rename to rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/execution/JavaExecutorTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaCartesianOperatorTest.java b/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaCartesianOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaCartesianOperatorTest.java
rename to rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaCartesianOperatorTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaCoGroupOperatorTest.java b/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaCoGroupOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaCoGroupOperatorTest.java
rename to rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaCoGroupOperatorTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaCollectionSourceTest.java b/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaCollectionSourceTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaCollectionSourceTest.java
rename to rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaCollectionSourceTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaCountOperatorTest.java b/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaCountOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaCountOperatorTest.java
rename to rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaCountOperatorTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaDistinctOperatorTest.java b/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaDistinctOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaDistinctOperatorTest.java
rename to rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaDistinctOperatorTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaExecutionOperatorTestBase.java b/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaExecutionOperatorTestBase.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaExecutionOperatorTestBase.java
rename to rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaExecutionOperatorTestBase.java
diff --git a/rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaFilterOperatorTest.java b/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaFilterOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaFilterOperatorTest.java
rename to rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaFilterOperatorTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaGlobalMaterializedGroupOperatorTest.java b/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaGlobalMaterializedGroupOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaGlobalMaterializedGroupOperatorTest.java
rename to rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaGlobalMaterializedGroupOperatorTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaGlobalReduceOperatorTest.java b/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaGlobalReduceOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaGlobalReduceOperatorTest.java
rename to rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaGlobalReduceOperatorTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaJoinOperatorTest.java b/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaJoinOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaJoinOperatorTest.java
rename to rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaJoinOperatorTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaLocalCallbackSinkTest.java b/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaLocalCallbackSinkTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaLocalCallbackSinkTest.java
rename to rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaLocalCallbackSinkTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaMaterializedGroupByOperatorTest.java b/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaMaterializedGroupByOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaMaterializedGroupByOperatorTest.java
rename to rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaMaterializedGroupByOperatorTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaObjectFileSinkTest.java b/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaObjectFileSinkTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaObjectFileSinkTest.java
rename to rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaObjectFileSinkTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaObjectFileSourceTest.java b/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaObjectFileSourceTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaObjectFileSourceTest.java
rename to rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaObjectFileSourceTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaRandomSampleOperatorTest.java b/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaRandomSampleOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaRandomSampleOperatorTest.java
rename to rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaRandomSampleOperatorTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaReduceByOperatorTest.java b/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaReduceByOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaReduceByOperatorTest.java
rename to rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaReduceByOperatorTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaReservoirSampleOperatorTest.java b/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaReservoirSampleOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaReservoirSampleOperatorTest.java
rename to rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaReservoirSampleOperatorTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaSortOperatorTest.java b/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaSortOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaSortOperatorTest.java
rename to rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaSortOperatorTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaTextFileSinkTest.java b/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaTextFileSinkTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaTextFileSinkTest.java
rename to rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaTextFileSinkTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaUnionAllOperatorTest.java b/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaUnionAllOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/operators/JavaUnionAllOperatorTest.java
rename to rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaUnionAllOperatorTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/test/ChannelFactory.java b/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/test/ChannelFactory.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/io/rheem/rheem/java/test/ChannelFactory.java
rename to rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/test/ChannelFactory.java
diff --git a/rheem-platforms/rheem-jdbc-template/src/main/java/io/rheem/rheem/jdbc/channels/SqlQueryChannel.java b/rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/channels/SqlQueryChannel.java
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/src/main/java/io/rheem/rheem/jdbc/channels/SqlQueryChannel.java
rename to rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/channels/SqlQueryChannel.java
diff --git a/rheem-platforms/rheem-jdbc-template/src/main/java/io/rheem/rheem/jdbc/compiler/FunctionCompiler.java b/rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/compiler/FunctionCompiler.java
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/src/main/java/io/rheem/rheem/jdbc/compiler/FunctionCompiler.java
rename to rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/compiler/FunctionCompiler.java
diff --git a/rheem-platforms/rheem-jdbc-template/src/main/java/io/rheem/rheem/jdbc/execution/DatabaseDescriptor.java b/rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/execution/DatabaseDescriptor.java
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/src/main/java/io/rheem/rheem/jdbc/execution/DatabaseDescriptor.java
rename to rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/execution/DatabaseDescriptor.java
diff --git a/rheem-platforms/rheem-jdbc-template/src/main/java/io/rheem/rheem/jdbc/execution/JdbcExecutor.java b/rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/execution/JdbcExecutor.java
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/src/main/java/io/rheem/rheem/jdbc/execution/JdbcExecutor.java
rename to rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/execution/JdbcExecutor.java
diff --git a/rheem-platforms/rheem-jdbc-template/src/main/java/io/rheem/rheem/jdbc/operators/JdbcExecutionOperator.java b/rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/JdbcExecutionOperator.java
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/src/main/java/io/rheem/rheem/jdbc/operators/JdbcExecutionOperator.java
rename to rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/JdbcExecutionOperator.java
diff --git a/rheem-platforms/rheem-jdbc-template/src/main/java/io/rheem/rheem/jdbc/operators/JdbcFilterOperator.java b/rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/JdbcFilterOperator.java
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/src/main/java/io/rheem/rheem/jdbc/operators/JdbcFilterOperator.java
rename to rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/JdbcFilterOperator.java
diff --git a/rheem-platforms/rheem-jdbc-template/src/main/java/io/rheem/rheem/jdbc/operators/JdbcProjectionOperator.java b/rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/JdbcProjectionOperator.java
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/src/main/java/io/rheem/rheem/jdbc/operators/JdbcProjectionOperator.java
rename to rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/JdbcProjectionOperator.java
diff --git a/rheem-platforms/rheem-jdbc-template/src/main/java/io/rheem/rheem/jdbc/operators/JdbcTableSource.java b/rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/JdbcTableSource.java
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/src/main/java/io/rheem/rheem/jdbc/operators/JdbcTableSource.java
rename to rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/JdbcTableSource.java
diff --git a/rheem-platforms/rheem-jdbc-template/src/main/java/io/rheem/rheem/jdbc/operators/SqlToStreamOperator.java b/rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/SqlToStreamOperator.java
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/src/main/java/io/rheem/rheem/jdbc/operators/SqlToStreamOperator.java
rename to rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/SqlToStreamOperator.java
diff --git a/rheem-platforms/rheem-jdbc-template/src/main/java/io/rheem/rheem/jdbc/platform/JdbcPlatformTemplate.java b/rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/platform/JdbcPlatformTemplate.java
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/src/main/java/io/rheem/rheem/jdbc/platform/JdbcPlatformTemplate.java
rename to rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/platform/JdbcPlatformTemplate.java
diff --git a/rheem-platforms/rheem-jdbc-template/src/test/java/io/rheem/rheem/jdbc/execution/JdbcExecutorTest.java b/rheem-platforms/rheem-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/execution/JdbcExecutorTest.java
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/src/test/java/io/rheem/rheem/jdbc/execution/JdbcExecutorTest.java
rename to rheem-platforms/rheem-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/execution/JdbcExecutorTest.java
diff --git a/rheem-platforms/rheem-jdbc-template/src/test/java/io/rheem/rheem/jdbc/operators/JdbcTableSourceTest.java b/rheem-platforms/rheem-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/operators/JdbcTableSourceTest.java
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/src/test/java/io/rheem/rheem/jdbc/operators/JdbcTableSourceTest.java
rename to rheem-platforms/rheem-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/operators/JdbcTableSourceTest.java
diff --git a/rheem-platforms/rheem-jdbc-template/src/test/java/io/rheem/rheem/jdbc/operators/OperatorTestBase.java b/rheem-platforms/rheem-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/operators/OperatorTestBase.java
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/src/test/java/io/rheem/rheem/jdbc/operators/OperatorTestBase.java
rename to rheem-platforms/rheem-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/operators/OperatorTestBase.java
diff --git a/rheem-platforms/rheem-jdbc-template/src/test/java/io/rheem/rheem/jdbc/operators/SqlToStreamOperatorTest.java b/rheem-platforms/rheem-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/operators/SqlToStreamOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/src/test/java/io/rheem/rheem/jdbc/operators/SqlToStreamOperatorTest.java
rename to rheem-platforms/rheem-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/operators/SqlToStreamOperatorTest.java
diff --git a/rheem-platforms/rheem-jdbc-template/src/test/java/io/rheem/rheem/jdbc/test/HsqldbFilterOperator.java b/rheem-platforms/rheem-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/test/HsqldbFilterOperator.java
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/src/test/java/io/rheem/rheem/jdbc/test/HsqldbFilterOperator.java
rename to rheem-platforms/rheem-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/test/HsqldbFilterOperator.java
diff --git a/rheem-platforms/rheem-jdbc-template/src/test/java/io/rheem/rheem/jdbc/test/HsqldbPlatform.java b/rheem-platforms/rheem-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/test/HsqldbPlatform.java
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/src/test/java/io/rheem/rheem/jdbc/test/HsqldbPlatform.java
rename to rheem-platforms/rheem-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/test/HsqldbPlatform.java
diff --git a/rheem-platforms/rheem-jdbc-template/src/test/java/io/rheem/rheem/jdbc/test/HsqldbProjectionOperator.java b/rheem-platforms/rheem-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/test/HsqldbProjectionOperator.java
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/src/test/java/io/rheem/rheem/jdbc/test/HsqldbProjectionOperator.java
rename to rheem-platforms/rheem-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/test/HsqldbProjectionOperator.java
diff --git a/rheem-platforms/rheem-jdbc-template/src/test/java/io/rheem/rheem/jdbc/test/HsqldbTableSource.java b/rheem-platforms/rheem-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/test/HsqldbTableSource.java
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/src/test/java/io/rheem/rheem/jdbc/test/HsqldbTableSource.java
rename to rheem-platforms/rheem-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/test/HsqldbTableSource.java
diff --git a/rheem-platforms/rheem-postgres/src/main/java/io/rheem/rheem/postgres/Postgres.java b/rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/Postgres.java
similarity index 100%
rename from rheem-platforms/rheem-postgres/src/main/java/io/rheem/rheem/postgres/Postgres.java
rename to rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/Postgres.java
diff --git a/rheem-platforms/rheem-postgres/src/main/java/io/rheem/rheem/postgres/channels/ChannelConversions.java b/rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/channels/ChannelConversions.java
similarity index 100%
rename from rheem-platforms/rheem-postgres/src/main/java/io/rheem/rheem/postgres/channels/ChannelConversions.java
rename to rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/channels/ChannelConversions.java
diff --git a/rheem-platforms/rheem-postgres/src/main/java/io/rheem/rheem/postgres/mapping/FilterMapping.java b/rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/mapping/FilterMapping.java
similarity index 100%
rename from rheem-platforms/rheem-postgres/src/main/java/io/rheem/rheem/postgres/mapping/FilterMapping.java
rename to rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/mapping/FilterMapping.java
diff --git a/rheem-platforms/rheem-postgres/src/main/java/io/rheem/rheem/postgres/mapping/Mappings.java b/rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/mapping/Mappings.java
similarity index 100%
rename from rheem-platforms/rheem-postgres/src/main/java/io/rheem/rheem/postgres/mapping/Mappings.java
rename to rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/mapping/Mappings.java
diff --git a/rheem-platforms/rheem-postgres/src/main/java/io/rheem/rheem/postgres/mapping/ProjectionMapping.java b/rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/mapping/ProjectionMapping.java
similarity index 100%
rename from rheem-platforms/rheem-postgres/src/main/java/io/rheem/rheem/postgres/mapping/ProjectionMapping.java
rename to rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/mapping/ProjectionMapping.java
diff --git a/rheem-platforms/rheem-postgres/src/main/java/io/rheem/rheem/postgres/operators/PostgresExecutionOperator.java b/rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/operators/PostgresExecutionOperator.java
similarity index 100%
rename from rheem-platforms/rheem-postgres/src/main/java/io/rheem/rheem/postgres/operators/PostgresExecutionOperator.java
rename to rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/operators/PostgresExecutionOperator.java
diff --git a/rheem-platforms/rheem-postgres/src/main/java/io/rheem/rheem/postgres/operators/PostgresFilterOperator.java b/rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/operators/PostgresFilterOperator.java
similarity index 100%
rename from rheem-platforms/rheem-postgres/src/main/java/io/rheem/rheem/postgres/operators/PostgresFilterOperator.java
rename to rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/operators/PostgresFilterOperator.java
diff --git a/rheem-platforms/rheem-postgres/src/main/java/io/rheem/rheem/postgres/operators/PostgresProjectionOperator.java b/rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/operators/PostgresProjectionOperator.java
similarity index 100%
rename from rheem-platforms/rheem-postgres/src/main/java/io/rheem/rheem/postgres/operators/PostgresProjectionOperator.java
rename to rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/operators/PostgresProjectionOperator.java
diff --git a/rheem-platforms/rheem-postgres/src/main/java/io/rheem/rheem/postgres/operators/PostgresTableSource.java b/rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/operators/PostgresTableSource.java
similarity index 100%
rename from rheem-platforms/rheem-postgres/src/main/java/io/rheem/rheem/postgres/operators/PostgresTableSource.java
rename to rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/operators/PostgresTableSource.java
diff --git a/rheem-platforms/rheem-postgres/src/main/java/io/rheem/rheem/postgres/platform/PostgresPlatform.java b/rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/platform/PostgresPlatform.java
similarity index 100%
rename from rheem-platforms/rheem-postgres/src/main/java/io/rheem/rheem/postgres/platform/PostgresPlatform.java
rename to rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/platform/PostgresPlatform.java
diff --git a/rheem-platforms/rheem-postgres/src/main/java/io/rheem/rheem/postgres/plugin/PostgresConversionsPlugin.java b/rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/plugin/PostgresConversionsPlugin.java
similarity index 100%
rename from rheem-platforms/rheem-postgres/src/main/java/io/rheem/rheem/postgres/plugin/PostgresConversionsPlugin.java
rename to rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/plugin/PostgresConversionsPlugin.java
diff --git a/rheem-platforms/rheem-postgres/src/main/java/io/rheem/rheem/postgres/plugin/PostgresPlugin.java b/rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/plugin/PostgresPlugin.java
similarity index 100%
rename from rheem-platforms/rheem-postgres/src/main/java/io/rheem/rheem/postgres/plugin/PostgresPlugin.java
rename to rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/plugin/PostgresPlugin.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/Spark.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/Spark.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/Spark.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/Spark.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/channels/BroadcastChannel.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/channels/BroadcastChannel.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/channels/BroadcastChannel.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/channels/BroadcastChannel.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/channels/ChannelConversions.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/channels/ChannelConversions.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/channels/ChannelConversions.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/channels/ChannelConversions.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/channels/FileChannels.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/channels/FileChannels.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/channels/FileChannels.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/channels/FileChannels.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/channels/RddChannel.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/channels/RddChannel.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/channels/RddChannel.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/channels/RddChannel.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/compiler/BinaryOperatorAdapter.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/BinaryOperatorAdapter.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/compiler/BinaryOperatorAdapter.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/BinaryOperatorAdapter.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/compiler/ExtendedBinaryOperatorAdapter.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedBinaryOperatorAdapter.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/compiler/ExtendedBinaryOperatorAdapter.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedBinaryOperatorAdapter.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/compiler/ExtendedFlatMapFunctionAdapter.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedFlatMapFunctionAdapter.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/compiler/ExtendedFlatMapFunctionAdapter.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedFlatMapFunctionAdapter.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/compiler/ExtendedFunction.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedFunction.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/compiler/ExtendedFunction.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedFunction.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/compiler/ExtendedMapFunctionAdapter.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedMapFunctionAdapter.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/compiler/ExtendedMapFunctionAdapter.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedMapFunctionAdapter.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/compiler/ExtendedMapPartitionsFunctionAdapter.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedMapPartitionsFunctionAdapter.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/compiler/ExtendedMapPartitionsFunctionAdapter.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedMapPartitionsFunctionAdapter.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/compiler/ExtendedPredicateAdapater.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedPredicateAdapater.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/compiler/ExtendedPredicateAdapater.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedPredicateAdapater.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/compiler/FlatMapFunctionAdapter.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/FlatMapFunctionAdapter.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/compiler/FlatMapFunctionAdapter.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/FlatMapFunctionAdapter.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/compiler/FunctionCompiler.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/FunctionCompiler.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/compiler/FunctionCompiler.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/FunctionCompiler.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/compiler/MapFunctionAdapter.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/MapFunctionAdapter.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/compiler/MapFunctionAdapter.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/MapFunctionAdapter.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/compiler/MapPartitionsFunctionAdapter.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/MapPartitionsFunctionAdapter.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/compiler/MapPartitionsFunctionAdapter.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/MapPartitionsFunctionAdapter.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/compiler/PredicateAdapter.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/PredicateAdapter.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/compiler/PredicateAdapter.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/PredicateAdapter.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/execution/SparkContextReference.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/execution/SparkContextReference.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/execution/SparkContextReference.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/execution/SparkContextReference.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/execution/SparkExecutionContext.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/execution/SparkExecutionContext.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/execution/SparkExecutionContext.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/execution/SparkExecutionContext.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/execution/SparkExecutor.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/execution/SparkExecutor.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/execution/SparkExecutor.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/execution/SparkExecutor.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/CartesianMapping.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/CartesianMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/CartesianMapping.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/CartesianMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/CoGroupMapping.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/CoGroupMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/CoGroupMapping.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/CoGroupMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/CollectionSourceMapping.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/CollectionSourceMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/CollectionSourceMapping.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/CollectionSourceMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/CountMapping.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/CountMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/CountMapping.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/CountMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/DistinctMapping.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/DistinctMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/DistinctMapping.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/DistinctMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/DoWhileMapping.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/DoWhileMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/DoWhileMapping.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/DoWhileMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/FilterMapping.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/FilterMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/FilterMapping.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/FilterMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/FlatMapMapping.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/FlatMapMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/FlatMapMapping.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/FlatMapMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/GlobalMaterializedGroupMapping.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/GlobalMaterializedGroupMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/GlobalMaterializedGroupMapping.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/GlobalMaterializedGroupMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/GlobalReduceMapping.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/GlobalReduceMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/GlobalReduceMapping.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/GlobalReduceMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/IntersectMapping.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/IntersectMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/IntersectMapping.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/IntersectMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/JoinMapping.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/JoinMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/JoinMapping.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/JoinMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/LocalCallbackSinkMapping.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/LocalCallbackSinkMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/LocalCallbackSinkMapping.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/LocalCallbackSinkMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/LoopMapping.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/LoopMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/LoopMapping.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/LoopMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/MapMapping.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/MapMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/MapMapping.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/MapMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/MapPartitionsMapping.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/MapPartitionsMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/MapPartitionsMapping.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/MapPartitionsMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/Mappings.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/Mappings.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/Mappings.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/Mappings.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/MaterializedGroupByMapping.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/MaterializedGroupByMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/MaterializedGroupByMapping.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/MaterializedGroupByMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/ReduceByMapping.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/ReduceByMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/ReduceByMapping.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/ReduceByMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/RepeatMapping.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/RepeatMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/RepeatMapping.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/RepeatMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/SampleMapping.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/SampleMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/SampleMapping.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/SampleMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/SortMapping.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/SortMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/SortMapping.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/SortMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/TextFileSinkMapping.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/TextFileSinkMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/TextFileSinkMapping.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/TextFileSinkMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/TextFileSourceMapping.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/TextFileSourceMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/TextFileSourceMapping.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/TextFileSourceMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/UnionAllMapping.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/UnionAllMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/UnionAllMapping.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/UnionAllMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/ZipWithIdMapping.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/ZipWithIdMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/ZipWithIdMapping.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/ZipWithIdMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/graph/PageRankMapping.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/graph/PageRankMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/mapping/graph/PageRankMapping.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/graph/PageRankMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkBernoulliSampleOperator.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkBernoulliSampleOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkBernoulliSampleOperator.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkBernoulliSampleOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkBroadcastOperator.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkBroadcastOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkBroadcastOperator.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkBroadcastOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkCacheOperator.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCacheOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkCacheOperator.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCacheOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkCartesianOperator.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCartesianOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkCartesianOperator.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCartesianOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkCoGroupOperator.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCoGroupOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkCoGroupOperator.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCoGroupOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkCollectOperator.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCollectOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkCollectOperator.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCollectOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkCollectionSource.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCollectionSource.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkCollectionSource.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCollectionSource.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkCountOperator.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCountOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkCountOperator.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCountOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkDistinctOperator.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkDistinctOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkDistinctOperator.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkDistinctOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkDoWhileOperator.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkDoWhileOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkDoWhileOperator.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkDoWhileOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkExecutionOperator.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkExecutionOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkExecutionOperator.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkExecutionOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkFilterOperator.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkFilterOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkFilterOperator.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkFilterOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkFlatMapOperator.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkFlatMapOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkFlatMapOperator.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkFlatMapOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkGlobalMaterializedGroupOperator.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkGlobalMaterializedGroupOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkGlobalMaterializedGroupOperator.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkGlobalMaterializedGroupOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkGlobalReduceOperator.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkGlobalReduceOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkGlobalReduceOperator.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkGlobalReduceOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkIntersectOperator.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkIntersectOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkIntersectOperator.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkIntersectOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkJoinOperator.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkJoinOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkJoinOperator.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkJoinOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkLocalCallbackSink.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkLocalCallbackSink.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkLocalCallbackSink.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkLocalCallbackSink.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkLoopOperator.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkLoopOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkLoopOperator.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkLoopOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkMapOperator.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkMapOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkMapOperator.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkMapOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkMapPartitionsOperator.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkMapPartitionsOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkMapPartitionsOperator.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkMapPartitionsOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkMaterializedGroupByOperator.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkMaterializedGroupByOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkMaterializedGroupByOperator.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkMaterializedGroupByOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkObjectFileSink.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkObjectFileSink.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkObjectFileSink.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkObjectFileSink.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkObjectFileSource.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkObjectFileSource.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkObjectFileSource.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkObjectFileSource.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkRandomPartitionSampleOperator.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkRandomPartitionSampleOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkRandomPartitionSampleOperator.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkRandomPartitionSampleOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkReduceByOperator.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkReduceByOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkReduceByOperator.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkReduceByOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkRepeatOperator.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkRepeatOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkRepeatOperator.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkRepeatOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkShufflePartitionSampleOperator.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkShufflePartitionSampleOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkShufflePartitionSampleOperator.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkShufflePartitionSampleOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkSortOperator.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkSortOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkSortOperator.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkSortOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkTextFileSink.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkTextFileSink.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkTextFileSink.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkTextFileSink.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkTextFileSource.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkTextFileSource.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkTextFileSource.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkTextFileSource.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkTsvFileSink.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkTsvFileSink.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkTsvFileSink.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkTsvFileSink.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkTsvFileSource.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkTsvFileSource.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkTsvFileSource.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkTsvFileSource.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkUnionAllOperator.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkUnionAllOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkUnionAllOperator.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkUnionAllOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkZipWithIdOperator.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkZipWithIdOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/operators/SparkZipWithIdOperator.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkZipWithIdOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/platform/SparkPlatform.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/platform/SparkPlatform.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/platform/SparkPlatform.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/platform/SparkPlatform.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/plugin/SparkBasicPlugin.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/plugin/SparkBasicPlugin.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/plugin/SparkBasicPlugin.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/plugin/SparkBasicPlugin.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/plugin/SparkConversionPlugin.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/plugin/SparkConversionPlugin.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/plugin/SparkConversionPlugin.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/plugin/SparkConversionPlugin.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/plugin/SparkGraphPlugin.java b/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/plugin/SparkGraphPlugin.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/io/rheem/rheem/spark/plugin/SparkGraphPlugin.java
rename to rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/plugin/SparkGraphPlugin.java
diff --git a/rheem-platforms/rheem-spark/src/main/scala/io/rheem/rheem/spark/operators/graph/SparkPageRankOperator.scala b/rheem-platforms/rheem-spark/src/main/scala/org/apache/incubator/wayang/spark/operators/graph/SparkPageRankOperator.scala
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/scala/io/rheem/rheem/spark/operators/graph/SparkPageRankOperator.scala
rename to rheem-platforms/rheem-spark/src/main/scala/org/apache/incubator/wayang/spark/operators/graph/SparkPageRankOperator.scala
diff --git a/rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkBernoulliSampleOperatorTest.java b/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkBernoulliSampleOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkBernoulliSampleOperatorTest.java
rename to rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkBernoulliSampleOperatorTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkCartesianOperatorTest.java b/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkCartesianOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkCartesianOperatorTest.java
rename to rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkCartesianOperatorTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkCoGroupOperatorTest.java b/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkCoGroupOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkCoGroupOperatorTest.java
rename to rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkCoGroupOperatorTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkCollectionSourceTest.java b/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkCollectionSourceTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkCollectionSourceTest.java
rename to rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkCollectionSourceTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkCountOperatorTest.java b/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkCountOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkCountOperatorTest.java
rename to rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkCountOperatorTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkDistinctOperatorTest.java b/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkDistinctOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkDistinctOperatorTest.java
rename to rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkDistinctOperatorTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkFilterOperatorTest.java b/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkFilterOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkFilterOperatorTest.java
rename to rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkFilterOperatorTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkFlatMapOperatorTest.java b/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkFlatMapOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkFlatMapOperatorTest.java
rename to rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkFlatMapOperatorTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkGlobalMaterializedGroupOperatorTest.java b/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkGlobalMaterializedGroupOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkGlobalMaterializedGroupOperatorTest.java
rename to rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkGlobalMaterializedGroupOperatorTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkGlobalReduceOperatorTest.java b/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkGlobalReduceOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkGlobalReduceOperatorTest.java
rename to rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkGlobalReduceOperatorTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkJoinOperatorTest.java b/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkJoinOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkJoinOperatorTest.java
rename to rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkJoinOperatorTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkMapPartitionsOperatorTest.java b/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkMapPartitionsOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkMapPartitionsOperatorTest.java
rename to rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkMapPartitionsOperatorTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkMaterializedGroupByOperatorTest.java b/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkMaterializedGroupByOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkMaterializedGroupByOperatorTest.java
rename to rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkMaterializedGroupByOperatorTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkObjectFileSinkTest.java b/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkObjectFileSinkTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkObjectFileSinkTest.java
rename to rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkObjectFileSinkTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkObjectFileSourceTest.java b/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkObjectFileSourceTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkObjectFileSourceTest.java
rename to rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkObjectFileSourceTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkOperatorTestBase.java b/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkOperatorTestBase.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkOperatorTestBase.java
rename to rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkOperatorTestBase.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkRandomPartitionSampleOperatorTest.java b/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkRandomPartitionSampleOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkRandomPartitionSampleOperatorTest.java
rename to rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkRandomPartitionSampleOperatorTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkReduceByOperatorTest.java b/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkReduceByOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkReduceByOperatorTest.java
rename to rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkReduceByOperatorTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkShufflePartitionSampleOperatorTest.java b/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkShufflePartitionSampleOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkShufflePartitionSampleOperatorTest.java
rename to rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkShufflePartitionSampleOperatorTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkSortOperatorTest.java b/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkSortOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkSortOperatorTest.java
rename to rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkSortOperatorTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkTextFileSinkTest.java b/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkTextFileSinkTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkTextFileSinkTest.java
rename to rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkTextFileSinkTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkUnionAllOperatorTest.java b/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkUnionAllOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/operators/SparkUnionAllOperatorTest.java
rename to rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkUnionAllOperatorTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/test/ChannelFactory.java b/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/test/ChannelFactory.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/io/rheem/rheem/spark/test/ChannelFactory.java
rename to rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/test/ChannelFactory.java
diff --git a/rheem-platforms/rheem-sqlite3/src/main/java/io/rheem/rheem/sqlite3/Sqlite3.java b/rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/Sqlite3.java
similarity index 100%
rename from rheem-platforms/rheem-sqlite3/src/main/java/io/rheem/rheem/sqlite3/Sqlite3.java
rename to rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/Sqlite3.java
diff --git a/rheem-platforms/rheem-sqlite3/src/main/java/io/rheem/rheem/sqlite3/channels/ChannelConversions.java b/rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/channels/ChannelConversions.java
similarity index 100%
rename from rheem-platforms/rheem-sqlite3/src/main/java/io/rheem/rheem/sqlite3/channels/ChannelConversions.java
rename to rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/channels/ChannelConversions.java
diff --git a/rheem-platforms/rheem-sqlite3/src/main/java/io/rheem/rheem/sqlite3/mapping/FilterMapping.java b/rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/mapping/FilterMapping.java
similarity index 100%
rename from rheem-platforms/rheem-sqlite3/src/main/java/io/rheem/rheem/sqlite3/mapping/FilterMapping.java
rename to rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/mapping/FilterMapping.java
diff --git a/rheem-platforms/rheem-sqlite3/src/main/java/io/rheem/rheem/sqlite3/mapping/Mappings.java b/rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/mapping/Mappings.java
similarity index 100%
rename from rheem-platforms/rheem-sqlite3/src/main/java/io/rheem/rheem/sqlite3/mapping/Mappings.java
rename to rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/mapping/Mappings.java
diff --git a/rheem-platforms/rheem-sqlite3/src/main/java/io/rheem/rheem/sqlite3/mapping/ProjectionMapping.java b/rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/mapping/ProjectionMapping.java
similarity index 100%
rename from rheem-platforms/rheem-sqlite3/src/main/java/io/rheem/rheem/sqlite3/mapping/ProjectionMapping.java
rename to rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/mapping/ProjectionMapping.java
diff --git a/rheem-platforms/rheem-sqlite3/src/main/java/io/rheem/rheem/sqlite3/operators/Sqlite3FilterOperator.java b/rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/operators/Sqlite3FilterOperator.java
similarity index 100%
rename from rheem-platforms/rheem-sqlite3/src/main/java/io/rheem/rheem/sqlite3/operators/Sqlite3FilterOperator.java
rename to rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/operators/Sqlite3FilterOperator.java
diff --git a/rheem-platforms/rheem-sqlite3/src/main/java/io/rheem/rheem/sqlite3/operators/Sqlite3ProjectionOperator.java b/rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/operators/Sqlite3ProjectionOperator.java
similarity index 100%
rename from rheem-platforms/rheem-sqlite3/src/main/java/io/rheem/rheem/sqlite3/operators/Sqlite3ProjectionOperator.java
rename to rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/operators/Sqlite3ProjectionOperator.java
diff --git a/rheem-platforms/rheem-sqlite3/src/main/java/io/rheem/rheem/sqlite3/operators/Sqlite3TableSource.java b/rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/operators/Sqlite3TableSource.java
similarity index 100%
rename from rheem-platforms/rheem-sqlite3/src/main/java/io/rheem/rheem/sqlite3/operators/Sqlite3TableSource.java
rename to rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/operators/Sqlite3TableSource.java
diff --git a/rheem-platforms/rheem-sqlite3/src/main/java/io/rheem/rheem/sqlite3/platform/Sqlite3Platform.java b/rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/platform/Sqlite3Platform.java
similarity index 100%
rename from rheem-platforms/rheem-sqlite3/src/main/java/io/rheem/rheem/sqlite3/platform/Sqlite3Platform.java
rename to rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/platform/Sqlite3Platform.java
diff --git a/rheem-platforms/rheem-sqlite3/src/main/java/io/rheem/rheem/sqlite3/plugin/Sqlite3ConversionPlugin.java b/rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/plugin/Sqlite3ConversionPlugin.java
similarity index 100%
rename from rheem-platforms/rheem-sqlite3/src/main/java/io/rheem/rheem/sqlite3/plugin/Sqlite3ConversionPlugin.java
rename to rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/plugin/Sqlite3ConversionPlugin.java
diff --git a/rheem-platforms/rheem-sqlite3/src/main/java/io/rheem/rheem/sqlite3/plugin/Sqlite3Plugin.java b/rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/plugin/Sqlite3Plugin.java
similarity index 100%
rename from rheem-platforms/rheem-sqlite3/src/main/java/io/rheem/rheem/sqlite3/plugin/Sqlite3Plugin.java
rename to rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/plugin/Sqlite3Plugin.java
diff --git a/rheem-profiler/src/main/java/io/rheem/rheem/profiler/data/DataGenerators.java b/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/data/DataGenerators.java
similarity index 100%
rename from rheem-profiler/src/main/java/io/rheem/rheem/profiler/data/DataGenerators.java
rename to rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/data/DataGenerators.java
diff --git a/rheem-profiler/src/main/java/io/rheem/rheem/profiler/hardware/DiskProfiler.java b/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/hardware/DiskProfiler.java
similarity index 100%
rename from rheem-profiler/src/main/java/io/rheem/rheem/profiler/hardware/DiskProfiler.java
rename to rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/hardware/DiskProfiler.java
diff --git a/rheem-profiler/src/main/java/io/rheem/rheem/profiler/java/BinaryOperatorProfiler.java b/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/BinaryOperatorProfiler.java
similarity index 100%
rename from rheem-profiler/src/main/java/io/rheem/rheem/profiler/java/BinaryOperatorProfiler.java
rename to rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/BinaryOperatorProfiler.java
diff --git a/rheem-profiler/src/main/java/io/rheem/rheem/profiler/java/JavaCollectionSourceProfiler.java b/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/JavaCollectionSourceProfiler.java
similarity index 100%
rename from rheem-profiler/src/main/java/io/rheem/rheem/profiler/java/JavaCollectionSourceProfiler.java
rename to rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/JavaCollectionSourceProfiler.java
diff --git a/rheem-profiler/src/main/java/io/rheem/rheem/profiler/java/JavaTextFileSourceProfiler.java b/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/JavaTextFileSourceProfiler.java
similarity index 100%
rename from rheem-profiler/src/main/java/io/rheem/rheem/profiler/java/JavaTextFileSourceProfiler.java
rename to rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/JavaTextFileSourceProfiler.java
diff --git a/rheem-profiler/src/main/java/io/rheem/rheem/profiler/java/OperatorProfiler.java b/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/OperatorProfiler.java
similarity index 100%
rename from rheem-profiler/src/main/java/io/rheem/rheem/profiler/java/OperatorProfiler.java
rename to rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/OperatorProfiler.java
diff --git a/rheem-profiler/src/main/java/io/rheem/rheem/profiler/java/OperatorProfilers.java b/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/OperatorProfilers.java
similarity index 100%
rename from rheem-profiler/src/main/java/io/rheem/rheem/profiler/java/OperatorProfilers.java
rename to rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/OperatorProfilers.java
diff --git a/rheem-profiler/src/main/java/io/rheem/rheem/profiler/java/Profiler.java b/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/Profiler.java
similarity index 100%
rename from rheem-profiler/src/main/java/io/rheem/rheem/profiler/java/Profiler.java
rename to rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/Profiler.java
diff --git a/rheem-profiler/src/main/java/io/rheem/rheem/profiler/java/SinkProfiler.java b/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/SinkProfiler.java
similarity index 100%
rename from rheem-profiler/src/main/java/io/rheem/rheem/profiler/java/SinkProfiler.java
rename to rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/SinkProfiler.java
diff --git a/rheem-profiler/src/main/java/io/rheem/rheem/profiler/java/SourceProfiler.java b/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/SourceProfiler.java
similarity index 100%
rename from rheem-profiler/src/main/java/io/rheem/rheem/profiler/java/SourceProfiler.java
rename to rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/SourceProfiler.java
diff --git a/rheem-profiler/src/main/java/io/rheem/rheem/profiler/java/UnaryOperatorProfiler.java b/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/UnaryOperatorProfiler.java
similarity index 100%
rename from rheem-profiler/src/main/java/io/rheem/rheem/profiler/java/UnaryOperatorProfiler.java
rename to rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/UnaryOperatorProfiler.java
diff --git a/rheem-profiler/src/main/java/io/rheem/rheem/profiler/log/DynamicEstimationContext.java b/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/DynamicEstimationContext.java
similarity index 100%
rename from rheem-profiler/src/main/java/io/rheem/rheem/profiler/log/DynamicEstimationContext.java
rename to rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/DynamicEstimationContext.java
diff --git a/rheem-profiler/src/main/java/io/rheem/rheem/profiler/log/DynamicLoadEstimator.java b/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/DynamicLoadEstimator.java
similarity index 100%
rename from rheem-profiler/src/main/java/io/rheem/rheem/profiler/log/DynamicLoadEstimator.java
rename to rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/DynamicLoadEstimator.java
diff --git a/rheem-profiler/src/main/java/io/rheem/rheem/profiler/log/DynamicLoadProfileEstimator.java b/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/DynamicLoadProfileEstimator.java
similarity index 100%
rename from rheem-profiler/src/main/java/io/rheem/rheem/profiler/log/DynamicLoadProfileEstimator.java
rename to rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/DynamicLoadProfileEstimator.java
diff --git a/rheem-profiler/src/main/java/io/rheem/rheem/profiler/log/DynamicLoadProfileEstimators.java b/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/DynamicLoadProfileEstimators.java
similarity index 100%
rename from rheem-profiler/src/main/java/io/rheem/rheem/profiler/log/DynamicLoadProfileEstimators.java
rename to rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/DynamicLoadProfileEstimators.java
diff --git a/rheem-profiler/src/main/java/io/rheem/rheem/profiler/log/GeneticOptimizer.java b/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/GeneticOptimizer.java
similarity index 100%
rename from rheem-profiler/src/main/java/io/rheem/rheem/profiler/log/GeneticOptimizer.java
rename to rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/GeneticOptimizer.java
diff --git a/rheem-profiler/src/main/java/io/rheem/rheem/profiler/log/GeneticOptimizerApp.java b/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/GeneticOptimizerApp.java
similarity index 100%
rename from rheem-profiler/src/main/java/io/rheem/rheem/profiler/log/GeneticOptimizerApp.java
rename to rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/GeneticOptimizerApp.java
diff --git a/rheem-profiler/src/main/java/io/rheem/rheem/profiler/log/Individual.java b/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/Individual.java
similarity index 100%
rename from rheem-profiler/src/main/java/io/rheem/rheem/profiler/log/Individual.java
rename to rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/Individual.java
diff --git a/rheem-profiler/src/main/java/io/rheem/rheem/profiler/log/LogEvaluator.java b/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/LogEvaluator.java
similarity index 100%
rename from rheem-profiler/src/main/java/io/rheem/rheem/profiler/log/LogEvaluator.java
rename to rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/LogEvaluator.java
diff --git a/rheem-profiler/src/main/java/io/rheem/rheem/profiler/log/OptimizationSpace.java b/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/OptimizationSpace.java
similarity index 100%
rename from rheem-profiler/src/main/java/io/rheem/rheem/profiler/log/OptimizationSpace.java
rename to rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/OptimizationSpace.java
diff --git a/rheem-profiler/src/main/java/io/rheem/rheem/profiler/log/Variable.java b/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/Variable.java
similarity index 100%
rename from rheem-profiler/src/main/java/io/rheem/rheem/profiler/log/Variable.java
rename to rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/Variable.java
diff --git a/rheem-profiler/src/main/java/io/rheem/rheem/profiler/log/sampling/Battle.java b/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/sampling/Battle.java
similarity index 100%
rename from rheem-profiler/src/main/java/io/rheem/rheem/profiler/log/sampling/Battle.java
rename to rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/sampling/Battle.java
diff --git a/rheem-profiler/src/main/java/io/rheem/rheem/profiler/log/sampling/ReservoirSampler.java b/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/sampling/ReservoirSampler.java
similarity index 100%
rename from rheem-profiler/src/main/java/io/rheem/rheem/profiler/log/sampling/ReservoirSampler.java
rename to rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/sampling/ReservoirSampler.java
diff --git a/rheem-profiler/src/main/java/io/rheem/rheem/profiler/log/sampling/Sampler.java b/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/sampling/Sampler.java
similarity index 100%
rename from rheem-profiler/src/main/java/io/rheem/rheem/profiler/log/sampling/Sampler.java
rename to rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/sampling/Sampler.java
diff --git a/rheem-profiler/src/main/java/io/rheem/rheem/profiler/log/sampling/TournamentSampler.java b/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/sampling/TournamentSampler.java
similarity index 100%
rename from rheem-profiler/src/main/java/io/rheem/rheem/profiler/log/sampling/TournamentSampler.java
rename to rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/sampling/TournamentSampler.java
diff --git a/rheem-profiler/src/main/java/io/rheem/rheem/profiler/spark/BinaryOperatorProfiler.java b/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/BinaryOperatorProfiler.java
similarity index 100%
rename from rheem-profiler/src/main/java/io/rheem/rheem/profiler/spark/BinaryOperatorProfiler.java
rename to rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/BinaryOperatorProfiler.java
diff --git a/rheem-profiler/src/main/java/io/rheem/rheem/profiler/spark/Main.java b/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/Main.java
similarity index 100%
rename from rheem-profiler/src/main/java/io/rheem/rheem/profiler/spark/Main.java
rename to rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/Main.java
diff --git a/rheem-profiler/src/main/java/io/rheem/rheem/profiler/spark/OperatorProfilers.java b/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/OperatorProfilers.java
similarity index 100%
rename from rheem-profiler/src/main/java/io/rheem/rheem/profiler/spark/OperatorProfilers.java
rename to rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/OperatorProfilers.java
diff --git a/rheem-profiler/src/main/java/io/rheem/rheem/profiler/spark/SinkProfiler.java b/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SinkProfiler.java
similarity index 100%
rename from rheem-profiler/src/main/java/io/rheem/rheem/profiler/spark/SinkProfiler.java
rename to rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SinkProfiler.java
diff --git a/rheem-profiler/src/main/java/io/rheem/rheem/profiler/spark/SparkCollectionSourceProfiler.java b/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkCollectionSourceProfiler.java
similarity index 100%
rename from rheem-profiler/src/main/java/io/rheem/rheem/profiler/spark/SparkCollectionSourceProfiler.java
rename to rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkCollectionSourceProfiler.java
diff --git a/rheem-profiler/src/main/java/io/rheem/rheem/profiler/spark/SparkOperatorProfiler.java b/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkOperatorProfiler.java
similarity index 100%
rename from rheem-profiler/src/main/java/io/rheem/rheem/profiler/spark/SparkOperatorProfiler.java
rename to rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkOperatorProfiler.java
diff --git a/rheem-profiler/src/main/java/io/rheem/rheem/profiler/spark/SparkSourceProfiler.java b/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkSourceProfiler.java
similarity index 100%
rename from rheem-profiler/src/main/java/io/rheem/rheem/profiler/spark/SparkSourceProfiler.java
rename to rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkSourceProfiler.java
diff --git a/rheem-profiler/src/main/java/io/rheem/rheem/profiler/spark/SparkTextFileSourceProfiler.java b/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkTextFileSourceProfiler.java
similarity index 100%
rename from rheem-profiler/src/main/java/io/rheem/rheem/profiler/spark/SparkTextFileSourceProfiler.java
rename to rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkTextFileSourceProfiler.java
diff --git a/rheem-profiler/src/main/java/io/rheem/rheem/profiler/spark/SparkUnaryOperatorProfiler.java b/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkUnaryOperatorProfiler.java
similarity index 100%
rename from rheem-profiler/src/main/java/io/rheem/rheem/profiler/spark/SparkUnaryOperatorProfiler.java
rename to rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkUnaryOperatorProfiler.java
diff --git a/rheem-profiler/src/main/java/io/rheem/rheem/profiler/util/ProfilingUtils.java b/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/util/ProfilingUtils.java
similarity index 100%
rename from rheem-profiler/src/main/java/io/rheem/rheem/profiler/util/ProfilingUtils.java
rename to rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/util/ProfilingUtils.java
diff --git a/rheem-profiler/src/main/java/io/rheem/rheem/profiler/util/RrdAccessor.java b/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/util/RrdAccessor.java
similarity index 100%
rename from rheem-profiler/src/main/java/io/rheem/rheem/profiler/util/RrdAccessor.java
rename to rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/util/RrdAccessor.java
diff --git a/rheem-tests/src/test/java/io/rheem/rheem/tests/FlinkIntegrationIT.java b/rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/FlinkIntegrationIT.java
similarity index 100%
rename from rheem-tests/src/test/java/io/rheem/rheem/tests/FlinkIntegrationIT.java
rename to rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/FlinkIntegrationIT.java
diff --git a/rheem-tests/src/test/java/io/rheem/rheem/tests/FullIntegrationIT.java b/rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/FullIntegrationIT.java
similarity index 100%
rename from rheem-tests/src/test/java/io/rheem/rheem/tests/FullIntegrationIT.java
rename to rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/FullIntegrationIT.java
diff --git a/rheem-tests/src/test/java/io/rheem/rheem/tests/GiraphIntegrationIT.java b/rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/GiraphIntegrationIT.java
similarity index 100%
rename from rheem-tests/src/test/java/io/rheem/rheem/tests/GiraphIntegrationIT.java
rename to rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/GiraphIntegrationIT.java
diff --git a/rheem-tests/src/test/java/io/rheem/rheem/tests/GraphChiIntegrationIT.java b/rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/GraphChiIntegrationIT.java
similarity index 100%
rename from rheem-tests/src/test/java/io/rheem/rheem/tests/GraphChiIntegrationIT.java
rename to rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/GraphChiIntegrationIT.java
diff --git a/rheem-tests/src/test/java/io/rheem/rheem/tests/JavaIntegrationIT.java b/rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/JavaIntegrationIT.java
similarity index 100%
rename from rheem-tests/src/test/java/io/rheem/rheem/tests/JavaIntegrationIT.java
rename to rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/JavaIntegrationIT.java
diff --git a/rheem-tests/src/test/java/io/rheem/rheem/tests/PostgresIntegrationIT.java b/rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/PostgresIntegrationIT.java
similarity index 100%
rename from rheem-tests/src/test/java/io/rheem/rheem/tests/PostgresIntegrationIT.java
rename to rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/PostgresIntegrationIT.java
diff --git a/rheem-tests/src/test/java/io/rheem/rheem/tests/RegressionIT.java b/rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/RegressionIT.java
similarity index 100%
rename from rheem-tests/src/test/java/io/rheem/rheem/tests/RegressionIT.java
rename to rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/RegressionIT.java
diff --git a/rheem-tests/src/test/java/io/rheem/rheem/tests/SparkIntegrationIT.java b/rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/SparkIntegrationIT.java
similarity index 100%
rename from rheem-tests/src/test/java/io/rheem/rheem/tests/SparkIntegrationIT.java
rename to rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/SparkIntegrationIT.java
diff --git a/rheem-tests/src/test/java/io/rheem/rheem/tests/RheemPlans.java b/rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/WayangPlans.java
similarity index 100%
rename from rheem-tests/src/test/java/io/rheem/rheem/tests/RheemPlans.java
rename to rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/WayangPlans.java
diff --git a/rheem-tests/src/test/java/io/rheem/rheem/tests/RheemPlansOperators.java b/rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/WayangPlansOperators.java
similarity index 100%
rename from rheem-tests/src/test/java/io/rheem/rheem/tests/RheemPlansOperators.java
rename to rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/WayangPlansOperators.java
diff --git a/rheem-tests/src/test/java/io/rheem/rheem/tests/WordCountIT.java b/rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/WordCountIT.java
similarity index 100%
rename from rheem-tests/src/test/java/io/rheem/rheem/tests/WordCountIT.java
rename to rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/WordCountIT.java
diff --git a/rheem-tests/src/test/java/io/rheem/rheem/tests/platform/MyMadeUpPlatform.java b/rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/platform/MyMadeUpPlatform.java
similarity index 100%
rename from rheem-tests/src/test/java/io/rheem/rheem/tests/platform/MyMadeUpPlatform.java
rename to rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/platform/MyMadeUpPlatform.java


[incubator-wayang] 03/05: folder structure

Posted by be...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bertty pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-wayang.git

commit 55107f7ec6d08959ad65ee19f6ecadbfd43cad46
Author: Bertty Contreras-Rojas <be...@scalytics.io>
AuthorDate: Fri Dec 18 12:53:05 2020 -0300

    folder structure
---
 {rheem-api => wayang-api}/pom.xml                           |   0
 .../scala/org/apache/incubator/wayang/api/DataQuanta.scala  |   0
 .../org/apache/incubator/wayang/api/DataQuantaBuilder.scala |   0
 .../org/apache/incubator/wayang/api/JavaPlanBuilder.scala   |   0
 .../scala/org/apache/incubator/wayang/api/PlanBuilder.scala |   0
 .../org/apache/incubator/wayang/api/RecordDataQuanta.scala  |   0
 .../incubator/wayang/api/RecordDataQuantaBuilder.scala      |   0
 .../scala/org/apache/incubator/wayang/api/graph/Edge.scala  |   0
 .../apache/incubator/wayang/api/graph/EdgeDataQuanta.scala  |   0
 .../incubator/wayang/api/graph/EdgeDataQuantaBuilder.scala  |   0
 .../org/apache/incubator/wayang/api/graph/package.scala     |   0
 .../scala/org/apache/incubator/wayang/api/package.scala     |   0
 .../incubator/wayang/api/util/DataQuantaBuilderCache.scala  |   0
 .../wayang/api/util/DataQuantaBuilderDecorator.scala        |   0
 .../org/apache/incubator/wayang/api/util/TypeTrap.scala     |   0
 .../java/org/apache/incubator/wayang/api/JavaApiTest.java   |   0
 .../src/test/resources/wayang.properties                    |   0
 .../scala/org/apache/incubator/wayang/api/ApiTest.scala     |   0
 {rheem-basic => wayang-basic}/pom.xml                       |   0
 .../org/apache/incubator/wayang/basic/WayangBasics.java     |   0
 .../apache/incubator/wayang/basic/channels/FileChannel.java |   0
 .../java/org/apache/incubator/wayang/basic/data/Record.java |   0
 .../java/org/apache/incubator/wayang/basic/data/Tuple2.java |   0
 .../java/org/apache/incubator/wayang/basic/data/Tuple5.java |   0
 .../wayang/basic/function/ProjectionDescriptor.java         |   0
 .../incubator/wayang/basic/mapping/GlobalReduceMapping.java |   0
 .../org/apache/incubator/wayang/basic/mapping/Mappings.java |   0
 .../wayang/basic/mapping/MaterializedGroupByMapping.java    |   0
 .../incubator/wayang/basic/mapping/PageRankMapping.java     |   0
 .../incubator/wayang/basic/mapping/ReduceByMapping.java     |   0
 .../incubator/wayang/basic/mapping/RepeatMapping.java       |   0
 .../incubator/wayang/basic/operators/CartesianOperator.java |   0
 .../incubator/wayang/basic/operators/CoGroupOperator.java   |   0
 .../incubator/wayang/basic/operators/CollectionSource.java  |   0
 .../incubator/wayang/basic/operators/CountOperator.java     |   0
 .../incubator/wayang/basic/operators/DistinctOperator.java  |   0
 .../incubator/wayang/basic/operators/DoWhileOperator.java   |   0
 .../incubator/wayang/basic/operators/FilterOperator.java    |   0
 .../incubator/wayang/basic/operators/FlatMapOperator.java   |   0
 .../basic/operators/GlobalMaterializedGroupOperator.java    |   0
 .../wayang/basic/operators/GlobalReduceOperator.java        |   0
 .../incubator/wayang/basic/operators/GroupByOperator.java   |   0
 .../incubator/wayang/basic/operators/IntersectOperator.java |   0
 .../incubator/wayang/basic/operators/JoinOperator.java      |   0
 .../incubator/wayang/basic/operators/LocalCallbackSink.java |   0
 .../incubator/wayang/basic/operators/LoopOperator.java      |   0
 .../incubator/wayang/basic/operators/MapOperator.java       |   0
 .../wayang/basic/operators/MapPartitionsOperator.java       |   0
 .../wayang/basic/operators/MaterializedGroupByOperator.java |   0
 .../incubator/wayang/basic/operators/PageRankOperator.java  |   0
 .../incubator/wayang/basic/operators/ReduceByOperator.java  |   0
 .../incubator/wayang/basic/operators/ReduceOperator.java    |   0
 .../incubator/wayang/basic/operators/RepeatOperator.java    |   0
 .../incubator/wayang/basic/operators/SampleOperator.java    |   0
 .../incubator/wayang/basic/operators/SortOperator.java      |   0
 .../incubator/wayang/basic/operators/TableSource.java       |   0
 .../incubator/wayang/basic/operators/TextFileSink.java      |   0
 .../incubator/wayang/basic/operators/TextFileSource.java    |   0
 .../incubator/wayang/basic/operators/UnionAllOperator.java  |   0
 .../incubator/wayang/basic/operators/ZipWithIdOperator.java |   0
 .../apache/incubator/wayang/basic/plugin/WayangBasic.java   |   0
 .../incubator/wayang/basic/plugin/WayangBasicGraph.java     |   0
 .../org/apache/incubator/wayang/basic/types/RecordType.java |   0
 .../src/main/resources/wayang-basic-defaults.properties     |   0
 .../wayang/basic/function/ProjectionDescriptorTest.java     |   0
 .../incubator/wayang/basic/mapping/ReduceByMappingTest.java |   0
 .../basic/operators/MaterializedGroupByOperatorTest.java    |   0
 .../wayang/basic/operators/TextFileSourceTest.java          |   0
 .../incubator/wayang/basic/operators/test/TestSink.java     |   0
 .../incubator/wayang/basic/operators/test/TestSource.java   |   0
 .../apache/incubator/wayang/basic/types/RecordTypeTest.java |   0
 .../src/test/resources/ulysses.txt                          |   0
 {rheem-core => wayang-core}/pom.xml                         |   0
 .../org/apache/incubator/wayang/core/mathex/MathEx.g4       |   0
 .../org/apache/incubator/wayang/core/api/Configuration.java |   0
 .../main/java/org/apache/incubator/wayang/core/api/Job.java |   0
 .../org/apache/incubator/wayang/core/api/WayangContext.java |   0
 .../wayang/core/api/configuration/CollectionProvider.java   |   0
 .../core/api/configuration/ConstantValueProvider.java       |   0
 .../core/api/configuration/ExplicitCollectionProvider.java  |   0
 .../api/configuration/FunctionalCollectionProvider.java     |   0
 .../core/api/configuration/FunctionalKeyValueProvider.java  |   0
 .../core/api/configuration/FunctionalValueProvider.java     |   0
 .../wayang/core/api/configuration/KeyValueProvider.java     |   0
 .../core/api/configuration/MapBasedKeyValueProvider.java    |   0
 .../wayang/core/api/configuration/ValueProvider.java        |   0
 .../wayang/core/api/exception/WayangException.java          |   0
 .../wayang/core/function/AggregationDescriptor.java         |   0
 .../incubator/wayang/core/function/ConsumerDescriptor.java  |   0
 .../incubator/wayang/core/function/ExecutionContext.java    |   0
 .../incubator/wayang/core/function/ExtendedFunction.java    |   0
 .../incubator/wayang/core/function/FlatMapDescriptor.java   |   0
 .../incubator/wayang/core/function/FunctionDescriptor.java  |   0
 .../wayang/core/function/MapPartitionsDescriptor.java       |   0
 .../incubator/wayang/core/function/PredicateDescriptor.java |   0
 .../incubator/wayang/core/function/ReduceDescriptor.java    |   0
 .../wayang/core/function/TransformationDescriptor.java      |   0
 .../org/apache/incubator/wayang/core/mapping/Mapping.java   |   0
 .../apache/incubator/wayang/core/mapping/OperatorMatch.java |   0
 .../incubator/wayang/core/mapping/OperatorPattern.java      |   0
 .../incubator/wayang/core/mapping/PlanTransformation.java   |   0
 .../wayang/core/mapping/ReplacementSubplanFactory.java      |   0
 .../apache/incubator/wayang/core/mapping/SubplanMatch.java  |   0
 .../incubator/wayang/core/mapping/SubplanPattern.java       |   0
 .../incubator/wayang/core/monitor/DisabledMonitor.java      |   0
 .../apache/incubator/wayang/core/monitor/FileMonitor.java   |   0
 .../apache/incubator/wayang/core/monitor/HttpMonitor.java   |   0
 .../org/apache/incubator/wayang/core/monitor/Monitor.java   |   0
 .../apache/incubator/wayang/core/monitor/ZeroMQMonitor.java |   0
 .../wayang/core/optimizer/AggregateOptimizationContext.java |   0
 .../wayang/core/optimizer/DefaultOptimizationContext.java   |   0
 .../wayang/core/optimizer/OptimizationContext.java          |   0
 .../incubator/wayang/core/optimizer/OptimizationUtils.java  |   0
 .../wayang/core/optimizer/ProbabilisticDoubleInterval.java  |   0
 .../core/optimizer/ProbabilisticIntervalEstimate.java       |   0
 .../incubator/wayang/core/optimizer/SanityChecker.java      |   0
 .../cardinality/AbstractAlternativeCardinalityPusher.java   |   0
 .../cardinality/AggregatingCardinalityEstimator.java        |   0
 .../core/optimizer/cardinality/CardinalityEstimate.java     |   0
 .../cardinality/CardinalityEstimationTraversal.java         |   0
 .../core/optimizer/cardinality/CardinalityEstimator.java    |   0
 .../optimizer/cardinality/CardinalityEstimatorManager.java  |   0
 .../core/optimizer/cardinality/CardinalityPusher.java       |   0
 .../optimizer/cardinality/DefaultCardinalityEstimator.java  |   0
 .../optimizer/cardinality/DefaultCardinalityPusher.java     |   0
 .../optimizer/cardinality/FallbackCardinalityEstimator.java |   0
 .../cardinality/FixedSizeCardinalityEstimator.java          |   0
 .../cardinality/LoopHeadAlternativeCardinalityPusher.java   |   0
 .../optimizer/cardinality/LoopSubplanCardinalityPusher.java |   0
 .../cardinality/OperatorAlternativeCardinalityPusher.java   |   0
 .../optimizer/cardinality/SubplanCardinalityPusher.java     |   0
 .../cardinality/SwitchForwardCardinalityEstimator.java      |   0
 .../wayang/core/optimizer/channels/ChannelConversion.java   |   0
 .../core/optimizer/channels/ChannelConversionGraph.java     |   0
 .../core/optimizer/channels/DefaultChannelConversion.java   |   0
 .../core/optimizer/costs/ConstantLoadProfileEstimator.java  |   0
 .../wayang/core/optimizer/costs/DefaultLoadEstimator.java   |   0
 .../wayang/core/optimizer/costs/EstimationContext.java      |   0
 .../wayang/core/optimizer/costs/IntervalLoadEstimator.java  |   0
 .../incubator/wayang/core/optimizer/costs/LoadEstimate.java |   0
 .../wayang/core/optimizer/costs/LoadEstimator.java          |   0
 .../incubator/wayang/core/optimizer/costs/LoadProfile.java  |   0
 .../wayang/core/optimizer/costs/LoadProfileEstimator.java   |   0
 .../wayang/core/optimizer/costs/LoadProfileEstimators.java  |   0
 .../core/optimizer/costs/LoadProfileToTimeConverter.java    |   0
 .../wayang/core/optimizer/costs/LoadToTimeConverter.java    |   0
 .../core/optimizer/costs/NestableLoadProfileEstimator.java  |   0
 .../core/optimizer/costs/SimpleEstimationContext.java       |   0
 .../incubator/wayang/core/optimizer/costs/TimeEstimate.java |   0
 .../wayang/core/optimizer/costs/TimeToCostConverter.java    |   0
 .../core/optimizer/enumeration/ExecutionTaskFlow.java       |   0
 .../optimizer/enumeration/ExecutionTaskFlowCompiler.java    |   0
 .../enumeration/LatentOperatorPruningStrategy.java          |   0
 .../wayang/core/optimizer/enumeration/LoopEnumerator.java   |   0
 .../core/optimizer/enumeration/LoopImplementation.java      |   0
 .../wayang/core/optimizer/enumeration/PlanEnumeration.java  |   0
 .../enumeration/PlanEnumerationPruningStrategy.java         |   0
 .../wayang/core/optimizer/enumeration/PlanEnumerator.java   |   0
 .../core/optimizer/enumeration/PlanImplementation.java      |   0
 .../core/optimizer/enumeration/RandomPruningStrategy.java   |   0
 .../enumeration/SinglePlatformPruningStrategy.java          |   0
 .../optimizer/enumeration/StageAssignmentTraversal.java     |   0
 .../core/optimizer/enumeration/TopKPruningStrategy.java     |   0
 .../core/optimizer/partition/EnumerationAlternative.java    |   0
 .../wayang/core/optimizer/partition/EnumerationBranch.java  |   0
 .../incubator/wayang/core/plan/executionplan/Channel.java   |   0
 .../wayang/core/plan/executionplan/ChannelInitializer.java  |   0
 .../wayang/core/plan/executionplan/ExecutionPlan.java       |   0
 .../wayang/core/plan/executionplan/ExecutionStage.java      |   0
 .../wayang/core/plan/executionplan/ExecutionStageLoop.java  |   0
 .../wayang/core/plan/executionplan/ExecutionTask.java       |   0
 .../wayang/core/plan/executionplan/PlatformExecution.java   |   0
 .../wayang/core/plan/wayangplan}/ActualOperator.java        |   0
 .../wayang/core/plan/wayangplan}/BinaryToUnaryOperator.java |   0
 .../wayang/core/plan/wayangplan}/CompositeOperator.java     |   0
 .../wayang/core/plan/wayangplan}/ElementaryOperator.java    |   0
 .../core/plan/wayangplan}/EstimationContextProperty.java    |   0
 .../wayang/core/plan/wayangplan}/ExecutionOperator.java     |   0
 .../incubator/wayang/core/plan/wayangplan}/InputSlot.java   |   0
 .../wayang/core/plan/wayangplan}/LoopHeadAlternative.java   |   0
 .../wayang/core/plan/wayangplan}/LoopHeadOperator.java      |   0
 .../wayang/core/plan/wayangplan}/LoopIsolator.java          |   0
 .../incubator/wayang/core/plan/wayangplan}/LoopSubplan.java |   0
 .../incubator/wayang/core/plan/wayangplan}/Operator.java    |   0
 .../wayang/core/plan/wayangplan}/OperatorAlternative.java   |   0
 .../wayang/core/plan/wayangplan}/OperatorBase.java          |   0
 .../wayang/core/plan/wayangplan}/OperatorContainer.java     |   0
 .../wayang/core/plan/wayangplan}/OperatorContainers.java    |   0
 .../incubator/wayang/core/plan/wayangplan}/Operators.java   |   0
 .../incubator/wayang/core/plan/wayangplan}/OutputSlot.java  |   0
 .../incubator/wayang/core/plan/wayangplan}/PlanMetrics.java |   0
 .../wayang/core/plan/wayangplan}/PlanTraversal.java         |   0
 .../apache/incubator/wayang/core/plan/wayangplan}/Slot.java |   0
 .../incubator/wayang/core/plan/wayangplan}/SlotMapping.java |   0
 .../incubator/wayang/core/plan/wayangplan}/Subplan.java     |   0
 .../wayang/core/plan/wayangplan}/TopDownPlanVisitor.java    |   0
 .../incubator/wayang/core/plan/wayangplan}/UnarySink.java   |   0
 .../incubator/wayang/core/plan/wayangplan}/UnarySource.java |   0
 .../wayang/core/plan/wayangplan}/UnaryToUnaryOperator.java  |   0
 .../incubator/wayang/core/plan/wayangplan}/WayangPlan.java  |   0
 .../wayangplan}/traversal/AbstractTopologicalTraversal.java |   0
 .../wayang/core/platform/AbstractChannelInstance.java       |   0
 .../incubator/wayang/core/platform/AtomicExecution.java     |   0
 .../wayang/core/platform/AtomicExecutionGroup.java          |   0
 .../apache/incubator/wayang/core/platform/Breakpoint.java   |   0
 .../wayang/core/platform/CardinalityBreakpoint.java         |   0
 .../incubator/wayang/core/platform/ChannelDescriptor.java   |   0
 .../incubator/wayang/core/platform/ChannelInstance.java     |   0
 .../wayang/core/platform/CompositeExecutionResource.java    |   0
 .../wayang/core/platform/ConjunctiveBreakpoint.java         |   0
 .../wayang/core/platform/CrossPlatformExecutor.java         |   0
 .../incubator/wayang/core/platform/ExecutionResource.java   |   0
 .../wayang/core/platform/ExecutionResourceTemplate.java     |   0
 .../incubator/wayang/core/platform/ExecutionState.java      |   0
 .../org/apache/incubator/wayang/core/platform/Executor.java |   0
 .../incubator/wayang/core/platform/ExecutorTemplate.java    |   0
 .../incubator/wayang/core/platform/FixBreakpoint.java       |   0
 .../org/apache/incubator/wayang/core/platform/Junction.java |   0
 .../wayang/core/platform/NoIterationBreakpoint.java         |   0
 .../incubator/wayang/core/platform/PartialExecution.java    |   0
 .../org/apache/incubator/wayang/core/platform/Platform.java |   0
 .../wayang/core/platform/PushExecutorTemplate.java          |   0
 .../wayang/core/platform/lineage/ChannelLineageNode.java    |   0
 .../wayang/core/platform/lineage/ExecutionLineageNode.java  |   0
 .../core/platform/lineage/LazyExecutionLineageNode.java     |   0
 .../apache/incubator/wayang/core/plugin/DynamicPlugin.java  |   0
 .../org/apache/incubator/wayang/core/plugin/Plugin.java     |   0
 .../wayang/core/profiling/CardinalityRepository.java        |   0
 .../incubator/wayang/core/profiling/CostMeasurement.java    |   0
 .../incubator/wayang/core/profiling/ExecutionLog.java       |   0
 .../wayang/core/profiling/ExecutionPlanMeasurement.java     |   0
 .../wayang/core/profiling/FullInstrumentationStrategy.java  |   0
 .../wayang/core/profiling/InstrumentationStrategy.java      |   0
 .../wayang/core/profiling/NoInstrumentationStrategy.java    |   0
 .../core/profiling/OutboundInstrumentationStrategy.java     |   0
 .../wayang/core/profiling/PartialExecutionMeasurement.java  |   0
 .../apache/incubator/wayang/core/profiling/ProfileDBs.java  |   0
 .../incubator/wayang/core/types/BasicDataUnitType.java      |   0
 .../org/apache/incubator/wayang/core/types/DataSetType.java |   0
 .../incubator/wayang/core/types/DataUnitGroupType.java      |   0
 .../apache/incubator/wayang/core/types/DataUnitType.java    |   0
 .../wayang/core/util/AbstractReferenceCountable.java        |   0
 .../java/org/apache/incubator/wayang/core/util/Action.java  |   0
 .../java/org/apache/incubator/wayang/core/util/Actions.java |   0
 .../java/org/apache/incubator/wayang/core/util/Bitmask.java |   0
 .../apache/incubator/wayang/core/util/Canonicalizer.java    |   0
 .../incubator/wayang/core/util/ConsumerIteratorAdapter.java |   0
 .../org/apache/incubator/wayang/core/util/Copyable.java     |   0
 .../java/org/apache/incubator/wayang/core/util/Counter.java |   0
 .../incubator/wayang/core/util/CrossProductIterable.java    |   0
 .../java/org/apache/incubator/wayang/core/util/Formats.java |   0
 .../org/apache/incubator/wayang/core/util/Iterators.java    |   0
 .../apache/incubator/wayang/core/util/JsonSerializable.java |   0
 .../incubator/wayang/core/util/JsonSerializables.java       |   0
 .../apache/incubator/wayang/core/util/JsonSerializer.java   |   0
 .../org/apache/incubator/wayang/core/util/JuelUtils.java    |   0
 .../incubator/wayang/core/util/LimitedInputStream.java      |   0
 .../java/org/apache/incubator/wayang/core/util/Logging.java |   0
 .../org/apache/incubator/wayang/core/util/LruCache.java     |   0
 .../org/apache/incubator/wayang/core/util/MultiMap.java     |   0
 .../incubator/wayang/core/util/OneTimeExecutable.java       |   0
 .../org/apache/incubator/wayang/core/util/Optional.java     |   0
 .../incubator/wayang/core/util/ReferenceCountable.java      |   0
 .../apache/incubator/wayang/core/util/ReflectionUtils.java  |   0
 .../java/org/apache/incubator/wayang/core/util/Tuple.java   |   0
 .../org/apache/incubator/wayang/core/util/WayangArrays.java |   0
 .../incubator/wayang/core/util/WayangCollections.java       |   0
 .../apache/incubator/wayang/core/util/fs/FileSystem.java    |   0
 .../apache/incubator/wayang/core/util/fs/FileSystems.java   |   0
 .../org/apache/incubator/wayang/core/util/fs/FileUtils.java |   0
 .../incubator/wayang/core/util/fs/HadoopFileSystem.java     |   0
 .../incubator/wayang/core/util/fs/LocalFileSystem.java      |   0
 .../apache/incubator/wayang/core/util/mathex/Context.java   |   0
 .../incubator/wayang/core/util/mathex/DefaultContext.java   |   0
 .../incubator/wayang/core/util/mathex/Expression.java       |   0
 .../wayang/core/util/mathex/ExpressionBuilder.java          |   0
 .../core/util/mathex/exceptions/EvaluationException.java    |   0
 .../wayang/core/util/mathex/exceptions/MathExException.java |   0
 .../wayang/core/util/mathex/exceptions/ParseException.java  |   0
 .../wayang/core/util/mathex/model/BinaryOperation.java      |   0
 .../wayang/core/util/mathex/model/CompiledFunction.java     |   0
 .../incubator/wayang/core/util/mathex/model/Constant.java   |   0
 .../wayang/core/util/mathex/model/NamedFunction.java        |   0
 .../wayang/core/util/mathex/model/UnaryOperation.java       |   0
 .../incubator/wayang/core/util/mathex/model/Variable.java   |   0
 .../src/main/resources/wayang-core-defaults.properties      |   0
 .../java/org/apache/incubator/wayang/core/SlotTest.java     |   0
 .../incubator/wayang/core/mapping/OperatorPatternTest.java  |   0
 .../wayang/core/mapping/PlanTransformationTest.java         |   0
 .../incubator/wayang/core/mapping/SubplanPatternTest.java   |   0
 .../incubator/wayang/core/mapping/test/TestSinkMapping.java |   0
 .../core/mapping/test/TestSinkToTestSink2Factory.java       |   0
 .../cardinality/AggregatingCardinalityEstimatorTest.java    |   0
 .../cardinality/DefaultCardinalityEstimatorTest.java        |   0
 .../cardinality/LoopSubplanCardinalityPusherTest.java       |   0
 .../optimizer/cardinality/SubplanCardinalityPusherTest.java |   0
 .../core/optimizer/channels/ChannelConversionGraphTest.java |   0
 .../optimizer/costs/NestableLoadProfileEstimatorTest.java   |   0
 .../optimizer/enumeration/StageAssignmentTraversalTest.java |   0
 .../wayang/core/plan/executionplan/test/TestChannel.java    |   0
 .../wayang/core/plan/wayangplan}/LoopIsolatorTest.java      |   0
 .../wayang/core/plan/wayangplan}/OperatorTest.java          |   0
 .../wayang/core/plan/wayangplan}/SlotMappingTest.java       |   0
 .../core/plan/wayangplan}/test/TestCustomMapOperator.java   |   0
 .../core/plan/wayangplan}/test/TestFilterOperator.java      |   0
 .../wayang/core/plan/wayangplan}/test/TestJoin.java         |   0
 .../wayang/core/plan/wayangplan}/test/TestLoopHead.java     |   0
 .../wayang/core/plan/wayangplan}/test/TestMapOperator.java  |   0
 .../wayang/core/plan/wayangplan}/test/TestSink.java         |   0
 .../wayang/core/plan/wayangplan}/test/TestSink2.java        |   0
 .../wayang/core/plan/wayangplan}/test/TestSource.java       |   0
 .../wayang/core/platform/PartialExecutionTest.java          |   0
 .../incubator/wayang/core/plugin/DynamicPluginTest.java     |   0
 .../incubator/wayang/core/test/DummyExecutionOperator.java  |   0
 .../wayang/core/test/DummyExternalReusableChannel.java      |   0
 .../incubator/wayang/core/test/DummyNonReusableChannel.java |   0
 .../apache/incubator/wayang/core/test/DummyPlatform.java    |   0
 .../incubator/wayang/core/test/DummyReusableChannel.java    |   0
 .../org/apache/incubator/wayang/core/test/MockFactory.java  |   0
 .../core/test/SerializableDummyExecutionOperator.java       |   0
 .../org/apache/incubator/wayang/core/test/TestDataUnit.java |   0
 .../apache/incubator/wayang/core/test/TestDataUnit2.java    |   0
 .../org/apache/incubator/wayang/core/util/BitmaskTest.java  |   0
 .../wayang/core/util/ConsumerIteratorAdapterTest.java       |   0
 .../wayang/core/util/CrossProductIterableTest.java          |   0
 .../incubator/wayang/core/util/LimitedInputStreamTest.java  |   0
 .../incubator/wayang/core/util/ReflectionUtilsTest.java     |   0
 .../incubator/wayang/core/util/WayangCollectionsTest.java   |   0
 .../wayang/core/util/mathex/ExpressionBuilderTest.java      |   0
 .../incubator/wayang/core/util/mathex/ExpressionTest.java   |   0
 .../src/test/resources/empty-plugin.yaml                    |   0
 .../src/test/resources/partial-plugin.yaml                  |   0
 .../src/test/resources/simplelogger.properties              |   0
 .../src/test/resources/test-plugin.yaml                     |   0
 {rheem-distro => wayang-distro}/pom.xml                     |   0
 {rheem-distro => wayang-distro}/src/assembly/distro.xml     |   0
 {rheem-extensions => wayang-extensions}/pom.xml             |   0
 .../wayang-iejoin}/pom.xml                                  |   0
 .../java/org/apache/incubator/wayang/iejoin/IEJoin.java     |   0
 .../java/org/apache/incubator/wayang/iejoin/data/Data.java  |   0
 .../apache/incubator/wayang/iejoin/mapping/Mappings.java    |   0
 .../incubator/wayang/iejoin/mapping/java/IEJoinMapping.java |   0
 .../wayang/iejoin/mapping/java/IESelfJoinMapping.java       |   0
 .../wayang/iejoin/mapping/spark/IEJoinMapping.java          |   0
 .../wayang/iejoin/mapping/spark/IESelfJoinMapping.java      |   0
 .../wayang/iejoin/operators/IEJoinMasterOperator.java       |   0
 .../incubator/wayang/iejoin/operators/IEJoinOperator.java   |   0
 .../wayang/iejoin/operators/IESelfJoinOperator.java         |   0
 .../wayang/iejoin/operators/JavaIEJoinOperator.java         |   0
 .../wayang/iejoin/operators/JavaIESelfJoinOperator.java     |   0
 .../wayang/iejoin/operators/SparkIEJoinOperator.java        |   0
 .../wayang/iejoin/operators/SparkIESelfJoinOperator.java    |   0
 .../wayang/iejoin/operators/java_helpers/BitSetJoin.java    |   0
 .../iejoin/operators/java_helpers/DataComparator.java       |   0
 .../wayang/iejoin/operators/java_helpers/extractData.java   |   0
 .../wayang/iejoin/operators/java_helpers/myMergeSort.java   |   0
 .../iejoin/operators/java_helpers/revDataComparator.java    |   0
 .../wayang/iejoin/operators/spark_helpers/BitSetJoin.java   |   0
 .../spark_helpers/List2AttributesObjectSkinny.java          |   0
 .../wayang/iejoin/operators/spark_helpers/addUniqueID.java  |   0
 .../iejoin/operators/spark_helpers/build2ListObject.java    |   0
 .../wayang/iejoin/operators/spark_helpers/extractData.java  |   0
 .../operators/spark_helpers/filterUnwantedBlocks.java       |   0
 .../wayang/iejoin/operators/spark_helpers/myMergeSort.java  |   0
 .../iejoin/operators/spark_helpers/revDataComparator.java   |   0
 .../iejoin/operators/JavaExecutionOperatorTestBase.java     |   0
 .../wayang/iejoin/operators/JavaIEJoinOperatorTest.java     |   0
 .../wayang/iejoin/operators/SparkIEJoinOperatorTest.java    |   0
 .../wayang/iejoin/operators/SparkIEJoinOperatorTest2.java   |   0
 .../wayang/iejoin/operators/SparkIEJoinOperatorTest3.java   |   0
 .../wayang/iejoin/operators/SparkIEJoinOperatorTest4.java   |   0
 .../iejoin/operators/SparkIESelfJoinOperatorTest.java       |   0
 .../wayang/iejoin/operators/SparkOperatorTestBase.java      |   0
 .../apache/incubator/wayang/iejoin/test/ChannelFactory.java |   0
 .../wayang-iejoin/src/test/resources/wayang.properties      |   0
 {rheem-platforms => wayang-platforms}/pom.xml               |   0
 .../rheem-flink => wayang-platforms/wayang-flink}/pom.xml   |   0
 .../main/java/org/apache/incubator/wayang/flink/Flink.java  |   0
 .../incubator/wayang/flink/channels/ChannelConversions.java |   0
 .../incubator/wayang/flink/channels/DataSetChannel.java     |   0
 .../wayang/flink/compiler/FlinkCoGroupFunction.java         |   0
 .../incubator/wayang/flink/compiler/FunctionCompiler.java   |   0
 .../wayang/flink/compiler/KeySelectorDistinct.java          |   0
 .../wayang/flink/compiler/KeySelectorFunction.java          |   0
 .../wayang/flink/compiler/OutputFormatConsumer.java         |   0
 .../wayang/flink/compiler/WayangFileOutputFormat.java       |   0
 .../wayang/flink/compiler/criterion/DummyFilter.java        |   0
 .../incubator/wayang/flink/compiler/criterion/DummyMap.java |   0
 .../wayang/flink/compiler/criterion/WayangAggregator.java   |   0
 .../compiler/criterion/WayangConvergenceCriterion.java      |   0
 .../flink/compiler/criterion/WayangFilterCriterion.java     |   0
 .../wayang/flink/compiler/criterion/WayangListValue.java    |   0
 .../wayang/flink/compiler/criterion/WayangValue.java        |   0
 .../wayang/flink/execution/FlinkContextReference.java       |   0
 .../wayang/flink/execution/FlinkExecutionContext.java       |   0
 .../incubator/wayang/flink/execution/FlinkExecutor.java     |   0
 .../incubator/wayang/flink/mapping/CartesianMapping.java    |   0
 .../incubator/wayang/flink/mapping/CoGroupMapping.java      |   0
 .../wayang/flink/mapping/CollectionSourceMapping.java       |   0
 .../apache/incubator/wayang/flink/mapping/CountMapping.java |   0
 .../incubator/wayang/flink/mapping/DistinctMapping.java     |   0
 .../incubator/wayang/flink/mapping/DoWhileMapping.java      |   0
 .../incubator/wayang/flink/mapping/FilterMapping.java       |   0
 .../incubator/wayang/flink/mapping/FlatMapMapping.java      |   0
 .../flink/mapping/GlobalMaterializedGroupMapping.java       |   0
 .../incubator/wayang/flink/mapping/GlobalReduceMapping.java |   0
 .../incubator/wayang/flink/mapping/GroupByMapping.java      |   0
 .../incubator/wayang/flink/mapping/IntersectMapping.java    |   0
 .../apache/incubator/wayang/flink/mapping/JoinMapping.java  |   0
 .../wayang/flink/mapping/LocalCallbackSinkMapping.java      |   0
 .../apache/incubator/wayang/flink/mapping/LoopMapping.java  |   0
 .../apache/incubator/wayang/flink/mapping/MapMapping.java   |   0
 .../wayang/flink/mapping/MapPartitionsMapping.java          |   0
 .../org/apache/incubator/wayang/flink/mapping/Mappings.java |   0
 .../wayang/flink/mapping/MaterializedGroupByMapping.java    |   0
 .../incubator/wayang/flink/mapping/PageRankMapping.java     |   0
 .../incubator/wayang/flink/mapping/ReduceByMapping.java     |   0
 .../incubator/wayang/flink/mapping/RepeatMapping.java       |   0
 .../incubator/wayang/flink/mapping/SampleMapping.java       |   0
 .../apache/incubator/wayang/flink/mapping/SortMapping.java  |   0
 .../incubator/wayang/flink/mapping/TextFileSinkMapping.java |   0
 .../wayang/flink/mapping/TextFileSourceMapping.java         |   0
 .../incubator/wayang/flink/mapping/UnionAllMapping.java     |   0
 .../incubator/wayang/flink/mapping/ZipWithIdMapping.java    |   0
 .../wayang/flink/operators/FlinkCartesianOperator.java      |   0
 .../wayang/flink/operators/FlinkCoGroupOperator.java        |   0
 .../wayang/flink/operators/FlinkCollectionSink.java         |   0
 .../wayang/flink/operators/FlinkCollectionSource.java       |   0
 .../wayang/flink/operators/FlinkCountOperator.java          |   0
 .../wayang/flink/operators/FlinkDistinctOperator.java       |   0
 .../wayang/flink/operators/FlinkDoWhileOperator.java        |   0
 .../wayang/flink/operators/FlinkExecutionOperator.java      |   0
 .../wayang/flink/operators/FlinkFilterOperator.java         |   0
 .../wayang/flink/operators/FlinkFlatMapOperator.java        |   0
 .../operators/FlinkGlobalMaterializedGroupOperator.java     |   0
 .../wayang/flink/operators/FlinkGlobalReduceOperator.java   |   0
 .../wayang/flink/operators/FlinkGroupByOperator.java        |   0
 .../wayang/flink/operators/FlinkIntersectOperator.java      |   0
 .../incubator/wayang/flink/operators/FlinkJoinOperator.java |   0
 .../wayang/flink/operators/FlinkLocalCallbackSink.java      |   0
 .../incubator/wayang/flink/operators/FlinkLoopOperator.java |   0
 .../incubator/wayang/flink/operators/FlinkMapOperator.java  |   0
 .../wayang/flink/operators/FlinkMapPartitionsOperator.java  |   0
 .../flink/operators/FlinkMaterializedGroupByOperator.java   |   0
 .../wayang/flink/operators/FlinkObjectFileSink.java         |   0
 .../wayang/flink/operators/FlinkObjectFileSource.java       |   0
 .../wayang/flink/operators/FlinkPageRankOperator.java       |   0
 .../wayang/flink/operators/FlinkReduceByOperator.java       |   0
 .../wayang/flink/operators/FlinkRepeatExpandedOperator.java |   0
 .../wayang/flink/operators/FlinkRepeatOperator.java         |   0
 .../wayang/flink/operators/FlinkSampleOperator.java         |   0
 .../incubator/wayang/flink/operators/FlinkSortOperator.java |   0
 .../incubator/wayang/flink/operators/FlinkTextFileSink.java |   0
 .../wayang/flink/operators/FlinkTextFileSource.java         |   0
 .../incubator/wayang/flink/operators/FlinkTsvFileSink.java  |   0
 .../wayang/flink/operators/FlinkUnionAllOperator.java       |   0
 .../wayang/flink/operators/FlinkZipWithIdOperator.java      |   0
 .../incubator/wayang/flink/platform/FlinkPlatform.java      |   0
 .../incubator/wayang/flink/plugin/FlinkBasicPlugin.java     |   0
 .../wayang/flink/plugin/FlinkConversionPlugin.java          |   0
 .../incubator/wayang/flink/plugin/FlinkGraphPlugin.java     |   0
 .../src/main/resources/wayang-flink-defaults.properties     |   0
 .../rheem-giraph => wayang-platforms/wayang-giraph}/pom.xml |   0
 .../wayang/giraph/Algorithm/PageRankAlgorithm.java          |   0
 .../wayang/giraph/Algorithm/PageRankParameters.java         |   0
 .../java/org/apache/incubator/wayang/giraph/Giraph.java     |   0
 .../wayang/giraph/channels/ChannelConversions.java          |   0
 .../incubator/wayang/giraph/execution/GiraphExecutor.java   |   0
 .../apache/incubator/wayang/giraph/mappings/Mappings.java   |   0
 .../incubator/wayang/giraph/mappings/PageRankMapping.java   |   0
 .../wayang/giraph/operators/GiraphExecutionOperator.java    |   0
 .../wayang/giraph/operators/GiraphPageRankOperator.java     |   0
 .../incubator/wayang/giraph/platform/GiraphPlatform.java    |   0
 .../apache/incubator/wayang/giraph/plugin/GiraphPlugin.java |   0
 .../src/main/resources/wayang-giraph-defaults.properties    |   0
 .../wayang/giraph/operators/GiraphPagaRankOperatorTest.java |   0
 .../wayang-giraph}/src/test/resources/test.edgelist         |   0
 .../wayang-graphchi}/pom.xml                                |   0
 .../java/org/apache/incubator/wayang/graphchi/GraphChi.java |   0
 .../wayang/graphchi/channels/ChannelConversions.java        |   0
 .../wayang/graphchi/execution/GraphChiExecutor.java         |   0
 .../apache/incubator/wayang/graphchi/mappings/Mappings.java |   0
 .../incubator/wayang/graphchi/mappings/PageRankMapping.java |   0
 .../graphchi/operators/GraphChiExecutionOperator.java       |   0
 .../wayang/graphchi/operators/GraphChiPageRankOperator.java |   0
 .../wayang/graphchi/platform/GraphChiPlatform.java          |   0
 .../incubator/wayang/graphchi/plugin/GraphChiPlugin.java    |   0
 .../src/main/resources/wayang-graphchi-defaults.properties  |   0
 .../graphchi/operators/GraphChiPageRankOperatorTest.java    |   0
 .../wayang-graphchi}/src/test/resources/test.edgelist       |   0
 .../rheem-java => wayang-platforms/wayang-java}/pom.xml     |   0
 .../main/java/org/apache/incubator/wayang/java/Java.java    |   0
 .../incubator/wayang/java/channels/ChannelConversions.java  |   0
 .../incubator/wayang/java/channels/CollectionChannel.java   |   0
 .../incubator/wayang/java/channels/JavaChannelInstance.java |   0
 .../incubator/wayang/java/channels/StreamChannel.java       |   0
 .../incubator/wayang/java/compiler/FunctionCompiler.java    |   0
 .../wayang/java/execution/JavaExecutionContext.java         |   0
 .../incubator/wayang/java/execution/JavaExecutor.java       |   0
 .../incubator/wayang/java/mapping/CartesianMapping.java     |   0
 .../incubator/wayang/java/mapping/CoGroupMapping.java       |   0
 .../wayang/java/mapping/CollectionSourceMapping.java        |   0
 .../apache/incubator/wayang/java/mapping/CountMapping.java  |   0
 .../incubator/wayang/java/mapping/DistinctMapping.java      |   0
 .../incubator/wayang/java/mapping/DoWhileMapping.java       |   0
 .../apache/incubator/wayang/java/mapping/FilterMapping.java |   0
 .../incubator/wayang/java/mapping/FlatMapMapping.java       |   0
 .../wayang/java/mapping/GlobalMaterializedGroupMapping.java |   0
 .../incubator/wayang/java/mapping/GlobalReduceMapping.java  |   0
 .../incubator/wayang/java/mapping/IntersectMapping.java     |   0
 .../apache/incubator/wayang/java/mapping/JoinMapping.java   |   0
 .../wayang/java/mapping/LocalCallbackSinkMapping.java       |   0
 .../apache/incubator/wayang/java/mapping/LoopMapping.java   |   0
 .../apache/incubator/wayang/java/mapping/MapMapping.java    |   0
 .../incubator/wayang/java/mapping/MapPartitionsMapping.java |   0
 .../org/apache/incubator/wayang/java/mapping/Mappings.java  |   0
 .../wayang/java/mapping/MaterializedGroupByMapping.java     |   0
 .../incubator/wayang/java/mapping/ReduceByMapping.java      |   0
 .../apache/incubator/wayang/java/mapping/RepeatMapping.java |   0
 .../apache/incubator/wayang/java/mapping/SampleMapping.java |   0
 .../apache/incubator/wayang/java/mapping/SortMapping.java   |   0
 .../incubator/wayang/java/mapping/TextFileSinkMapping.java  |   0
 .../wayang/java/mapping/TextFileSourceMapping.java          |   0
 .../incubator/wayang/java/mapping/UnionAllMapping.java      |   0
 .../incubator/wayang/java/mapping/ZipWithIdMapping.java     |   0
 .../wayang/java/mapping/graph/PageRankMapping.java          |   0
 .../wayang/java/operators/JavaCartesianOperator.java        |   0
 .../wayang/java/operators/JavaCoGroupOperator.java          |   0
 .../wayang/java/operators/JavaCollectOperator.java          |   0
 .../wayang/java/operators/JavaCollectionSource.java         |   0
 .../incubator/wayang/java/operators/JavaCountOperator.java  |   0
 .../wayang/java/operators/JavaDistinctOperator.java         |   0
 .../wayang/java/operators/JavaDoWhileOperator.java          |   0
 .../wayang/java/operators/JavaExecutionOperator.java        |   0
 .../incubator/wayang/java/operators/JavaFilterOperator.java |   0
 .../wayang/java/operators/JavaFlatMapOperator.java          |   0
 .../java/operators/JavaGlobalMaterializedGroupOperator.java |   0
 .../wayang/java/operators/JavaGlobalReduceOperator.java     |   0
 .../wayang/java/operators/JavaIntersectOperator.java        |   0
 .../incubator/wayang/java/operators/JavaJoinOperator.java   |   0
 .../wayang/java/operators/JavaLocalCallbackSink.java        |   0
 .../incubator/wayang/java/operators/JavaLoopOperator.java   |   0
 .../incubator/wayang/java/operators/JavaMapOperator.java    |   0
 .../wayang/java/operators/JavaMapPartitionsOperator.java    |   0
 .../java/operators/JavaMaterializedGroupByOperator.java     |   0
 .../incubator/wayang/java/operators/JavaObjectFileSink.java |   0
 .../wayang/java/operators/JavaObjectFileSource.java         |   0
 .../wayang/java/operators/JavaRandomSampleOperator.java     |   0
 .../wayang/java/operators/JavaReduceByOperator.java         |   0
 .../incubator/wayang/java/operators/JavaRepeatOperator.java |   0
 .../wayang/java/operators/JavaReservoirSampleOperator.java  |   0
 .../incubator/wayang/java/operators/JavaSortOperator.java   |   0
 .../incubator/wayang/java/operators/JavaTextFileSink.java   |   0
 .../incubator/wayang/java/operators/JavaTextFileSource.java |   0
 .../incubator/wayang/java/operators/JavaTsvFileSink.java    |   0
 .../incubator/wayang/java/operators/JavaTsvFileSource.java  |   0
 .../wayang/java/operators/JavaUnionAllOperator.java         |   0
 .../wayang/java/operators/graph/JavaPageRankOperator.java   |   0
 .../apache/incubator/wayang/java/platform/JavaPlatform.java |   0
 .../incubator/wayang/java/plugin/JavaBasicPlugin.java       |   0
 .../wayang/java/plugin/JavaChannelConversionPlugin.java     |   0
 .../incubator/wayang/java/plugin/JavaGraphPlugin.java       |   0
 .../src/main/resources/wayang-java-defaults.properties      |   0
 .../incubator/wayang/java/execution/JavaExecutorTest.java   |   0
 .../wayang/java/operators/JavaCartesianOperatorTest.java    |   0
 .../wayang/java/operators/JavaCoGroupOperatorTest.java      |   0
 .../wayang/java/operators/JavaCollectionSourceTest.java     |   0
 .../wayang/java/operators/JavaCountOperatorTest.java        |   0
 .../wayang/java/operators/JavaDistinctOperatorTest.java     |   0
 .../java/operators/JavaExecutionOperatorTestBase.java       |   0
 .../wayang/java/operators/JavaFilterOperatorTest.java       |   0
 .../operators/JavaGlobalMaterializedGroupOperatorTest.java  |   0
 .../wayang/java/operators/JavaGlobalReduceOperatorTest.java |   0
 .../wayang/java/operators/JavaJoinOperatorTest.java         |   0
 .../wayang/java/operators/JavaLocalCallbackSinkTest.java    |   0
 .../java/operators/JavaMaterializedGroupByOperatorTest.java |   0
 .../wayang/java/operators/JavaObjectFileSinkTest.java       |   0
 .../wayang/java/operators/JavaObjectFileSourceTest.java     |   0
 .../wayang/java/operators/JavaRandomSampleOperatorTest.java |   0
 .../wayang/java/operators/JavaReduceByOperatorTest.java     |   0
 .../java/operators/JavaReservoirSampleOperatorTest.java     |   0
 .../wayang/java/operators/JavaSortOperatorTest.java         |   0
 .../wayang/java/operators/JavaTextFileSinkTest.java         |   0
 .../wayang/java/operators/JavaUnionAllOperatorTest.java     |   0
 .../apache/incubator/wayang/java/test/ChannelFactory.java   |   0
 .../src/test/resources/0-to-10000.sequence_file             | Bin
 .../wayang-jdbc-template}/pom.xml                           |   0
 .../incubator/wayang/jdbc/channels/SqlQueryChannel.java     |   0
 .../incubator/wayang/jdbc/compiler/FunctionCompiler.java    |   0
 .../incubator/wayang/jdbc/execution/DatabaseDescriptor.java |   0
 .../incubator/wayang/jdbc/execution/JdbcExecutor.java       |   0
 .../wayang/jdbc/operators/JdbcExecutionOperator.java        |   0
 .../incubator/wayang/jdbc/operators/JdbcFilterOperator.java |   0
 .../wayang/jdbc/operators/JdbcProjectionOperator.java       |   0
 .../incubator/wayang/jdbc/operators/JdbcTableSource.java    |   0
 .../wayang/jdbc/operators/SqlToStreamOperator.java          |   0
 .../wayang/jdbc/platform/JdbcPlatformTemplate.java          |   0
 .../incubator/wayang/jdbc/execution/JdbcExecutorTest.java   |   0
 .../wayang/jdbc/operators/JdbcTableSourceTest.java          |   0
 .../incubator/wayang/jdbc/operators/OperatorTestBase.java   |   0
 .../wayang/jdbc/operators/SqlToStreamOperatorTest.java      |   0
 .../incubator/wayang/jdbc/test/HsqldbFilterOperator.java    |   0
 .../apache/incubator/wayang/jdbc/test/HsqldbPlatform.java   |   0
 .../wayang/jdbc/test/HsqldbProjectionOperator.java          |   0
 .../incubator/wayang/jdbc/test/HsqldbTableSource.java       |   0
 .../src/test/resources/wayang-hsqldb-defaults.properties    |   0
 .../wayang-postgres}/pom.xml                                |   0
 .../java/org/apache/incubator/wayang/postgres/Postgres.java |   0
 .../wayang/postgres/channels/ChannelConversions.java        |   0
 .../incubator/wayang/postgres/mapping/FilterMapping.java    |   0
 .../apache/incubator/wayang/postgres/mapping/Mappings.java  |   0
 .../wayang/postgres/mapping/ProjectionMapping.java          |   0
 .../postgres/operators/PostgresExecutionOperator.java       |   0
 .../wayang/postgres/operators/PostgresFilterOperator.java   |   0
 .../postgres/operators/PostgresProjectionOperator.java      |   0
 .../wayang/postgres/operators/PostgresTableSource.java      |   0
 .../wayang/postgres/platform/PostgresPlatform.java          |   0
 .../wayang/postgres/plugin/PostgresConversionsPlugin.java   |   0
 .../incubator/wayang/postgres/plugin/PostgresPlugin.java    |   0
 .../src/main/resources/wayang-postgres-defaults.properties  |   0
 .../rheem-spark => wayang-platforms/wayang-spark}/pom.xml   |   0
 .../main/java/org/apache/incubator/wayang/spark/Spark.java  |   0
 .../incubator/wayang/spark/channels/BroadcastChannel.java   |   0
 .../incubator/wayang/spark/channels/ChannelConversions.java |   0
 .../incubator/wayang/spark/channels/FileChannels.java       |   0
 .../apache/incubator/wayang/spark/channels/RddChannel.java  |   0
 .../wayang/spark/compiler/BinaryOperatorAdapter.java        |   0
 .../spark/compiler/ExtendedBinaryOperatorAdapter.java       |   0
 .../spark/compiler/ExtendedFlatMapFunctionAdapter.java      |   0
 .../incubator/wayang/spark/compiler/ExtendedFunction.java   |   0
 .../wayang/spark/compiler/ExtendedMapFunctionAdapter.java   |   0
 .../compiler/ExtendedMapPartitionsFunctionAdapter.java      |   0
 .../wayang/spark/compiler/ExtendedPredicateAdapater.java    |   0
 .../wayang/spark/compiler/FlatMapFunctionAdapter.java       |   0
 .../incubator/wayang/spark/compiler/FunctionCompiler.java   |   0
 .../incubator/wayang/spark/compiler/MapFunctionAdapter.java |   0
 .../wayang/spark/compiler/MapPartitionsFunctionAdapter.java |   0
 .../incubator/wayang/spark/compiler/PredicateAdapter.java   |   0
 .../wayang/spark/execution/SparkContextReference.java       |   0
 .../wayang/spark/execution/SparkExecutionContext.java       |   0
 .../incubator/wayang/spark/execution/SparkExecutor.java     |   0
 .../incubator/wayang/spark/mapping/CartesianMapping.java    |   0
 .../incubator/wayang/spark/mapping/CoGroupMapping.java      |   0
 .../wayang/spark/mapping/CollectionSourceMapping.java       |   0
 .../apache/incubator/wayang/spark/mapping/CountMapping.java |   0
 .../incubator/wayang/spark/mapping/DistinctMapping.java     |   0
 .../incubator/wayang/spark/mapping/DoWhileMapping.java      |   0
 .../incubator/wayang/spark/mapping/FilterMapping.java       |   0
 .../incubator/wayang/spark/mapping/FlatMapMapping.java      |   0
 .../spark/mapping/GlobalMaterializedGroupMapping.java       |   0
 .../incubator/wayang/spark/mapping/GlobalReduceMapping.java |   0
 .../incubator/wayang/spark/mapping/IntersectMapping.java    |   0
 .../apache/incubator/wayang/spark/mapping/JoinMapping.java  |   0
 .../wayang/spark/mapping/LocalCallbackSinkMapping.java      |   0
 .../apache/incubator/wayang/spark/mapping/LoopMapping.java  |   0
 .../apache/incubator/wayang/spark/mapping/MapMapping.java   |   0
 .../wayang/spark/mapping/MapPartitionsMapping.java          |   0
 .../org/apache/incubator/wayang/spark/mapping/Mappings.java |   0
 .../wayang/spark/mapping/MaterializedGroupByMapping.java    |   0
 .../incubator/wayang/spark/mapping/ReduceByMapping.java     |   0
 .../incubator/wayang/spark/mapping/RepeatMapping.java       |   0
 .../incubator/wayang/spark/mapping/SampleMapping.java       |   0
 .../apache/incubator/wayang/spark/mapping/SortMapping.java  |   0
 .../incubator/wayang/spark/mapping/TextFileSinkMapping.java |   0
 .../wayang/spark/mapping/TextFileSourceMapping.java         |   0
 .../incubator/wayang/spark/mapping/UnionAllMapping.java     |   0
 .../incubator/wayang/spark/mapping/ZipWithIdMapping.java    |   0
 .../wayang/spark/mapping/graph/PageRankMapping.java         |   0
 .../spark/operators/SparkBernoulliSampleOperator.java       |   0
 .../wayang/spark/operators/SparkBroadcastOperator.java      |   0
 .../wayang/spark/operators/SparkCacheOperator.java          |   0
 .../wayang/spark/operators/SparkCartesianOperator.java      |   0
 .../wayang/spark/operators/SparkCoGroupOperator.java        |   0
 .../wayang/spark/operators/SparkCollectOperator.java        |   0
 .../wayang/spark/operators/SparkCollectionSource.java       |   0
 .../wayang/spark/operators/SparkCountOperator.java          |   0
 .../wayang/spark/operators/SparkDistinctOperator.java       |   0
 .../wayang/spark/operators/SparkDoWhileOperator.java        |   0
 .../wayang/spark/operators/SparkExecutionOperator.java      |   0
 .../wayang/spark/operators/SparkFilterOperator.java         |   0
 .../wayang/spark/operators/SparkFlatMapOperator.java        |   0
 .../operators/SparkGlobalMaterializedGroupOperator.java     |   0
 .../wayang/spark/operators/SparkGlobalReduceOperator.java   |   0
 .../wayang/spark/operators/SparkIntersectOperator.java      |   0
 .../incubator/wayang/spark/operators/SparkJoinOperator.java |   0
 .../wayang/spark/operators/SparkLocalCallbackSink.java      |   0
 .../incubator/wayang/spark/operators/SparkLoopOperator.java |   0
 .../incubator/wayang/spark/operators/SparkMapOperator.java  |   0
 .../wayang/spark/operators/SparkMapPartitionsOperator.java  |   0
 .../spark/operators/SparkMaterializedGroupByOperator.java   |   0
 .../wayang/spark/operators/SparkObjectFileSink.java         |   0
 .../wayang/spark/operators/SparkObjectFileSource.java       |   0
 .../spark/operators/SparkRandomPartitionSampleOperator.java |   0
 .../wayang/spark/operators/SparkReduceByOperator.java       |   0
 .../wayang/spark/operators/SparkRepeatOperator.java         |   0
 .../operators/SparkShufflePartitionSampleOperator.java      |   0
 .../incubator/wayang/spark/operators/SparkSortOperator.java |   0
 .../incubator/wayang/spark/operators/SparkTextFileSink.java |   0
 .../wayang/spark/operators/SparkTextFileSource.java         |   0
 .../incubator/wayang/spark/operators/SparkTsvFileSink.java  |   0
 .../wayang/spark/operators/SparkTsvFileSource.java          |   0
 .../wayang/spark/operators/SparkUnionAllOperator.java       |   0
 .../wayang/spark/operators/SparkZipWithIdOperator.java      |   0
 .../incubator/wayang/spark/platform/SparkPlatform.java      |   0
 .../incubator/wayang/spark/plugin/SparkBasicPlugin.java     |   0
 .../wayang/spark/plugin/SparkConversionPlugin.java          |   0
 .../incubator/wayang/spark/plugin/SparkGraphPlugin.java     |   0
 .../src/main/resources/wayang-spark-defaults.properties     |   0
 .../spark/operators/graph/SparkPageRankOperator.scala       |   0
 .../spark/operators/SparkBernoulliSampleOperatorTest.java   |   0
 .../wayang/spark/operators/SparkCartesianOperatorTest.java  |   0
 .../wayang/spark/operators/SparkCoGroupOperatorTest.java    |   0
 .../wayang/spark/operators/SparkCollectionSourceTest.java   |   0
 .../wayang/spark/operators/SparkCountOperatorTest.java      |   0
 .../wayang/spark/operators/SparkDistinctOperatorTest.java   |   0
 .../wayang/spark/operators/SparkFilterOperatorTest.java     |   0
 .../wayang/spark/operators/SparkFlatMapOperatorTest.java    |   0
 .../operators/SparkGlobalMaterializedGroupOperatorTest.java |   0
 .../spark/operators/SparkGlobalReduceOperatorTest.java      |   0
 .../wayang/spark/operators/SparkJoinOperatorTest.java       |   0
 .../spark/operators/SparkMapPartitionsOperatorTest.java     |   0
 .../operators/SparkMaterializedGroupByOperatorTest.java     |   0
 .../wayang/spark/operators/SparkObjectFileSinkTest.java     |   0
 .../wayang/spark/operators/SparkObjectFileSourceTest.java   |   0
 .../wayang/spark/operators/SparkOperatorTestBase.java       |   0
 .../operators/SparkRandomPartitionSampleOperatorTest.java   |   0
 .../wayang/spark/operators/SparkReduceByOperatorTest.java   |   0
 .../operators/SparkShufflePartitionSampleOperatorTest.java  |   0
 .../wayang/spark/operators/SparkSortOperatorTest.java       |   0
 .../wayang/spark/operators/SparkTextFileSinkTest.java       |   0
 .../wayang/spark/operators/SparkUnionAllOperatorTest.java   |   0
 .../apache/incubator/wayang/spark/test/ChannelFactory.java  |   0
 .../src/test/resources/0-to-10000.sequence_file             | Bin
 .../wayang-spark/src/test/resources/wayang.properties       |   0
 .../wayang-sqlite3}/pom.xml                                 |   0
 .../java/org/apache/incubator/wayang/sqlite3/Sqlite3.java   |   0
 .../wayang/sqlite3/channels/ChannelConversions.java         |   0
 .../incubator/wayang/sqlite3/mapping/FilterMapping.java     |   0
 .../apache/incubator/wayang/sqlite3/mapping/Mappings.java   |   0
 .../incubator/wayang/sqlite3/mapping/ProjectionMapping.java |   0
 .../wayang/sqlite3/operators/Sqlite3FilterOperator.java     |   0
 .../wayang/sqlite3/operators/Sqlite3ProjectionOperator.java |   0
 .../wayang/sqlite3/operators/Sqlite3TableSource.java        |   0
 .../incubator/wayang/sqlite3/platform/Sqlite3Platform.java  |   0
 .../wayang/sqlite3/plugin/Sqlite3ConversionPlugin.java      |   0
 .../incubator/wayang/sqlite3/plugin/Sqlite3Plugin.java      |   0
 .../src/main/resources/wayang-sqlite3-defaults.properties   |   0
 {rheem-profiler => wayang-profiler}/pom.xml                 |   0
 .../incubator/wayang/profiler/data/DataGenerators.java      |   0
 .../incubator/wayang/profiler/hardware/DiskProfiler.java    |   0
 .../wayang/profiler/java/BinaryOperatorProfiler.java        |   0
 .../wayang/profiler/java/JavaCollectionSourceProfiler.java  |   0
 .../wayang/profiler/java/JavaTextFileSourceProfiler.java    |   0
 .../incubator/wayang/profiler/java/OperatorProfiler.java    |   0
 .../incubator/wayang/profiler/java/OperatorProfilers.java   |   0
 .../org/apache/incubator/wayang/profiler/java/Profiler.java |   0
 .../apache/incubator/wayang/profiler/java/SinkProfiler.java |   0
 .../incubator/wayang/profiler/java/SourceProfiler.java      |   0
 .../wayang/profiler/java/UnaryOperatorProfiler.java         |   0
 .../wayang/profiler/log/DynamicEstimationContext.java       |   0
 .../incubator/wayang/profiler/log/DynamicLoadEstimator.java |   0
 .../wayang/profiler/log/DynamicLoadProfileEstimator.java    |   0
 .../wayang/profiler/log/DynamicLoadProfileEstimators.java   |   0
 .../incubator/wayang/profiler/log/GeneticOptimizer.java     |   0
 .../incubator/wayang/profiler/log/GeneticOptimizerApp.java  |   0
 .../apache/incubator/wayang/profiler/log/Individual.java    |   0
 .../apache/incubator/wayang/profiler/log/LogEvaluator.java  |   0
 .../incubator/wayang/profiler/log/OptimizationSpace.java    |   0
 .../org/apache/incubator/wayang/profiler/log/Variable.java  |   0
 .../incubator/wayang/profiler/log/sampling/Battle.java      |   0
 .../wayang/profiler/log/sampling/ReservoirSampler.java      |   0
 .../incubator/wayang/profiler/log/sampling/Sampler.java     |   0
 .../wayang/profiler/log/sampling/TournamentSampler.java     |   0
 .../wayang/profiler/spark/BinaryOperatorProfiler.java       |   0
 .../org/apache/incubator/wayang/profiler/spark/Main.java    |   0
 .../incubator/wayang/profiler/spark/OperatorProfilers.java  |   0
 .../incubator/wayang/profiler/spark/SinkProfiler.java       |   0
 .../profiler/spark/SparkCollectionSourceProfiler.java       |   0
 .../wayang/profiler/spark/SparkOperatorProfiler.java        |   0
 .../wayang/profiler/spark/SparkSourceProfiler.java          |   0
 .../wayang/profiler/spark/SparkTextFileSourceProfiler.java  |   0
 .../wayang/profiler/spark/SparkUnaryOperatorProfiler.java   |   0
 .../incubator/wayang/profiler/util/ProfilingUtils.java      |   0
 .../apache/incubator/wayang/profiler/util/RrdAccessor.java  |   0
 {rheem-tests => wayang-tests}/app.properties                |   0
 {rheem-tests => wayang-tests}/pom.xml                       |   0
 .../apache/incubator/wayang/tests/FlinkIntegrationIT.java   |   0
 .../apache/incubator/wayang/tests/FullIntegrationIT.java    |   0
 .../apache/incubator/wayang/tests/GiraphIntegrationIT.java  |   0
 .../incubator/wayang/tests/GraphChiIntegrationIT.java       |   0
 .../apache/incubator/wayang/tests/JavaIntegrationIT.java    |   0
 .../incubator/wayang/tests/PostgresIntegrationIT.java       |   0
 .../org/org/apache/incubator/wayang/tests/RegressionIT.java |   0
 .../apache/incubator/wayang/tests/SparkIntegrationIT.java   |   0
 .../org/org/apache/incubator/wayang/tests/WayangPlans.java  |   0
 .../apache/incubator/wayang/tests/WayangPlansOperators.java |   0
 .../org/org/apache/incubator/wayang/tests/WordCountIT.java  |   0
 .../incubator/wayang/tests/platform/MyMadeUpPlatform.java   |   0
 .../src/test/resources/lines-with-key1.txt                  |   0
 .../src/test/resources/lines-with-key2.txt                  |   0
 .../src/test/resources/other-lines.txt                      |   0
 .../src/test/resources/simplelogger.properties              |   0
 .../src/test/resources/some-lines.txt                       |   0
 .../src/test/resources/ulysses.txt                          |   0
 .../src/test/resources/wayang-hsqldb-defaults.properties    |   0
 .../src/test/resources/wayang.properties                    |   0
 806 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/rheem-api/pom.xml b/wayang-api/pom.xml
similarity index 100%
rename from rheem-api/pom.xml
rename to wayang-api/pom.xml
diff --git a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/DataQuanta.scala b/wayang-api/src/main/scala/org/apache/incubator/wayang/api/DataQuanta.scala
similarity index 100%
rename from rheem-api/src/main/scala/org/apache/incubator/wayang/api/DataQuanta.scala
rename to wayang-api/src/main/scala/org/apache/incubator/wayang/api/DataQuanta.scala
diff --git a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/DataQuantaBuilder.scala b/wayang-api/src/main/scala/org/apache/incubator/wayang/api/DataQuantaBuilder.scala
similarity index 100%
rename from rheem-api/src/main/scala/org/apache/incubator/wayang/api/DataQuantaBuilder.scala
rename to wayang-api/src/main/scala/org/apache/incubator/wayang/api/DataQuantaBuilder.scala
diff --git a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/JavaPlanBuilder.scala b/wayang-api/src/main/scala/org/apache/incubator/wayang/api/JavaPlanBuilder.scala
similarity index 100%
rename from rheem-api/src/main/scala/org/apache/incubator/wayang/api/JavaPlanBuilder.scala
rename to wayang-api/src/main/scala/org/apache/incubator/wayang/api/JavaPlanBuilder.scala
diff --git a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/PlanBuilder.scala b/wayang-api/src/main/scala/org/apache/incubator/wayang/api/PlanBuilder.scala
similarity index 100%
rename from rheem-api/src/main/scala/org/apache/incubator/wayang/api/PlanBuilder.scala
rename to wayang-api/src/main/scala/org/apache/incubator/wayang/api/PlanBuilder.scala
diff --git a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/RecordDataQuanta.scala b/wayang-api/src/main/scala/org/apache/incubator/wayang/api/RecordDataQuanta.scala
similarity index 100%
rename from rheem-api/src/main/scala/org/apache/incubator/wayang/api/RecordDataQuanta.scala
rename to wayang-api/src/main/scala/org/apache/incubator/wayang/api/RecordDataQuanta.scala
diff --git a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/RecordDataQuantaBuilder.scala b/wayang-api/src/main/scala/org/apache/incubator/wayang/api/RecordDataQuantaBuilder.scala
similarity index 100%
rename from rheem-api/src/main/scala/org/apache/incubator/wayang/api/RecordDataQuantaBuilder.scala
rename to wayang-api/src/main/scala/org/apache/incubator/wayang/api/RecordDataQuantaBuilder.scala
diff --git a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/graph/Edge.scala b/wayang-api/src/main/scala/org/apache/incubator/wayang/api/graph/Edge.scala
similarity index 100%
rename from rheem-api/src/main/scala/org/apache/incubator/wayang/api/graph/Edge.scala
rename to wayang-api/src/main/scala/org/apache/incubator/wayang/api/graph/Edge.scala
diff --git a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/graph/EdgeDataQuanta.scala b/wayang-api/src/main/scala/org/apache/incubator/wayang/api/graph/EdgeDataQuanta.scala
similarity index 100%
rename from rheem-api/src/main/scala/org/apache/incubator/wayang/api/graph/EdgeDataQuanta.scala
rename to wayang-api/src/main/scala/org/apache/incubator/wayang/api/graph/EdgeDataQuanta.scala
diff --git a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/graph/EdgeDataQuantaBuilder.scala b/wayang-api/src/main/scala/org/apache/incubator/wayang/api/graph/EdgeDataQuantaBuilder.scala
similarity index 100%
rename from rheem-api/src/main/scala/org/apache/incubator/wayang/api/graph/EdgeDataQuantaBuilder.scala
rename to wayang-api/src/main/scala/org/apache/incubator/wayang/api/graph/EdgeDataQuantaBuilder.scala
diff --git a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/graph/package.scala b/wayang-api/src/main/scala/org/apache/incubator/wayang/api/graph/package.scala
similarity index 100%
rename from rheem-api/src/main/scala/org/apache/incubator/wayang/api/graph/package.scala
rename to wayang-api/src/main/scala/org/apache/incubator/wayang/api/graph/package.scala
diff --git a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/package.scala b/wayang-api/src/main/scala/org/apache/incubator/wayang/api/package.scala
similarity index 100%
rename from rheem-api/src/main/scala/org/apache/incubator/wayang/api/package.scala
rename to wayang-api/src/main/scala/org/apache/incubator/wayang/api/package.scala
diff --git a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/util/DataQuantaBuilderCache.scala b/wayang-api/src/main/scala/org/apache/incubator/wayang/api/util/DataQuantaBuilderCache.scala
similarity index 100%
rename from rheem-api/src/main/scala/org/apache/incubator/wayang/api/util/DataQuantaBuilderCache.scala
rename to wayang-api/src/main/scala/org/apache/incubator/wayang/api/util/DataQuantaBuilderCache.scala
diff --git a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/util/DataQuantaBuilderDecorator.scala b/wayang-api/src/main/scala/org/apache/incubator/wayang/api/util/DataQuantaBuilderDecorator.scala
similarity index 100%
rename from rheem-api/src/main/scala/org/apache/incubator/wayang/api/util/DataQuantaBuilderDecorator.scala
rename to wayang-api/src/main/scala/org/apache/incubator/wayang/api/util/DataQuantaBuilderDecorator.scala
diff --git a/rheem-api/src/main/scala/org/apache/incubator/wayang/api/util/TypeTrap.scala b/wayang-api/src/main/scala/org/apache/incubator/wayang/api/util/TypeTrap.scala
similarity index 100%
rename from rheem-api/src/main/scala/org/apache/incubator/wayang/api/util/TypeTrap.scala
rename to wayang-api/src/main/scala/org/apache/incubator/wayang/api/util/TypeTrap.scala
diff --git a/rheem-api/src/test/java/org/apache/incubator/wayang/api/JavaApiTest.java b/wayang-api/src/test/java/org/apache/incubator/wayang/api/JavaApiTest.java
similarity index 100%
rename from rheem-api/src/test/java/org/apache/incubator/wayang/api/JavaApiTest.java
rename to wayang-api/src/test/java/org/apache/incubator/wayang/api/JavaApiTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/resources/rheem.properties b/wayang-api/src/test/resources/wayang.properties
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/resources/rheem.properties
rename to wayang-api/src/test/resources/wayang.properties
diff --git a/rheem-api/src/test/scala/org/apache/incubator/wayang/api/ApiTest.scala b/wayang-api/src/test/scala/org/apache/incubator/wayang/api/ApiTest.scala
similarity index 100%
rename from rheem-api/src/test/scala/org/apache/incubator/wayang/api/ApiTest.scala
rename to wayang-api/src/test/scala/org/apache/incubator/wayang/api/ApiTest.scala
diff --git a/rheem-basic/pom.xml b/wayang-basic/pom.xml
similarity index 100%
rename from rheem-basic/pom.xml
rename to wayang-basic/pom.xml
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/WayangBasics.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/WayangBasics.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/WayangBasics.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/WayangBasics.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/channels/FileChannel.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/channels/FileChannel.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/channels/FileChannel.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/channels/FileChannel.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/data/Record.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/data/Record.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/data/Record.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/data/Record.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/data/Tuple2.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/data/Tuple2.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/data/Tuple2.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/data/Tuple2.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/data/Tuple5.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/data/Tuple5.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/data/Tuple5.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/data/Tuple5.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/function/ProjectionDescriptor.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/function/ProjectionDescriptor.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/function/ProjectionDescriptor.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/function/ProjectionDescriptor.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/GlobalReduceMapping.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/GlobalReduceMapping.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/GlobalReduceMapping.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/GlobalReduceMapping.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/Mappings.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/Mappings.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/Mappings.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/Mappings.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/MaterializedGroupByMapping.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/MaterializedGroupByMapping.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/MaterializedGroupByMapping.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/MaterializedGroupByMapping.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/PageRankMapping.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/PageRankMapping.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/PageRankMapping.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/PageRankMapping.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/ReduceByMapping.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/ReduceByMapping.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/ReduceByMapping.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/ReduceByMapping.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/RepeatMapping.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/RepeatMapping.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/RepeatMapping.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/RepeatMapping.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CartesianOperator.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CartesianOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CartesianOperator.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CartesianOperator.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CoGroupOperator.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CoGroupOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CoGroupOperator.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CoGroupOperator.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CollectionSource.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CollectionSource.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CollectionSource.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CollectionSource.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CountOperator.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CountOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CountOperator.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CountOperator.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/DistinctOperator.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/DistinctOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/DistinctOperator.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/DistinctOperator.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/DoWhileOperator.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/DoWhileOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/DoWhileOperator.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/DoWhileOperator.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/FilterOperator.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/FilterOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/FilterOperator.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/FilterOperator.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/FlatMapOperator.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/FlatMapOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/FlatMapOperator.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/FlatMapOperator.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/GlobalMaterializedGroupOperator.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/GlobalMaterializedGroupOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/GlobalMaterializedGroupOperator.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/GlobalMaterializedGroupOperator.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/GlobalReduceOperator.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/GlobalReduceOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/GlobalReduceOperator.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/GlobalReduceOperator.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/GroupByOperator.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/GroupByOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/GroupByOperator.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/GroupByOperator.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/IntersectOperator.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/IntersectOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/IntersectOperator.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/IntersectOperator.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/JoinOperator.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/JoinOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/JoinOperator.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/JoinOperator.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/LocalCallbackSink.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/LocalCallbackSink.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/LocalCallbackSink.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/LocalCallbackSink.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/LoopOperator.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/LoopOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/LoopOperator.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/LoopOperator.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/MapOperator.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/MapOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/MapOperator.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/MapOperator.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/MapPartitionsOperator.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/MapPartitionsOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/MapPartitionsOperator.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/MapPartitionsOperator.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/MaterializedGroupByOperator.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/MaterializedGroupByOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/MaterializedGroupByOperator.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/MaterializedGroupByOperator.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/PageRankOperator.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/PageRankOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/PageRankOperator.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/PageRankOperator.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/ReduceByOperator.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/ReduceByOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/ReduceByOperator.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/ReduceByOperator.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/ReduceOperator.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/ReduceOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/ReduceOperator.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/ReduceOperator.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/RepeatOperator.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/RepeatOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/RepeatOperator.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/RepeatOperator.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/SampleOperator.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/SampleOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/SampleOperator.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/SampleOperator.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/SortOperator.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/SortOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/SortOperator.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/SortOperator.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/TableSource.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/TableSource.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/TableSource.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/TableSource.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/TextFileSink.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/TextFileSink.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/TextFileSink.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/TextFileSink.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/TextFileSource.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/TextFileSource.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/TextFileSource.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/TextFileSource.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/UnionAllOperator.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/UnionAllOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/UnionAllOperator.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/UnionAllOperator.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/ZipWithIdOperator.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/ZipWithIdOperator.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/operators/ZipWithIdOperator.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/ZipWithIdOperator.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/plugin/WayangBasic.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/plugin/WayangBasic.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/plugin/WayangBasic.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/plugin/WayangBasic.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/plugin/WayangBasicGraph.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/plugin/WayangBasicGraph.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/plugin/WayangBasicGraph.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/plugin/WayangBasicGraph.java
diff --git a/rheem-basic/src/main/java/org/apache/incubator/wayang/basic/types/RecordType.java b/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/types/RecordType.java
similarity index 100%
rename from rheem-basic/src/main/java/org/apache/incubator/wayang/basic/types/RecordType.java
rename to wayang-basic/src/main/java/org/apache/incubator/wayang/basic/types/RecordType.java
diff --git a/rheem-basic/src/main/resources/rheem-basic-defaults.properties b/wayang-basic/src/main/resources/wayang-basic-defaults.properties
similarity index 100%
rename from rheem-basic/src/main/resources/rheem-basic-defaults.properties
rename to wayang-basic/src/main/resources/wayang-basic-defaults.properties
diff --git a/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/function/ProjectionDescriptorTest.java b/wayang-basic/src/test/java/org/apache/incubator/wayang/basic/function/ProjectionDescriptorTest.java
similarity index 100%
rename from rheem-basic/src/test/java/org/apache/incubator/wayang/basic/function/ProjectionDescriptorTest.java
rename to wayang-basic/src/test/java/org/apache/incubator/wayang/basic/function/ProjectionDescriptorTest.java
diff --git a/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/mapping/ReduceByMappingTest.java b/wayang-basic/src/test/java/org/apache/incubator/wayang/basic/mapping/ReduceByMappingTest.java
similarity index 100%
rename from rheem-basic/src/test/java/org/apache/incubator/wayang/basic/mapping/ReduceByMappingTest.java
rename to wayang-basic/src/test/java/org/apache/incubator/wayang/basic/mapping/ReduceByMappingTest.java
diff --git a/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/operators/MaterializedGroupByOperatorTest.java b/wayang-basic/src/test/java/org/apache/incubator/wayang/basic/operators/MaterializedGroupByOperatorTest.java
similarity index 100%
rename from rheem-basic/src/test/java/org/apache/incubator/wayang/basic/operators/MaterializedGroupByOperatorTest.java
rename to wayang-basic/src/test/java/org/apache/incubator/wayang/basic/operators/MaterializedGroupByOperatorTest.java
diff --git a/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/operators/TextFileSourceTest.java b/wayang-basic/src/test/java/org/apache/incubator/wayang/basic/operators/TextFileSourceTest.java
similarity index 100%
rename from rheem-basic/src/test/java/org/apache/incubator/wayang/basic/operators/TextFileSourceTest.java
rename to wayang-basic/src/test/java/org/apache/incubator/wayang/basic/operators/TextFileSourceTest.java
diff --git a/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/operators/test/TestSink.java b/wayang-basic/src/test/java/org/apache/incubator/wayang/basic/operators/test/TestSink.java
similarity index 100%
rename from rheem-basic/src/test/java/org/apache/incubator/wayang/basic/operators/test/TestSink.java
rename to wayang-basic/src/test/java/org/apache/incubator/wayang/basic/operators/test/TestSink.java
diff --git a/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/operators/test/TestSource.java b/wayang-basic/src/test/java/org/apache/incubator/wayang/basic/operators/test/TestSource.java
similarity index 100%
rename from rheem-basic/src/test/java/org/apache/incubator/wayang/basic/operators/test/TestSource.java
rename to wayang-basic/src/test/java/org/apache/incubator/wayang/basic/operators/test/TestSource.java
diff --git a/rheem-basic/src/test/java/org/apache/incubator/wayang/basic/types/RecordTypeTest.java b/wayang-basic/src/test/java/org/apache/incubator/wayang/basic/types/RecordTypeTest.java
similarity index 100%
rename from rheem-basic/src/test/java/org/apache/incubator/wayang/basic/types/RecordTypeTest.java
rename to wayang-basic/src/test/java/org/apache/incubator/wayang/basic/types/RecordTypeTest.java
diff --git a/rheem-tests/src/test/resources/ulysses.txt b/wayang-basic/src/test/resources/ulysses.txt
similarity index 100%
rename from rheem-tests/src/test/resources/ulysses.txt
rename to wayang-basic/src/test/resources/ulysses.txt
diff --git a/rheem-core/pom.xml b/wayang-core/pom.xml
similarity index 100%
rename from rheem-core/pom.xml
rename to wayang-core/pom.xml
diff --git a/rheem-core/src/main/antlr4/org/apache/incubator/wayang/core/mathex/MathEx.g4 b/wayang-core/src/main/antlr4/org/apache/incubator/wayang/core/mathex/MathEx.g4
similarity index 100%
rename from rheem-core/src/main/antlr4/org/apache/incubator/wayang/core/mathex/MathEx.g4
rename to wayang-core/src/main/antlr4/org/apache/incubator/wayang/core/mathex/MathEx.g4
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/Configuration.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/api/Configuration.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/api/Configuration.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/api/Configuration.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/Job.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/api/Job.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/api/Job.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/api/Job.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/WayangContext.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/api/WayangContext.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/api/WayangContext.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/api/WayangContext.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/CollectionProvider.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/CollectionProvider.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/CollectionProvider.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/CollectionProvider.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/ConstantValueProvider.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/ConstantValueProvider.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/ConstantValueProvider.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/ConstantValueProvider.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/ExplicitCollectionProvider.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/ExplicitCollectionProvider.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/ExplicitCollectionProvider.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/ExplicitCollectionProvider.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/FunctionalCollectionProvider.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/FunctionalCollectionProvider.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/FunctionalCollectionProvider.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/FunctionalCollectionProvider.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/FunctionalKeyValueProvider.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/FunctionalKeyValueProvider.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/FunctionalKeyValueProvider.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/FunctionalKeyValueProvider.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/FunctionalValueProvider.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/FunctionalValueProvider.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/FunctionalValueProvider.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/FunctionalValueProvider.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/KeyValueProvider.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/KeyValueProvider.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/KeyValueProvider.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/KeyValueProvider.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/MapBasedKeyValueProvider.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/MapBasedKeyValueProvider.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/MapBasedKeyValueProvider.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/MapBasedKeyValueProvider.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/ValueProvider.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/ValueProvider.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/ValueProvider.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/ValueProvider.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/api/exception/WayangException.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/api/exception/WayangException.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/api/exception/WayangException.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/api/exception/WayangException.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/AggregationDescriptor.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/function/AggregationDescriptor.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/function/AggregationDescriptor.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/function/AggregationDescriptor.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/ConsumerDescriptor.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/function/ConsumerDescriptor.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/function/ConsumerDescriptor.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/function/ConsumerDescriptor.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/ExecutionContext.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/function/ExecutionContext.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/function/ExecutionContext.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/function/ExecutionContext.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/ExtendedFunction.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/function/ExtendedFunction.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/function/ExtendedFunction.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/function/ExtendedFunction.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/FlatMapDescriptor.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/function/FlatMapDescriptor.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/function/FlatMapDescriptor.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/function/FlatMapDescriptor.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/FunctionDescriptor.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/function/FunctionDescriptor.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/function/FunctionDescriptor.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/function/FunctionDescriptor.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/MapPartitionsDescriptor.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/function/MapPartitionsDescriptor.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/function/MapPartitionsDescriptor.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/function/MapPartitionsDescriptor.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/PredicateDescriptor.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/function/PredicateDescriptor.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/function/PredicateDescriptor.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/function/PredicateDescriptor.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/ReduceDescriptor.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/function/ReduceDescriptor.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/function/ReduceDescriptor.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/function/ReduceDescriptor.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/function/TransformationDescriptor.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/function/TransformationDescriptor.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/function/TransformationDescriptor.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/function/TransformationDescriptor.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/Mapping.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/mapping/Mapping.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/Mapping.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/mapping/Mapping.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/OperatorMatch.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/mapping/OperatorMatch.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/OperatorMatch.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/mapping/OperatorMatch.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/OperatorPattern.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/mapping/OperatorPattern.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/OperatorPattern.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/mapping/OperatorPattern.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/PlanTransformation.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/mapping/PlanTransformation.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/PlanTransformation.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/mapping/PlanTransformation.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/ReplacementSubplanFactory.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/mapping/ReplacementSubplanFactory.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/ReplacementSubplanFactory.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/mapping/ReplacementSubplanFactory.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/SubplanMatch.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/mapping/SubplanMatch.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/SubplanMatch.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/mapping/SubplanMatch.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/SubplanPattern.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/mapping/SubplanPattern.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/mapping/SubplanPattern.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/mapping/SubplanPattern.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/DisabledMonitor.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/monitor/DisabledMonitor.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/DisabledMonitor.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/monitor/DisabledMonitor.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/FileMonitor.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/monitor/FileMonitor.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/FileMonitor.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/monitor/FileMonitor.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/HttpMonitor.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/monitor/HttpMonitor.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/HttpMonitor.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/monitor/HttpMonitor.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/Monitor.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/monitor/Monitor.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/Monitor.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/monitor/Monitor.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/ZeroMQMonitor.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/monitor/ZeroMQMonitor.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/monitor/ZeroMQMonitor.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/monitor/ZeroMQMonitor.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/AggregateOptimizationContext.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/AggregateOptimizationContext.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/AggregateOptimizationContext.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/AggregateOptimizationContext.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/DefaultOptimizationContext.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/DefaultOptimizationContext.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/DefaultOptimizationContext.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/DefaultOptimizationContext.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/OptimizationContext.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/OptimizationContext.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/OptimizationContext.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/OptimizationContext.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/OptimizationUtils.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/OptimizationUtils.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/OptimizationUtils.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/OptimizationUtils.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/ProbabilisticDoubleInterval.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/ProbabilisticDoubleInterval.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/ProbabilisticDoubleInterval.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/ProbabilisticDoubleInterval.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/ProbabilisticIntervalEstimate.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/ProbabilisticIntervalEstimate.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/ProbabilisticIntervalEstimate.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/ProbabilisticIntervalEstimate.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/SanityChecker.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/SanityChecker.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/SanityChecker.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/SanityChecker.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/AbstractAlternativeCardinalityPusher.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/AbstractAlternativeCardinalityPusher.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/AbstractAlternativeCardinalityPusher.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/AbstractAlternativeCardinalityPusher.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/AggregatingCardinalityEstimator.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/AggregatingCardinalityEstimator.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/AggregatingCardinalityEstimator.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/AggregatingCardinalityEstimator.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimate.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimate.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimate.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimate.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimationTraversal.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimationTraversal.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimationTraversal.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimationTraversal.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimator.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimator.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimator.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimator.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimatorManager.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimatorManager.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimatorManager.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimatorManager.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityPusher.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityPusher.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityPusher.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityPusher.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/DefaultCardinalityEstimator.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/DefaultCardinalityEstimator.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/DefaultCardinalityEstimator.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/DefaultCardinalityEstimator.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/DefaultCardinalityPusher.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/DefaultCardinalityPusher.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/DefaultCardinalityPusher.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/DefaultCardinalityPusher.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/FallbackCardinalityEstimator.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/FallbackCardinalityEstimator.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/FallbackCardinalityEstimator.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/FallbackCardinalityEstimator.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/FixedSizeCardinalityEstimator.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/FixedSizeCardinalityEstimator.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/FixedSizeCardinalityEstimator.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/FixedSizeCardinalityEstimator.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/LoopHeadAlternativeCardinalityPusher.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/LoopHeadAlternativeCardinalityPusher.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/LoopHeadAlternativeCardinalityPusher.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/LoopHeadAlternativeCardinalityPusher.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/LoopSubplanCardinalityPusher.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/LoopSubplanCardinalityPusher.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/LoopSubplanCardinalityPusher.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/LoopSubplanCardinalityPusher.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/OperatorAlternativeCardinalityPusher.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/OperatorAlternativeCardinalityPusher.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/OperatorAlternativeCardinalityPusher.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/OperatorAlternativeCardinalityPusher.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/SubplanCardinalityPusher.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/SubplanCardinalityPusher.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/SubplanCardinalityPusher.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/SubplanCardinalityPusher.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/SwitchForwardCardinalityEstimator.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/SwitchForwardCardinalityEstimator.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/SwitchForwardCardinalityEstimator.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/SwitchForwardCardinalityEstimator.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/channels/ChannelConversion.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/channels/ChannelConversion.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/channels/ChannelConversion.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/channels/ChannelConversion.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/channels/ChannelConversionGraph.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/channels/ChannelConversionGraph.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/channels/ChannelConversionGraph.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/channels/ChannelConversionGraph.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/channels/DefaultChannelConversion.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/channels/DefaultChannelConversion.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/channels/DefaultChannelConversion.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/channels/DefaultChannelConversion.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/ConstantLoadProfileEstimator.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/ConstantLoadProfileEstimator.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/ConstantLoadProfileEstimator.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/ConstantLoadProfileEstimator.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/DefaultLoadEstimator.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/DefaultLoadEstimator.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/DefaultLoadEstimator.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/DefaultLoadEstimator.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/EstimationContext.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/EstimationContext.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/EstimationContext.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/EstimationContext.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/IntervalLoadEstimator.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/IntervalLoadEstimator.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/IntervalLoadEstimator.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/IntervalLoadEstimator.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadEstimate.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadEstimate.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadEstimate.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadEstimate.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadEstimator.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadEstimator.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadEstimator.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadEstimator.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfile.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfile.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfile.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfile.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfileEstimator.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfileEstimator.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfileEstimator.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfileEstimator.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfileEstimators.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfileEstimators.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfileEstimators.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfileEstimators.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfileToTimeConverter.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfileToTimeConverter.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfileToTimeConverter.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfileToTimeConverter.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadToTimeConverter.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadToTimeConverter.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadToTimeConverter.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadToTimeConverter.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/NestableLoadProfileEstimator.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/NestableLoadProfileEstimator.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/NestableLoadProfileEstimator.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/NestableLoadProfileEstimator.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/SimpleEstimationContext.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/SimpleEstimationContext.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/SimpleEstimationContext.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/SimpleEstimationContext.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/TimeEstimate.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/TimeEstimate.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/TimeEstimate.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/TimeEstimate.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/TimeToCostConverter.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/TimeToCostConverter.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/TimeToCostConverter.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/TimeToCostConverter.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/ExecutionTaskFlow.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/ExecutionTaskFlow.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/ExecutionTaskFlow.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/ExecutionTaskFlow.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/ExecutionTaskFlowCompiler.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/ExecutionTaskFlowCompiler.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/ExecutionTaskFlowCompiler.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/ExecutionTaskFlowCompiler.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/LatentOperatorPruningStrategy.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/LatentOperatorPruningStrategy.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/LatentOperatorPruningStrategy.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/LatentOperatorPruningStrategy.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/LoopEnumerator.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/LoopEnumerator.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/LoopEnumerator.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/LoopEnumerator.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/LoopImplementation.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/LoopImplementation.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/LoopImplementation.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/LoopImplementation.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanEnumeration.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanEnumeration.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanEnumeration.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanEnumeration.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanEnumerationPruningStrategy.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanEnumerationPruningStrategy.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanEnumerationPruningStrategy.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanEnumerationPruningStrategy.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanEnumerator.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanEnumerator.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanEnumerator.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanEnumerator.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanImplementation.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanImplementation.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanImplementation.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanImplementation.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/RandomPruningStrategy.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/RandomPruningStrategy.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/RandomPruningStrategy.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/RandomPruningStrategy.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/SinglePlatformPruningStrategy.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/SinglePlatformPruningStrategy.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/SinglePlatformPruningStrategy.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/SinglePlatformPruningStrategy.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/StageAssignmentTraversal.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/StageAssignmentTraversal.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/StageAssignmentTraversal.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/StageAssignmentTraversal.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/TopKPruningStrategy.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/TopKPruningStrategy.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/TopKPruningStrategy.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/TopKPruningStrategy.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/partition/EnumerationAlternative.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/partition/EnumerationAlternative.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/partition/EnumerationAlternative.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/partition/EnumerationAlternative.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/partition/EnumerationBranch.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/partition/EnumerationBranch.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/optimizer/partition/EnumerationBranch.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/partition/EnumerationBranch.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/Channel.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/Channel.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/Channel.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/Channel.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ChannelInitializer.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ChannelInitializer.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ChannelInitializer.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ChannelInitializer.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionPlan.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionPlan.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionPlan.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionPlan.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionStage.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionStage.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionStage.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionStage.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionStageLoop.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionStageLoop.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionStageLoop.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionStageLoop.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionTask.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionTask.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionTask.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionTask.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/PlatformExecution.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/PlatformExecution.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/PlatformExecution.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/PlatformExecution.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/ActualOperator.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/ActualOperator.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/ActualOperator.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/ActualOperator.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/BinaryToUnaryOperator.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/BinaryToUnaryOperator.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/BinaryToUnaryOperator.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/BinaryToUnaryOperator.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/CompositeOperator.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/CompositeOperator.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/CompositeOperator.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/CompositeOperator.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/ElementaryOperator.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/ElementaryOperator.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/ElementaryOperator.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/ElementaryOperator.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/EstimationContextProperty.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/EstimationContextProperty.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/EstimationContextProperty.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/EstimationContextProperty.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/ExecutionOperator.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/ExecutionOperator.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/ExecutionOperator.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/ExecutionOperator.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/InputSlot.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/InputSlot.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/InputSlot.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/InputSlot.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/LoopHeadAlternative.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/LoopHeadAlternative.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/LoopHeadAlternative.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/LoopHeadAlternative.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/LoopHeadOperator.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/LoopHeadOperator.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/LoopHeadOperator.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/LoopHeadOperator.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/LoopIsolator.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/LoopIsolator.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/LoopIsolator.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/LoopIsolator.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/LoopSubplan.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/LoopSubplan.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/LoopSubplan.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/LoopSubplan.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/Operator.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/Operator.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/Operator.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/Operator.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OperatorAlternative.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/OperatorAlternative.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OperatorAlternative.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/OperatorAlternative.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OperatorBase.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/OperatorBase.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OperatorBase.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/OperatorBase.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OperatorContainer.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/OperatorContainer.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OperatorContainer.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/OperatorContainer.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OperatorContainers.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/OperatorContainers.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OperatorContainers.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/OperatorContainers.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/Operators.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/Operators.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/Operators.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/Operators.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OutputSlot.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/OutputSlot.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/OutputSlot.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/OutputSlot.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/PlanMetrics.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/PlanMetrics.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/PlanMetrics.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/PlanMetrics.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/PlanTraversal.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/PlanTraversal.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/PlanTraversal.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/PlanTraversal.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/Slot.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/Slot.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/Slot.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/Slot.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/SlotMapping.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/SlotMapping.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/SlotMapping.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/SlotMapping.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/Subplan.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/Subplan.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/Subplan.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/Subplan.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/TopDownPlanVisitor.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/TopDownPlanVisitor.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/TopDownPlanVisitor.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/TopDownPlanVisitor.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/UnarySink.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/UnarySink.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/UnarySink.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/UnarySink.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/UnarySource.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/UnarySource.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/UnarySource.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/UnarySource.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/UnaryToUnaryOperator.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/UnaryToUnaryOperator.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/UnaryToUnaryOperator.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/UnaryToUnaryOperator.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/WayangPlan.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/WayangPlan.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/WayangPlan.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/WayangPlan.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/traversal/AbstractTopologicalTraversal.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/traversal/AbstractTopologicalTraversal.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plan/rheemplan/traversal/AbstractTopologicalTraversal.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/traversal/AbstractTopologicalTraversal.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/AbstractChannelInstance.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/AbstractChannelInstance.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/AbstractChannelInstance.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/AbstractChannelInstance.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/AtomicExecution.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/AtomicExecution.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/AtomicExecution.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/AtomicExecution.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/AtomicExecutionGroup.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/AtomicExecutionGroup.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/AtomicExecutionGroup.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/AtomicExecutionGroup.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/Breakpoint.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/Breakpoint.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/Breakpoint.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/Breakpoint.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/CardinalityBreakpoint.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/CardinalityBreakpoint.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/CardinalityBreakpoint.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/CardinalityBreakpoint.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/ChannelDescriptor.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/ChannelDescriptor.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/ChannelDescriptor.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/ChannelDescriptor.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/ChannelInstance.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/ChannelInstance.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/ChannelInstance.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/ChannelInstance.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/CompositeExecutionResource.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/CompositeExecutionResource.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/CompositeExecutionResource.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/CompositeExecutionResource.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/ConjunctiveBreakpoint.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/ConjunctiveBreakpoint.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/ConjunctiveBreakpoint.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/ConjunctiveBreakpoint.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/CrossPlatformExecutor.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/CrossPlatformExecutor.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/CrossPlatformExecutor.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/CrossPlatformExecutor.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/ExecutionResource.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/ExecutionResource.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/ExecutionResource.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/ExecutionResource.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/ExecutionResourceTemplate.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/ExecutionResourceTemplate.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/ExecutionResourceTemplate.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/ExecutionResourceTemplate.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/ExecutionState.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/ExecutionState.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/ExecutionState.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/ExecutionState.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/Executor.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/Executor.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/Executor.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/Executor.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/ExecutorTemplate.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/ExecutorTemplate.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/ExecutorTemplate.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/ExecutorTemplate.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/FixBreakpoint.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/FixBreakpoint.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/FixBreakpoint.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/FixBreakpoint.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/Junction.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/Junction.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/Junction.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/Junction.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/NoIterationBreakpoint.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/NoIterationBreakpoint.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/NoIterationBreakpoint.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/NoIterationBreakpoint.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/PartialExecution.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/PartialExecution.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/PartialExecution.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/PartialExecution.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/Platform.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/Platform.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/Platform.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/Platform.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/PushExecutorTemplate.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/PushExecutorTemplate.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/PushExecutorTemplate.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/PushExecutorTemplate.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/lineage/ChannelLineageNode.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/lineage/ChannelLineageNode.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/lineage/ChannelLineageNode.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/lineage/ChannelLineageNode.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/lineage/ExecutionLineageNode.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/lineage/ExecutionLineageNode.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/lineage/ExecutionLineageNode.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/lineage/ExecutionLineageNode.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/lineage/LazyExecutionLineageNode.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/lineage/LazyExecutionLineageNode.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/platform/lineage/LazyExecutionLineageNode.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/lineage/LazyExecutionLineageNode.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plugin/DynamicPlugin.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plugin/DynamicPlugin.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plugin/DynamicPlugin.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plugin/DynamicPlugin.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/plugin/Plugin.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/plugin/Plugin.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/plugin/Plugin.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/plugin/Plugin.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/CardinalityRepository.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/CardinalityRepository.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/CardinalityRepository.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/CardinalityRepository.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/CostMeasurement.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/CostMeasurement.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/CostMeasurement.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/CostMeasurement.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/ExecutionLog.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/ExecutionLog.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/ExecutionLog.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/ExecutionLog.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/ExecutionPlanMeasurement.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/ExecutionPlanMeasurement.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/ExecutionPlanMeasurement.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/ExecutionPlanMeasurement.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/FullInstrumentationStrategy.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/FullInstrumentationStrategy.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/FullInstrumentationStrategy.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/FullInstrumentationStrategy.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/InstrumentationStrategy.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/InstrumentationStrategy.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/InstrumentationStrategy.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/InstrumentationStrategy.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/NoInstrumentationStrategy.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/NoInstrumentationStrategy.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/NoInstrumentationStrategy.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/NoInstrumentationStrategy.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/OutboundInstrumentationStrategy.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/OutboundInstrumentationStrategy.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/OutboundInstrumentationStrategy.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/OutboundInstrumentationStrategy.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/PartialExecutionMeasurement.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/PartialExecutionMeasurement.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/PartialExecutionMeasurement.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/PartialExecutionMeasurement.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/ProfileDBs.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/ProfileDBs.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/profiling/ProfileDBs.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/ProfileDBs.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/types/BasicDataUnitType.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/types/BasicDataUnitType.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/types/BasicDataUnitType.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/types/BasicDataUnitType.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/types/DataSetType.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/types/DataSetType.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/types/DataSetType.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/types/DataSetType.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/types/DataUnitGroupType.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/types/DataUnitGroupType.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/types/DataUnitGroupType.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/types/DataUnitGroupType.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/types/DataUnitType.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/types/DataUnitType.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/types/DataUnitType.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/types/DataUnitType.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/AbstractReferenceCountable.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/AbstractReferenceCountable.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/AbstractReferenceCountable.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/AbstractReferenceCountable.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Action.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Action.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Action.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Action.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Actions.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Actions.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Actions.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Actions.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Bitmask.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Bitmask.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Bitmask.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Bitmask.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Canonicalizer.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Canonicalizer.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Canonicalizer.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Canonicalizer.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/ConsumerIteratorAdapter.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/ConsumerIteratorAdapter.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/ConsumerIteratorAdapter.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/ConsumerIteratorAdapter.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Copyable.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Copyable.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Copyable.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Copyable.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Counter.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Counter.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Counter.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Counter.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/CrossProductIterable.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/CrossProductIterable.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/CrossProductIterable.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/CrossProductIterable.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Formats.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Formats.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Formats.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Formats.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Iterators.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Iterators.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Iterators.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Iterators.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/JsonSerializable.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/JsonSerializable.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/JsonSerializable.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/JsonSerializable.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/JsonSerializables.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/JsonSerializables.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/JsonSerializables.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/JsonSerializables.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/JsonSerializer.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/JsonSerializer.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/JsonSerializer.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/JsonSerializer.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/JuelUtils.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/JuelUtils.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/JuelUtils.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/JuelUtils.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/LimitedInputStream.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/LimitedInputStream.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/LimitedInputStream.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/LimitedInputStream.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Logging.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Logging.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Logging.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Logging.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/LruCache.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/LruCache.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/LruCache.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/LruCache.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/MultiMap.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/MultiMap.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/MultiMap.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/MultiMap.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/OneTimeExecutable.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/OneTimeExecutable.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/OneTimeExecutable.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/OneTimeExecutable.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Optional.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Optional.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Optional.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Optional.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/ReferenceCountable.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/ReferenceCountable.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/ReferenceCountable.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/ReferenceCountable.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/ReflectionUtils.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/ReflectionUtils.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/ReflectionUtils.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/ReflectionUtils.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Tuple.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Tuple.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/Tuple.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Tuple.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/WayangArrays.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/WayangArrays.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/WayangArrays.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/WayangArrays.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/WayangCollections.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/WayangCollections.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/WayangCollections.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/WayangCollections.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/fs/FileSystem.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/fs/FileSystem.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/fs/FileSystem.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/fs/FileSystem.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/fs/FileSystems.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/fs/FileSystems.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/fs/FileSystems.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/fs/FileSystems.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/fs/FileUtils.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/fs/FileUtils.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/fs/FileUtils.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/fs/FileUtils.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/fs/HadoopFileSystem.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/fs/HadoopFileSystem.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/fs/HadoopFileSystem.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/fs/HadoopFileSystem.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/fs/LocalFileSystem.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/fs/LocalFileSystem.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/fs/LocalFileSystem.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/fs/LocalFileSystem.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/Context.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/Context.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/Context.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/Context.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/DefaultContext.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/DefaultContext.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/DefaultContext.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/DefaultContext.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/Expression.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/Expression.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/Expression.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/Expression.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/ExpressionBuilder.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/ExpressionBuilder.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/ExpressionBuilder.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/ExpressionBuilder.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/exceptions/EvaluationException.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/exceptions/EvaluationException.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/exceptions/EvaluationException.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/exceptions/EvaluationException.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/exceptions/MathExException.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/exceptions/MathExException.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/exceptions/MathExException.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/exceptions/MathExException.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/exceptions/ParseException.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/exceptions/ParseException.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/exceptions/ParseException.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/exceptions/ParseException.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/BinaryOperation.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/BinaryOperation.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/BinaryOperation.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/BinaryOperation.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/CompiledFunction.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/CompiledFunction.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/CompiledFunction.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/CompiledFunction.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/Constant.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/Constant.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/Constant.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/Constant.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/NamedFunction.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/NamedFunction.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/NamedFunction.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/NamedFunction.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/UnaryOperation.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/UnaryOperation.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/UnaryOperation.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/UnaryOperation.java
diff --git a/rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/Variable.java b/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/Variable.java
similarity index 100%
rename from rheem-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/Variable.java
rename to wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/Variable.java
diff --git a/rheem-core/src/main/resources/rheem-core-defaults.properties b/wayang-core/src/main/resources/wayang-core-defaults.properties
similarity index 100%
rename from rheem-core/src/main/resources/rheem-core-defaults.properties
rename to wayang-core/src/main/resources/wayang-core-defaults.properties
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/SlotTest.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/SlotTest.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/SlotTest.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/SlotTest.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/mapping/OperatorPatternTest.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/mapping/OperatorPatternTest.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/mapping/OperatorPatternTest.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/mapping/OperatorPatternTest.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/mapping/PlanTransformationTest.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/mapping/PlanTransformationTest.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/mapping/PlanTransformationTest.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/mapping/PlanTransformationTest.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/mapping/SubplanPatternTest.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/mapping/SubplanPatternTest.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/mapping/SubplanPatternTest.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/mapping/SubplanPatternTest.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/mapping/test/TestSinkMapping.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/mapping/test/TestSinkMapping.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/mapping/test/TestSinkMapping.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/mapping/test/TestSinkMapping.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/mapping/test/TestSinkToTestSink2Factory.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/mapping/test/TestSinkToTestSink2Factory.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/mapping/test/TestSinkToTestSink2Factory.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/mapping/test/TestSinkToTestSink2Factory.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/optimizer/cardinality/AggregatingCardinalityEstimatorTest.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/optimizer/cardinality/AggregatingCardinalityEstimatorTest.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/optimizer/cardinality/AggregatingCardinalityEstimatorTest.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/optimizer/cardinality/AggregatingCardinalityEstimatorTest.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/optimizer/cardinality/DefaultCardinalityEstimatorTest.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/optimizer/cardinality/DefaultCardinalityEstimatorTest.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/optimizer/cardinality/DefaultCardinalityEstimatorTest.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/optimizer/cardinality/DefaultCardinalityEstimatorTest.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/optimizer/cardinality/LoopSubplanCardinalityPusherTest.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/optimizer/cardinality/LoopSubplanCardinalityPusherTest.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/optimizer/cardinality/LoopSubplanCardinalityPusherTest.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/optimizer/cardinality/LoopSubplanCardinalityPusherTest.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/optimizer/cardinality/SubplanCardinalityPusherTest.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/optimizer/cardinality/SubplanCardinalityPusherTest.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/optimizer/cardinality/SubplanCardinalityPusherTest.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/optimizer/cardinality/SubplanCardinalityPusherTest.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/optimizer/channels/ChannelConversionGraphTest.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/optimizer/channels/ChannelConversionGraphTest.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/optimizer/channels/ChannelConversionGraphTest.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/optimizer/channels/ChannelConversionGraphTest.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/optimizer/costs/NestableLoadProfileEstimatorTest.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/optimizer/costs/NestableLoadProfileEstimatorTest.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/optimizer/costs/NestableLoadProfileEstimatorTest.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/optimizer/costs/NestableLoadProfileEstimatorTest.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/optimizer/enumeration/StageAssignmentTraversalTest.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/optimizer/enumeration/StageAssignmentTraversalTest.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/optimizer/enumeration/StageAssignmentTraversalTest.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/optimizer/enumeration/StageAssignmentTraversalTest.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/executionplan/test/TestChannel.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/executionplan/test/TestChannel.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/executionplan/test/TestChannel.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/executionplan/test/TestChannel.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/LoopIsolatorTest.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/LoopIsolatorTest.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/LoopIsolatorTest.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/LoopIsolatorTest.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/OperatorTest.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/OperatorTest.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/OperatorTest.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/OperatorTest.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/SlotMappingTest.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/SlotMappingTest.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/SlotMappingTest.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/SlotMappingTest.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/test/TestCustomMapOperator.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/test/TestCustomMapOperator.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/test/TestCustomMapOperator.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/test/TestCustomMapOperator.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/test/TestFilterOperator.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/test/TestFilterOperator.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/test/TestFilterOperator.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/test/TestFilterOperator.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/test/TestJoin.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/test/TestJoin.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/test/TestJoin.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/test/TestJoin.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/test/TestLoopHead.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/test/TestLoopHead.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/test/TestLoopHead.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/test/TestLoopHead.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/test/TestMapOperator.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/test/TestMapOperator.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/test/TestMapOperator.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/test/TestMapOperator.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/test/TestSink.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/test/TestSink.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/test/TestSink.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/test/TestSink.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/test/TestSink2.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/test/TestSink2.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/test/TestSink2.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/test/TestSink2.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/test/TestSource.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/test/TestSource.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/plan/rheemplan/test/TestSource.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/test/TestSource.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/platform/PartialExecutionTest.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/platform/PartialExecutionTest.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/platform/PartialExecutionTest.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/platform/PartialExecutionTest.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/plugin/DynamicPluginTest.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/plugin/DynamicPluginTest.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/plugin/DynamicPluginTest.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/plugin/DynamicPluginTest.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/test/DummyExecutionOperator.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/test/DummyExecutionOperator.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/test/DummyExecutionOperator.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/test/DummyExecutionOperator.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/test/DummyExternalReusableChannel.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/test/DummyExternalReusableChannel.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/test/DummyExternalReusableChannel.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/test/DummyExternalReusableChannel.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/test/DummyNonReusableChannel.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/test/DummyNonReusableChannel.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/test/DummyNonReusableChannel.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/test/DummyNonReusableChannel.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/test/DummyPlatform.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/test/DummyPlatform.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/test/DummyPlatform.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/test/DummyPlatform.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/test/DummyReusableChannel.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/test/DummyReusableChannel.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/test/DummyReusableChannel.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/test/DummyReusableChannel.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/test/MockFactory.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/test/MockFactory.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/test/MockFactory.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/test/MockFactory.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/test/SerializableDummyExecutionOperator.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/test/SerializableDummyExecutionOperator.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/test/SerializableDummyExecutionOperator.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/test/SerializableDummyExecutionOperator.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/test/TestDataUnit.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/test/TestDataUnit.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/test/TestDataUnit.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/test/TestDataUnit.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/test/TestDataUnit2.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/test/TestDataUnit2.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/test/TestDataUnit2.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/test/TestDataUnit2.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/util/BitmaskTest.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/util/BitmaskTest.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/util/BitmaskTest.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/util/BitmaskTest.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/util/ConsumerIteratorAdapterTest.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/util/ConsumerIteratorAdapterTest.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/util/ConsumerIteratorAdapterTest.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/util/ConsumerIteratorAdapterTest.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/util/CrossProductIterableTest.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/util/CrossProductIterableTest.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/util/CrossProductIterableTest.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/util/CrossProductIterableTest.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/util/LimitedInputStreamTest.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/util/LimitedInputStreamTest.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/util/LimitedInputStreamTest.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/util/LimitedInputStreamTest.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/util/ReflectionUtilsTest.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/util/ReflectionUtilsTest.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/util/ReflectionUtilsTest.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/util/ReflectionUtilsTest.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/util/WayangCollectionsTest.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/util/WayangCollectionsTest.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/util/WayangCollectionsTest.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/util/WayangCollectionsTest.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/util/mathex/ExpressionBuilderTest.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/util/mathex/ExpressionBuilderTest.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/util/mathex/ExpressionBuilderTest.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/util/mathex/ExpressionBuilderTest.java
diff --git a/rheem-core/src/test/java/org/apache/incubator/wayang/core/util/mathex/ExpressionTest.java b/wayang-core/src/test/java/org/apache/incubator/wayang/core/util/mathex/ExpressionTest.java
similarity index 100%
rename from rheem-core/src/test/java/org/apache/incubator/wayang/core/util/mathex/ExpressionTest.java
rename to wayang-core/src/test/java/org/apache/incubator/wayang/core/util/mathex/ExpressionTest.java
diff --git a/rheem-core/src/test/resources/empty-plugin.yaml b/wayang-core/src/test/resources/empty-plugin.yaml
similarity index 100%
rename from rheem-core/src/test/resources/empty-plugin.yaml
rename to wayang-core/src/test/resources/empty-plugin.yaml
diff --git a/rheem-core/src/test/resources/partial-plugin.yaml b/wayang-core/src/test/resources/partial-plugin.yaml
similarity index 100%
rename from rheem-core/src/test/resources/partial-plugin.yaml
rename to wayang-core/src/test/resources/partial-plugin.yaml
diff --git a/rheem-core/src/test/resources/simplelogger.properties b/wayang-core/src/test/resources/simplelogger.properties
similarity index 100%
rename from rheem-core/src/test/resources/simplelogger.properties
rename to wayang-core/src/test/resources/simplelogger.properties
diff --git a/rheem-core/src/test/resources/test-plugin.yaml b/wayang-core/src/test/resources/test-plugin.yaml
similarity index 100%
rename from rheem-core/src/test/resources/test-plugin.yaml
rename to wayang-core/src/test/resources/test-plugin.yaml
diff --git a/rheem-distro/pom.xml b/wayang-distro/pom.xml
similarity index 100%
rename from rheem-distro/pom.xml
rename to wayang-distro/pom.xml
diff --git a/rheem-distro/src/assembly/distro.xml b/wayang-distro/src/assembly/distro.xml
similarity index 100%
rename from rheem-distro/src/assembly/distro.xml
rename to wayang-distro/src/assembly/distro.xml
diff --git a/rheem-extensions/pom.xml b/wayang-extensions/pom.xml
similarity index 100%
rename from rheem-extensions/pom.xml
rename to wayang-extensions/pom.xml
diff --git a/rheem-extensions/rheem-iejoin/pom.xml b/wayang-extensions/wayang-iejoin/pom.xml
similarity index 100%
rename from rheem-extensions/rheem-iejoin/pom.xml
rename to wayang-extensions/wayang-iejoin/pom.xml
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/IEJoin.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/IEJoin.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/IEJoin.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/IEJoin.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/data/Data.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/data/Data.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/data/Data.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/data/Data.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/Mappings.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/Mappings.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/Mappings.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/Mappings.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/java/IEJoinMapping.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/java/IEJoinMapping.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/java/IEJoinMapping.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/java/IEJoinMapping.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/java/IESelfJoinMapping.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/java/IESelfJoinMapping.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/java/IESelfJoinMapping.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/java/IESelfJoinMapping.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/spark/IEJoinMapping.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/spark/IEJoinMapping.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/spark/IEJoinMapping.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/spark/IEJoinMapping.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/spark/IESelfJoinMapping.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/spark/IESelfJoinMapping.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/spark/IESelfJoinMapping.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/spark/IESelfJoinMapping.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/IEJoinMasterOperator.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/IEJoinMasterOperator.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/IEJoinMasterOperator.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/IEJoinMasterOperator.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/IEJoinOperator.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/IEJoinOperator.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/IEJoinOperator.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/IEJoinOperator.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/IESelfJoinOperator.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/IESelfJoinOperator.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/IESelfJoinOperator.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/IESelfJoinOperator.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/JavaIEJoinOperator.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/JavaIEJoinOperator.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/JavaIEJoinOperator.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/JavaIEJoinOperator.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/JavaIESelfJoinOperator.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/JavaIESelfJoinOperator.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/JavaIESelfJoinOperator.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/JavaIESelfJoinOperator.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperator.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperator.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperator.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperator.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/SparkIESelfJoinOperator.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/SparkIESelfJoinOperator.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/SparkIESelfJoinOperator.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/SparkIESelfJoinOperator.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/BitSetJoin.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/BitSetJoin.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/BitSetJoin.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/BitSetJoin.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/DataComparator.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/DataComparator.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/DataComparator.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/DataComparator.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/extractData.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/extractData.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/extractData.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/extractData.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/myMergeSort.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/myMergeSort.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/myMergeSort.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/myMergeSort.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/revDataComparator.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/revDataComparator.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/revDataComparator.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/revDataComparator.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/BitSetJoin.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/BitSetJoin.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/BitSetJoin.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/BitSetJoin.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/List2AttributesObjectSkinny.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/List2AttributesObjectSkinny.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/List2AttributesObjectSkinny.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/List2AttributesObjectSkinny.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/addUniqueID.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/addUniqueID.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/addUniqueID.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/addUniqueID.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/build2ListObject.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/build2ListObject.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/build2ListObject.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/build2ListObject.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/extractData.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/extractData.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/extractData.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/extractData.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/filterUnwantedBlocks.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/filterUnwantedBlocks.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/filterUnwantedBlocks.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/filterUnwantedBlocks.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/myMergeSort.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/myMergeSort.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/myMergeSort.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/myMergeSort.java
diff --git a/rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/revDataComparator.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/revDataComparator.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/revDataComparator.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/revDataComparator.java
diff --git a/rheem-extensions/rheem-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/JavaExecutionOperatorTestBase.java b/wayang-extensions/wayang-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/JavaExecutionOperatorTestBase.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/JavaExecutionOperatorTestBase.java
rename to wayang-extensions/wayang-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/JavaExecutionOperatorTestBase.java
diff --git a/rheem-extensions/rheem-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/JavaIEJoinOperatorTest.java b/wayang-extensions/wayang-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/JavaIEJoinOperatorTest.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/JavaIEJoinOperatorTest.java
rename to wayang-extensions/wayang-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/JavaIEJoinOperatorTest.java
diff --git a/rheem-extensions/rheem-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperatorTest.java b/wayang-extensions/wayang-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperatorTest.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperatorTest.java
rename to wayang-extensions/wayang-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperatorTest.java
diff --git a/rheem-extensions/rheem-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperatorTest2.java b/wayang-extensions/wayang-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperatorTest2.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperatorTest2.java
rename to wayang-extensions/wayang-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperatorTest2.java
diff --git a/rheem-extensions/rheem-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperatorTest3.java b/wayang-extensions/wayang-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperatorTest3.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperatorTest3.java
rename to wayang-extensions/wayang-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperatorTest3.java
diff --git a/rheem-extensions/rheem-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperatorTest4.java b/wayang-extensions/wayang-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperatorTest4.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperatorTest4.java
rename to wayang-extensions/wayang-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperatorTest4.java
diff --git a/rheem-extensions/rheem-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIESelfJoinOperatorTest.java b/wayang-extensions/wayang-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIESelfJoinOperatorTest.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIESelfJoinOperatorTest.java
rename to wayang-extensions/wayang-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIESelfJoinOperatorTest.java
diff --git a/rheem-extensions/rheem-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkOperatorTestBase.java b/wayang-extensions/wayang-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkOperatorTestBase.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkOperatorTestBase.java
rename to wayang-extensions/wayang-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkOperatorTestBase.java
diff --git a/rheem-extensions/rheem-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/test/ChannelFactory.java b/wayang-extensions/wayang-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/test/ChannelFactory.java
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/test/ChannelFactory.java
rename to wayang-extensions/wayang-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/test/ChannelFactory.java
diff --git a/rheem-extensions/rheem-iejoin/src/test/resources/rheem.properties b/wayang-extensions/wayang-iejoin/src/test/resources/wayang.properties
similarity index 100%
rename from rheem-extensions/rheem-iejoin/src/test/resources/rheem.properties
rename to wayang-extensions/wayang-iejoin/src/test/resources/wayang.properties
diff --git a/rheem-platforms/pom.xml b/wayang-platforms/pom.xml
similarity index 100%
rename from rheem-platforms/pom.xml
rename to wayang-platforms/pom.xml
diff --git a/rheem-platforms/rheem-flink/pom.xml b/wayang-platforms/wayang-flink/pom.xml
similarity index 100%
rename from rheem-platforms/rheem-flink/pom.xml
rename to wayang-platforms/wayang-flink/pom.xml
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/Flink.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/Flink.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/Flink.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/Flink.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/channels/ChannelConversions.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/channels/ChannelConversions.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/channels/ChannelConversions.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/channels/ChannelConversions.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/channels/DataSetChannel.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/channels/DataSetChannel.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/channels/DataSetChannel.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/channels/DataSetChannel.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/FlinkCoGroupFunction.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/FlinkCoGroupFunction.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/FlinkCoGroupFunction.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/FlinkCoGroupFunction.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/FunctionCompiler.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/FunctionCompiler.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/FunctionCompiler.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/FunctionCompiler.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/KeySelectorDistinct.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/KeySelectorDistinct.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/KeySelectorDistinct.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/KeySelectorDistinct.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/KeySelectorFunction.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/KeySelectorFunction.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/KeySelectorFunction.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/KeySelectorFunction.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/OutputFormatConsumer.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/OutputFormatConsumer.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/OutputFormatConsumer.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/OutputFormatConsumer.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/WayangFileOutputFormat.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/WayangFileOutputFormat.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/WayangFileOutputFormat.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/WayangFileOutputFormat.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/DummyFilter.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/DummyFilter.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/DummyFilter.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/DummyFilter.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/DummyMap.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/DummyMap.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/DummyMap.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/DummyMap.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangAggregator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangAggregator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangAggregator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangAggregator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangConvergenceCriterion.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangConvergenceCriterion.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangConvergenceCriterion.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangConvergenceCriterion.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangFilterCriterion.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangFilterCriterion.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangFilterCriterion.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangFilterCriterion.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangListValue.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangListValue.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangListValue.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangListValue.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangValue.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangValue.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangValue.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangValue.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/execution/FlinkContextReference.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/execution/FlinkContextReference.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/execution/FlinkContextReference.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/execution/FlinkContextReference.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/execution/FlinkExecutionContext.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/execution/FlinkExecutionContext.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/execution/FlinkExecutionContext.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/execution/FlinkExecutionContext.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/execution/FlinkExecutor.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/execution/FlinkExecutor.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/execution/FlinkExecutor.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/execution/FlinkExecutor.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/CartesianMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/CartesianMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/CartesianMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/CartesianMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/CoGroupMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/CoGroupMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/CoGroupMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/CoGroupMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/CollectionSourceMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/CollectionSourceMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/CollectionSourceMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/CollectionSourceMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/CountMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/CountMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/CountMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/CountMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/DistinctMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/DistinctMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/DistinctMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/DistinctMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/DoWhileMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/DoWhileMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/DoWhileMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/DoWhileMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/FilterMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/FilterMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/FilterMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/FilterMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/FlatMapMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/FlatMapMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/FlatMapMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/FlatMapMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/GlobalMaterializedGroupMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/GlobalMaterializedGroupMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/GlobalMaterializedGroupMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/GlobalMaterializedGroupMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/GlobalReduceMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/GlobalReduceMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/GlobalReduceMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/GlobalReduceMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/GroupByMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/GroupByMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/GroupByMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/GroupByMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/IntersectMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/IntersectMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/IntersectMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/IntersectMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/JoinMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/JoinMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/JoinMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/JoinMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/LocalCallbackSinkMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/LocalCallbackSinkMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/LocalCallbackSinkMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/LocalCallbackSinkMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/LoopMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/LoopMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/LoopMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/LoopMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/MapMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/MapMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/MapMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/MapMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/MapPartitionsMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/MapPartitionsMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/MapPartitionsMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/MapPartitionsMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/Mappings.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/Mappings.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/Mappings.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/Mappings.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/MaterializedGroupByMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/MaterializedGroupByMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/MaterializedGroupByMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/MaterializedGroupByMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/PageRankMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/PageRankMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/PageRankMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/PageRankMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/ReduceByMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/ReduceByMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/ReduceByMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/ReduceByMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/RepeatMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/RepeatMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/RepeatMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/RepeatMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/SampleMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/SampleMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/SampleMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/SampleMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/SortMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/SortMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/SortMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/SortMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/TextFileSinkMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/TextFileSinkMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/TextFileSinkMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/TextFileSinkMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/TextFileSourceMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/TextFileSourceMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/TextFileSourceMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/TextFileSourceMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/UnionAllMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/UnionAllMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/UnionAllMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/UnionAllMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/ZipWithIdMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/ZipWithIdMapping.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/ZipWithIdMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/ZipWithIdMapping.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCartesianOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCartesianOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCartesianOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCartesianOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCoGroupOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCoGroupOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCoGroupOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCoGroupOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCollectionSink.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCollectionSink.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCollectionSink.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCollectionSink.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCollectionSource.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCollectionSource.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCollectionSource.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCollectionSource.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCountOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCountOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCountOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCountOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkDistinctOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkDistinctOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkDistinctOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkDistinctOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkDoWhileOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkDoWhileOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkDoWhileOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkDoWhileOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkExecutionOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkExecutionOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkExecutionOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkExecutionOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkFilterOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkFilterOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkFilterOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkFilterOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkFlatMapOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkFlatMapOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkFlatMapOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkFlatMapOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkGlobalMaterializedGroupOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkGlobalMaterializedGroupOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkGlobalMaterializedGroupOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkGlobalMaterializedGroupOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkGlobalReduceOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkGlobalReduceOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkGlobalReduceOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkGlobalReduceOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkGroupByOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkGroupByOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkGroupByOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkGroupByOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkIntersectOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkIntersectOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkIntersectOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkIntersectOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkJoinOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkJoinOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkJoinOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkJoinOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkLocalCallbackSink.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkLocalCallbackSink.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkLocalCallbackSink.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkLocalCallbackSink.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkLoopOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkLoopOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkLoopOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkLoopOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkMapOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkMapOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkMapOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkMapOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkMapPartitionsOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkMapPartitionsOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkMapPartitionsOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkMapPartitionsOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkMaterializedGroupByOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkMaterializedGroupByOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkMaterializedGroupByOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkMaterializedGroupByOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkObjectFileSink.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkObjectFileSink.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkObjectFileSink.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkObjectFileSink.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkObjectFileSource.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkObjectFileSource.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkObjectFileSource.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkObjectFileSource.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkPageRankOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkPageRankOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkPageRankOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkPageRankOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkReduceByOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkReduceByOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkReduceByOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkReduceByOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkRepeatExpandedOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkRepeatExpandedOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkRepeatExpandedOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkRepeatExpandedOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkRepeatOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkRepeatOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkRepeatOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkRepeatOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkSampleOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkSampleOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkSampleOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkSampleOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkSortOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkSortOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkSortOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkSortOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkTextFileSink.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkTextFileSink.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkTextFileSink.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkTextFileSink.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkTextFileSource.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkTextFileSource.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkTextFileSource.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkTextFileSource.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkTsvFileSink.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkTsvFileSink.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkTsvFileSink.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkTsvFileSink.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkUnionAllOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkUnionAllOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkUnionAllOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkUnionAllOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkZipWithIdOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkZipWithIdOperator.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkZipWithIdOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkZipWithIdOperator.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/platform/FlinkPlatform.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/platform/FlinkPlatform.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/platform/FlinkPlatform.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/platform/FlinkPlatform.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/plugin/FlinkBasicPlugin.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/plugin/FlinkBasicPlugin.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/plugin/FlinkBasicPlugin.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/plugin/FlinkBasicPlugin.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/plugin/FlinkConversionPlugin.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/plugin/FlinkConversionPlugin.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/plugin/FlinkConversionPlugin.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/plugin/FlinkConversionPlugin.java
diff --git a/rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/plugin/FlinkGraphPlugin.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/plugin/FlinkGraphPlugin.java
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/java/org/apache/incubator/wayang/flink/plugin/FlinkGraphPlugin.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/plugin/FlinkGraphPlugin.java
diff --git a/rheem-platforms/rheem-flink/src/main/resources/rheem-flink-defaults.properties b/wayang-platforms/wayang-flink/src/main/resources/wayang-flink-defaults.properties
similarity index 100%
rename from rheem-platforms/rheem-flink/src/main/resources/rheem-flink-defaults.properties
rename to wayang-platforms/wayang-flink/src/main/resources/wayang-flink-defaults.properties
diff --git a/rheem-platforms/rheem-giraph/pom.xml b/wayang-platforms/wayang-giraph/pom.xml
similarity index 100%
rename from rheem-platforms/rheem-giraph/pom.xml
rename to wayang-platforms/wayang-giraph/pom.xml
diff --git a/rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/Algorithm/PageRankAlgorithm.java b/wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/Algorithm/PageRankAlgorithm.java
similarity index 100%
rename from rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/Algorithm/PageRankAlgorithm.java
rename to wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/Algorithm/PageRankAlgorithm.java
diff --git a/rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/Algorithm/PageRankParameters.java b/wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/Algorithm/PageRankParameters.java
similarity index 100%
rename from rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/Algorithm/PageRankParameters.java
rename to wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/Algorithm/PageRankParameters.java
diff --git a/rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/Giraph.java b/wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/Giraph.java
similarity index 100%
rename from rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/Giraph.java
rename to wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/Giraph.java
diff --git a/rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/channels/ChannelConversions.java b/wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/channels/ChannelConversions.java
similarity index 100%
rename from rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/channels/ChannelConversions.java
rename to wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/channels/ChannelConversions.java
diff --git a/rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/execution/GiraphExecutor.java b/wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/execution/GiraphExecutor.java
similarity index 100%
rename from rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/execution/GiraphExecutor.java
rename to wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/execution/GiraphExecutor.java
diff --git a/rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/mappings/Mappings.java b/wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/mappings/Mappings.java
similarity index 100%
rename from rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/mappings/Mappings.java
rename to wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/mappings/Mappings.java
diff --git a/rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/mappings/PageRankMapping.java b/wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/mappings/PageRankMapping.java
similarity index 100%
rename from rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/mappings/PageRankMapping.java
rename to wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/mappings/PageRankMapping.java
diff --git a/rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/operators/GiraphExecutionOperator.java b/wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/operators/GiraphExecutionOperator.java
similarity index 100%
rename from rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/operators/GiraphExecutionOperator.java
rename to wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/operators/GiraphExecutionOperator.java
diff --git a/rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/operators/GiraphPageRankOperator.java b/wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/operators/GiraphPageRankOperator.java
similarity index 100%
rename from rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/operators/GiraphPageRankOperator.java
rename to wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/operators/GiraphPageRankOperator.java
diff --git a/rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/platform/GiraphPlatform.java b/wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/platform/GiraphPlatform.java
similarity index 100%
rename from rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/platform/GiraphPlatform.java
rename to wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/platform/GiraphPlatform.java
diff --git a/rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/plugin/GiraphPlugin.java b/wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/plugin/GiraphPlugin.java
similarity index 100%
rename from rheem-platforms/rheem-giraph/src/main/java/org/apache/incubator/wayang/giraph/plugin/GiraphPlugin.java
rename to wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/plugin/GiraphPlugin.java
diff --git a/rheem-platforms/rheem-giraph/src/main/resources/rheem-giraph-defaults.properties b/wayang-platforms/wayang-giraph/src/main/resources/wayang-giraph-defaults.properties
similarity index 100%
rename from rheem-platforms/rheem-giraph/src/main/resources/rheem-giraph-defaults.properties
rename to wayang-platforms/wayang-giraph/src/main/resources/wayang-giraph-defaults.properties
diff --git a/rheem-platforms/rheem-giraph/src/test/java/org/apache/incubator/wayang/giraph/operators/GiraphPagaRankOperatorTest.java b/wayang-platforms/wayang-giraph/src/test/java/org/apache/incubator/wayang/giraph/operators/GiraphPagaRankOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-giraph/src/test/java/org/apache/incubator/wayang/giraph/operators/GiraphPagaRankOperatorTest.java
rename to wayang-platforms/wayang-giraph/src/test/java/org/apache/incubator/wayang/giraph/operators/GiraphPagaRankOperatorTest.java
diff --git a/rheem-platforms/rheem-graphchi/src/test/resources/test.edgelist b/wayang-platforms/wayang-giraph/src/test/resources/test.edgelist
similarity index 100%
rename from rheem-platforms/rheem-graphchi/src/test/resources/test.edgelist
rename to wayang-platforms/wayang-giraph/src/test/resources/test.edgelist
diff --git a/rheem-platforms/rheem-graphchi/pom.xml b/wayang-platforms/wayang-graphchi/pom.xml
similarity index 100%
rename from rheem-platforms/rheem-graphchi/pom.xml
rename to wayang-platforms/wayang-graphchi/pom.xml
diff --git a/rheem-platforms/rheem-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/GraphChi.java b/wayang-platforms/wayang-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/GraphChi.java
similarity index 100%
rename from rheem-platforms/rheem-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/GraphChi.java
rename to wayang-platforms/wayang-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/GraphChi.java
diff --git a/rheem-platforms/rheem-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/channels/ChannelConversions.java b/wayang-platforms/wayang-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/channels/ChannelConversions.java
similarity index 100%
rename from rheem-platforms/rheem-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/channels/ChannelConversions.java
rename to wayang-platforms/wayang-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/channels/ChannelConversions.java
diff --git a/rheem-platforms/rheem-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/execution/GraphChiExecutor.java b/wayang-platforms/wayang-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/execution/GraphChiExecutor.java
similarity index 100%
rename from rheem-platforms/rheem-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/execution/GraphChiExecutor.java
rename to wayang-platforms/wayang-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/execution/GraphChiExecutor.java
diff --git a/rheem-platforms/rheem-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/mappings/Mappings.java b/wayang-platforms/wayang-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/mappings/Mappings.java
similarity index 100%
rename from rheem-platforms/rheem-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/mappings/Mappings.java
rename to wayang-platforms/wayang-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/mappings/Mappings.java
diff --git a/rheem-platforms/rheem-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/mappings/PageRankMapping.java b/wayang-platforms/wayang-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/mappings/PageRankMapping.java
similarity index 100%
rename from rheem-platforms/rheem-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/mappings/PageRankMapping.java
rename to wayang-platforms/wayang-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/mappings/PageRankMapping.java
diff --git a/rheem-platforms/rheem-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/operators/GraphChiExecutionOperator.java b/wayang-platforms/wayang-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/operators/GraphChiExecutionOperator.java
similarity index 100%
rename from rheem-platforms/rheem-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/operators/GraphChiExecutionOperator.java
rename to wayang-platforms/wayang-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/operators/GraphChiExecutionOperator.java
diff --git a/rheem-platforms/rheem-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/operators/GraphChiPageRankOperator.java b/wayang-platforms/wayang-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/operators/GraphChiPageRankOperator.java
similarity index 100%
rename from rheem-platforms/rheem-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/operators/GraphChiPageRankOperator.java
rename to wayang-platforms/wayang-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/operators/GraphChiPageRankOperator.java
diff --git a/rheem-platforms/rheem-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/platform/GraphChiPlatform.java b/wayang-platforms/wayang-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/platform/GraphChiPlatform.java
similarity index 100%
rename from rheem-platforms/rheem-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/platform/GraphChiPlatform.java
rename to wayang-platforms/wayang-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/platform/GraphChiPlatform.java
diff --git a/rheem-platforms/rheem-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/plugin/GraphChiPlugin.java b/wayang-platforms/wayang-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/plugin/GraphChiPlugin.java
similarity index 100%
rename from rheem-platforms/rheem-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/plugin/GraphChiPlugin.java
rename to wayang-platforms/wayang-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/plugin/GraphChiPlugin.java
diff --git a/rheem-platforms/rheem-graphchi/src/main/resources/rheem-graphchi-defaults.properties b/wayang-platforms/wayang-graphchi/src/main/resources/wayang-graphchi-defaults.properties
similarity index 100%
rename from rheem-platforms/rheem-graphchi/src/main/resources/rheem-graphchi-defaults.properties
rename to wayang-platforms/wayang-graphchi/src/main/resources/wayang-graphchi-defaults.properties
diff --git a/rheem-platforms/rheem-graphchi/src/test/java/org/apache/incubator/wayang/graphchi/operators/GraphChiPageRankOperatorTest.java b/wayang-platforms/wayang-graphchi/src/test/java/org/apache/incubator/wayang/graphchi/operators/GraphChiPageRankOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-graphchi/src/test/java/org/apache/incubator/wayang/graphchi/operators/GraphChiPageRankOperatorTest.java
rename to wayang-platforms/wayang-graphchi/src/test/java/org/apache/incubator/wayang/graphchi/operators/GraphChiPageRankOperatorTest.java
diff --git a/rheem-platforms/rheem-giraph/src/test/resources/test.edgelist b/wayang-platforms/wayang-graphchi/src/test/resources/test.edgelist
similarity index 100%
rename from rheem-platforms/rheem-giraph/src/test/resources/test.edgelist
rename to wayang-platforms/wayang-graphchi/src/test/resources/test.edgelist
diff --git a/rheem-platforms/rheem-java/pom.xml b/wayang-platforms/wayang-java/pom.xml
similarity index 100%
rename from rheem-platforms/rheem-java/pom.xml
rename to wayang-platforms/wayang-java/pom.xml
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/Java.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/Java.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/Java.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/Java.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/channels/ChannelConversions.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/channels/ChannelConversions.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/channels/ChannelConversions.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/channels/ChannelConversions.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/channels/CollectionChannel.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/channels/CollectionChannel.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/channels/CollectionChannel.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/channels/CollectionChannel.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/channels/JavaChannelInstance.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/channels/JavaChannelInstance.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/channels/JavaChannelInstance.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/channels/JavaChannelInstance.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/channels/StreamChannel.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/channels/StreamChannel.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/channels/StreamChannel.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/channels/StreamChannel.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/compiler/FunctionCompiler.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/compiler/FunctionCompiler.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/compiler/FunctionCompiler.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/compiler/FunctionCompiler.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/execution/JavaExecutionContext.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/execution/JavaExecutionContext.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/execution/JavaExecutionContext.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/execution/JavaExecutionContext.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/execution/JavaExecutor.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/execution/JavaExecutor.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/execution/JavaExecutor.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/execution/JavaExecutor.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/CartesianMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/CartesianMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/CartesianMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/CartesianMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/CoGroupMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/CoGroupMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/CoGroupMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/CoGroupMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/CollectionSourceMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/CollectionSourceMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/CollectionSourceMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/CollectionSourceMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/CountMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/CountMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/CountMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/CountMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/DistinctMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/DistinctMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/DistinctMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/DistinctMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/DoWhileMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/DoWhileMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/DoWhileMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/DoWhileMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/FilterMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/FilterMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/FilterMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/FilterMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/FlatMapMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/FlatMapMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/FlatMapMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/FlatMapMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/GlobalMaterializedGroupMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/GlobalMaterializedGroupMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/GlobalMaterializedGroupMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/GlobalMaterializedGroupMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/GlobalReduceMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/GlobalReduceMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/GlobalReduceMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/GlobalReduceMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/IntersectMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/IntersectMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/IntersectMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/IntersectMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/JoinMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/JoinMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/JoinMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/JoinMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/LocalCallbackSinkMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/LocalCallbackSinkMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/LocalCallbackSinkMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/LocalCallbackSinkMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/LoopMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/LoopMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/LoopMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/LoopMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/MapMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/MapMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/MapMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/MapMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/MapPartitionsMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/MapPartitionsMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/MapPartitionsMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/MapPartitionsMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/Mappings.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/Mappings.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/Mappings.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/Mappings.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/MaterializedGroupByMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/MaterializedGroupByMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/MaterializedGroupByMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/MaterializedGroupByMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/ReduceByMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/ReduceByMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/ReduceByMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/ReduceByMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/RepeatMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/RepeatMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/RepeatMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/RepeatMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/SampleMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/SampleMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/SampleMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/SampleMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/SortMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/SortMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/SortMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/SortMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/TextFileSinkMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/TextFileSinkMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/TextFileSinkMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/TextFileSinkMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/TextFileSourceMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/TextFileSourceMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/TextFileSourceMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/TextFileSourceMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/UnionAllMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/UnionAllMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/UnionAllMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/UnionAllMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/ZipWithIdMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/ZipWithIdMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/ZipWithIdMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/ZipWithIdMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/graph/PageRankMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/graph/PageRankMapping.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/mapping/graph/PageRankMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/graph/PageRankMapping.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCartesianOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCartesianOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCartesianOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCartesianOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCoGroupOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCoGroupOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCoGroupOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCoGroupOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCollectOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCollectOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCollectOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCollectOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCollectionSource.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCollectionSource.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCollectionSource.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCollectionSource.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCountOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCountOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCountOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCountOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaDistinctOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaDistinctOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaDistinctOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaDistinctOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaDoWhileOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaDoWhileOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaDoWhileOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaDoWhileOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaExecutionOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaExecutionOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaExecutionOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaExecutionOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaFilterOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaFilterOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaFilterOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaFilterOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaFlatMapOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaFlatMapOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaFlatMapOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaFlatMapOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaGlobalMaterializedGroupOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaGlobalMaterializedGroupOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaGlobalMaterializedGroupOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaGlobalMaterializedGroupOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaGlobalReduceOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaGlobalReduceOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaGlobalReduceOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaGlobalReduceOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaIntersectOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaIntersectOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaIntersectOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaIntersectOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaJoinOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaJoinOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaJoinOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaJoinOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaLocalCallbackSink.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaLocalCallbackSink.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaLocalCallbackSink.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaLocalCallbackSink.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaLoopOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaLoopOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaLoopOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaLoopOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaMapOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaMapOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaMapOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaMapOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaMapPartitionsOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaMapPartitionsOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaMapPartitionsOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaMapPartitionsOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaMaterializedGroupByOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaMaterializedGroupByOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaMaterializedGroupByOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaMaterializedGroupByOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaObjectFileSink.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaObjectFileSink.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaObjectFileSink.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaObjectFileSink.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaObjectFileSource.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaObjectFileSource.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaObjectFileSource.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaObjectFileSource.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaRandomSampleOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaRandomSampleOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaRandomSampleOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaRandomSampleOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaReduceByOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaReduceByOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaReduceByOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaReduceByOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaRepeatOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaRepeatOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaRepeatOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaRepeatOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaReservoirSampleOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaReservoirSampleOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaReservoirSampleOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaReservoirSampleOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaSortOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaSortOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaSortOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaSortOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaTextFileSink.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaTextFileSink.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaTextFileSink.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaTextFileSink.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaTextFileSource.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaTextFileSource.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaTextFileSource.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaTextFileSource.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaTsvFileSink.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaTsvFileSink.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaTsvFileSink.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaTsvFileSink.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaTsvFileSource.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaTsvFileSource.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaTsvFileSource.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaTsvFileSource.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaUnionAllOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaUnionAllOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaUnionAllOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaUnionAllOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/graph/JavaPageRankOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/graph/JavaPageRankOperator.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/operators/graph/JavaPageRankOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/graph/JavaPageRankOperator.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/platform/JavaPlatform.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/platform/JavaPlatform.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/platform/JavaPlatform.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/platform/JavaPlatform.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/plugin/JavaBasicPlugin.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/plugin/JavaBasicPlugin.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/plugin/JavaBasicPlugin.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/plugin/JavaBasicPlugin.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/plugin/JavaChannelConversionPlugin.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/plugin/JavaChannelConversionPlugin.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/plugin/JavaChannelConversionPlugin.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/plugin/JavaChannelConversionPlugin.java
diff --git a/rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/plugin/JavaGraphPlugin.java b/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/plugin/JavaGraphPlugin.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/java/org/apache/incubator/wayang/java/plugin/JavaGraphPlugin.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/plugin/JavaGraphPlugin.java
diff --git a/rheem-platforms/rheem-java/src/main/resources/rheem-java-defaults.properties b/wayang-platforms/wayang-java/src/main/resources/wayang-java-defaults.properties
similarity index 100%
rename from rheem-platforms/rheem-java/src/main/resources/rheem-java-defaults.properties
rename to wayang-platforms/wayang-java/src/main/resources/wayang-java-defaults.properties
diff --git a/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/execution/JavaExecutorTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/execution/JavaExecutorTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/execution/JavaExecutorTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/execution/JavaExecutorTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaCartesianOperatorTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaCartesianOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaCartesianOperatorTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaCartesianOperatorTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaCoGroupOperatorTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaCoGroupOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaCoGroupOperatorTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaCoGroupOperatorTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaCollectionSourceTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaCollectionSourceTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaCollectionSourceTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaCollectionSourceTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaCountOperatorTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaCountOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaCountOperatorTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaCountOperatorTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaDistinctOperatorTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaDistinctOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaDistinctOperatorTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaDistinctOperatorTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaExecutionOperatorTestBase.java b/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaExecutionOperatorTestBase.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaExecutionOperatorTestBase.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaExecutionOperatorTestBase.java
diff --git a/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaFilterOperatorTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaFilterOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaFilterOperatorTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaFilterOperatorTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaGlobalMaterializedGroupOperatorTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaGlobalMaterializedGroupOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaGlobalMaterializedGroupOperatorTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaGlobalMaterializedGroupOperatorTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaGlobalReduceOperatorTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaGlobalReduceOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaGlobalReduceOperatorTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaGlobalReduceOperatorTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaJoinOperatorTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaJoinOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaJoinOperatorTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaJoinOperatorTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaLocalCallbackSinkTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaLocalCallbackSinkTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaLocalCallbackSinkTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaLocalCallbackSinkTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaMaterializedGroupByOperatorTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaMaterializedGroupByOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaMaterializedGroupByOperatorTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaMaterializedGroupByOperatorTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaObjectFileSinkTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaObjectFileSinkTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaObjectFileSinkTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaObjectFileSinkTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaObjectFileSourceTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaObjectFileSourceTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaObjectFileSourceTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaObjectFileSourceTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaRandomSampleOperatorTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaRandomSampleOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaRandomSampleOperatorTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaRandomSampleOperatorTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaReduceByOperatorTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaReduceByOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaReduceByOperatorTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaReduceByOperatorTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaReservoirSampleOperatorTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaReservoirSampleOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaReservoirSampleOperatorTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaReservoirSampleOperatorTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaSortOperatorTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaSortOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaSortOperatorTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaSortOperatorTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaTextFileSinkTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaTextFileSinkTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaTextFileSinkTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaTextFileSinkTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaUnionAllOperatorTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaUnionAllOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaUnionAllOperatorTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaUnionAllOperatorTest.java
diff --git a/rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/test/ChannelFactory.java b/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/test/ChannelFactory.java
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/java/org/apache/incubator/wayang/java/test/ChannelFactory.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/test/ChannelFactory.java
diff --git a/rheem-platforms/rheem-spark/src/test/resources/0-to-10000.sequence_file b/wayang-platforms/wayang-java/src/test/resources/0-to-10000.sequence_file
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/resources/0-to-10000.sequence_file
rename to wayang-platforms/wayang-java/src/test/resources/0-to-10000.sequence_file
diff --git a/rheem-platforms/rheem-jdbc-template/pom.xml b/wayang-platforms/wayang-jdbc-template/pom.xml
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/pom.xml
rename to wayang-platforms/wayang-jdbc-template/pom.xml
diff --git a/rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/channels/SqlQueryChannel.java b/wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/channels/SqlQueryChannel.java
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/channels/SqlQueryChannel.java
rename to wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/channels/SqlQueryChannel.java
diff --git a/rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/compiler/FunctionCompiler.java b/wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/compiler/FunctionCompiler.java
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/compiler/FunctionCompiler.java
rename to wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/compiler/FunctionCompiler.java
diff --git a/rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/execution/DatabaseDescriptor.java b/wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/execution/DatabaseDescriptor.java
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/execution/DatabaseDescriptor.java
rename to wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/execution/DatabaseDescriptor.java
diff --git a/rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/execution/JdbcExecutor.java b/wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/execution/JdbcExecutor.java
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/execution/JdbcExecutor.java
rename to wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/execution/JdbcExecutor.java
diff --git a/rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/JdbcExecutionOperator.java b/wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/JdbcExecutionOperator.java
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/JdbcExecutionOperator.java
rename to wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/JdbcExecutionOperator.java
diff --git a/rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/JdbcFilterOperator.java b/wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/JdbcFilterOperator.java
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/JdbcFilterOperator.java
rename to wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/JdbcFilterOperator.java
diff --git a/rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/JdbcProjectionOperator.java b/wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/JdbcProjectionOperator.java
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/JdbcProjectionOperator.java
rename to wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/JdbcProjectionOperator.java
diff --git a/rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/JdbcTableSource.java b/wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/JdbcTableSource.java
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/JdbcTableSource.java
rename to wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/JdbcTableSource.java
diff --git a/rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/SqlToStreamOperator.java b/wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/SqlToStreamOperator.java
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/SqlToStreamOperator.java
rename to wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/SqlToStreamOperator.java
diff --git a/rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/platform/JdbcPlatformTemplate.java b/wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/platform/JdbcPlatformTemplate.java
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/platform/JdbcPlatformTemplate.java
rename to wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/platform/JdbcPlatformTemplate.java
diff --git a/rheem-platforms/rheem-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/execution/JdbcExecutorTest.java b/wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/execution/JdbcExecutorTest.java
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/execution/JdbcExecutorTest.java
rename to wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/execution/JdbcExecutorTest.java
diff --git a/rheem-platforms/rheem-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/operators/JdbcTableSourceTest.java b/wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/operators/JdbcTableSourceTest.java
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/operators/JdbcTableSourceTest.java
rename to wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/operators/JdbcTableSourceTest.java
diff --git a/rheem-platforms/rheem-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/operators/OperatorTestBase.java b/wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/operators/OperatorTestBase.java
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/operators/OperatorTestBase.java
rename to wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/operators/OperatorTestBase.java
diff --git a/rheem-platforms/rheem-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/operators/SqlToStreamOperatorTest.java b/wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/operators/SqlToStreamOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/operators/SqlToStreamOperatorTest.java
rename to wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/operators/SqlToStreamOperatorTest.java
diff --git a/rheem-platforms/rheem-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/test/HsqldbFilterOperator.java b/wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/test/HsqldbFilterOperator.java
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/test/HsqldbFilterOperator.java
rename to wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/test/HsqldbFilterOperator.java
diff --git a/rheem-platforms/rheem-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/test/HsqldbPlatform.java b/wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/test/HsqldbPlatform.java
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/test/HsqldbPlatform.java
rename to wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/test/HsqldbPlatform.java
diff --git a/rheem-platforms/rheem-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/test/HsqldbProjectionOperator.java b/wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/test/HsqldbProjectionOperator.java
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/test/HsqldbProjectionOperator.java
rename to wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/test/HsqldbProjectionOperator.java
diff --git a/rheem-platforms/rheem-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/test/HsqldbTableSource.java b/wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/test/HsqldbTableSource.java
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/test/HsqldbTableSource.java
rename to wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/test/HsqldbTableSource.java
diff --git a/rheem-platforms/rheem-jdbc-template/src/test/resources/rheem-hsqldb-defaults.properties b/wayang-platforms/wayang-jdbc-template/src/test/resources/wayang-hsqldb-defaults.properties
similarity index 100%
rename from rheem-platforms/rheem-jdbc-template/src/test/resources/rheem-hsqldb-defaults.properties
rename to wayang-platforms/wayang-jdbc-template/src/test/resources/wayang-hsqldb-defaults.properties
diff --git a/rheem-platforms/rheem-postgres/pom.xml b/wayang-platforms/wayang-postgres/pom.xml
similarity index 100%
rename from rheem-platforms/rheem-postgres/pom.xml
rename to wayang-platforms/wayang-postgres/pom.xml
diff --git a/rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/Postgres.java b/wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/Postgres.java
similarity index 100%
rename from rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/Postgres.java
rename to wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/Postgres.java
diff --git a/rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/channels/ChannelConversions.java b/wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/channels/ChannelConversions.java
similarity index 100%
rename from rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/channels/ChannelConversions.java
rename to wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/channels/ChannelConversions.java
diff --git a/rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/mapping/FilterMapping.java b/wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/mapping/FilterMapping.java
similarity index 100%
rename from rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/mapping/FilterMapping.java
rename to wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/mapping/FilterMapping.java
diff --git a/rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/mapping/Mappings.java b/wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/mapping/Mappings.java
similarity index 100%
rename from rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/mapping/Mappings.java
rename to wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/mapping/Mappings.java
diff --git a/rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/mapping/ProjectionMapping.java b/wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/mapping/ProjectionMapping.java
similarity index 100%
rename from rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/mapping/ProjectionMapping.java
rename to wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/mapping/ProjectionMapping.java
diff --git a/rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/operators/PostgresExecutionOperator.java b/wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/operators/PostgresExecutionOperator.java
similarity index 100%
rename from rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/operators/PostgresExecutionOperator.java
rename to wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/operators/PostgresExecutionOperator.java
diff --git a/rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/operators/PostgresFilterOperator.java b/wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/operators/PostgresFilterOperator.java
similarity index 100%
rename from rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/operators/PostgresFilterOperator.java
rename to wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/operators/PostgresFilterOperator.java
diff --git a/rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/operators/PostgresProjectionOperator.java b/wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/operators/PostgresProjectionOperator.java
similarity index 100%
rename from rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/operators/PostgresProjectionOperator.java
rename to wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/operators/PostgresProjectionOperator.java
diff --git a/rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/operators/PostgresTableSource.java b/wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/operators/PostgresTableSource.java
similarity index 100%
rename from rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/operators/PostgresTableSource.java
rename to wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/operators/PostgresTableSource.java
diff --git a/rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/platform/PostgresPlatform.java b/wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/platform/PostgresPlatform.java
similarity index 100%
rename from rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/platform/PostgresPlatform.java
rename to wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/platform/PostgresPlatform.java
diff --git a/rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/plugin/PostgresConversionsPlugin.java b/wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/plugin/PostgresConversionsPlugin.java
similarity index 100%
rename from rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/plugin/PostgresConversionsPlugin.java
rename to wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/plugin/PostgresConversionsPlugin.java
diff --git a/rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/plugin/PostgresPlugin.java b/wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/plugin/PostgresPlugin.java
similarity index 100%
rename from rheem-platforms/rheem-postgres/src/main/java/org/apache/incubator/wayang/postgres/plugin/PostgresPlugin.java
rename to wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/plugin/PostgresPlugin.java
diff --git a/rheem-platforms/rheem-postgres/src/main/resources/rheem-postgres-defaults.properties b/wayang-platforms/wayang-postgres/src/main/resources/wayang-postgres-defaults.properties
similarity index 100%
rename from rheem-platforms/rheem-postgres/src/main/resources/rheem-postgres-defaults.properties
rename to wayang-platforms/wayang-postgres/src/main/resources/wayang-postgres-defaults.properties
diff --git a/rheem-platforms/rheem-spark/pom.xml b/wayang-platforms/wayang-spark/pom.xml
similarity index 100%
rename from rheem-platforms/rheem-spark/pom.xml
rename to wayang-platforms/wayang-spark/pom.xml
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/Spark.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/Spark.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/Spark.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/Spark.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/channels/BroadcastChannel.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/channels/BroadcastChannel.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/channels/BroadcastChannel.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/channels/BroadcastChannel.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/channels/ChannelConversions.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/channels/ChannelConversions.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/channels/ChannelConversions.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/channels/ChannelConversions.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/channels/FileChannels.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/channels/FileChannels.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/channels/FileChannels.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/channels/FileChannels.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/channels/RddChannel.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/channels/RddChannel.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/channels/RddChannel.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/channels/RddChannel.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/BinaryOperatorAdapter.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/BinaryOperatorAdapter.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/BinaryOperatorAdapter.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/BinaryOperatorAdapter.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedBinaryOperatorAdapter.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedBinaryOperatorAdapter.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedBinaryOperatorAdapter.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedBinaryOperatorAdapter.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedFlatMapFunctionAdapter.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedFlatMapFunctionAdapter.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedFlatMapFunctionAdapter.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedFlatMapFunctionAdapter.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedFunction.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedFunction.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedFunction.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedFunction.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedMapFunctionAdapter.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedMapFunctionAdapter.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedMapFunctionAdapter.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedMapFunctionAdapter.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedMapPartitionsFunctionAdapter.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedMapPartitionsFunctionAdapter.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedMapPartitionsFunctionAdapter.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedMapPartitionsFunctionAdapter.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedPredicateAdapater.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedPredicateAdapater.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedPredicateAdapater.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedPredicateAdapater.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/FlatMapFunctionAdapter.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/FlatMapFunctionAdapter.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/FlatMapFunctionAdapter.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/FlatMapFunctionAdapter.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/FunctionCompiler.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/FunctionCompiler.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/FunctionCompiler.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/FunctionCompiler.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/MapFunctionAdapter.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/MapFunctionAdapter.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/MapFunctionAdapter.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/MapFunctionAdapter.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/MapPartitionsFunctionAdapter.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/MapPartitionsFunctionAdapter.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/MapPartitionsFunctionAdapter.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/MapPartitionsFunctionAdapter.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/PredicateAdapter.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/PredicateAdapter.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/PredicateAdapter.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/PredicateAdapter.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/execution/SparkContextReference.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/execution/SparkContextReference.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/execution/SparkContextReference.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/execution/SparkContextReference.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/execution/SparkExecutionContext.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/execution/SparkExecutionContext.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/execution/SparkExecutionContext.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/execution/SparkExecutionContext.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/execution/SparkExecutor.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/execution/SparkExecutor.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/execution/SparkExecutor.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/execution/SparkExecutor.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/CartesianMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/CartesianMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/CartesianMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/CartesianMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/CoGroupMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/CoGroupMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/CoGroupMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/CoGroupMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/CollectionSourceMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/CollectionSourceMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/CollectionSourceMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/CollectionSourceMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/CountMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/CountMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/CountMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/CountMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/DistinctMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/DistinctMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/DistinctMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/DistinctMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/DoWhileMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/DoWhileMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/DoWhileMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/DoWhileMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/FilterMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/FilterMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/FilterMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/FilterMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/FlatMapMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/FlatMapMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/FlatMapMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/FlatMapMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/GlobalMaterializedGroupMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/GlobalMaterializedGroupMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/GlobalMaterializedGroupMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/GlobalMaterializedGroupMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/GlobalReduceMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/GlobalReduceMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/GlobalReduceMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/GlobalReduceMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/IntersectMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/IntersectMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/IntersectMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/IntersectMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/JoinMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/JoinMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/JoinMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/JoinMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/LocalCallbackSinkMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/LocalCallbackSinkMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/LocalCallbackSinkMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/LocalCallbackSinkMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/LoopMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/LoopMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/LoopMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/LoopMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/MapMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/MapMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/MapMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/MapMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/MapPartitionsMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/MapPartitionsMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/MapPartitionsMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/MapPartitionsMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/Mappings.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/Mappings.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/Mappings.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/Mappings.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/MaterializedGroupByMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/MaterializedGroupByMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/MaterializedGroupByMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/MaterializedGroupByMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/ReduceByMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/ReduceByMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/ReduceByMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/ReduceByMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/RepeatMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/RepeatMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/RepeatMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/RepeatMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/SampleMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/SampleMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/SampleMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/SampleMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/SortMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/SortMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/SortMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/SortMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/TextFileSinkMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/TextFileSinkMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/TextFileSinkMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/TextFileSinkMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/TextFileSourceMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/TextFileSourceMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/TextFileSourceMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/TextFileSourceMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/UnionAllMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/UnionAllMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/UnionAllMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/UnionAllMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/ZipWithIdMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/ZipWithIdMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/ZipWithIdMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/ZipWithIdMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/graph/PageRankMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/graph/PageRankMapping.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/graph/PageRankMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/graph/PageRankMapping.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkBernoulliSampleOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkBernoulliSampleOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkBernoulliSampleOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkBernoulliSampleOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkBroadcastOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkBroadcastOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkBroadcastOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkBroadcastOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCacheOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCacheOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCacheOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCacheOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCartesianOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCartesianOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCartesianOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCartesianOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCoGroupOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCoGroupOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCoGroupOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCoGroupOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCollectOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCollectOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCollectOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCollectOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCollectionSource.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCollectionSource.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCollectionSource.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCollectionSource.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCountOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCountOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCountOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCountOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkDistinctOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkDistinctOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkDistinctOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkDistinctOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkDoWhileOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkDoWhileOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkDoWhileOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkDoWhileOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkExecutionOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkExecutionOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkExecutionOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkExecutionOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkFilterOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkFilterOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkFilterOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkFilterOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkFlatMapOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkFlatMapOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkFlatMapOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkFlatMapOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkGlobalMaterializedGroupOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkGlobalMaterializedGroupOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkGlobalMaterializedGroupOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkGlobalMaterializedGroupOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkGlobalReduceOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkGlobalReduceOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkGlobalReduceOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkGlobalReduceOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkIntersectOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkIntersectOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkIntersectOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkIntersectOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkJoinOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkJoinOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkJoinOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkJoinOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkLocalCallbackSink.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkLocalCallbackSink.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkLocalCallbackSink.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkLocalCallbackSink.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkLoopOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkLoopOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkLoopOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkLoopOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkMapOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkMapOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkMapOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkMapOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkMapPartitionsOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkMapPartitionsOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkMapPartitionsOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkMapPartitionsOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkMaterializedGroupByOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkMaterializedGroupByOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkMaterializedGroupByOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkMaterializedGroupByOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkObjectFileSink.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkObjectFileSink.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkObjectFileSink.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkObjectFileSink.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkObjectFileSource.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkObjectFileSource.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkObjectFileSource.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkObjectFileSource.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkRandomPartitionSampleOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkRandomPartitionSampleOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkRandomPartitionSampleOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkRandomPartitionSampleOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkReduceByOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkReduceByOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkReduceByOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkReduceByOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkRepeatOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkRepeatOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkRepeatOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkRepeatOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkShufflePartitionSampleOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkShufflePartitionSampleOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkShufflePartitionSampleOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkShufflePartitionSampleOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkSortOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkSortOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkSortOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkSortOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkTextFileSink.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkTextFileSink.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkTextFileSink.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkTextFileSink.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkTextFileSource.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkTextFileSource.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkTextFileSource.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkTextFileSource.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkTsvFileSink.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkTsvFileSink.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkTsvFileSink.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkTsvFileSink.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkTsvFileSource.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkTsvFileSource.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkTsvFileSource.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkTsvFileSource.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkUnionAllOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkUnionAllOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkUnionAllOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkUnionAllOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkZipWithIdOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkZipWithIdOperator.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkZipWithIdOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkZipWithIdOperator.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/platform/SparkPlatform.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/platform/SparkPlatform.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/platform/SparkPlatform.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/platform/SparkPlatform.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/plugin/SparkBasicPlugin.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/plugin/SparkBasicPlugin.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/plugin/SparkBasicPlugin.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/plugin/SparkBasicPlugin.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/plugin/SparkConversionPlugin.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/plugin/SparkConversionPlugin.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/plugin/SparkConversionPlugin.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/plugin/SparkConversionPlugin.java
diff --git a/rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/plugin/SparkGraphPlugin.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/plugin/SparkGraphPlugin.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/java/org/apache/incubator/wayang/spark/plugin/SparkGraphPlugin.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/plugin/SparkGraphPlugin.java
diff --git a/rheem-platforms/rheem-spark/src/main/resources/rheem-spark-defaults.properties b/wayang-platforms/wayang-spark/src/main/resources/wayang-spark-defaults.properties
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/resources/rheem-spark-defaults.properties
rename to wayang-platforms/wayang-spark/src/main/resources/wayang-spark-defaults.properties
diff --git a/rheem-platforms/rheem-spark/src/main/scala/org/apache/incubator/wayang/spark/operators/graph/SparkPageRankOperator.scala b/wayang-platforms/wayang-spark/src/main/scala/org/apache/incubator/wayang/spark/operators/graph/SparkPageRankOperator.scala
similarity index 100%
rename from rheem-platforms/rheem-spark/src/main/scala/org/apache/incubator/wayang/spark/operators/graph/SparkPageRankOperator.scala
rename to wayang-platforms/wayang-spark/src/main/scala/org/apache/incubator/wayang/spark/operators/graph/SparkPageRankOperator.scala
diff --git a/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkBernoulliSampleOperatorTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkBernoulliSampleOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkBernoulliSampleOperatorTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkBernoulliSampleOperatorTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkCartesianOperatorTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkCartesianOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkCartesianOperatorTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkCartesianOperatorTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkCoGroupOperatorTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkCoGroupOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkCoGroupOperatorTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkCoGroupOperatorTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkCollectionSourceTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkCollectionSourceTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkCollectionSourceTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkCollectionSourceTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkCountOperatorTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkCountOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkCountOperatorTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkCountOperatorTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkDistinctOperatorTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkDistinctOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkDistinctOperatorTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkDistinctOperatorTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkFilterOperatorTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkFilterOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkFilterOperatorTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkFilterOperatorTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkFlatMapOperatorTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkFlatMapOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkFlatMapOperatorTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkFlatMapOperatorTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkGlobalMaterializedGroupOperatorTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkGlobalMaterializedGroupOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkGlobalMaterializedGroupOperatorTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkGlobalMaterializedGroupOperatorTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkGlobalReduceOperatorTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkGlobalReduceOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkGlobalReduceOperatorTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkGlobalReduceOperatorTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkJoinOperatorTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkJoinOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkJoinOperatorTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkJoinOperatorTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkMapPartitionsOperatorTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkMapPartitionsOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkMapPartitionsOperatorTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkMapPartitionsOperatorTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkMaterializedGroupByOperatorTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkMaterializedGroupByOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkMaterializedGroupByOperatorTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkMaterializedGroupByOperatorTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkObjectFileSinkTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkObjectFileSinkTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkObjectFileSinkTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkObjectFileSinkTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkObjectFileSourceTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkObjectFileSourceTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkObjectFileSourceTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkObjectFileSourceTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkOperatorTestBase.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkOperatorTestBase.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkOperatorTestBase.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkOperatorTestBase.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkRandomPartitionSampleOperatorTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkRandomPartitionSampleOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkRandomPartitionSampleOperatorTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkRandomPartitionSampleOperatorTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkReduceByOperatorTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkReduceByOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkReduceByOperatorTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkReduceByOperatorTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkShufflePartitionSampleOperatorTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkShufflePartitionSampleOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkShufflePartitionSampleOperatorTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkShufflePartitionSampleOperatorTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkSortOperatorTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkSortOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkSortOperatorTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkSortOperatorTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkTextFileSinkTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkTextFileSinkTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkTextFileSinkTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkTextFileSinkTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkUnionAllOperatorTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkUnionAllOperatorTest.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkUnionAllOperatorTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkUnionAllOperatorTest.java
diff --git a/rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/test/ChannelFactory.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/test/ChannelFactory.java
similarity index 100%
rename from rheem-platforms/rheem-spark/src/test/java/org/apache/incubator/wayang/spark/test/ChannelFactory.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/test/ChannelFactory.java
diff --git a/rheem-platforms/rheem-java/src/test/resources/0-to-10000.sequence_file b/wayang-platforms/wayang-spark/src/test/resources/0-to-10000.sequence_file
similarity index 100%
rename from rheem-platforms/rheem-java/src/test/resources/0-to-10000.sequence_file
rename to wayang-platforms/wayang-spark/src/test/resources/0-to-10000.sequence_file
diff --git a/rheem-api/src/test/resources/rheem.properties b/wayang-platforms/wayang-spark/src/test/resources/wayang.properties
similarity index 100%
rename from rheem-api/src/test/resources/rheem.properties
rename to wayang-platforms/wayang-spark/src/test/resources/wayang.properties
diff --git a/rheem-platforms/rheem-sqlite3/pom.xml b/wayang-platforms/wayang-sqlite3/pom.xml
similarity index 100%
rename from rheem-platforms/rheem-sqlite3/pom.xml
rename to wayang-platforms/wayang-sqlite3/pom.xml
diff --git a/rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/Sqlite3.java b/wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/Sqlite3.java
similarity index 100%
rename from rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/Sqlite3.java
rename to wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/Sqlite3.java
diff --git a/rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/channels/ChannelConversions.java b/wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/channels/ChannelConversions.java
similarity index 100%
rename from rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/channels/ChannelConversions.java
rename to wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/channels/ChannelConversions.java
diff --git a/rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/mapping/FilterMapping.java b/wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/mapping/FilterMapping.java
similarity index 100%
rename from rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/mapping/FilterMapping.java
rename to wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/mapping/FilterMapping.java
diff --git a/rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/mapping/Mappings.java b/wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/mapping/Mappings.java
similarity index 100%
rename from rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/mapping/Mappings.java
rename to wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/mapping/Mappings.java
diff --git a/rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/mapping/ProjectionMapping.java b/wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/mapping/ProjectionMapping.java
similarity index 100%
rename from rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/mapping/ProjectionMapping.java
rename to wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/mapping/ProjectionMapping.java
diff --git a/rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/operators/Sqlite3FilterOperator.java b/wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/operators/Sqlite3FilterOperator.java
similarity index 100%
rename from rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/operators/Sqlite3FilterOperator.java
rename to wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/operators/Sqlite3FilterOperator.java
diff --git a/rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/operators/Sqlite3ProjectionOperator.java b/wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/operators/Sqlite3ProjectionOperator.java
similarity index 100%
rename from rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/operators/Sqlite3ProjectionOperator.java
rename to wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/operators/Sqlite3ProjectionOperator.java
diff --git a/rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/operators/Sqlite3TableSource.java b/wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/operators/Sqlite3TableSource.java
similarity index 100%
rename from rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/operators/Sqlite3TableSource.java
rename to wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/operators/Sqlite3TableSource.java
diff --git a/rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/platform/Sqlite3Platform.java b/wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/platform/Sqlite3Platform.java
similarity index 100%
rename from rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/platform/Sqlite3Platform.java
rename to wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/platform/Sqlite3Platform.java
diff --git a/rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/plugin/Sqlite3ConversionPlugin.java b/wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/plugin/Sqlite3ConversionPlugin.java
similarity index 100%
rename from rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/plugin/Sqlite3ConversionPlugin.java
rename to wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/plugin/Sqlite3ConversionPlugin.java
diff --git a/rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/plugin/Sqlite3Plugin.java b/wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/plugin/Sqlite3Plugin.java
similarity index 100%
rename from rheem-platforms/rheem-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/plugin/Sqlite3Plugin.java
rename to wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/plugin/Sqlite3Plugin.java
diff --git a/rheem-platforms/rheem-sqlite3/src/main/resources/rheem-sqlite3-defaults.properties b/wayang-platforms/wayang-sqlite3/src/main/resources/wayang-sqlite3-defaults.properties
similarity index 100%
rename from rheem-platforms/rheem-sqlite3/src/main/resources/rheem-sqlite3-defaults.properties
rename to wayang-platforms/wayang-sqlite3/src/main/resources/wayang-sqlite3-defaults.properties
diff --git a/rheem-profiler/pom.xml b/wayang-profiler/pom.xml
similarity index 100%
rename from rheem-profiler/pom.xml
rename to wayang-profiler/pom.xml
diff --git a/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/data/DataGenerators.java b/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/data/DataGenerators.java
similarity index 100%
rename from rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/data/DataGenerators.java
rename to wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/data/DataGenerators.java
diff --git a/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/hardware/DiskProfiler.java b/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/hardware/DiskProfiler.java
similarity index 100%
rename from rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/hardware/DiskProfiler.java
rename to wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/hardware/DiskProfiler.java
diff --git a/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/BinaryOperatorProfiler.java b/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/BinaryOperatorProfiler.java
similarity index 100%
rename from rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/BinaryOperatorProfiler.java
rename to wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/BinaryOperatorProfiler.java
diff --git a/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/JavaCollectionSourceProfiler.java b/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/JavaCollectionSourceProfiler.java
similarity index 100%
rename from rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/JavaCollectionSourceProfiler.java
rename to wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/JavaCollectionSourceProfiler.java
diff --git a/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/JavaTextFileSourceProfiler.java b/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/JavaTextFileSourceProfiler.java
similarity index 100%
rename from rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/JavaTextFileSourceProfiler.java
rename to wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/JavaTextFileSourceProfiler.java
diff --git a/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/OperatorProfiler.java b/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/OperatorProfiler.java
similarity index 100%
rename from rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/OperatorProfiler.java
rename to wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/OperatorProfiler.java
diff --git a/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/OperatorProfilers.java b/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/OperatorProfilers.java
similarity index 100%
rename from rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/OperatorProfilers.java
rename to wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/OperatorProfilers.java
diff --git a/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/Profiler.java b/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/Profiler.java
similarity index 100%
rename from rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/Profiler.java
rename to wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/Profiler.java
diff --git a/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/SinkProfiler.java b/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/SinkProfiler.java
similarity index 100%
rename from rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/SinkProfiler.java
rename to wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/SinkProfiler.java
diff --git a/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/SourceProfiler.java b/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/SourceProfiler.java
similarity index 100%
rename from rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/SourceProfiler.java
rename to wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/SourceProfiler.java
diff --git a/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/UnaryOperatorProfiler.java b/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/UnaryOperatorProfiler.java
similarity index 100%
rename from rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/UnaryOperatorProfiler.java
rename to wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/UnaryOperatorProfiler.java
diff --git a/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/DynamicEstimationContext.java b/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/DynamicEstimationContext.java
similarity index 100%
rename from rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/DynamicEstimationContext.java
rename to wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/DynamicEstimationContext.java
diff --git a/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/DynamicLoadEstimator.java b/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/DynamicLoadEstimator.java
similarity index 100%
rename from rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/DynamicLoadEstimator.java
rename to wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/DynamicLoadEstimator.java
diff --git a/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/DynamicLoadProfileEstimator.java b/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/DynamicLoadProfileEstimator.java
similarity index 100%
rename from rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/DynamicLoadProfileEstimator.java
rename to wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/DynamicLoadProfileEstimator.java
diff --git a/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/DynamicLoadProfileEstimators.java b/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/DynamicLoadProfileEstimators.java
similarity index 100%
rename from rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/DynamicLoadProfileEstimators.java
rename to wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/DynamicLoadProfileEstimators.java
diff --git a/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/GeneticOptimizer.java b/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/GeneticOptimizer.java
similarity index 100%
rename from rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/GeneticOptimizer.java
rename to wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/GeneticOptimizer.java
diff --git a/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/GeneticOptimizerApp.java b/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/GeneticOptimizerApp.java
similarity index 100%
rename from rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/GeneticOptimizerApp.java
rename to wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/GeneticOptimizerApp.java
diff --git a/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/Individual.java b/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/Individual.java
similarity index 100%
rename from rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/Individual.java
rename to wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/Individual.java
diff --git a/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/LogEvaluator.java b/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/LogEvaluator.java
similarity index 100%
rename from rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/LogEvaluator.java
rename to wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/LogEvaluator.java
diff --git a/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/OptimizationSpace.java b/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/OptimizationSpace.java
similarity index 100%
rename from rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/OptimizationSpace.java
rename to wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/OptimizationSpace.java
diff --git a/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/Variable.java b/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/Variable.java
similarity index 100%
rename from rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/Variable.java
rename to wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/Variable.java
diff --git a/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/sampling/Battle.java b/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/sampling/Battle.java
similarity index 100%
rename from rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/sampling/Battle.java
rename to wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/sampling/Battle.java
diff --git a/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/sampling/ReservoirSampler.java b/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/sampling/ReservoirSampler.java
similarity index 100%
rename from rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/sampling/ReservoirSampler.java
rename to wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/sampling/ReservoirSampler.java
diff --git a/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/sampling/Sampler.java b/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/sampling/Sampler.java
similarity index 100%
rename from rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/sampling/Sampler.java
rename to wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/sampling/Sampler.java
diff --git a/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/sampling/TournamentSampler.java b/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/sampling/TournamentSampler.java
similarity index 100%
rename from rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/sampling/TournamentSampler.java
rename to wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/sampling/TournamentSampler.java
diff --git a/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/BinaryOperatorProfiler.java b/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/BinaryOperatorProfiler.java
similarity index 100%
rename from rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/BinaryOperatorProfiler.java
rename to wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/BinaryOperatorProfiler.java
diff --git a/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/Main.java b/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/Main.java
similarity index 100%
rename from rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/Main.java
rename to wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/Main.java
diff --git a/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/OperatorProfilers.java b/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/OperatorProfilers.java
similarity index 100%
rename from rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/OperatorProfilers.java
rename to wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/OperatorProfilers.java
diff --git a/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SinkProfiler.java b/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SinkProfiler.java
similarity index 100%
rename from rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SinkProfiler.java
rename to wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SinkProfiler.java
diff --git a/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkCollectionSourceProfiler.java b/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkCollectionSourceProfiler.java
similarity index 100%
rename from rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkCollectionSourceProfiler.java
rename to wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkCollectionSourceProfiler.java
diff --git a/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkOperatorProfiler.java b/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkOperatorProfiler.java
similarity index 100%
rename from rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkOperatorProfiler.java
rename to wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkOperatorProfiler.java
diff --git a/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkSourceProfiler.java b/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkSourceProfiler.java
similarity index 100%
rename from rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkSourceProfiler.java
rename to wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkSourceProfiler.java
diff --git a/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkTextFileSourceProfiler.java b/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkTextFileSourceProfiler.java
similarity index 100%
rename from rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkTextFileSourceProfiler.java
rename to wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkTextFileSourceProfiler.java
diff --git a/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkUnaryOperatorProfiler.java b/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkUnaryOperatorProfiler.java
similarity index 100%
rename from rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkUnaryOperatorProfiler.java
rename to wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkUnaryOperatorProfiler.java
diff --git a/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/util/ProfilingUtils.java b/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/util/ProfilingUtils.java
similarity index 100%
rename from rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/util/ProfilingUtils.java
rename to wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/util/ProfilingUtils.java
diff --git a/rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/util/RrdAccessor.java b/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/util/RrdAccessor.java
similarity index 100%
rename from rheem-profiler/src/main/java/org/apache/incubator/wayang/profiler/util/RrdAccessor.java
rename to wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/util/RrdAccessor.java
diff --git a/rheem-tests/app.properties b/wayang-tests/app.properties
similarity index 100%
rename from rheem-tests/app.properties
rename to wayang-tests/app.properties
diff --git a/rheem-tests/pom.xml b/wayang-tests/pom.xml
similarity index 100%
rename from rheem-tests/pom.xml
rename to wayang-tests/pom.xml
diff --git a/rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/FlinkIntegrationIT.java b/wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/FlinkIntegrationIT.java
similarity index 100%
rename from rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/FlinkIntegrationIT.java
rename to wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/FlinkIntegrationIT.java
diff --git a/rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/FullIntegrationIT.java b/wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/FullIntegrationIT.java
similarity index 100%
rename from rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/FullIntegrationIT.java
rename to wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/FullIntegrationIT.java
diff --git a/rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/GiraphIntegrationIT.java b/wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/GiraphIntegrationIT.java
similarity index 100%
rename from rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/GiraphIntegrationIT.java
rename to wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/GiraphIntegrationIT.java
diff --git a/rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/GraphChiIntegrationIT.java b/wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/GraphChiIntegrationIT.java
similarity index 100%
rename from rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/GraphChiIntegrationIT.java
rename to wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/GraphChiIntegrationIT.java
diff --git a/rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/JavaIntegrationIT.java b/wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/JavaIntegrationIT.java
similarity index 100%
rename from rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/JavaIntegrationIT.java
rename to wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/JavaIntegrationIT.java
diff --git a/rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/PostgresIntegrationIT.java b/wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/PostgresIntegrationIT.java
similarity index 100%
rename from rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/PostgresIntegrationIT.java
rename to wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/PostgresIntegrationIT.java
diff --git a/rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/RegressionIT.java b/wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/RegressionIT.java
similarity index 100%
rename from rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/RegressionIT.java
rename to wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/RegressionIT.java
diff --git a/rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/SparkIntegrationIT.java b/wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/SparkIntegrationIT.java
similarity index 100%
rename from rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/SparkIntegrationIT.java
rename to wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/SparkIntegrationIT.java
diff --git a/rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/WayangPlans.java b/wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/WayangPlans.java
similarity index 100%
rename from rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/WayangPlans.java
rename to wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/WayangPlans.java
diff --git a/rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/WayangPlansOperators.java b/wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/WayangPlansOperators.java
similarity index 100%
rename from rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/WayangPlansOperators.java
rename to wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/WayangPlansOperators.java
diff --git a/rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/WordCountIT.java b/wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/WordCountIT.java
similarity index 100%
rename from rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/WordCountIT.java
rename to wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/WordCountIT.java
diff --git a/rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/platform/MyMadeUpPlatform.java b/wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/platform/MyMadeUpPlatform.java
similarity index 100%
rename from rheem-tests/src/test/java/org/org/apache/incubator/wayang/tests/platform/MyMadeUpPlatform.java
rename to wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/platform/MyMadeUpPlatform.java
diff --git a/rheem-tests/src/test/resources/lines-with-key1.txt b/wayang-tests/src/test/resources/lines-with-key1.txt
similarity index 100%
rename from rheem-tests/src/test/resources/lines-with-key1.txt
rename to wayang-tests/src/test/resources/lines-with-key1.txt
diff --git a/rheem-tests/src/test/resources/lines-with-key2.txt b/wayang-tests/src/test/resources/lines-with-key2.txt
similarity index 100%
rename from rheem-tests/src/test/resources/lines-with-key2.txt
rename to wayang-tests/src/test/resources/lines-with-key2.txt
diff --git a/rheem-tests/src/test/resources/other-lines.txt b/wayang-tests/src/test/resources/other-lines.txt
similarity index 100%
rename from rheem-tests/src/test/resources/other-lines.txt
rename to wayang-tests/src/test/resources/other-lines.txt
diff --git a/rheem-tests/src/test/resources/simplelogger.properties b/wayang-tests/src/test/resources/simplelogger.properties
similarity index 100%
rename from rheem-tests/src/test/resources/simplelogger.properties
rename to wayang-tests/src/test/resources/simplelogger.properties
diff --git a/rheem-tests/src/test/resources/some-lines.txt b/wayang-tests/src/test/resources/some-lines.txt
similarity index 100%
rename from rheem-tests/src/test/resources/some-lines.txt
rename to wayang-tests/src/test/resources/some-lines.txt
diff --git a/rheem-basic/src/test/resources/ulysses.txt b/wayang-tests/src/test/resources/ulysses.txt
similarity index 100%
rename from rheem-basic/src/test/resources/ulysses.txt
rename to wayang-tests/src/test/resources/ulysses.txt
diff --git a/rheem-tests/src/test/resources/rheem-hsqldb-defaults.properties b/wayang-tests/src/test/resources/wayang-hsqldb-defaults.properties
similarity index 100%
rename from rheem-tests/src/test/resources/rheem-hsqldb-defaults.properties
rename to wayang-tests/src/test/resources/wayang-hsqldb-defaults.properties
diff --git a/rheem-tests/src/test/resources/rheem.properties b/wayang-tests/src/test/resources/wayang.properties
similarity index 100%
rename from rheem-tests/src/test/resources/rheem.properties
rename to wayang-tests/src/test/resources/wayang.properties


[incubator-wayang] 04/05: rename location

Posted by be...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bertty pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-wayang.git

commit 98c20848115dda1527bb3d37dd503a81cd7f90d7
Author: Bertty Contreras-Rojas <be...@scalytics.io>
AuthorDate: Fri Dec 18 13:19:42 2020 -0300

    rename location
---
 .../src/main/scala/org/apache/{incubator => }/wayang/api/DataQuanta.scala | 0
 .../scala/org/apache/{incubator => }/wayang/api/DataQuantaBuilder.scala   | 0
 .../scala/org/apache/{incubator => }/wayang/api/JavaPlanBuilder.scala     | 0
 .../main/scala/org/apache/{incubator => }/wayang/api/PlanBuilder.scala    | 0
 .../scala/org/apache/{incubator => }/wayang/api/RecordDataQuanta.scala    | 0
 .../org/apache/{incubator => }/wayang/api/RecordDataQuantaBuilder.scala   | 0
 .../src/main/scala/org/apache/{incubator => }/wayang/api/graph/Edge.scala | 0
 .../org/apache/{incubator => }/wayang/api/graph/EdgeDataQuanta.scala      | 0
 .../apache/{incubator => }/wayang/api/graph/EdgeDataQuantaBuilder.scala   | 0
 .../main/scala/org/apache/{incubator => }/wayang/api/graph/package.scala  | 0
 .../src/main/scala/org/apache/{incubator => }/wayang/api/package.scala    | 0
 .../apache/{incubator => }/wayang/api/util/DataQuantaBuilderCache.scala   | 0
 .../{incubator => }/wayang/api/util/DataQuantaBuilderDecorator.scala      | 0
 .../main/scala/org/apache/{incubator => }/wayang/api/util/TypeTrap.scala  | 0
 .../src/test/java/org/apache/{incubator => }/wayang/api/JavaApiTest.java  | 0
 .../src/test/scala/org/apache/{incubator => }/wayang/api/ApiTest.scala    | 0
 .../main/java/org/apache/{incubator => }/wayang/basic/WayangBasics.java   | 0
 .../org/apache/{incubator => }/wayang/basic/channels/FileChannel.java     | 0
 .../main/java/org/apache/{incubator => }/wayang/basic/data/Record.java    | 0
 .../main/java/org/apache/{incubator => }/wayang/basic/data/Tuple2.java    | 0
 .../main/java/org/apache/{incubator => }/wayang/basic/data/Tuple5.java    | 0
 .../{incubator => }/wayang/basic/function/ProjectionDescriptor.java       | 0
 .../apache/{incubator => }/wayang/basic/mapping/GlobalReduceMapping.java  | 0
 .../java/org/apache/{incubator => }/wayang/basic/mapping/Mappings.java    | 0
 .../{incubator => }/wayang/basic/mapping/MaterializedGroupByMapping.java  | 0
 .../org/apache/{incubator => }/wayang/basic/mapping/PageRankMapping.java  | 0
 .../org/apache/{incubator => }/wayang/basic/mapping/ReduceByMapping.java  | 0
 .../org/apache/{incubator => }/wayang/basic/mapping/RepeatMapping.java    | 0
 .../apache/{incubator => }/wayang/basic/operators/CartesianOperator.java  | 0
 .../apache/{incubator => }/wayang/basic/operators/CoGroupOperator.java    | 0
 .../apache/{incubator => }/wayang/basic/operators/CollectionSource.java   | 0
 .../org/apache/{incubator => }/wayang/basic/operators/CountOperator.java  | 0
 .../apache/{incubator => }/wayang/basic/operators/DistinctOperator.java   | 0
 .../apache/{incubator => }/wayang/basic/operators/DoWhileOperator.java    | 0
 .../org/apache/{incubator => }/wayang/basic/operators/FilterOperator.java | 0
 .../apache/{incubator => }/wayang/basic/operators/FlatMapOperator.java    | 0
 .../wayang/basic/operators/GlobalMaterializedGroupOperator.java           | 0
 .../{incubator => }/wayang/basic/operators/GlobalReduceOperator.java      | 0
 .../apache/{incubator => }/wayang/basic/operators/GroupByOperator.java    | 0
 .../apache/{incubator => }/wayang/basic/operators/IntersectOperator.java  | 0
 .../org/apache/{incubator => }/wayang/basic/operators/JoinOperator.java   | 0
 .../apache/{incubator => }/wayang/basic/operators/LocalCallbackSink.java  | 0
 .../org/apache/{incubator => }/wayang/basic/operators/LoopOperator.java   | 0
 .../org/apache/{incubator => }/wayang/basic/operators/MapOperator.java    | 0
 .../{incubator => }/wayang/basic/operators/MapPartitionsOperator.java     | 0
 .../wayang/basic/operators/MaterializedGroupByOperator.java               | 0
 .../apache/{incubator => }/wayang/basic/operators/PageRankOperator.java   | 0
 .../apache/{incubator => }/wayang/basic/operators/ReduceByOperator.java   | 0
 .../org/apache/{incubator => }/wayang/basic/operators/ReduceOperator.java | 0
 .../org/apache/{incubator => }/wayang/basic/operators/RepeatOperator.java | 0
 .../org/apache/{incubator => }/wayang/basic/operators/SampleOperator.java | 0
 .../org/apache/{incubator => }/wayang/basic/operators/SortOperator.java   | 0
 .../org/apache/{incubator => }/wayang/basic/operators/TableSource.java    | 0
 .../org/apache/{incubator => }/wayang/basic/operators/TextFileSink.java   | 0
 .../org/apache/{incubator => }/wayang/basic/operators/TextFileSource.java | 0
 .../apache/{incubator => }/wayang/basic/operators/UnionAllOperator.java   | 0
 .../apache/{incubator => }/wayang/basic/operators/ZipWithIdOperator.java  | 0
 .../java/org/apache/{incubator => }/wayang/basic/plugin/WayangBasic.java  | 0
 .../org/apache/{incubator => }/wayang/basic/plugin/WayangBasicGraph.java  | 0
 .../java/org/apache/{incubator => }/wayang/basic/types/RecordType.java    | 0
 .../{incubator => }/wayang/basic/function/ProjectionDescriptorTest.java   | 0
 .../apache/{incubator => }/wayang/basic/mapping/ReduceByMappingTest.java  | 0
 .../wayang/basic/operators/MaterializedGroupByOperatorTest.java           | 0
 .../apache/{incubator => }/wayang/basic/operators/TextFileSourceTest.java | 0
 .../org/apache/{incubator => }/wayang/basic/operators/test/TestSink.java  | 0
 .../apache/{incubator => }/wayang/basic/operators/test/TestSource.java    | 0
 .../org/apache/{incubator => }/wayang/basic/types/RecordTypeTest.java     | 0
 .../main/antlr4/org/apache/{incubator => }/wayang/core/mathex/MathEx.g4   | 0
 .../java/org/apache/{incubator => }/wayang/core/api/Configuration.java    | 0
 .../src/main/java/org/apache/{incubator => }/wayang/core/api/Job.java     | 0
 .../java/org/apache/{incubator => }/wayang/core/api/WayangContext.java    | 0
 .../{incubator => }/wayang/core/api/configuration/CollectionProvider.java | 0
 .../wayang/core/api/configuration/ConstantValueProvider.java              | 0
 .../wayang/core/api/configuration/ExplicitCollectionProvider.java         | 0
 .../wayang/core/api/configuration/FunctionalCollectionProvider.java       | 0
 .../wayang/core/api/configuration/FunctionalKeyValueProvider.java         | 0
 .../wayang/core/api/configuration/FunctionalValueProvider.java            | 0
 .../{incubator => }/wayang/core/api/configuration/KeyValueProvider.java   | 0
 .../wayang/core/api/configuration/MapBasedKeyValueProvider.java           | 0
 .../{incubator => }/wayang/core/api/configuration/ValueProvider.java      | 0
 .../apache/{incubator => }/wayang/core/api/exception/WayangException.java | 0
 .../{incubator => }/wayang/core/function/AggregationDescriptor.java       | 0
 .../apache/{incubator => }/wayang/core/function/ConsumerDescriptor.java   | 0
 .../org/apache/{incubator => }/wayang/core/function/ExecutionContext.java | 0
 .../org/apache/{incubator => }/wayang/core/function/ExtendedFunction.java | 0
 .../apache/{incubator => }/wayang/core/function/FlatMapDescriptor.java    | 0
 .../apache/{incubator => }/wayang/core/function/FunctionDescriptor.java   | 0
 .../{incubator => }/wayang/core/function/MapPartitionsDescriptor.java     | 0
 .../apache/{incubator => }/wayang/core/function/PredicateDescriptor.java  | 0
 .../org/apache/{incubator => }/wayang/core/function/ReduceDescriptor.java | 0
 .../{incubator => }/wayang/core/function/TransformationDescriptor.java    | 0
 .../main/java/org/apache/{incubator => }/wayang/core/mapping/Mapping.java | 0
 .../org/apache/{incubator => }/wayang/core/mapping/OperatorMatch.java     | 0
 .../org/apache/{incubator => }/wayang/core/mapping/OperatorPattern.java   | 0
 .../apache/{incubator => }/wayang/core/mapping/PlanTransformation.java    | 0
 .../{incubator => }/wayang/core/mapping/ReplacementSubplanFactory.java    | 0
 .../java/org/apache/{incubator => }/wayang/core/mapping/SubplanMatch.java | 0
 .../org/apache/{incubator => }/wayang/core/mapping/SubplanPattern.java    | 0
 .../org/apache/{incubator => }/wayang/core/monitor/DisabledMonitor.java   | 0
 .../java/org/apache/{incubator => }/wayang/core/monitor/FileMonitor.java  | 0
 .../java/org/apache/{incubator => }/wayang/core/monitor/HttpMonitor.java  | 0
 .../main/java/org/apache/{incubator => }/wayang/core/monitor/Monitor.java | 0
 .../org/apache/{incubator => }/wayang/core/monitor/ZeroMQMonitor.java     | 0
 .../wayang/core/optimizer/AggregateOptimizationContext.java               | 0
 .../{incubator => }/wayang/core/optimizer/DefaultOptimizationContext.java | 0
 .../apache/{incubator => }/wayang/core/optimizer/OptimizationContext.java | 0
 .../apache/{incubator => }/wayang/core/optimizer/OptimizationUtils.java   | 0
 .../wayang/core/optimizer/ProbabilisticDoubleInterval.java                | 0
 .../wayang/core/optimizer/ProbabilisticIntervalEstimate.java              | 0
 .../org/apache/{incubator => }/wayang/core/optimizer/SanityChecker.java   | 0
 .../core/optimizer/cardinality/AbstractAlternativeCardinalityPusher.java  | 0
 .../core/optimizer/cardinality/AggregatingCardinalityEstimator.java       | 0
 .../wayang/core/optimizer/cardinality/CardinalityEstimate.java            | 0
 .../wayang/core/optimizer/cardinality/CardinalityEstimationTraversal.java | 0
 .../wayang/core/optimizer/cardinality/CardinalityEstimator.java           | 0
 .../wayang/core/optimizer/cardinality/CardinalityEstimatorManager.java    | 0
 .../wayang/core/optimizer/cardinality/CardinalityPusher.java              | 0
 .../wayang/core/optimizer/cardinality/DefaultCardinalityEstimator.java    | 0
 .../wayang/core/optimizer/cardinality/DefaultCardinalityPusher.java       | 0
 .../wayang/core/optimizer/cardinality/FallbackCardinalityEstimator.java   | 0
 .../wayang/core/optimizer/cardinality/FixedSizeCardinalityEstimator.java  | 0
 .../core/optimizer/cardinality/LoopHeadAlternativeCardinalityPusher.java  | 0
 .../wayang/core/optimizer/cardinality/LoopSubplanCardinalityPusher.java   | 0
 .../core/optimizer/cardinality/OperatorAlternativeCardinalityPusher.java  | 0
 .../wayang/core/optimizer/cardinality/SubplanCardinalityPusher.java       | 0
 .../core/optimizer/cardinality/SwitchForwardCardinalityEstimator.java     | 0
 .../{incubator => }/wayang/core/optimizer/channels/ChannelConversion.java | 0
 .../wayang/core/optimizer/channels/ChannelConversionGraph.java            | 0
 .../wayang/core/optimizer/channels/DefaultChannelConversion.java          | 0
 .../wayang/core/optimizer/costs/ConstantLoadProfileEstimator.java         | 0
 .../{incubator => }/wayang/core/optimizer/costs/DefaultLoadEstimator.java | 0
 .../{incubator => }/wayang/core/optimizer/costs/EstimationContext.java    | 0
 .../wayang/core/optimizer/costs/IntervalLoadEstimator.java                | 0
 .../apache/{incubator => }/wayang/core/optimizer/costs/LoadEstimate.java  | 0
 .../apache/{incubator => }/wayang/core/optimizer/costs/LoadEstimator.java | 0
 .../apache/{incubator => }/wayang/core/optimizer/costs/LoadProfile.java   | 0
 .../{incubator => }/wayang/core/optimizer/costs/LoadProfileEstimator.java | 0
 .../wayang/core/optimizer/costs/LoadProfileEstimators.java                | 0
 .../wayang/core/optimizer/costs/LoadProfileToTimeConverter.java           | 0
 .../{incubator => }/wayang/core/optimizer/costs/LoadToTimeConverter.java  | 0
 .../wayang/core/optimizer/costs/NestableLoadProfileEstimator.java         | 0
 .../wayang/core/optimizer/costs/SimpleEstimationContext.java              | 0
 .../apache/{incubator => }/wayang/core/optimizer/costs/TimeEstimate.java  | 0
 .../{incubator => }/wayang/core/optimizer/costs/TimeToCostConverter.java  | 0
 .../wayang/core/optimizer/enumeration/ExecutionTaskFlow.java              | 0
 .../wayang/core/optimizer/enumeration/ExecutionTaskFlowCompiler.java      | 0
 .../wayang/core/optimizer/enumeration/LatentOperatorPruningStrategy.java  | 0
 .../{incubator => }/wayang/core/optimizer/enumeration/LoopEnumerator.java | 0
 .../wayang/core/optimizer/enumeration/LoopImplementation.java             | 0
 .../wayang/core/optimizer/enumeration/PlanEnumeration.java                | 0
 .../wayang/core/optimizer/enumeration/PlanEnumerationPruningStrategy.java | 0
 .../{incubator => }/wayang/core/optimizer/enumeration/PlanEnumerator.java | 0
 .../wayang/core/optimizer/enumeration/PlanImplementation.java             | 0
 .../wayang/core/optimizer/enumeration/RandomPruningStrategy.java          | 0
 .../wayang/core/optimizer/enumeration/SinglePlatformPruningStrategy.java  | 0
 .../wayang/core/optimizer/enumeration/StageAssignmentTraversal.java       | 0
 .../wayang/core/optimizer/enumeration/TopKPruningStrategy.java            | 0
 .../wayang/core/optimizer/partition/EnumerationAlternative.java           | 0
 .../wayang/core/optimizer/partition/EnumerationBranch.java                | 0
 .../apache/{incubator => }/wayang/core/plan/executionplan/Channel.java    | 0
 .../wayang/core/plan/executionplan/ChannelInitializer.java                | 0
 .../{incubator => }/wayang/core/plan/executionplan/ExecutionPlan.java     | 0
 .../{incubator => }/wayang/core/plan/executionplan/ExecutionStage.java    | 0
 .../wayang/core/plan/executionplan/ExecutionStageLoop.java                | 0
 .../{incubator => }/wayang/core/plan/executionplan/ExecutionTask.java     | 0
 .../{incubator => }/wayang/core/plan/executionplan/PlatformExecution.java | 0
 .../{incubator => }/wayang/core/plan/wayangplan/ActualOperator.java       | 0
 .../wayang/core/plan/wayangplan/BinaryToUnaryOperator.java                | 0
 .../{incubator => }/wayang/core/plan/wayangplan/CompositeOperator.java    | 0
 .../{incubator => }/wayang/core/plan/wayangplan/ElementaryOperator.java   | 0
 .../wayang/core/plan/wayangplan/EstimationContextProperty.java            | 0
 .../{incubator => }/wayang/core/plan/wayangplan/ExecutionOperator.java    | 0
 .../org/apache/{incubator => }/wayang/core/plan/wayangplan/InputSlot.java | 0
 .../{incubator => }/wayang/core/plan/wayangplan/LoopHeadAlternative.java  | 0
 .../{incubator => }/wayang/core/plan/wayangplan/LoopHeadOperator.java     | 0
 .../apache/{incubator => }/wayang/core/plan/wayangplan/LoopIsolator.java  | 0
 .../apache/{incubator => }/wayang/core/plan/wayangplan/LoopSubplan.java   | 0
 .../org/apache/{incubator => }/wayang/core/plan/wayangplan/Operator.java  | 0
 .../{incubator => }/wayang/core/plan/wayangplan/OperatorAlternative.java  | 0
 .../apache/{incubator => }/wayang/core/plan/wayangplan/OperatorBase.java  | 0
 .../{incubator => }/wayang/core/plan/wayangplan/OperatorContainer.java    | 0
 .../{incubator => }/wayang/core/plan/wayangplan/OperatorContainers.java   | 0
 .../org/apache/{incubator => }/wayang/core/plan/wayangplan/Operators.java | 0
 .../apache/{incubator => }/wayang/core/plan/wayangplan/OutputSlot.java    | 0
 .../apache/{incubator => }/wayang/core/plan/wayangplan/PlanMetrics.java   | 0
 .../apache/{incubator => }/wayang/core/plan/wayangplan/PlanTraversal.java | 0
 .../java/org/apache/{incubator => }/wayang/core/plan/wayangplan/Slot.java | 0
 .../apache/{incubator => }/wayang/core/plan/wayangplan/SlotMapping.java   | 0
 .../org/apache/{incubator => }/wayang/core/plan/wayangplan/Subplan.java   | 0
 .../{incubator => }/wayang/core/plan/wayangplan/TopDownPlanVisitor.java   | 0
 .../org/apache/{incubator => }/wayang/core/plan/wayangplan/UnarySink.java | 0
 .../apache/{incubator => }/wayang/core/plan/wayangplan/UnarySource.java   | 0
 .../{incubator => }/wayang/core/plan/wayangplan/UnaryToUnaryOperator.java | 0
 .../apache/{incubator => }/wayang/core/plan/wayangplan/WayangPlan.java    | 0
 .../core/plan/wayangplan/traversal/AbstractTopologicalTraversal.java      | 0
 .../{incubator => }/wayang/core/platform/AbstractChannelInstance.java     | 0
 .../org/apache/{incubator => }/wayang/core/platform/AtomicExecution.java  | 0
 .../apache/{incubator => }/wayang/core/platform/AtomicExecutionGroup.java | 0
 .../java/org/apache/{incubator => }/wayang/core/platform/Breakpoint.java  | 0
 .../{incubator => }/wayang/core/platform/CardinalityBreakpoint.java       | 0
 .../apache/{incubator => }/wayang/core/platform/ChannelDescriptor.java    | 0
 .../org/apache/{incubator => }/wayang/core/platform/ChannelInstance.java  | 0
 .../{incubator => }/wayang/core/platform/CompositeExecutionResource.java  | 0
 .../{incubator => }/wayang/core/platform/ConjunctiveBreakpoint.java       | 0
 .../{incubator => }/wayang/core/platform/CrossPlatformExecutor.java       | 0
 .../apache/{incubator => }/wayang/core/platform/ExecutionResource.java    | 0
 .../{incubator => }/wayang/core/platform/ExecutionResourceTemplate.java   | 0
 .../org/apache/{incubator => }/wayang/core/platform/ExecutionState.java   | 0
 .../java/org/apache/{incubator => }/wayang/core/platform/Executor.java    | 0
 .../org/apache/{incubator => }/wayang/core/platform/ExecutorTemplate.java | 0
 .../org/apache/{incubator => }/wayang/core/platform/FixBreakpoint.java    | 0
 .../java/org/apache/{incubator => }/wayang/core/platform/Junction.java    | 0
 .../{incubator => }/wayang/core/platform/NoIterationBreakpoint.java       | 0
 .../org/apache/{incubator => }/wayang/core/platform/PartialExecution.java | 0
 .../java/org/apache/{incubator => }/wayang/core/platform/Platform.java    | 0
 .../apache/{incubator => }/wayang/core/platform/PushExecutorTemplate.java | 0
 .../{incubator => }/wayang/core/platform/lineage/ChannelLineageNode.java  | 0
 .../wayang/core/platform/lineage/ExecutionLineageNode.java                | 0
 .../wayang/core/platform/lineage/LazyExecutionLineageNode.java            | 0
 .../java/org/apache/{incubator => }/wayang/core/plugin/DynamicPlugin.java | 0
 .../main/java/org/apache/{incubator => }/wayang/core/plugin/Plugin.java   | 0
 .../{incubator => }/wayang/core/profiling/CardinalityRepository.java      | 0
 .../org/apache/{incubator => }/wayang/core/profiling/CostMeasurement.java | 0
 .../org/apache/{incubator => }/wayang/core/profiling/ExecutionLog.java    | 0
 .../{incubator => }/wayang/core/profiling/ExecutionPlanMeasurement.java   | 0
 .../wayang/core/profiling/FullInstrumentationStrategy.java                | 0
 .../{incubator => }/wayang/core/profiling/InstrumentationStrategy.java    | 0
 .../{incubator => }/wayang/core/profiling/NoInstrumentationStrategy.java  | 0
 .../wayang/core/profiling/OutboundInstrumentationStrategy.java            | 0
 .../wayang/core/profiling/PartialExecutionMeasurement.java                | 0
 .../java/org/apache/{incubator => }/wayang/core/profiling/ProfileDBs.java | 0
 .../org/apache/{incubator => }/wayang/core/types/BasicDataUnitType.java   | 0
 .../java/org/apache/{incubator => }/wayang/core/types/DataSetType.java    | 0
 .../org/apache/{incubator => }/wayang/core/types/DataUnitGroupType.java   | 0
 .../java/org/apache/{incubator => }/wayang/core/types/DataUnitType.java   | 0
 .../{incubator => }/wayang/core/util/AbstractReferenceCountable.java      | 0
 .../src/main/java/org/apache/{incubator => }/wayang/core/util/Action.java | 0
 .../main/java/org/apache/{incubator => }/wayang/core/util/Actions.java    | 0
 .../main/java/org/apache/{incubator => }/wayang/core/util/Bitmask.java    | 0
 .../java/org/apache/{incubator => }/wayang/core/util/Canonicalizer.java   | 0
 .../apache/{incubator => }/wayang/core/util/ConsumerIteratorAdapter.java  | 0
 .../main/java/org/apache/{incubator => }/wayang/core/util/Copyable.java   | 0
 .../main/java/org/apache/{incubator => }/wayang/core/util/Counter.java    | 0
 .../org/apache/{incubator => }/wayang/core/util/CrossProductIterable.java | 0
 .../main/java/org/apache/{incubator => }/wayang/core/util/Formats.java    | 0
 .../main/java/org/apache/{incubator => }/wayang/core/util/Iterators.java  | 0
 .../org/apache/{incubator => }/wayang/core/util/JsonSerializable.java     | 0
 .../org/apache/{incubator => }/wayang/core/util/JsonSerializables.java    | 0
 .../java/org/apache/{incubator => }/wayang/core/util/JsonSerializer.java  | 0
 .../main/java/org/apache/{incubator => }/wayang/core/util/JuelUtils.java  | 0
 .../org/apache/{incubator => }/wayang/core/util/LimitedInputStream.java   | 0
 .../main/java/org/apache/{incubator => }/wayang/core/util/Logging.java    | 0
 .../main/java/org/apache/{incubator => }/wayang/core/util/LruCache.java   | 0
 .../main/java/org/apache/{incubator => }/wayang/core/util/MultiMap.java   | 0
 .../org/apache/{incubator => }/wayang/core/util/OneTimeExecutable.java    | 0
 .../main/java/org/apache/{incubator => }/wayang/core/util/Optional.java   | 0
 .../org/apache/{incubator => }/wayang/core/util/ReferenceCountable.java   | 0
 .../java/org/apache/{incubator => }/wayang/core/util/ReflectionUtils.java | 0
 .../src/main/java/org/apache/{incubator => }/wayang/core/util/Tuple.java  | 0
 .../java/org/apache/{incubator => }/wayang/core/util/WayangArrays.java    | 0
 .../org/apache/{incubator => }/wayang/core/util/WayangCollections.java    | 0
 .../java/org/apache/{incubator => }/wayang/core/util/fs/FileSystem.java   | 0
 .../java/org/apache/{incubator => }/wayang/core/util/fs/FileSystems.java  | 0
 .../java/org/apache/{incubator => }/wayang/core/util/fs/FileUtils.java    | 0
 .../org/apache/{incubator => }/wayang/core/util/fs/HadoopFileSystem.java  | 0
 .../org/apache/{incubator => }/wayang/core/util/fs/LocalFileSystem.java   | 0
 .../java/org/apache/{incubator => }/wayang/core/util/mathex/Context.java  | 0
 .../apache/{incubator => }/wayang/core/util/mathex/DefaultContext.java    | 0
 .../org/apache/{incubator => }/wayang/core/util/mathex/Expression.java    | 0
 .../apache/{incubator => }/wayang/core/util/mathex/ExpressionBuilder.java | 0
 .../wayang/core/util/mathex/exceptions/EvaluationException.java           | 0
 .../wayang/core/util/mathex/exceptions/MathExException.java               | 0
 .../wayang/core/util/mathex/exceptions/ParseException.java                | 0
 .../{incubator => }/wayang/core/util/mathex/model/BinaryOperation.java    | 0
 .../{incubator => }/wayang/core/util/mathex/model/CompiledFunction.java   | 0
 .../apache/{incubator => }/wayang/core/util/mathex/model/Constant.java    | 0
 .../{incubator => }/wayang/core/util/mathex/model/NamedFunction.java      | 0
 .../{incubator => }/wayang/core/util/mathex/model/UnaryOperation.java     | 0
 .../apache/{incubator => }/wayang/core/util/mathex/model/Variable.java    | 0
 .../src/test/java/org/apache/{incubator => }/wayang/core/SlotTest.java    | 0
 .../apache/{incubator => }/wayang/core/mapping/OperatorPatternTest.java   | 0
 .../{incubator => }/wayang/core/mapping/PlanTransformationTest.java       | 0
 .../apache/{incubator => }/wayang/core/mapping/SubplanPatternTest.java    | 0
 .../apache/{incubator => }/wayang/core/mapping/test/TestSinkMapping.java  | 0
 .../wayang/core/mapping/test/TestSinkToTestSink2Factory.java              | 0
 .../core/optimizer/cardinality/AggregatingCardinalityEstimatorTest.java   | 0
 .../core/optimizer/cardinality/DefaultCardinalityEstimatorTest.java       | 0
 .../core/optimizer/cardinality/LoopSubplanCardinalityPusherTest.java      | 0
 .../wayang/core/optimizer/cardinality/SubplanCardinalityPusherTest.java   | 0
 .../wayang/core/optimizer/channels/ChannelConversionGraphTest.java        | 0
 .../wayang/core/optimizer/costs/NestableLoadProfileEstimatorTest.java     | 0
 .../wayang/core/optimizer/enumeration/StageAssignmentTraversalTest.java   | 0
 .../{incubator => }/wayang/core/plan/executionplan/test/TestChannel.java  | 0
 .../{incubator => }/wayang/core/plan/wayangplan/LoopIsolatorTest.java     | 0
 .../apache/{incubator => }/wayang/core/plan/wayangplan/OperatorTest.java  | 0
 .../{incubator => }/wayang/core/plan/wayangplan/SlotMappingTest.java      | 0
 .../wayang/core/plan/wayangplan/test/TestCustomMapOperator.java           | 0
 .../wayang/core/plan/wayangplan/test/TestFilterOperator.java              | 0
 .../apache/{incubator => }/wayang/core/plan/wayangplan/test/TestJoin.java | 0
 .../{incubator => }/wayang/core/plan/wayangplan/test/TestLoopHead.java    | 0
 .../{incubator => }/wayang/core/plan/wayangplan/test/TestMapOperator.java | 0
 .../apache/{incubator => }/wayang/core/plan/wayangplan/test/TestSink.java | 0
 .../{incubator => }/wayang/core/plan/wayangplan/test/TestSink2.java       | 0
 .../{incubator => }/wayang/core/plan/wayangplan/test/TestSource.java      | 0
 .../apache/{incubator => }/wayang/core/platform/PartialExecutionTest.java | 0
 .../org/apache/{incubator => }/wayang/core/plugin/DynamicPluginTest.java  | 0
 .../apache/{incubator => }/wayang/core/test/DummyExecutionOperator.java   | 0
 .../{incubator => }/wayang/core/test/DummyExternalReusableChannel.java    | 0
 .../apache/{incubator => }/wayang/core/test/DummyNonReusableChannel.java  | 0
 .../java/org/apache/{incubator => }/wayang/core/test/DummyPlatform.java   | 0
 .../org/apache/{incubator => }/wayang/core/test/DummyReusableChannel.java | 0
 .../java/org/apache/{incubator => }/wayang/core/test/MockFactory.java     | 0
 .../wayang/core/test/SerializableDummyExecutionOperator.java              | 0
 .../java/org/apache/{incubator => }/wayang/core/test/TestDataUnit.java    | 0
 .../java/org/apache/{incubator => }/wayang/core/test/TestDataUnit2.java   | 0
 .../java/org/apache/{incubator => }/wayang/core/util/BitmaskTest.java     | 0
 .../{incubator => }/wayang/core/util/ConsumerIteratorAdapterTest.java     | 0
 .../apache/{incubator => }/wayang/core/util/CrossProductIterableTest.java | 0
 .../apache/{incubator => }/wayang/core/util/LimitedInputStreamTest.java   | 0
 .../org/apache/{incubator => }/wayang/core/util/ReflectionUtilsTest.java  | 0
 .../apache/{incubator => }/wayang/core/util/WayangCollectionsTest.java    | 0
 .../{incubator => }/wayang/core/util/mathex/ExpressionBuilderTest.java    | 0
 .../apache/{incubator => }/wayang/core/util/mathex/ExpressionTest.java    | 0
 .../src/main/java/org/apache/{incubator => }/wayang/iejoin/IEJoin.java    | 0
 .../src/main/java/org/apache/{incubator => }/wayang/iejoin/data/Data.java | 0
 .../java/org/apache/{incubator => }/wayang/iejoin/mapping/Mappings.java   | 0
 .../apache/{incubator => }/wayang/iejoin/mapping/java/IEJoinMapping.java  | 0
 .../{incubator => }/wayang/iejoin/mapping/java/IESelfJoinMapping.java     | 0
 .../apache/{incubator => }/wayang/iejoin/mapping/spark/IEJoinMapping.java | 0
 .../{incubator => }/wayang/iejoin/mapping/spark/IESelfJoinMapping.java    | 0
 .../{incubator => }/wayang/iejoin/operators/IEJoinMasterOperator.java     | 0
 .../apache/{incubator => }/wayang/iejoin/operators/IEJoinOperator.java    | 0
 .../{incubator => }/wayang/iejoin/operators/IESelfJoinOperator.java       | 0
 .../{incubator => }/wayang/iejoin/operators/JavaIEJoinOperator.java       | 0
 .../{incubator => }/wayang/iejoin/operators/JavaIESelfJoinOperator.java   | 0
 .../{incubator => }/wayang/iejoin/operators/SparkIEJoinOperator.java      | 0
 .../{incubator => }/wayang/iejoin/operators/SparkIESelfJoinOperator.java  | 0
 .../{incubator => }/wayang/iejoin/operators/java_helpers/BitSetJoin.java  | 0
 .../wayang/iejoin/operators/java_helpers/DataComparator.java              | 0
 .../{incubator => }/wayang/iejoin/operators/java_helpers/extractData.java | 0
 .../{incubator => }/wayang/iejoin/operators/java_helpers/myMergeSort.java | 0
 .../wayang/iejoin/operators/java_helpers/revDataComparator.java           | 0
 .../{incubator => }/wayang/iejoin/operators/spark_helpers/BitSetJoin.java | 0
 .../iejoin/operators/spark_helpers/List2AttributesObjectSkinny.java       | 0
 .../wayang/iejoin/operators/spark_helpers/addUniqueID.java                | 0
 .../wayang/iejoin/operators/spark_helpers/build2ListObject.java           | 0
 .../wayang/iejoin/operators/spark_helpers/extractData.java                | 0
 .../wayang/iejoin/operators/spark_helpers/filterUnwantedBlocks.java       | 0
 .../wayang/iejoin/operators/spark_helpers/myMergeSort.java                | 0
 .../wayang/iejoin/operators/spark_helpers/revDataComparator.java          | 0
 .../wayang/iejoin/operators/JavaExecutionOperatorTestBase.java            | 0
 .../{incubator => }/wayang/iejoin/operators/JavaIEJoinOperatorTest.java   | 0
 .../{incubator => }/wayang/iejoin/operators/SparkIEJoinOperatorTest.java  | 0
 .../{incubator => }/wayang/iejoin/operators/SparkIEJoinOperatorTest2.java | 0
 .../{incubator => }/wayang/iejoin/operators/SparkIEJoinOperatorTest3.java | 0
 .../{incubator => }/wayang/iejoin/operators/SparkIEJoinOperatorTest4.java | 0
 .../wayang/iejoin/operators/SparkIESelfJoinOperatorTest.java              | 0
 .../{incubator => }/wayang/iejoin/operators/SparkOperatorTestBase.java    | 0
 .../org/apache/{incubator => }/wayang/iejoin/test/ChannelFactory.java     | 0
 .../src/main/java/org/apache/{incubator => }/wayang/flink/Flink.java      | 0
 .../apache/{incubator => }/wayang/flink/channels/ChannelConversions.java  | 0
 .../org/apache/{incubator => }/wayang/flink/channels/DataSetChannel.java  | 0
 .../{incubator => }/wayang/flink/compiler/FlinkCoGroupFunction.java       | 0
 .../apache/{incubator => }/wayang/flink/compiler/FunctionCompiler.java    | 0
 .../apache/{incubator => }/wayang/flink/compiler/KeySelectorDistinct.java | 0
 .../apache/{incubator => }/wayang/flink/compiler/KeySelectorFunction.java | 0
 .../{incubator => }/wayang/flink/compiler/OutputFormatConsumer.java       | 0
 .../{incubator => }/wayang/flink/compiler/WayangFileOutputFormat.java     | 0
 .../{incubator => }/wayang/flink/compiler/criterion/DummyFilter.java      | 0
 .../apache/{incubator => }/wayang/flink/compiler/criterion/DummyMap.java  | 0
 .../{incubator => }/wayang/flink/compiler/criterion/WayangAggregator.java | 0
 .../wayang/flink/compiler/criterion/WayangConvergenceCriterion.java       | 0
 .../wayang/flink/compiler/criterion/WayangFilterCriterion.java            | 0
 .../{incubator => }/wayang/flink/compiler/criterion/WayangListValue.java  | 0
 .../{incubator => }/wayang/flink/compiler/criterion/WayangValue.java      | 0
 .../{incubator => }/wayang/flink/execution/FlinkContextReference.java     | 0
 .../{incubator => }/wayang/flink/execution/FlinkExecutionContext.java     | 0
 .../org/apache/{incubator => }/wayang/flink/execution/FlinkExecutor.java  | 0
 .../org/apache/{incubator => }/wayang/flink/mapping/CartesianMapping.java | 0
 .../org/apache/{incubator => }/wayang/flink/mapping/CoGroupMapping.java   | 0
 .../{incubator => }/wayang/flink/mapping/CollectionSourceMapping.java     | 0
 .../org/apache/{incubator => }/wayang/flink/mapping/CountMapping.java     | 0
 .../org/apache/{incubator => }/wayang/flink/mapping/DistinctMapping.java  | 0
 .../org/apache/{incubator => }/wayang/flink/mapping/DoWhileMapping.java   | 0
 .../org/apache/{incubator => }/wayang/flink/mapping/FilterMapping.java    | 0
 .../org/apache/{incubator => }/wayang/flink/mapping/FlatMapMapping.java   | 0
 .../wayang/flink/mapping/GlobalMaterializedGroupMapping.java              | 0
 .../apache/{incubator => }/wayang/flink/mapping/GlobalReduceMapping.java  | 0
 .../org/apache/{incubator => }/wayang/flink/mapping/GroupByMapping.java   | 0
 .../org/apache/{incubator => }/wayang/flink/mapping/IntersectMapping.java | 0
 .../java/org/apache/{incubator => }/wayang/flink/mapping/JoinMapping.java | 0
 .../{incubator => }/wayang/flink/mapping/LocalCallbackSinkMapping.java    | 0
 .../java/org/apache/{incubator => }/wayang/flink/mapping/LoopMapping.java | 0
 .../java/org/apache/{incubator => }/wayang/flink/mapping/MapMapping.java  | 0
 .../apache/{incubator => }/wayang/flink/mapping/MapPartitionsMapping.java | 0
 .../java/org/apache/{incubator => }/wayang/flink/mapping/Mappings.java    | 0
 .../{incubator => }/wayang/flink/mapping/MaterializedGroupByMapping.java  | 0
 .../org/apache/{incubator => }/wayang/flink/mapping/PageRankMapping.java  | 0
 .../org/apache/{incubator => }/wayang/flink/mapping/ReduceByMapping.java  | 0
 .../org/apache/{incubator => }/wayang/flink/mapping/RepeatMapping.java    | 0
 .../org/apache/{incubator => }/wayang/flink/mapping/SampleMapping.java    | 0
 .../java/org/apache/{incubator => }/wayang/flink/mapping/SortMapping.java | 0
 .../apache/{incubator => }/wayang/flink/mapping/TextFileSinkMapping.java  | 0
 .../{incubator => }/wayang/flink/mapping/TextFileSourceMapping.java       | 0
 .../org/apache/{incubator => }/wayang/flink/mapping/UnionAllMapping.java  | 0
 .../org/apache/{incubator => }/wayang/flink/mapping/ZipWithIdMapping.java | 0
 .../{incubator => }/wayang/flink/operators/FlinkCartesianOperator.java    | 0
 .../{incubator => }/wayang/flink/operators/FlinkCoGroupOperator.java      | 0
 .../{incubator => }/wayang/flink/operators/FlinkCollectionSink.java       | 0
 .../{incubator => }/wayang/flink/operators/FlinkCollectionSource.java     | 0
 .../apache/{incubator => }/wayang/flink/operators/FlinkCountOperator.java | 0
 .../{incubator => }/wayang/flink/operators/FlinkDistinctOperator.java     | 0
 .../{incubator => }/wayang/flink/operators/FlinkDoWhileOperator.java      | 0
 .../{incubator => }/wayang/flink/operators/FlinkExecutionOperator.java    | 0
 .../{incubator => }/wayang/flink/operators/FlinkFilterOperator.java       | 0
 .../{incubator => }/wayang/flink/operators/FlinkFlatMapOperator.java      | 0
 .../wayang/flink/operators/FlinkGlobalMaterializedGroupOperator.java      | 0
 .../{incubator => }/wayang/flink/operators/FlinkGlobalReduceOperator.java | 0
 .../{incubator => }/wayang/flink/operators/FlinkGroupByOperator.java      | 0
 .../{incubator => }/wayang/flink/operators/FlinkIntersectOperator.java    | 0
 .../apache/{incubator => }/wayang/flink/operators/FlinkJoinOperator.java  | 0
 .../{incubator => }/wayang/flink/operators/FlinkLocalCallbackSink.java    | 0
 .../apache/{incubator => }/wayang/flink/operators/FlinkLoopOperator.java  | 0
 .../apache/{incubator => }/wayang/flink/operators/FlinkMapOperator.java   | 0
 .../wayang/flink/operators/FlinkMapPartitionsOperator.java                | 0
 .../wayang/flink/operators/FlinkMaterializedGroupByOperator.java          | 0
 .../{incubator => }/wayang/flink/operators/FlinkObjectFileSink.java       | 0
 .../{incubator => }/wayang/flink/operators/FlinkObjectFileSource.java     | 0
 .../{incubator => }/wayang/flink/operators/FlinkPageRankOperator.java     | 0
 .../{incubator => }/wayang/flink/operators/FlinkReduceByOperator.java     | 0
 .../wayang/flink/operators/FlinkRepeatExpandedOperator.java               | 0
 .../{incubator => }/wayang/flink/operators/FlinkRepeatOperator.java       | 0
 .../{incubator => }/wayang/flink/operators/FlinkSampleOperator.java       | 0
 .../apache/{incubator => }/wayang/flink/operators/FlinkSortOperator.java  | 0
 .../apache/{incubator => }/wayang/flink/operators/FlinkTextFileSink.java  | 0
 .../{incubator => }/wayang/flink/operators/FlinkTextFileSource.java       | 0
 .../apache/{incubator => }/wayang/flink/operators/FlinkTsvFileSink.java   | 0
 .../{incubator => }/wayang/flink/operators/FlinkUnionAllOperator.java     | 0
 .../{incubator => }/wayang/flink/operators/FlinkZipWithIdOperator.java    | 0
 .../org/apache/{incubator => }/wayang/flink/platform/FlinkPlatform.java   | 0
 .../org/apache/{incubator => }/wayang/flink/plugin/FlinkBasicPlugin.java  | 0
 .../apache/{incubator => }/wayang/flink/plugin/FlinkConversionPlugin.java | 0
 .../org/apache/{incubator => }/wayang/flink/plugin/FlinkGraphPlugin.java  | 0
 .../apache/{incubator => }/wayang/giraph/Algorithm/PageRankAlgorithm.java | 0
 .../{incubator => }/wayang/giraph/Algorithm/PageRankParameters.java       | 0
 .../src/main/java/org/apache/{incubator => }/wayang/giraph/Giraph.java    | 0
 .../apache/{incubator => }/wayang/giraph/channels/ChannelConversions.java | 0
 .../apache/{incubator => }/wayang/giraph/execution/GiraphExecutor.java    | 0
 .../java/org/apache/{incubator => }/wayang/giraph/mappings/Mappings.java  | 0
 .../apache/{incubator => }/wayang/giraph/mappings/PageRankMapping.java    | 0
 .../{incubator => }/wayang/giraph/operators/GiraphExecutionOperator.java  | 0
 .../{incubator => }/wayang/giraph/operators/GiraphPageRankOperator.java   | 0
 .../org/apache/{incubator => }/wayang/giraph/platform/GiraphPlatform.java | 0
 .../org/apache/{incubator => }/wayang/giraph/plugin/GiraphPlugin.java     | 0
 .../wayang/giraph/operators/GiraphPagaRankOperatorTest.java               | 0
 .../main/java/org/apache/{incubator => }/wayang/graphchi/GraphChi.java    | 0
 .../{incubator => }/wayang/graphchi/channels/ChannelConversions.java      | 0
 .../{incubator => }/wayang/graphchi/execution/GraphChiExecutor.java       | 0
 .../org/apache/{incubator => }/wayang/graphchi/mappings/Mappings.java     | 0
 .../apache/{incubator => }/wayang/graphchi/mappings/PageRankMapping.java  | 0
 .../wayang/graphchi/operators/GraphChiExecutionOperator.java              | 0
 .../wayang/graphchi/operators/GraphChiPageRankOperator.java               | 0
 .../apache/{incubator => }/wayang/graphchi/platform/GraphChiPlatform.java | 0
 .../org/apache/{incubator => }/wayang/graphchi/plugin/GraphChiPlugin.java | 0
 .../wayang/graphchi/operators/GraphChiPageRankOperatorTest.java           | 0
 .../src/main/java/org/apache/{incubator => }/wayang/java/Java.java        | 0
 .../apache/{incubator => }/wayang/java/channels/ChannelConversions.java   | 0
 .../apache/{incubator => }/wayang/java/channels/CollectionChannel.java    | 0
 .../apache/{incubator => }/wayang/java/channels/JavaChannelInstance.java  | 0
 .../org/apache/{incubator => }/wayang/java/channels/StreamChannel.java    | 0
 .../org/apache/{incubator => }/wayang/java/compiler/FunctionCompiler.java | 0
 .../{incubator => }/wayang/java/execution/JavaExecutionContext.java       | 0
 .../org/apache/{incubator => }/wayang/java/execution/JavaExecutor.java    | 0
 .../org/apache/{incubator => }/wayang/java/mapping/CartesianMapping.java  | 0
 .../org/apache/{incubator => }/wayang/java/mapping/CoGroupMapping.java    | 0
 .../{incubator => }/wayang/java/mapping/CollectionSourceMapping.java      | 0
 .../java/org/apache/{incubator => }/wayang/java/mapping/CountMapping.java | 0
 .../org/apache/{incubator => }/wayang/java/mapping/DistinctMapping.java   | 0
 .../org/apache/{incubator => }/wayang/java/mapping/DoWhileMapping.java    | 0
 .../org/apache/{incubator => }/wayang/java/mapping/FilterMapping.java     | 0
 .../org/apache/{incubator => }/wayang/java/mapping/FlatMapMapping.java    | 0
 .../wayang/java/mapping/GlobalMaterializedGroupMapping.java               | 0
 .../apache/{incubator => }/wayang/java/mapping/GlobalReduceMapping.java   | 0
 .../org/apache/{incubator => }/wayang/java/mapping/IntersectMapping.java  | 0
 .../java/org/apache/{incubator => }/wayang/java/mapping/JoinMapping.java  | 0
 .../{incubator => }/wayang/java/mapping/LocalCallbackSinkMapping.java     | 0
 .../java/org/apache/{incubator => }/wayang/java/mapping/LoopMapping.java  | 0
 .../java/org/apache/{incubator => }/wayang/java/mapping/MapMapping.java   | 0
 .../apache/{incubator => }/wayang/java/mapping/MapPartitionsMapping.java  | 0
 .../java/org/apache/{incubator => }/wayang/java/mapping/Mappings.java     | 0
 .../{incubator => }/wayang/java/mapping/MaterializedGroupByMapping.java   | 0
 .../org/apache/{incubator => }/wayang/java/mapping/ReduceByMapping.java   | 0
 .../org/apache/{incubator => }/wayang/java/mapping/RepeatMapping.java     | 0
 .../org/apache/{incubator => }/wayang/java/mapping/SampleMapping.java     | 0
 .../java/org/apache/{incubator => }/wayang/java/mapping/SortMapping.java  | 0
 .../apache/{incubator => }/wayang/java/mapping/TextFileSinkMapping.java   | 0
 .../apache/{incubator => }/wayang/java/mapping/TextFileSourceMapping.java | 0
 .../org/apache/{incubator => }/wayang/java/mapping/UnionAllMapping.java   | 0
 .../org/apache/{incubator => }/wayang/java/mapping/ZipWithIdMapping.java  | 0
 .../apache/{incubator => }/wayang/java/mapping/graph/PageRankMapping.java | 0
 .../{incubator => }/wayang/java/operators/JavaCartesianOperator.java      | 0
 .../apache/{incubator => }/wayang/java/operators/JavaCoGroupOperator.java | 0
 .../apache/{incubator => }/wayang/java/operators/JavaCollectOperator.java | 0
 .../{incubator => }/wayang/java/operators/JavaCollectionSource.java       | 0
 .../apache/{incubator => }/wayang/java/operators/JavaCountOperator.java   | 0
 .../{incubator => }/wayang/java/operators/JavaDistinctOperator.java       | 0
 .../apache/{incubator => }/wayang/java/operators/JavaDoWhileOperator.java | 0
 .../{incubator => }/wayang/java/operators/JavaExecutionOperator.java      | 0
 .../apache/{incubator => }/wayang/java/operators/JavaFilterOperator.java  | 0
 .../apache/{incubator => }/wayang/java/operators/JavaFlatMapOperator.java | 0
 .../wayang/java/operators/JavaGlobalMaterializedGroupOperator.java        | 0
 .../{incubator => }/wayang/java/operators/JavaGlobalReduceOperator.java   | 0
 .../{incubator => }/wayang/java/operators/JavaIntersectOperator.java      | 0
 .../apache/{incubator => }/wayang/java/operators/JavaJoinOperator.java    | 0
 .../{incubator => }/wayang/java/operators/JavaLocalCallbackSink.java      | 0
 .../apache/{incubator => }/wayang/java/operators/JavaLoopOperator.java    | 0
 .../org/apache/{incubator => }/wayang/java/operators/JavaMapOperator.java | 0
 .../{incubator => }/wayang/java/operators/JavaMapPartitionsOperator.java  | 0
 .../wayang/java/operators/JavaMaterializedGroupByOperator.java            | 0
 .../apache/{incubator => }/wayang/java/operators/JavaObjectFileSink.java  | 0
 .../{incubator => }/wayang/java/operators/JavaObjectFileSource.java       | 0
 .../{incubator => }/wayang/java/operators/JavaRandomSampleOperator.java   | 0
 .../{incubator => }/wayang/java/operators/JavaReduceByOperator.java       | 0
 .../apache/{incubator => }/wayang/java/operators/JavaRepeatOperator.java  | 0
 .../wayang/java/operators/JavaReservoirSampleOperator.java                | 0
 .../apache/{incubator => }/wayang/java/operators/JavaSortOperator.java    | 0
 .../apache/{incubator => }/wayang/java/operators/JavaTextFileSink.java    | 0
 .../apache/{incubator => }/wayang/java/operators/JavaTextFileSource.java  | 0
 .../org/apache/{incubator => }/wayang/java/operators/JavaTsvFileSink.java | 0
 .../apache/{incubator => }/wayang/java/operators/JavaTsvFileSource.java   | 0
 .../{incubator => }/wayang/java/operators/JavaUnionAllOperator.java       | 0
 .../{incubator => }/wayang/java/operators/graph/JavaPageRankOperator.java | 0
 .../org/apache/{incubator => }/wayang/java/platform/JavaPlatform.java     | 0
 .../org/apache/{incubator => }/wayang/java/plugin/JavaBasicPlugin.java    | 0
 .../{incubator => }/wayang/java/plugin/JavaChannelConversionPlugin.java   | 0
 .../org/apache/{incubator => }/wayang/java/plugin/JavaGraphPlugin.java    | 0
 .../apache/{incubator => }/wayang/java/execution/JavaExecutorTest.java    | 0
 .../{incubator => }/wayang/java/operators/JavaCartesianOperatorTest.java  | 0
 .../{incubator => }/wayang/java/operators/JavaCoGroupOperatorTest.java    | 0
 .../{incubator => }/wayang/java/operators/JavaCollectionSourceTest.java   | 0
 .../{incubator => }/wayang/java/operators/JavaCountOperatorTest.java      | 0
 .../{incubator => }/wayang/java/operators/JavaDistinctOperatorTest.java   | 0
 .../wayang/java/operators/JavaExecutionOperatorTestBase.java              | 0
 .../{incubator => }/wayang/java/operators/JavaFilterOperatorTest.java     | 0
 .../wayang/java/operators/JavaGlobalMaterializedGroupOperatorTest.java    | 0
 .../wayang/java/operators/JavaGlobalReduceOperatorTest.java               | 0
 .../{incubator => }/wayang/java/operators/JavaJoinOperatorTest.java       | 0
 .../{incubator => }/wayang/java/operators/JavaLocalCallbackSinkTest.java  | 0
 .../wayang/java/operators/JavaMaterializedGroupByOperatorTest.java        | 0
 .../{incubator => }/wayang/java/operators/JavaObjectFileSinkTest.java     | 0
 .../{incubator => }/wayang/java/operators/JavaObjectFileSourceTest.java   | 0
 .../wayang/java/operators/JavaRandomSampleOperatorTest.java               | 0
 .../{incubator => }/wayang/java/operators/JavaReduceByOperatorTest.java   | 0
 .../wayang/java/operators/JavaReservoirSampleOperatorTest.java            | 0
 .../{incubator => }/wayang/java/operators/JavaSortOperatorTest.java       | 0
 .../{incubator => }/wayang/java/operators/JavaTextFileSinkTest.java       | 0
 .../{incubator => }/wayang/java/operators/JavaUnionAllOperatorTest.java   | 0
 .../java/org/apache/{incubator => }/wayang/java/test/ChannelFactory.java  | 0
 .../org/apache/{incubator => }/wayang/jdbc/channels/SqlQueryChannel.java  | 0
 .../org/apache/{incubator => }/wayang/jdbc/compiler/FunctionCompiler.java | 0
 .../apache/{incubator => }/wayang/jdbc/execution/DatabaseDescriptor.java  | 0
 .../org/apache/{incubator => }/wayang/jdbc/execution/JdbcExecutor.java    | 0
 .../{incubator => }/wayang/jdbc/operators/JdbcExecutionOperator.java      | 0
 .../apache/{incubator => }/wayang/jdbc/operators/JdbcFilterOperator.java  | 0
 .../{incubator => }/wayang/jdbc/operators/JdbcProjectionOperator.java     | 0
 .../org/apache/{incubator => }/wayang/jdbc/operators/JdbcTableSource.java | 0
 .../apache/{incubator => }/wayang/jdbc/operators/SqlToStreamOperator.java | 0
 .../apache/{incubator => }/wayang/jdbc/platform/JdbcPlatformTemplate.java | 0
 .../apache/{incubator => }/wayang/jdbc/execution/JdbcExecutorTest.java    | 0
 .../apache/{incubator => }/wayang/jdbc/operators/JdbcTableSourceTest.java | 0
 .../apache/{incubator => }/wayang/jdbc/operators/OperatorTestBase.java    | 0
 .../{incubator => }/wayang/jdbc/operators/SqlToStreamOperatorTest.java    | 0
 .../org/apache/{incubator => }/wayang/jdbc/test/HsqldbFilterOperator.java | 0
 .../java/org/apache/{incubator => }/wayang/jdbc/test/HsqldbPlatform.java  | 0
 .../apache/{incubator => }/wayang/jdbc/test/HsqldbProjectionOperator.java | 0
 .../org/apache/{incubator => }/wayang/jdbc/test/HsqldbTableSource.java    | 0
 .../main/java/org/apache/{incubator => }/wayang/postgres/Postgres.java    | 0
 .../{incubator => }/wayang/postgres/channels/ChannelConversions.java      | 0
 .../org/apache/{incubator => }/wayang/postgres/mapping/FilterMapping.java | 0
 .../java/org/apache/{incubator => }/wayang/postgres/mapping/Mappings.java | 0
 .../apache/{incubator => }/wayang/postgres/mapping/ProjectionMapping.java | 0
 .../wayang/postgres/operators/PostgresExecutionOperator.java              | 0
 .../{incubator => }/wayang/postgres/operators/PostgresFilterOperator.java | 0
 .../wayang/postgres/operators/PostgresProjectionOperator.java             | 0
 .../{incubator => }/wayang/postgres/operators/PostgresTableSource.java    | 0
 .../apache/{incubator => }/wayang/postgres/platform/PostgresPlatform.java | 0
 .../{incubator => }/wayang/postgres/plugin/PostgresConversionsPlugin.java | 0
 .../org/apache/{incubator => }/wayang/postgres/plugin/PostgresPlugin.java | 0
 .../src/main/java/org/apache/{incubator => }/wayang/spark/Spark.java      | 0
 .../apache/{incubator => }/wayang/spark/channels/BroadcastChannel.java    | 0
 .../apache/{incubator => }/wayang/spark/channels/ChannelConversions.java  | 0
 .../org/apache/{incubator => }/wayang/spark/channels/FileChannels.java    | 0
 .../java/org/apache/{incubator => }/wayang/spark/channels/RddChannel.java | 0
 .../{incubator => }/wayang/spark/compiler/BinaryOperatorAdapter.java      | 0
 .../wayang/spark/compiler/ExtendedBinaryOperatorAdapter.java              | 0
 .../wayang/spark/compiler/ExtendedFlatMapFunctionAdapter.java             | 0
 .../apache/{incubator => }/wayang/spark/compiler/ExtendedFunction.java    | 0
 .../{incubator => }/wayang/spark/compiler/ExtendedMapFunctionAdapter.java | 0
 .../wayang/spark/compiler/ExtendedMapPartitionsFunctionAdapter.java       | 0
 .../{incubator => }/wayang/spark/compiler/ExtendedPredicateAdapater.java  | 0
 .../{incubator => }/wayang/spark/compiler/FlatMapFunctionAdapter.java     | 0
 .../apache/{incubator => }/wayang/spark/compiler/FunctionCompiler.java    | 0
 .../apache/{incubator => }/wayang/spark/compiler/MapFunctionAdapter.java  | 0
 .../wayang/spark/compiler/MapPartitionsFunctionAdapter.java               | 0
 .../apache/{incubator => }/wayang/spark/compiler/PredicateAdapter.java    | 0
 .../{incubator => }/wayang/spark/execution/SparkContextReference.java     | 0
 .../{incubator => }/wayang/spark/execution/SparkExecutionContext.java     | 0
 .../org/apache/{incubator => }/wayang/spark/execution/SparkExecutor.java  | 0
 .../org/apache/{incubator => }/wayang/spark/mapping/CartesianMapping.java | 0
 .../org/apache/{incubator => }/wayang/spark/mapping/CoGroupMapping.java   | 0
 .../{incubator => }/wayang/spark/mapping/CollectionSourceMapping.java     | 0
 .../org/apache/{incubator => }/wayang/spark/mapping/CountMapping.java     | 0
 .../org/apache/{incubator => }/wayang/spark/mapping/DistinctMapping.java  | 0
 .../org/apache/{incubator => }/wayang/spark/mapping/DoWhileMapping.java   | 0
 .../org/apache/{incubator => }/wayang/spark/mapping/FilterMapping.java    | 0
 .../org/apache/{incubator => }/wayang/spark/mapping/FlatMapMapping.java   | 0
 .../wayang/spark/mapping/GlobalMaterializedGroupMapping.java              | 0
 .../apache/{incubator => }/wayang/spark/mapping/GlobalReduceMapping.java  | 0
 .../org/apache/{incubator => }/wayang/spark/mapping/IntersectMapping.java | 0
 .../java/org/apache/{incubator => }/wayang/spark/mapping/JoinMapping.java | 0
 .../{incubator => }/wayang/spark/mapping/LocalCallbackSinkMapping.java    | 0
 .../java/org/apache/{incubator => }/wayang/spark/mapping/LoopMapping.java | 0
 .../java/org/apache/{incubator => }/wayang/spark/mapping/MapMapping.java  | 0
 .../apache/{incubator => }/wayang/spark/mapping/MapPartitionsMapping.java | 0
 .../java/org/apache/{incubator => }/wayang/spark/mapping/Mappings.java    | 0
 .../{incubator => }/wayang/spark/mapping/MaterializedGroupByMapping.java  | 0
 .../org/apache/{incubator => }/wayang/spark/mapping/ReduceByMapping.java  | 0
 .../org/apache/{incubator => }/wayang/spark/mapping/RepeatMapping.java    | 0
 .../org/apache/{incubator => }/wayang/spark/mapping/SampleMapping.java    | 0
 .../java/org/apache/{incubator => }/wayang/spark/mapping/SortMapping.java | 0
 .../apache/{incubator => }/wayang/spark/mapping/TextFileSinkMapping.java  | 0
 .../{incubator => }/wayang/spark/mapping/TextFileSourceMapping.java       | 0
 .../org/apache/{incubator => }/wayang/spark/mapping/UnionAllMapping.java  | 0
 .../org/apache/{incubator => }/wayang/spark/mapping/ZipWithIdMapping.java | 0
 .../{incubator => }/wayang/spark/mapping/graph/PageRankMapping.java       | 0
 .../wayang/spark/operators/SparkBernoulliSampleOperator.java              | 0
 .../{incubator => }/wayang/spark/operators/SparkBroadcastOperator.java    | 0
 .../apache/{incubator => }/wayang/spark/operators/SparkCacheOperator.java | 0
 .../{incubator => }/wayang/spark/operators/SparkCartesianOperator.java    | 0
 .../{incubator => }/wayang/spark/operators/SparkCoGroupOperator.java      | 0
 .../{incubator => }/wayang/spark/operators/SparkCollectOperator.java      | 0
 .../{incubator => }/wayang/spark/operators/SparkCollectionSource.java     | 0
 .../apache/{incubator => }/wayang/spark/operators/SparkCountOperator.java | 0
 .../{incubator => }/wayang/spark/operators/SparkDistinctOperator.java     | 0
 .../{incubator => }/wayang/spark/operators/SparkDoWhileOperator.java      | 0
 .../{incubator => }/wayang/spark/operators/SparkExecutionOperator.java    | 0
 .../{incubator => }/wayang/spark/operators/SparkFilterOperator.java       | 0
 .../{incubator => }/wayang/spark/operators/SparkFlatMapOperator.java      | 0
 .../wayang/spark/operators/SparkGlobalMaterializedGroupOperator.java      | 0
 .../{incubator => }/wayang/spark/operators/SparkGlobalReduceOperator.java | 0
 .../{incubator => }/wayang/spark/operators/SparkIntersectOperator.java    | 0
 .../apache/{incubator => }/wayang/spark/operators/SparkJoinOperator.java  | 0
 .../{incubator => }/wayang/spark/operators/SparkLocalCallbackSink.java    | 0
 .../apache/{incubator => }/wayang/spark/operators/SparkLoopOperator.java  | 0
 .../apache/{incubator => }/wayang/spark/operators/SparkMapOperator.java   | 0
 .../wayang/spark/operators/SparkMapPartitionsOperator.java                | 0
 .../wayang/spark/operators/SparkMaterializedGroupByOperator.java          | 0
 .../{incubator => }/wayang/spark/operators/SparkObjectFileSink.java       | 0
 .../{incubator => }/wayang/spark/operators/SparkObjectFileSource.java     | 0
 .../wayang/spark/operators/SparkRandomPartitionSampleOperator.java        | 0
 .../{incubator => }/wayang/spark/operators/SparkReduceByOperator.java     | 0
 .../{incubator => }/wayang/spark/operators/SparkRepeatOperator.java       | 0
 .../wayang/spark/operators/SparkShufflePartitionSampleOperator.java       | 0
 .../apache/{incubator => }/wayang/spark/operators/SparkSortOperator.java  | 0
 .../apache/{incubator => }/wayang/spark/operators/SparkTextFileSink.java  | 0
 .../{incubator => }/wayang/spark/operators/SparkTextFileSource.java       | 0
 .../apache/{incubator => }/wayang/spark/operators/SparkTsvFileSink.java   | 0
 .../apache/{incubator => }/wayang/spark/operators/SparkTsvFileSource.java | 0
 .../{incubator => }/wayang/spark/operators/SparkUnionAllOperator.java     | 0
 .../{incubator => }/wayang/spark/operators/SparkZipWithIdOperator.java    | 0
 .../org/apache/{incubator => }/wayang/spark/platform/SparkPlatform.java   | 0
 .../org/apache/{incubator => }/wayang/spark/plugin/SparkBasicPlugin.java  | 0
 .../apache/{incubator => }/wayang/spark/plugin/SparkConversionPlugin.java | 0
 .../org/apache/{incubator => }/wayang/spark/plugin/SparkGraphPlugin.java  | 0
 .../wayang/spark/operators/graph/SparkPageRankOperator.scala              | 0
 .../wayang/spark/operators/SparkBernoulliSampleOperatorTest.java          | 0
 .../wayang/spark/operators/SparkCartesianOperatorTest.java                | 0
 .../{incubator => }/wayang/spark/operators/SparkCoGroupOperatorTest.java  | 0
 .../{incubator => }/wayang/spark/operators/SparkCollectionSourceTest.java | 0
 .../{incubator => }/wayang/spark/operators/SparkCountOperatorTest.java    | 0
 .../{incubator => }/wayang/spark/operators/SparkDistinctOperatorTest.java | 0
 .../{incubator => }/wayang/spark/operators/SparkFilterOperatorTest.java   | 0
 .../{incubator => }/wayang/spark/operators/SparkFlatMapOperatorTest.java  | 0
 .../wayang/spark/operators/SparkGlobalMaterializedGroupOperatorTest.java  | 0
 .../wayang/spark/operators/SparkGlobalReduceOperatorTest.java             | 0
 .../{incubator => }/wayang/spark/operators/SparkJoinOperatorTest.java     | 0
 .../wayang/spark/operators/SparkMapPartitionsOperatorTest.java            | 0
 .../wayang/spark/operators/SparkMaterializedGroupByOperatorTest.java      | 0
 .../{incubator => }/wayang/spark/operators/SparkObjectFileSinkTest.java   | 0
 .../{incubator => }/wayang/spark/operators/SparkObjectFileSourceTest.java | 0
 .../{incubator => }/wayang/spark/operators/SparkOperatorTestBase.java     | 0
 .../wayang/spark/operators/SparkRandomPartitionSampleOperatorTest.java    | 0
 .../{incubator => }/wayang/spark/operators/SparkReduceByOperatorTest.java | 0
 .../wayang/spark/operators/SparkShufflePartitionSampleOperatorTest.java   | 0
 .../{incubator => }/wayang/spark/operators/SparkSortOperatorTest.java     | 0
 .../{incubator => }/wayang/spark/operators/SparkTextFileSinkTest.java     | 0
 .../{incubator => }/wayang/spark/operators/SparkUnionAllOperatorTest.java | 0
 .../java/org/apache/{incubator => }/wayang/spark/test/ChannelFactory.java | 0
 .../src/main/java/org/apache/{incubator => }/wayang/sqlite3/Sqlite3.java  | 0
 .../{incubator => }/wayang/sqlite3/channels/ChannelConversions.java       | 0
 .../org/apache/{incubator => }/wayang/sqlite3/mapping/FilterMapping.java  | 0
 .../java/org/apache/{incubator => }/wayang/sqlite3/mapping/Mappings.java  | 0
 .../apache/{incubator => }/wayang/sqlite3/mapping/ProjectionMapping.java  | 0
 .../{incubator => }/wayang/sqlite3/operators/Sqlite3FilterOperator.java   | 0
 .../wayang/sqlite3/operators/Sqlite3ProjectionOperator.java               | 0
 .../{incubator => }/wayang/sqlite3/operators/Sqlite3TableSource.java      | 0
 .../apache/{incubator => }/wayang/sqlite3/platform/Sqlite3Platform.java   | 0
 .../{incubator => }/wayang/sqlite3/plugin/Sqlite3ConversionPlugin.java    | 0
 .../org/apache/{incubator => }/wayang/sqlite3/plugin/Sqlite3Plugin.java   | 0
 .../org/apache/{incubator => }/wayang/profiler/data/DataGenerators.java   | 0
 .../org/apache/{incubator => }/wayang/profiler/hardware/DiskProfiler.java | 0
 .../{incubator => }/wayang/profiler/java/BinaryOperatorProfiler.java      | 0
 .../wayang/profiler/java/JavaCollectionSourceProfiler.java                | 0
 .../{incubator => }/wayang/profiler/java/JavaTextFileSourceProfiler.java  | 0
 .../org/apache/{incubator => }/wayang/profiler/java/OperatorProfiler.java | 0
 .../apache/{incubator => }/wayang/profiler/java/OperatorProfilers.java    | 0
 .../java/org/apache/{incubator => }/wayang/profiler/java/Profiler.java    | 0
 .../org/apache/{incubator => }/wayang/profiler/java/SinkProfiler.java     | 0
 .../org/apache/{incubator => }/wayang/profiler/java/SourceProfiler.java   | 0
 .../{incubator => }/wayang/profiler/java/UnaryOperatorProfiler.java       | 0
 .../{incubator => }/wayang/profiler/log/DynamicEstimationContext.java     | 0
 .../apache/{incubator => }/wayang/profiler/log/DynamicLoadEstimator.java  | 0
 .../{incubator => }/wayang/profiler/log/DynamicLoadProfileEstimator.java  | 0
 .../{incubator => }/wayang/profiler/log/DynamicLoadProfileEstimators.java | 0
 .../org/apache/{incubator => }/wayang/profiler/log/GeneticOptimizer.java  | 0
 .../apache/{incubator => }/wayang/profiler/log/GeneticOptimizerApp.java   | 0
 .../java/org/apache/{incubator => }/wayang/profiler/log/Individual.java   | 0
 .../java/org/apache/{incubator => }/wayang/profiler/log/LogEvaluator.java | 0
 .../org/apache/{incubator => }/wayang/profiler/log/OptimizationSpace.java | 0
 .../java/org/apache/{incubator => }/wayang/profiler/log/Variable.java     | 0
 .../org/apache/{incubator => }/wayang/profiler/log/sampling/Battle.java   | 0
 .../{incubator => }/wayang/profiler/log/sampling/ReservoirSampler.java    | 0
 .../org/apache/{incubator => }/wayang/profiler/log/sampling/Sampler.java  | 0
 .../{incubator => }/wayang/profiler/log/sampling/TournamentSampler.java   | 0
 .../{incubator => }/wayang/profiler/spark/BinaryOperatorProfiler.java     | 0
 .../main/java/org/apache/{incubator => }/wayang/profiler/spark/Main.java  | 0
 .../apache/{incubator => }/wayang/profiler/spark/OperatorProfilers.java   | 0
 .../org/apache/{incubator => }/wayang/profiler/spark/SinkProfiler.java    | 0
 .../wayang/profiler/spark/SparkCollectionSourceProfiler.java              | 0
 .../{incubator => }/wayang/profiler/spark/SparkOperatorProfiler.java      | 0
 .../apache/{incubator => }/wayang/profiler/spark/SparkSourceProfiler.java | 0
 .../wayang/profiler/spark/SparkTextFileSourceProfiler.java                | 0
 .../{incubator => }/wayang/profiler/spark/SparkUnaryOperatorProfiler.java | 0
 .../org/apache/{incubator => }/wayang/profiler/util/ProfilingUtils.java   | 0
 .../java/org/apache/{incubator => }/wayang/profiler/util/RrdAccessor.java | 0
 .../{org/apache/incubator => apache}/wayang/tests/FlinkIntegrationIT.java | 0
 .../{org/apache/incubator => apache}/wayang/tests/FullIntegrationIT.java  | 0
 .../apache/incubator => apache}/wayang/tests/GiraphIntegrationIT.java     | 0
 .../apache/incubator => apache}/wayang/tests/GraphChiIntegrationIT.java   | 0
 .../{org/apache/incubator => apache}/wayang/tests/JavaIntegrationIT.java  | 0
 .../apache/incubator => apache}/wayang/tests/PostgresIntegrationIT.java   | 0
 .../org/{org/apache/incubator => apache}/wayang/tests/RegressionIT.java   | 0
 .../{org/apache/incubator => apache}/wayang/tests/SparkIntegrationIT.java | 0
 .../org/{org/apache/incubator => apache}/wayang/tests/WayangPlans.java    | 0
 .../apache/incubator => apache}/wayang/tests/WayangPlansOperators.java    | 0
 .../org/{org/apache/incubator => apache}/wayang/tests/WordCountIT.java    | 0
 .../incubator => apache}/wayang/tests/platform/MyMadeUpPlatform.java      | 0
 757 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/wayang-api/src/main/scala/org/apache/incubator/wayang/api/DataQuanta.scala b/wayang-api/src/main/scala/org/apache/wayang/api/DataQuanta.scala
similarity index 100%
rename from wayang-api/src/main/scala/org/apache/incubator/wayang/api/DataQuanta.scala
rename to wayang-api/src/main/scala/org/apache/wayang/api/DataQuanta.scala
diff --git a/wayang-api/src/main/scala/org/apache/incubator/wayang/api/DataQuantaBuilder.scala b/wayang-api/src/main/scala/org/apache/wayang/api/DataQuantaBuilder.scala
similarity index 100%
rename from wayang-api/src/main/scala/org/apache/incubator/wayang/api/DataQuantaBuilder.scala
rename to wayang-api/src/main/scala/org/apache/wayang/api/DataQuantaBuilder.scala
diff --git a/wayang-api/src/main/scala/org/apache/incubator/wayang/api/JavaPlanBuilder.scala b/wayang-api/src/main/scala/org/apache/wayang/api/JavaPlanBuilder.scala
similarity index 100%
rename from wayang-api/src/main/scala/org/apache/incubator/wayang/api/JavaPlanBuilder.scala
rename to wayang-api/src/main/scala/org/apache/wayang/api/JavaPlanBuilder.scala
diff --git a/wayang-api/src/main/scala/org/apache/incubator/wayang/api/PlanBuilder.scala b/wayang-api/src/main/scala/org/apache/wayang/api/PlanBuilder.scala
similarity index 100%
rename from wayang-api/src/main/scala/org/apache/incubator/wayang/api/PlanBuilder.scala
rename to wayang-api/src/main/scala/org/apache/wayang/api/PlanBuilder.scala
diff --git a/wayang-api/src/main/scala/org/apache/incubator/wayang/api/RecordDataQuanta.scala b/wayang-api/src/main/scala/org/apache/wayang/api/RecordDataQuanta.scala
similarity index 100%
rename from wayang-api/src/main/scala/org/apache/incubator/wayang/api/RecordDataQuanta.scala
rename to wayang-api/src/main/scala/org/apache/wayang/api/RecordDataQuanta.scala
diff --git a/wayang-api/src/main/scala/org/apache/incubator/wayang/api/RecordDataQuantaBuilder.scala b/wayang-api/src/main/scala/org/apache/wayang/api/RecordDataQuantaBuilder.scala
similarity index 100%
rename from wayang-api/src/main/scala/org/apache/incubator/wayang/api/RecordDataQuantaBuilder.scala
rename to wayang-api/src/main/scala/org/apache/wayang/api/RecordDataQuantaBuilder.scala
diff --git a/wayang-api/src/main/scala/org/apache/incubator/wayang/api/graph/Edge.scala b/wayang-api/src/main/scala/org/apache/wayang/api/graph/Edge.scala
similarity index 100%
rename from wayang-api/src/main/scala/org/apache/incubator/wayang/api/graph/Edge.scala
rename to wayang-api/src/main/scala/org/apache/wayang/api/graph/Edge.scala
diff --git a/wayang-api/src/main/scala/org/apache/incubator/wayang/api/graph/EdgeDataQuanta.scala b/wayang-api/src/main/scala/org/apache/wayang/api/graph/EdgeDataQuanta.scala
similarity index 100%
rename from wayang-api/src/main/scala/org/apache/incubator/wayang/api/graph/EdgeDataQuanta.scala
rename to wayang-api/src/main/scala/org/apache/wayang/api/graph/EdgeDataQuanta.scala
diff --git a/wayang-api/src/main/scala/org/apache/incubator/wayang/api/graph/EdgeDataQuantaBuilder.scala b/wayang-api/src/main/scala/org/apache/wayang/api/graph/EdgeDataQuantaBuilder.scala
similarity index 100%
rename from wayang-api/src/main/scala/org/apache/incubator/wayang/api/graph/EdgeDataQuantaBuilder.scala
rename to wayang-api/src/main/scala/org/apache/wayang/api/graph/EdgeDataQuantaBuilder.scala
diff --git a/wayang-api/src/main/scala/org/apache/incubator/wayang/api/graph/package.scala b/wayang-api/src/main/scala/org/apache/wayang/api/graph/package.scala
similarity index 100%
rename from wayang-api/src/main/scala/org/apache/incubator/wayang/api/graph/package.scala
rename to wayang-api/src/main/scala/org/apache/wayang/api/graph/package.scala
diff --git a/wayang-api/src/main/scala/org/apache/incubator/wayang/api/package.scala b/wayang-api/src/main/scala/org/apache/wayang/api/package.scala
similarity index 100%
rename from wayang-api/src/main/scala/org/apache/incubator/wayang/api/package.scala
rename to wayang-api/src/main/scala/org/apache/wayang/api/package.scala
diff --git a/wayang-api/src/main/scala/org/apache/incubator/wayang/api/util/DataQuantaBuilderCache.scala b/wayang-api/src/main/scala/org/apache/wayang/api/util/DataQuantaBuilderCache.scala
similarity index 100%
rename from wayang-api/src/main/scala/org/apache/incubator/wayang/api/util/DataQuantaBuilderCache.scala
rename to wayang-api/src/main/scala/org/apache/wayang/api/util/DataQuantaBuilderCache.scala
diff --git a/wayang-api/src/main/scala/org/apache/incubator/wayang/api/util/DataQuantaBuilderDecorator.scala b/wayang-api/src/main/scala/org/apache/wayang/api/util/DataQuantaBuilderDecorator.scala
similarity index 100%
rename from wayang-api/src/main/scala/org/apache/incubator/wayang/api/util/DataQuantaBuilderDecorator.scala
rename to wayang-api/src/main/scala/org/apache/wayang/api/util/DataQuantaBuilderDecorator.scala
diff --git a/wayang-api/src/main/scala/org/apache/incubator/wayang/api/util/TypeTrap.scala b/wayang-api/src/main/scala/org/apache/wayang/api/util/TypeTrap.scala
similarity index 100%
rename from wayang-api/src/main/scala/org/apache/incubator/wayang/api/util/TypeTrap.scala
rename to wayang-api/src/main/scala/org/apache/wayang/api/util/TypeTrap.scala
diff --git a/wayang-api/src/test/java/org/apache/incubator/wayang/api/JavaApiTest.java b/wayang-api/src/test/java/org/apache/wayang/api/JavaApiTest.java
similarity index 100%
rename from wayang-api/src/test/java/org/apache/incubator/wayang/api/JavaApiTest.java
rename to wayang-api/src/test/java/org/apache/wayang/api/JavaApiTest.java
diff --git a/wayang-api/src/test/scala/org/apache/incubator/wayang/api/ApiTest.scala b/wayang-api/src/test/scala/org/apache/wayang/api/ApiTest.scala
similarity index 100%
rename from wayang-api/src/test/scala/org/apache/incubator/wayang/api/ApiTest.scala
rename to wayang-api/src/test/scala/org/apache/wayang/api/ApiTest.scala
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/WayangBasics.java b/wayang-basic/src/main/java/org/apache/wayang/basic/WayangBasics.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/WayangBasics.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/WayangBasics.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/channels/FileChannel.java b/wayang-basic/src/main/java/org/apache/wayang/basic/channels/FileChannel.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/channels/FileChannel.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/channels/FileChannel.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/data/Record.java b/wayang-basic/src/main/java/org/apache/wayang/basic/data/Record.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/data/Record.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/data/Record.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/data/Tuple2.java b/wayang-basic/src/main/java/org/apache/wayang/basic/data/Tuple2.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/data/Tuple2.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/data/Tuple2.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/data/Tuple5.java b/wayang-basic/src/main/java/org/apache/wayang/basic/data/Tuple5.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/data/Tuple5.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/data/Tuple5.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/function/ProjectionDescriptor.java b/wayang-basic/src/main/java/org/apache/wayang/basic/function/ProjectionDescriptor.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/function/ProjectionDescriptor.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/function/ProjectionDescriptor.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/GlobalReduceMapping.java b/wayang-basic/src/main/java/org/apache/wayang/basic/mapping/GlobalReduceMapping.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/GlobalReduceMapping.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/mapping/GlobalReduceMapping.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/Mappings.java b/wayang-basic/src/main/java/org/apache/wayang/basic/mapping/Mappings.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/Mappings.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/mapping/Mappings.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/MaterializedGroupByMapping.java b/wayang-basic/src/main/java/org/apache/wayang/basic/mapping/MaterializedGroupByMapping.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/MaterializedGroupByMapping.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/mapping/MaterializedGroupByMapping.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/PageRankMapping.java b/wayang-basic/src/main/java/org/apache/wayang/basic/mapping/PageRankMapping.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/PageRankMapping.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/mapping/PageRankMapping.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/ReduceByMapping.java b/wayang-basic/src/main/java/org/apache/wayang/basic/mapping/ReduceByMapping.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/ReduceByMapping.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/mapping/ReduceByMapping.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/RepeatMapping.java b/wayang-basic/src/main/java/org/apache/wayang/basic/mapping/RepeatMapping.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/mapping/RepeatMapping.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/mapping/RepeatMapping.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CartesianOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/CartesianOperator.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CartesianOperator.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/operators/CartesianOperator.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CoGroupOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/CoGroupOperator.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CoGroupOperator.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/operators/CoGroupOperator.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CollectionSource.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/CollectionSource.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CollectionSource.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/operators/CollectionSource.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CountOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/CountOperator.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/CountOperator.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/operators/CountOperator.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/DistinctOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/DistinctOperator.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/DistinctOperator.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/operators/DistinctOperator.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/DoWhileOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/DoWhileOperator.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/DoWhileOperator.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/operators/DoWhileOperator.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/FilterOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/FilterOperator.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/FilterOperator.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/operators/FilterOperator.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/FlatMapOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/FlatMapOperator.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/FlatMapOperator.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/operators/FlatMapOperator.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/GlobalMaterializedGroupOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/GlobalMaterializedGroupOperator.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/GlobalMaterializedGroupOperator.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/operators/GlobalMaterializedGroupOperator.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/GlobalReduceOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/GlobalReduceOperator.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/GlobalReduceOperator.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/operators/GlobalReduceOperator.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/GroupByOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/GroupByOperator.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/GroupByOperator.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/operators/GroupByOperator.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/IntersectOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/IntersectOperator.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/IntersectOperator.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/operators/IntersectOperator.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/JoinOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/JoinOperator.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/JoinOperator.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/operators/JoinOperator.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/LocalCallbackSink.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/LocalCallbackSink.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/LocalCallbackSink.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/operators/LocalCallbackSink.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/LoopOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/LoopOperator.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/LoopOperator.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/operators/LoopOperator.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/MapOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/MapOperator.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/MapOperator.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/operators/MapOperator.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/MapPartitionsOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/MapPartitionsOperator.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/MapPartitionsOperator.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/operators/MapPartitionsOperator.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/MaterializedGroupByOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/MaterializedGroupByOperator.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/MaterializedGroupByOperator.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/operators/MaterializedGroupByOperator.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/PageRankOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/PageRankOperator.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/PageRankOperator.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/operators/PageRankOperator.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/ReduceByOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/ReduceByOperator.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/ReduceByOperator.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/operators/ReduceByOperator.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/ReduceOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/ReduceOperator.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/ReduceOperator.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/operators/ReduceOperator.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/RepeatOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/RepeatOperator.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/RepeatOperator.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/operators/RepeatOperator.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/SampleOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/SampleOperator.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/SampleOperator.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/operators/SampleOperator.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/SortOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/SortOperator.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/SortOperator.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/operators/SortOperator.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/TableSource.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/TableSource.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/TableSource.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/operators/TableSource.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/TextFileSink.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/TextFileSink.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/TextFileSink.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/operators/TextFileSink.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/TextFileSource.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/TextFileSource.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/TextFileSource.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/operators/TextFileSource.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/UnionAllOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/UnionAllOperator.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/UnionAllOperator.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/operators/UnionAllOperator.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/ZipWithIdOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/ZipWithIdOperator.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/operators/ZipWithIdOperator.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/operators/ZipWithIdOperator.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/plugin/WayangBasic.java b/wayang-basic/src/main/java/org/apache/wayang/basic/plugin/WayangBasic.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/plugin/WayangBasic.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/plugin/WayangBasic.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/plugin/WayangBasicGraph.java b/wayang-basic/src/main/java/org/apache/wayang/basic/plugin/WayangBasicGraph.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/plugin/WayangBasicGraph.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/plugin/WayangBasicGraph.java
diff --git a/wayang-basic/src/main/java/org/apache/incubator/wayang/basic/types/RecordType.java b/wayang-basic/src/main/java/org/apache/wayang/basic/types/RecordType.java
similarity index 100%
rename from wayang-basic/src/main/java/org/apache/incubator/wayang/basic/types/RecordType.java
rename to wayang-basic/src/main/java/org/apache/wayang/basic/types/RecordType.java
diff --git a/wayang-basic/src/test/java/org/apache/incubator/wayang/basic/function/ProjectionDescriptorTest.java b/wayang-basic/src/test/java/org/apache/wayang/basic/function/ProjectionDescriptorTest.java
similarity index 100%
rename from wayang-basic/src/test/java/org/apache/incubator/wayang/basic/function/ProjectionDescriptorTest.java
rename to wayang-basic/src/test/java/org/apache/wayang/basic/function/ProjectionDescriptorTest.java
diff --git a/wayang-basic/src/test/java/org/apache/incubator/wayang/basic/mapping/ReduceByMappingTest.java b/wayang-basic/src/test/java/org/apache/wayang/basic/mapping/ReduceByMappingTest.java
similarity index 100%
rename from wayang-basic/src/test/java/org/apache/incubator/wayang/basic/mapping/ReduceByMappingTest.java
rename to wayang-basic/src/test/java/org/apache/wayang/basic/mapping/ReduceByMappingTest.java
diff --git a/wayang-basic/src/test/java/org/apache/incubator/wayang/basic/operators/MaterializedGroupByOperatorTest.java b/wayang-basic/src/test/java/org/apache/wayang/basic/operators/MaterializedGroupByOperatorTest.java
similarity index 100%
rename from wayang-basic/src/test/java/org/apache/incubator/wayang/basic/operators/MaterializedGroupByOperatorTest.java
rename to wayang-basic/src/test/java/org/apache/wayang/basic/operators/MaterializedGroupByOperatorTest.java
diff --git a/wayang-basic/src/test/java/org/apache/incubator/wayang/basic/operators/TextFileSourceTest.java b/wayang-basic/src/test/java/org/apache/wayang/basic/operators/TextFileSourceTest.java
similarity index 100%
rename from wayang-basic/src/test/java/org/apache/incubator/wayang/basic/operators/TextFileSourceTest.java
rename to wayang-basic/src/test/java/org/apache/wayang/basic/operators/TextFileSourceTest.java
diff --git a/wayang-basic/src/test/java/org/apache/incubator/wayang/basic/operators/test/TestSink.java b/wayang-basic/src/test/java/org/apache/wayang/basic/operators/test/TestSink.java
similarity index 100%
rename from wayang-basic/src/test/java/org/apache/incubator/wayang/basic/operators/test/TestSink.java
rename to wayang-basic/src/test/java/org/apache/wayang/basic/operators/test/TestSink.java
diff --git a/wayang-basic/src/test/java/org/apache/incubator/wayang/basic/operators/test/TestSource.java b/wayang-basic/src/test/java/org/apache/wayang/basic/operators/test/TestSource.java
similarity index 100%
rename from wayang-basic/src/test/java/org/apache/incubator/wayang/basic/operators/test/TestSource.java
rename to wayang-basic/src/test/java/org/apache/wayang/basic/operators/test/TestSource.java
diff --git a/wayang-basic/src/test/java/org/apache/incubator/wayang/basic/types/RecordTypeTest.java b/wayang-basic/src/test/java/org/apache/wayang/basic/types/RecordTypeTest.java
similarity index 100%
rename from wayang-basic/src/test/java/org/apache/incubator/wayang/basic/types/RecordTypeTest.java
rename to wayang-basic/src/test/java/org/apache/wayang/basic/types/RecordTypeTest.java
diff --git a/wayang-core/src/main/antlr4/org/apache/incubator/wayang/core/mathex/MathEx.g4 b/wayang-core/src/main/antlr4/org/apache/wayang/core/mathex/MathEx.g4
similarity index 100%
rename from wayang-core/src/main/antlr4/org/apache/incubator/wayang/core/mathex/MathEx.g4
rename to wayang-core/src/main/antlr4/org/apache/wayang/core/mathex/MathEx.g4
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/api/Configuration.java b/wayang-core/src/main/java/org/apache/wayang/core/api/Configuration.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/api/Configuration.java
rename to wayang-core/src/main/java/org/apache/wayang/core/api/Configuration.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/api/Job.java b/wayang-core/src/main/java/org/apache/wayang/core/api/Job.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/api/Job.java
rename to wayang-core/src/main/java/org/apache/wayang/core/api/Job.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/api/WayangContext.java b/wayang-core/src/main/java/org/apache/wayang/core/api/WayangContext.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/api/WayangContext.java
rename to wayang-core/src/main/java/org/apache/wayang/core/api/WayangContext.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/CollectionProvider.java b/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/CollectionProvider.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/CollectionProvider.java
rename to wayang-core/src/main/java/org/apache/wayang/core/api/configuration/CollectionProvider.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/ConstantValueProvider.java b/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/ConstantValueProvider.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/ConstantValueProvider.java
rename to wayang-core/src/main/java/org/apache/wayang/core/api/configuration/ConstantValueProvider.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/ExplicitCollectionProvider.java b/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/ExplicitCollectionProvider.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/ExplicitCollectionProvider.java
rename to wayang-core/src/main/java/org/apache/wayang/core/api/configuration/ExplicitCollectionProvider.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/FunctionalCollectionProvider.java b/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/FunctionalCollectionProvider.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/FunctionalCollectionProvider.java
rename to wayang-core/src/main/java/org/apache/wayang/core/api/configuration/FunctionalCollectionProvider.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/FunctionalKeyValueProvider.java b/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/FunctionalKeyValueProvider.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/FunctionalKeyValueProvider.java
rename to wayang-core/src/main/java/org/apache/wayang/core/api/configuration/FunctionalKeyValueProvider.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/FunctionalValueProvider.java b/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/FunctionalValueProvider.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/FunctionalValueProvider.java
rename to wayang-core/src/main/java/org/apache/wayang/core/api/configuration/FunctionalValueProvider.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/KeyValueProvider.java b/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/KeyValueProvider.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/KeyValueProvider.java
rename to wayang-core/src/main/java/org/apache/wayang/core/api/configuration/KeyValueProvider.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/MapBasedKeyValueProvider.java b/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/MapBasedKeyValueProvider.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/MapBasedKeyValueProvider.java
rename to wayang-core/src/main/java/org/apache/wayang/core/api/configuration/MapBasedKeyValueProvider.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/ValueProvider.java b/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/ValueProvider.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/api/configuration/ValueProvider.java
rename to wayang-core/src/main/java/org/apache/wayang/core/api/configuration/ValueProvider.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/api/exception/WayangException.java b/wayang-core/src/main/java/org/apache/wayang/core/api/exception/WayangException.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/api/exception/WayangException.java
rename to wayang-core/src/main/java/org/apache/wayang/core/api/exception/WayangException.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/function/AggregationDescriptor.java b/wayang-core/src/main/java/org/apache/wayang/core/function/AggregationDescriptor.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/function/AggregationDescriptor.java
rename to wayang-core/src/main/java/org/apache/wayang/core/function/AggregationDescriptor.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/function/ConsumerDescriptor.java b/wayang-core/src/main/java/org/apache/wayang/core/function/ConsumerDescriptor.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/function/ConsumerDescriptor.java
rename to wayang-core/src/main/java/org/apache/wayang/core/function/ConsumerDescriptor.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/function/ExecutionContext.java b/wayang-core/src/main/java/org/apache/wayang/core/function/ExecutionContext.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/function/ExecutionContext.java
rename to wayang-core/src/main/java/org/apache/wayang/core/function/ExecutionContext.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/function/ExtendedFunction.java b/wayang-core/src/main/java/org/apache/wayang/core/function/ExtendedFunction.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/function/ExtendedFunction.java
rename to wayang-core/src/main/java/org/apache/wayang/core/function/ExtendedFunction.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/function/FlatMapDescriptor.java b/wayang-core/src/main/java/org/apache/wayang/core/function/FlatMapDescriptor.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/function/FlatMapDescriptor.java
rename to wayang-core/src/main/java/org/apache/wayang/core/function/FlatMapDescriptor.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/function/FunctionDescriptor.java b/wayang-core/src/main/java/org/apache/wayang/core/function/FunctionDescriptor.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/function/FunctionDescriptor.java
rename to wayang-core/src/main/java/org/apache/wayang/core/function/FunctionDescriptor.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/function/MapPartitionsDescriptor.java b/wayang-core/src/main/java/org/apache/wayang/core/function/MapPartitionsDescriptor.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/function/MapPartitionsDescriptor.java
rename to wayang-core/src/main/java/org/apache/wayang/core/function/MapPartitionsDescriptor.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/function/PredicateDescriptor.java b/wayang-core/src/main/java/org/apache/wayang/core/function/PredicateDescriptor.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/function/PredicateDescriptor.java
rename to wayang-core/src/main/java/org/apache/wayang/core/function/PredicateDescriptor.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/function/ReduceDescriptor.java b/wayang-core/src/main/java/org/apache/wayang/core/function/ReduceDescriptor.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/function/ReduceDescriptor.java
rename to wayang-core/src/main/java/org/apache/wayang/core/function/ReduceDescriptor.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/function/TransformationDescriptor.java b/wayang-core/src/main/java/org/apache/wayang/core/function/TransformationDescriptor.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/function/TransformationDescriptor.java
rename to wayang-core/src/main/java/org/apache/wayang/core/function/TransformationDescriptor.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/mapping/Mapping.java b/wayang-core/src/main/java/org/apache/wayang/core/mapping/Mapping.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/mapping/Mapping.java
rename to wayang-core/src/main/java/org/apache/wayang/core/mapping/Mapping.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/mapping/OperatorMatch.java b/wayang-core/src/main/java/org/apache/wayang/core/mapping/OperatorMatch.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/mapping/OperatorMatch.java
rename to wayang-core/src/main/java/org/apache/wayang/core/mapping/OperatorMatch.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/mapping/OperatorPattern.java b/wayang-core/src/main/java/org/apache/wayang/core/mapping/OperatorPattern.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/mapping/OperatorPattern.java
rename to wayang-core/src/main/java/org/apache/wayang/core/mapping/OperatorPattern.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/mapping/PlanTransformation.java b/wayang-core/src/main/java/org/apache/wayang/core/mapping/PlanTransformation.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/mapping/PlanTransformation.java
rename to wayang-core/src/main/java/org/apache/wayang/core/mapping/PlanTransformation.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/mapping/ReplacementSubplanFactory.java b/wayang-core/src/main/java/org/apache/wayang/core/mapping/ReplacementSubplanFactory.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/mapping/ReplacementSubplanFactory.java
rename to wayang-core/src/main/java/org/apache/wayang/core/mapping/ReplacementSubplanFactory.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/mapping/SubplanMatch.java b/wayang-core/src/main/java/org/apache/wayang/core/mapping/SubplanMatch.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/mapping/SubplanMatch.java
rename to wayang-core/src/main/java/org/apache/wayang/core/mapping/SubplanMatch.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/mapping/SubplanPattern.java b/wayang-core/src/main/java/org/apache/wayang/core/mapping/SubplanPattern.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/mapping/SubplanPattern.java
rename to wayang-core/src/main/java/org/apache/wayang/core/mapping/SubplanPattern.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/monitor/DisabledMonitor.java b/wayang-core/src/main/java/org/apache/wayang/core/monitor/DisabledMonitor.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/monitor/DisabledMonitor.java
rename to wayang-core/src/main/java/org/apache/wayang/core/monitor/DisabledMonitor.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/monitor/FileMonitor.java b/wayang-core/src/main/java/org/apache/wayang/core/monitor/FileMonitor.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/monitor/FileMonitor.java
rename to wayang-core/src/main/java/org/apache/wayang/core/monitor/FileMonitor.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/monitor/HttpMonitor.java b/wayang-core/src/main/java/org/apache/wayang/core/monitor/HttpMonitor.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/monitor/HttpMonitor.java
rename to wayang-core/src/main/java/org/apache/wayang/core/monitor/HttpMonitor.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/monitor/Monitor.java b/wayang-core/src/main/java/org/apache/wayang/core/monitor/Monitor.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/monitor/Monitor.java
rename to wayang-core/src/main/java/org/apache/wayang/core/monitor/Monitor.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/monitor/ZeroMQMonitor.java b/wayang-core/src/main/java/org/apache/wayang/core/monitor/ZeroMQMonitor.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/monitor/ZeroMQMonitor.java
rename to wayang-core/src/main/java/org/apache/wayang/core/monitor/ZeroMQMonitor.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/AggregateOptimizationContext.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/AggregateOptimizationContext.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/AggregateOptimizationContext.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/AggregateOptimizationContext.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/DefaultOptimizationContext.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/DefaultOptimizationContext.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/DefaultOptimizationContext.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/DefaultOptimizationContext.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/OptimizationContext.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/OptimizationContext.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/OptimizationContext.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/OptimizationContext.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/OptimizationUtils.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/OptimizationUtils.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/OptimizationUtils.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/OptimizationUtils.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/ProbabilisticDoubleInterval.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/ProbabilisticDoubleInterval.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/ProbabilisticDoubleInterval.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/ProbabilisticDoubleInterval.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/ProbabilisticIntervalEstimate.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/ProbabilisticIntervalEstimate.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/ProbabilisticIntervalEstimate.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/ProbabilisticIntervalEstimate.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/SanityChecker.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/SanityChecker.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/SanityChecker.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/SanityChecker.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/AbstractAlternativeCardinalityPusher.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/AbstractAlternativeCardinalityPusher.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/AbstractAlternativeCardinalityPusher.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/AbstractAlternativeCardinalityPusher.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/AggregatingCardinalityEstimator.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/AggregatingCardinalityEstimator.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/AggregatingCardinalityEstimator.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/AggregatingCardinalityEstimator.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimate.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/CardinalityEstimate.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimate.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/CardinalityEstimate.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimationTraversal.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/CardinalityEstimationTraversal.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimationTraversal.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/CardinalityEstimationTraversal.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimator.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/CardinalityEstimator.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimator.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/CardinalityEstimator.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimatorManager.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/CardinalityEstimatorManager.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityEstimatorManager.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/CardinalityEstimatorManager.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityPusher.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/CardinalityPusher.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/CardinalityPusher.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/CardinalityPusher.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/DefaultCardinalityEstimator.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/DefaultCardinalityEstimator.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/DefaultCardinalityEstimator.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/DefaultCardinalityEstimator.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/DefaultCardinalityPusher.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/DefaultCardinalityPusher.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/DefaultCardinalityPusher.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/DefaultCardinalityPusher.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/FallbackCardinalityEstimator.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/FallbackCardinalityEstimator.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/FallbackCardinalityEstimator.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/FallbackCardinalityEstimator.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/FixedSizeCardinalityEstimator.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/FixedSizeCardinalityEstimator.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/FixedSizeCardinalityEstimator.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/FixedSizeCardinalityEstimator.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/LoopHeadAlternativeCardinalityPusher.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/LoopHeadAlternativeCardinalityPusher.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/LoopHeadAlternativeCardinalityPusher.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/LoopHeadAlternativeCardinalityPusher.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/LoopSubplanCardinalityPusher.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/LoopSubplanCardinalityPusher.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/LoopSubplanCardinalityPusher.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/LoopSubplanCardinalityPusher.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/OperatorAlternativeCardinalityPusher.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/OperatorAlternativeCardinalityPusher.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/OperatorAlternativeCardinalityPusher.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/OperatorAlternativeCardinalityPusher.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/SubplanCardinalityPusher.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/SubplanCardinalityPusher.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/SubplanCardinalityPusher.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/SubplanCardinalityPusher.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/SwitchForwardCardinalityEstimator.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/SwitchForwardCardinalityEstimator.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/cardinality/SwitchForwardCardinalityEstimator.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/SwitchForwardCardinalityEstimator.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/channels/ChannelConversion.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/channels/ChannelConversion.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/channels/ChannelConversion.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/channels/ChannelConversion.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/channels/ChannelConversionGraph.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/channels/ChannelConversionGraph.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/channels/ChannelConversionGraph.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/channels/ChannelConversionGraph.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/channels/DefaultChannelConversion.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/channels/DefaultChannelConversion.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/channels/DefaultChannelConversion.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/channels/DefaultChannelConversion.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/ConstantLoadProfileEstimator.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/ConstantLoadProfileEstimator.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/ConstantLoadProfileEstimator.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/ConstantLoadProfileEstimator.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/DefaultLoadEstimator.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/DefaultLoadEstimator.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/DefaultLoadEstimator.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/DefaultLoadEstimator.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/EstimationContext.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/EstimationContext.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/EstimationContext.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/EstimationContext.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/IntervalLoadEstimator.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/IntervalLoadEstimator.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/IntervalLoadEstimator.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/IntervalLoadEstimator.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadEstimate.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadEstimate.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadEstimate.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadEstimate.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadEstimator.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadEstimator.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadEstimator.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadEstimator.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfile.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadProfile.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfile.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadProfile.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfileEstimator.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadProfileEstimator.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfileEstimator.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadProfileEstimator.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfileEstimators.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadProfileEstimators.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfileEstimators.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadProfileEstimators.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfileToTimeConverter.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadProfileToTimeConverter.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadProfileToTimeConverter.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadProfileToTimeConverter.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadToTimeConverter.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadToTimeConverter.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/LoadToTimeConverter.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadToTimeConverter.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/NestableLoadProfileEstimator.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/NestableLoadProfileEstimator.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/NestableLoadProfileEstimator.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/NestableLoadProfileEstimator.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/SimpleEstimationContext.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/SimpleEstimationContext.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/SimpleEstimationContext.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/SimpleEstimationContext.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/TimeEstimate.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/TimeEstimate.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/TimeEstimate.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/TimeEstimate.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/TimeToCostConverter.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/TimeToCostConverter.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/costs/TimeToCostConverter.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/TimeToCostConverter.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/ExecutionTaskFlow.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/ExecutionTaskFlow.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/ExecutionTaskFlow.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/ExecutionTaskFlow.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/ExecutionTaskFlowCompiler.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/ExecutionTaskFlowCompiler.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/ExecutionTaskFlowCompiler.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/ExecutionTaskFlowCompiler.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/LatentOperatorPruningStrategy.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/LatentOperatorPruningStrategy.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/LatentOperatorPruningStrategy.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/LatentOperatorPruningStrategy.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/LoopEnumerator.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/LoopEnumerator.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/LoopEnumerator.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/LoopEnumerator.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/LoopImplementation.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/LoopImplementation.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/LoopImplementation.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/LoopImplementation.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanEnumeration.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/PlanEnumeration.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanEnumeration.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/PlanEnumeration.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanEnumerationPruningStrategy.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/PlanEnumerationPruningStrategy.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanEnumerationPruningStrategy.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/PlanEnumerationPruningStrategy.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanEnumerator.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/PlanEnumerator.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanEnumerator.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/PlanEnumerator.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanImplementation.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/PlanImplementation.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/PlanImplementation.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/PlanImplementation.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/RandomPruningStrategy.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/RandomPruningStrategy.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/RandomPruningStrategy.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/RandomPruningStrategy.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/SinglePlatformPruningStrategy.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/SinglePlatformPruningStrategy.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/SinglePlatformPruningStrategy.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/SinglePlatformPruningStrategy.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/StageAssignmentTraversal.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/StageAssignmentTraversal.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/StageAssignmentTraversal.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/StageAssignmentTraversal.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/TopKPruningStrategy.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/TopKPruningStrategy.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/enumeration/TopKPruningStrategy.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/TopKPruningStrategy.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/partition/EnumerationAlternative.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/partition/EnumerationAlternative.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/partition/EnumerationAlternative.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/partition/EnumerationAlternative.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/partition/EnumerationBranch.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/partition/EnumerationBranch.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/optimizer/partition/EnumerationBranch.java
rename to wayang-core/src/main/java/org/apache/wayang/core/optimizer/partition/EnumerationBranch.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/Channel.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/Channel.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/Channel.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/Channel.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ChannelInitializer.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/ChannelInitializer.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ChannelInitializer.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/ChannelInitializer.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionPlan.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/ExecutionPlan.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionPlan.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/ExecutionPlan.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionStage.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/ExecutionStage.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionStage.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/ExecutionStage.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionStageLoop.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/ExecutionStageLoop.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionStageLoop.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/ExecutionStageLoop.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionTask.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/ExecutionTask.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/ExecutionTask.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/ExecutionTask.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/PlatformExecution.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/PlatformExecution.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/executionplan/PlatformExecution.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/PlatformExecution.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/ActualOperator.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/ActualOperator.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/ActualOperator.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/ActualOperator.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/BinaryToUnaryOperator.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/BinaryToUnaryOperator.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/BinaryToUnaryOperator.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/BinaryToUnaryOperator.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/CompositeOperator.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/CompositeOperator.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/CompositeOperator.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/CompositeOperator.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/ElementaryOperator.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/ElementaryOperator.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/ElementaryOperator.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/ElementaryOperator.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/EstimationContextProperty.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/EstimationContextProperty.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/EstimationContextProperty.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/EstimationContextProperty.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/ExecutionOperator.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/ExecutionOperator.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/ExecutionOperator.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/ExecutionOperator.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/InputSlot.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/InputSlot.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/InputSlot.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/InputSlot.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/LoopHeadAlternative.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/LoopHeadAlternative.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/LoopHeadAlternative.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/LoopHeadAlternative.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/LoopHeadOperator.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/LoopHeadOperator.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/LoopHeadOperator.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/LoopHeadOperator.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/LoopIsolator.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/LoopIsolator.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/LoopIsolator.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/LoopIsolator.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/LoopSubplan.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/LoopSubplan.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/LoopSubplan.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/LoopSubplan.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/Operator.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/Operator.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/Operator.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/Operator.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/OperatorAlternative.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/OperatorAlternative.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/OperatorAlternative.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/OperatorAlternative.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/OperatorBase.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/OperatorBase.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/OperatorBase.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/OperatorBase.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/OperatorContainer.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/OperatorContainer.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/OperatorContainer.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/OperatorContainer.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/OperatorContainers.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/OperatorContainers.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/OperatorContainers.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/OperatorContainers.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/Operators.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/Operators.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/Operators.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/Operators.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/OutputSlot.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/OutputSlot.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/OutputSlot.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/OutputSlot.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/PlanMetrics.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/PlanMetrics.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/PlanMetrics.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/PlanMetrics.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/PlanTraversal.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/PlanTraversal.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/PlanTraversal.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/PlanTraversal.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/Slot.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/Slot.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/Slot.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/Slot.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/SlotMapping.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/SlotMapping.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/SlotMapping.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/SlotMapping.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/Subplan.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/Subplan.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/Subplan.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/Subplan.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/TopDownPlanVisitor.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/TopDownPlanVisitor.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/TopDownPlanVisitor.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/TopDownPlanVisitor.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/UnarySink.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/UnarySink.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/UnarySink.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/UnarySink.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/UnarySource.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/UnarySource.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/UnarySource.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/UnarySource.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/UnaryToUnaryOperator.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/UnaryToUnaryOperator.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/UnaryToUnaryOperator.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/UnaryToUnaryOperator.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/WayangPlan.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/WayangPlan.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/WayangPlan.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/WayangPlan.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/traversal/AbstractTopologicalTraversal.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/traversal/AbstractTopologicalTraversal.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plan/wayangplan/traversal/AbstractTopologicalTraversal.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/traversal/AbstractTopologicalTraversal.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/AbstractChannelInstance.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/AbstractChannelInstance.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/AbstractChannelInstance.java
rename to wayang-core/src/main/java/org/apache/wayang/core/platform/AbstractChannelInstance.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/AtomicExecution.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/AtomicExecution.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/AtomicExecution.java
rename to wayang-core/src/main/java/org/apache/wayang/core/platform/AtomicExecution.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/AtomicExecutionGroup.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/AtomicExecutionGroup.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/AtomicExecutionGroup.java
rename to wayang-core/src/main/java/org/apache/wayang/core/platform/AtomicExecutionGroup.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/Breakpoint.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/Breakpoint.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/Breakpoint.java
rename to wayang-core/src/main/java/org/apache/wayang/core/platform/Breakpoint.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/CardinalityBreakpoint.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/CardinalityBreakpoint.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/CardinalityBreakpoint.java
rename to wayang-core/src/main/java/org/apache/wayang/core/platform/CardinalityBreakpoint.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/ChannelDescriptor.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/ChannelDescriptor.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/ChannelDescriptor.java
rename to wayang-core/src/main/java/org/apache/wayang/core/platform/ChannelDescriptor.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/ChannelInstance.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/ChannelInstance.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/ChannelInstance.java
rename to wayang-core/src/main/java/org/apache/wayang/core/platform/ChannelInstance.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/CompositeExecutionResource.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/CompositeExecutionResource.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/CompositeExecutionResource.java
rename to wayang-core/src/main/java/org/apache/wayang/core/platform/CompositeExecutionResource.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/ConjunctiveBreakpoint.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/ConjunctiveBreakpoint.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/ConjunctiveBreakpoint.java
rename to wayang-core/src/main/java/org/apache/wayang/core/platform/ConjunctiveBreakpoint.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/CrossPlatformExecutor.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/CrossPlatformExecutor.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/CrossPlatformExecutor.java
rename to wayang-core/src/main/java/org/apache/wayang/core/platform/CrossPlatformExecutor.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/ExecutionResource.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/ExecutionResource.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/ExecutionResource.java
rename to wayang-core/src/main/java/org/apache/wayang/core/platform/ExecutionResource.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/ExecutionResourceTemplate.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/ExecutionResourceTemplate.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/ExecutionResourceTemplate.java
rename to wayang-core/src/main/java/org/apache/wayang/core/platform/ExecutionResourceTemplate.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/ExecutionState.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/ExecutionState.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/ExecutionState.java
rename to wayang-core/src/main/java/org/apache/wayang/core/platform/ExecutionState.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/Executor.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/Executor.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/Executor.java
rename to wayang-core/src/main/java/org/apache/wayang/core/platform/Executor.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/ExecutorTemplate.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/ExecutorTemplate.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/ExecutorTemplate.java
rename to wayang-core/src/main/java/org/apache/wayang/core/platform/ExecutorTemplate.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/FixBreakpoint.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/FixBreakpoint.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/FixBreakpoint.java
rename to wayang-core/src/main/java/org/apache/wayang/core/platform/FixBreakpoint.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/Junction.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/Junction.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/Junction.java
rename to wayang-core/src/main/java/org/apache/wayang/core/platform/Junction.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/NoIterationBreakpoint.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/NoIterationBreakpoint.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/NoIterationBreakpoint.java
rename to wayang-core/src/main/java/org/apache/wayang/core/platform/NoIterationBreakpoint.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/PartialExecution.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/PartialExecution.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/PartialExecution.java
rename to wayang-core/src/main/java/org/apache/wayang/core/platform/PartialExecution.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/Platform.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/Platform.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/Platform.java
rename to wayang-core/src/main/java/org/apache/wayang/core/platform/Platform.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/PushExecutorTemplate.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/PushExecutorTemplate.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/PushExecutorTemplate.java
rename to wayang-core/src/main/java/org/apache/wayang/core/platform/PushExecutorTemplate.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/lineage/ChannelLineageNode.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/lineage/ChannelLineageNode.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/lineage/ChannelLineageNode.java
rename to wayang-core/src/main/java/org/apache/wayang/core/platform/lineage/ChannelLineageNode.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/lineage/ExecutionLineageNode.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/lineage/ExecutionLineageNode.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/lineage/ExecutionLineageNode.java
rename to wayang-core/src/main/java/org/apache/wayang/core/platform/lineage/ExecutionLineageNode.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/lineage/LazyExecutionLineageNode.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/lineage/LazyExecutionLineageNode.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/platform/lineage/LazyExecutionLineageNode.java
rename to wayang-core/src/main/java/org/apache/wayang/core/platform/lineage/LazyExecutionLineageNode.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plugin/DynamicPlugin.java b/wayang-core/src/main/java/org/apache/wayang/core/plugin/DynamicPlugin.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plugin/DynamicPlugin.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plugin/DynamicPlugin.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/plugin/Plugin.java b/wayang-core/src/main/java/org/apache/wayang/core/plugin/Plugin.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/plugin/Plugin.java
rename to wayang-core/src/main/java/org/apache/wayang/core/plugin/Plugin.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/CardinalityRepository.java b/wayang-core/src/main/java/org/apache/wayang/core/profiling/CardinalityRepository.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/CardinalityRepository.java
rename to wayang-core/src/main/java/org/apache/wayang/core/profiling/CardinalityRepository.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/CostMeasurement.java b/wayang-core/src/main/java/org/apache/wayang/core/profiling/CostMeasurement.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/CostMeasurement.java
rename to wayang-core/src/main/java/org/apache/wayang/core/profiling/CostMeasurement.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/ExecutionLog.java b/wayang-core/src/main/java/org/apache/wayang/core/profiling/ExecutionLog.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/ExecutionLog.java
rename to wayang-core/src/main/java/org/apache/wayang/core/profiling/ExecutionLog.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/ExecutionPlanMeasurement.java b/wayang-core/src/main/java/org/apache/wayang/core/profiling/ExecutionPlanMeasurement.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/ExecutionPlanMeasurement.java
rename to wayang-core/src/main/java/org/apache/wayang/core/profiling/ExecutionPlanMeasurement.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/FullInstrumentationStrategy.java b/wayang-core/src/main/java/org/apache/wayang/core/profiling/FullInstrumentationStrategy.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/FullInstrumentationStrategy.java
rename to wayang-core/src/main/java/org/apache/wayang/core/profiling/FullInstrumentationStrategy.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/InstrumentationStrategy.java b/wayang-core/src/main/java/org/apache/wayang/core/profiling/InstrumentationStrategy.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/InstrumentationStrategy.java
rename to wayang-core/src/main/java/org/apache/wayang/core/profiling/InstrumentationStrategy.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/NoInstrumentationStrategy.java b/wayang-core/src/main/java/org/apache/wayang/core/profiling/NoInstrumentationStrategy.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/NoInstrumentationStrategy.java
rename to wayang-core/src/main/java/org/apache/wayang/core/profiling/NoInstrumentationStrategy.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/OutboundInstrumentationStrategy.java b/wayang-core/src/main/java/org/apache/wayang/core/profiling/OutboundInstrumentationStrategy.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/OutboundInstrumentationStrategy.java
rename to wayang-core/src/main/java/org/apache/wayang/core/profiling/OutboundInstrumentationStrategy.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/PartialExecutionMeasurement.java b/wayang-core/src/main/java/org/apache/wayang/core/profiling/PartialExecutionMeasurement.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/PartialExecutionMeasurement.java
rename to wayang-core/src/main/java/org/apache/wayang/core/profiling/PartialExecutionMeasurement.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/ProfileDBs.java b/wayang-core/src/main/java/org/apache/wayang/core/profiling/ProfileDBs.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/profiling/ProfileDBs.java
rename to wayang-core/src/main/java/org/apache/wayang/core/profiling/ProfileDBs.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/types/BasicDataUnitType.java b/wayang-core/src/main/java/org/apache/wayang/core/types/BasicDataUnitType.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/types/BasicDataUnitType.java
rename to wayang-core/src/main/java/org/apache/wayang/core/types/BasicDataUnitType.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/types/DataSetType.java b/wayang-core/src/main/java/org/apache/wayang/core/types/DataSetType.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/types/DataSetType.java
rename to wayang-core/src/main/java/org/apache/wayang/core/types/DataSetType.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/types/DataUnitGroupType.java b/wayang-core/src/main/java/org/apache/wayang/core/types/DataUnitGroupType.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/types/DataUnitGroupType.java
rename to wayang-core/src/main/java/org/apache/wayang/core/types/DataUnitGroupType.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/types/DataUnitType.java b/wayang-core/src/main/java/org/apache/wayang/core/types/DataUnitType.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/types/DataUnitType.java
rename to wayang-core/src/main/java/org/apache/wayang/core/types/DataUnitType.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/AbstractReferenceCountable.java b/wayang-core/src/main/java/org/apache/wayang/core/util/AbstractReferenceCountable.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/AbstractReferenceCountable.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/AbstractReferenceCountable.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Action.java b/wayang-core/src/main/java/org/apache/wayang/core/util/Action.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Action.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/Action.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Actions.java b/wayang-core/src/main/java/org/apache/wayang/core/util/Actions.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Actions.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/Actions.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Bitmask.java b/wayang-core/src/main/java/org/apache/wayang/core/util/Bitmask.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Bitmask.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/Bitmask.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Canonicalizer.java b/wayang-core/src/main/java/org/apache/wayang/core/util/Canonicalizer.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Canonicalizer.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/Canonicalizer.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/ConsumerIteratorAdapter.java b/wayang-core/src/main/java/org/apache/wayang/core/util/ConsumerIteratorAdapter.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/ConsumerIteratorAdapter.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/ConsumerIteratorAdapter.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Copyable.java b/wayang-core/src/main/java/org/apache/wayang/core/util/Copyable.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Copyable.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/Copyable.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Counter.java b/wayang-core/src/main/java/org/apache/wayang/core/util/Counter.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Counter.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/Counter.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/CrossProductIterable.java b/wayang-core/src/main/java/org/apache/wayang/core/util/CrossProductIterable.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/CrossProductIterable.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/CrossProductIterable.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Formats.java b/wayang-core/src/main/java/org/apache/wayang/core/util/Formats.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Formats.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/Formats.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Iterators.java b/wayang-core/src/main/java/org/apache/wayang/core/util/Iterators.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Iterators.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/Iterators.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/JsonSerializable.java b/wayang-core/src/main/java/org/apache/wayang/core/util/JsonSerializable.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/JsonSerializable.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/JsonSerializable.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/JsonSerializables.java b/wayang-core/src/main/java/org/apache/wayang/core/util/JsonSerializables.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/JsonSerializables.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/JsonSerializables.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/JsonSerializer.java b/wayang-core/src/main/java/org/apache/wayang/core/util/JsonSerializer.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/JsonSerializer.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/JsonSerializer.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/JuelUtils.java b/wayang-core/src/main/java/org/apache/wayang/core/util/JuelUtils.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/JuelUtils.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/JuelUtils.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/LimitedInputStream.java b/wayang-core/src/main/java/org/apache/wayang/core/util/LimitedInputStream.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/LimitedInputStream.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/LimitedInputStream.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Logging.java b/wayang-core/src/main/java/org/apache/wayang/core/util/Logging.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Logging.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/Logging.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/LruCache.java b/wayang-core/src/main/java/org/apache/wayang/core/util/LruCache.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/LruCache.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/LruCache.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/MultiMap.java b/wayang-core/src/main/java/org/apache/wayang/core/util/MultiMap.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/MultiMap.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/MultiMap.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/OneTimeExecutable.java b/wayang-core/src/main/java/org/apache/wayang/core/util/OneTimeExecutable.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/OneTimeExecutable.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/OneTimeExecutable.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Optional.java b/wayang-core/src/main/java/org/apache/wayang/core/util/Optional.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Optional.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/Optional.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/ReferenceCountable.java b/wayang-core/src/main/java/org/apache/wayang/core/util/ReferenceCountable.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/ReferenceCountable.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/ReferenceCountable.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/ReflectionUtils.java b/wayang-core/src/main/java/org/apache/wayang/core/util/ReflectionUtils.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/ReflectionUtils.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/ReflectionUtils.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Tuple.java b/wayang-core/src/main/java/org/apache/wayang/core/util/Tuple.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/Tuple.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/Tuple.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/WayangArrays.java b/wayang-core/src/main/java/org/apache/wayang/core/util/WayangArrays.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/WayangArrays.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/WayangArrays.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/WayangCollections.java b/wayang-core/src/main/java/org/apache/wayang/core/util/WayangCollections.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/WayangCollections.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/WayangCollections.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/fs/FileSystem.java b/wayang-core/src/main/java/org/apache/wayang/core/util/fs/FileSystem.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/fs/FileSystem.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/fs/FileSystem.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/fs/FileSystems.java b/wayang-core/src/main/java/org/apache/wayang/core/util/fs/FileSystems.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/fs/FileSystems.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/fs/FileSystems.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/fs/FileUtils.java b/wayang-core/src/main/java/org/apache/wayang/core/util/fs/FileUtils.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/fs/FileUtils.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/fs/FileUtils.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/fs/HadoopFileSystem.java b/wayang-core/src/main/java/org/apache/wayang/core/util/fs/HadoopFileSystem.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/fs/HadoopFileSystem.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/fs/HadoopFileSystem.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/fs/LocalFileSystem.java b/wayang-core/src/main/java/org/apache/wayang/core/util/fs/LocalFileSystem.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/fs/LocalFileSystem.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/fs/LocalFileSystem.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/Context.java b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/Context.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/Context.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/mathex/Context.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/DefaultContext.java b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/DefaultContext.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/DefaultContext.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/mathex/DefaultContext.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/Expression.java b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/Expression.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/Expression.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/mathex/Expression.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/ExpressionBuilder.java b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/ExpressionBuilder.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/ExpressionBuilder.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/mathex/ExpressionBuilder.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/exceptions/EvaluationException.java b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/exceptions/EvaluationException.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/exceptions/EvaluationException.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/mathex/exceptions/EvaluationException.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/exceptions/MathExException.java b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/exceptions/MathExException.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/exceptions/MathExException.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/mathex/exceptions/MathExException.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/exceptions/ParseException.java b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/exceptions/ParseException.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/exceptions/ParseException.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/mathex/exceptions/ParseException.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/BinaryOperation.java b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/model/BinaryOperation.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/BinaryOperation.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/mathex/model/BinaryOperation.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/CompiledFunction.java b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/model/CompiledFunction.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/CompiledFunction.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/mathex/model/CompiledFunction.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/Constant.java b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/model/Constant.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/Constant.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/mathex/model/Constant.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/NamedFunction.java b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/model/NamedFunction.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/NamedFunction.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/mathex/model/NamedFunction.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/UnaryOperation.java b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/model/UnaryOperation.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/UnaryOperation.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/mathex/model/UnaryOperation.java
diff --git a/wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/Variable.java b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/model/Variable.java
similarity index 100%
rename from wayang-core/src/main/java/org/apache/incubator/wayang/core/util/mathex/model/Variable.java
rename to wayang-core/src/main/java/org/apache/wayang/core/util/mathex/model/Variable.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/SlotTest.java b/wayang-core/src/test/java/org/apache/wayang/core/SlotTest.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/SlotTest.java
rename to wayang-core/src/test/java/org/apache/wayang/core/SlotTest.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/mapping/OperatorPatternTest.java b/wayang-core/src/test/java/org/apache/wayang/core/mapping/OperatorPatternTest.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/mapping/OperatorPatternTest.java
rename to wayang-core/src/test/java/org/apache/wayang/core/mapping/OperatorPatternTest.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/mapping/PlanTransformationTest.java b/wayang-core/src/test/java/org/apache/wayang/core/mapping/PlanTransformationTest.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/mapping/PlanTransformationTest.java
rename to wayang-core/src/test/java/org/apache/wayang/core/mapping/PlanTransformationTest.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/mapping/SubplanPatternTest.java b/wayang-core/src/test/java/org/apache/wayang/core/mapping/SubplanPatternTest.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/mapping/SubplanPatternTest.java
rename to wayang-core/src/test/java/org/apache/wayang/core/mapping/SubplanPatternTest.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/mapping/test/TestSinkMapping.java b/wayang-core/src/test/java/org/apache/wayang/core/mapping/test/TestSinkMapping.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/mapping/test/TestSinkMapping.java
rename to wayang-core/src/test/java/org/apache/wayang/core/mapping/test/TestSinkMapping.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/mapping/test/TestSinkToTestSink2Factory.java b/wayang-core/src/test/java/org/apache/wayang/core/mapping/test/TestSinkToTestSink2Factory.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/mapping/test/TestSinkToTestSink2Factory.java
rename to wayang-core/src/test/java/org/apache/wayang/core/mapping/test/TestSinkToTestSink2Factory.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/optimizer/cardinality/AggregatingCardinalityEstimatorTest.java b/wayang-core/src/test/java/org/apache/wayang/core/optimizer/cardinality/AggregatingCardinalityEstimatorTest.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/optimizer/cardinality/AggregatingCardinalityEstimatorTest.java
rename to wayang-core/src/test/java/org/apache/wayang/core/optimizer/cardinality/AggregatingCardinalityEstimatorTest.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/optimizer/cardinality/DefaultCardinalityEstimatorTest.java b/wayang-core/src/test/java/org/apache/wayang/core/optimizer/cardinality/DefaultCardinalityEstimatorTest.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/optimizer/cardinality/DefaultCardinalityEstimatorTest.java
rename to wayang-core/src/test/java/org/apache/wayang/core/optimizer/cardinality/DefaultCardinalityEstimatorTest.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/optimizer/cardinality/LoopSubplanCardinalityPusherTest.java b/wayang-core/src/test/java/org/apache/wayang/core/optimizer/cardinality/LoopSubplanCardinalityPusherTest.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/optimizer/cardinality/LoopSubplanCardinalityPusherTest.java
rename to wayang-core/src/test/java/org/apache/wayang/core/optimizer/cardinality/LoopSubplanCardinalityPusherTest.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/optimizer/cardinality/SubplanCardinalityPusherTest.java b/wayang-core/src/test/java/org/apache/wayang/core/optimizer/cardinality/SubplanCardinalityPusherTest.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/optimizer/cardinality/SubplanCardinalityPusherTest.java
rename to wayang-core/src/test/java/org/apache/wayang/core/optimizer/cardinality/SubplanCardinalityPusherTest.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/optimizer/channels/ChannelConversionGraphTest.java b/wayang-core/src/test/java/org/apache/wayang/core/optimizer/channels/ChannelConversionGraphTest.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/optimizer/channels/ChannelConversionGraphTest.java
rename to wayang-core/src/test/java/org/apache/wayang/core/optimizer/channels/ChannelConversionGraphTest.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/optimizer/costs/NestableLoadProfileEstimatorTest.java b/wayang-core/src/test/java/org/apache/wayang/core/optimizer/costs/NestableLoadProfileEstimatorTest.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/optimizer/costs/NestableLoadProfileEstimatorTest.java
rename to wayang-core/src/test/java/org/apache/wayang/core/optimizer/costs/NestableLoadProfileEstimatorTest.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/optimizer/enumeration/StageAssignmentTraversalTest.java b/wayang-core/src/test/java/org/apache/wayang/core/optimizer/enumeration/StageAssignmentTraversalTest.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/optimizer/enumeration/StageAssignmentTraversalTest.java
rename to wayang-core/src/test/java/org/apache/wayang/core/optimizer/enumeration/StageAssignmentTraversalTest.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/executionplan/test/TestChannel.java b/wayang-core/src/test/java/org/apache/wayang/core/plan/executionplan/test/TestChannel.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/executionplan/test/TestChannel.java
rename to wayang-core/src/test/java/org/apache/wayang/core/plan/executionplan/test/TestChannel.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/LoopIsolatorTest.java b/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/LoopIsolatorTest.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/LoopIsolatorTest.java
rename to wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/LoopIsolatorTest.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/OperatorTest.java b/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/OperatorTest.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/OperatorTest.java
rename to wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/OperatorTest.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/SlotMappingTest.java b/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/SlotMappingTest.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/SlotMappingTest.java
rename to wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/SlotMappingTest.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/test/TestCustomMapOperator.java b/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestCustomMapOperator.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/test/TestCustomMapOperator.java
rename to wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestCustomMapOperator.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/test/TestFilterOperator.java b/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestFilterOperator.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/test/TestFilterOperator.java
rename to wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestFilterOperator.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/test/TestJoin.java b/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestJoin.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/test/TestJoin.java
rename to wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestJoin.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/test/TestLoopHead.java b/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestLoopHead.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/test/TestLoopHead.java
rename to wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestLoopHead.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/test/TestMapOperator.java b/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestMapOperator.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/test/TestMapOperator.java
rename to wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestMapOperator.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/test/TestSink.java b/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestSink.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/test/TestSink.java
rename to wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestSink.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/test/TestSink2.java b/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestSink2.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/test/TestSink2.java
rename to wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestSink2.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/test/TestSource.java b/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestSource.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/plan/wayangplan/test/TestSource.java
rename to wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestSource.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/platform/PartialExecutionTest.java b/wayang-core/src/test/java/org/apache/wayang/core/platform/PartialExecutionTest.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/platform/PartialExecutionTest.java
rename to wayang-core/src/test/java/org/apache/wayang/core/platform/PartialExecutionTest.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/plugin/DynamicPluginTest.java b/wayang-core/src/test/java/org/apache/wayang/core/plugin/DynamicPluginTest.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/plugin/DynamicPluginTest.java
rename to wayang-core/src/test/java/org/apache/wayang/core/plugin/DynamicPluginTest.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/test/DummyExecutionOperator.java b/wayang-core/src/test/java/org/apache/wayang/core/test/DummyExecutionOperator.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/test/DummyExecutionOperator.java
rename to wayang-core/src/test/java/org/apache/wayang/core/test/DummyExecutionOperator.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/test/DummyExternalReusableChannel.java b/wayang-core/src/test/java/org/apache/wayang/core/test/DummyExternalReusableChannel.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/test/DummyExternalReusableChannel.java
rename to wayang-core/src/test/java/org/apache/wayang/core/test/DummyExternalReusableChannel.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/test/DummyNonReusableChannel.java b/wayang-core/src/test/java/org/apache/wayang/core/test/DummyNonReusableChannel.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/test/DummyNonReusableChannel.java
rename to wayang-core/src/test/java/org/apache/wayang/core/test/DummyNonReusableChannel.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/test/DummyPlatform.java b/wayang-core/src/test/java/org/apache/wayang/core/test/DummyPlatform.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/test/DummyPlatform.java
rename to wayang-core/src/test/java/org/apache/wayang/core/test/DummyPlatform.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/test/DummyReusableChannel.java b/wayang-core/src/test/java/org/apache/wayang/core/test/DummyReusableChannel.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/test/DummyReusableChannel.java
rename to wayang-core/src/test/java/org/apache/wayang/core/test/DummyReusableChannel.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/test/MockFactory.java b/wayang-core/src/test/java/org/apache/wayang/core/test/MockFactory.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/test/MockFactory.java
rename to wayang-core/src/test/java/org/apache/wayang/core/test/MockFactory.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/test/SerializableDummyExecutionOperator.java b/wayang-core/src/test/java/org/apache/wayang/core/test/SerializableDummyExecutionOperator.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/test/SerializableDummyExecutionOperator.java
rename to wayang-core/src/test/java/org/apache/wayang/core/test/SerializableDummyExecutionOperator.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/test/TestDataUnit.java b/wayang-core/src/test/java/org/apache/wayang/core/test/TestDataUnit.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/test/TestDataUnit.java
rename to wayang-core/src/test/java/org/apache/wayang/core/test/TestDataUnit.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/test/TestDataUnit2.java b/wayang-core/src/test/java/org/apache/wayang/core/test/TestDataUnit2.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/test/TestDataUnit2.java
rename to wayang-core/src/test/java/org/apache/wayang/core/test/TestDataUnit2.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/util/BitmaskTest.java b/wayang-core/src/test/java/org/apache/wayang/core/util/BitmaskTest.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/util/BitmaskTest.java
rename to wayang-core/src/test/java/org/apache/wayang/core/util/BitmaskTest.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/util/ConsumerIteratorAdapterTest.java b/wayang-core/src/test/java/org/apache/wayang/core/util/ConsumerIteratorAdapterTest.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/util/ConsumerIteratorAdapterTest.java
rename to wayang-core/src/test/java/org/apache/wayang/core/util/ConsumerIteratorAdapterTest.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/util/CrossProductIterableTest.java b/wayang-core/src/test/java/org/apache/wayang/core/util/CrossProductIterableTest.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/util/CrossProductIterableTest.java
rename to wayang-core/src/test/java/org/apache/wayang/core/util/CrossProductIterableTest.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/util/LimitedInputStreamTest.java b/wayang-core/src/test/java/org/apache/wayang/core/util/LimitedInputStreamTest.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/util/LimitedInputStreamTest.java
rename to wayang-core/src/test/java/org/apache/wayang/core/util/LimitedInputStreamTest.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/util/ReflectionUtilsTest.java b/wayang-core/src/test/java/org/apache/wayang/core/util/ReflectionUtilsTest.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/util/ReflectionUtilsTest.java
rename to wayang-core/src/test/java/org/apache/wayang/core/util/ReflectionUtilsTest.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/util/WayangCollectionsTest.java b/wayang-core/src/test/java/org/apache/wayang/core/util/WayangCollectionsTest.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/util/WayangCollectionsTest.java
rename to wayang-core/src/test/java/org/apache/wayang/core/util/WayangCollectionsTest.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/util/mathex/ExpressionBuilderTest.java b/wayang-core/src/test/java/org/apache/wayang/core/util/mathex/ExpressionBuilderTest.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/util/mathex/ExpressionBuilderTest.java
rename to wayang-core/src/test/java/org/apache/wayang/core/util/mathex/ExpressionBuilderTest.java
diff --git a/wayang-core/src/test/java/org/apache/incubator/wayang/core/util/mathex/ExpressionTest.java b/wayang-core/src/test/java/org/apache/wayang/core/util/mathex/ExpressionTest.java
similarity index 100%
rename from wayang-core/src/test/java/org/apache/incubator/wayang/core/util/mathex/ExpressionTest.java
rename to wayang-core/src/test/java/org/apache/wayang/core/util/mathex/ExpressionTest.java
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/IEJoin.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/IEJoin.java
similarity index 100%
rename from wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/IEJoin.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/IEJoin.java
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/data/Data.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/data/Data.java
similarity index 100%
rename from wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/data/Data.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/data/Data.java
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/Mappings.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/mapping/Mappings.java
similarity index 100%
rename from wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/Mappings.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/mapping/Mappings.java
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/java/IEJoinMapping.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/mapping/java/IEJoinMapping.java
similarity index 100%
rename from wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/java/IEJoinMapping.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/mapping/java/IEJoinMapping.java
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/java/IESelfJoinMapping.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/mapping/java/IESelfJoinMapping.java
similarity index 100%
rename from wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/java/IESelfJoinMapping.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/mapping/java/IESelfJoinMapping.java
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/spark/IEJoinMapping.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/mapping/spark/IEJoinMapping.java
similarity index 100%
rename from wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/spark/IEJoinMapping.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/mapping/spark/IEJoinMapping.java
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/spark/IESelfJoinMapping.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/mapping/spark/IESelfJoinMapping.java
similarity index 100%
rename from wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/mapping/spark/IESelfJoinMapping.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/mapping/spark/IESelfJoinMapping.java
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/IEJoinMasterOperator.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/IEJoinMasterOperator.java
similarity index 100%
rename from wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/IEJoinMasterOperator.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/IEJoinMasterOperator.java
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/IEJoinOperator.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/IEJoinOperator.java
similarity index 100%
rename from wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/IEJoinOperator.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/IEJoinOperator.java
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/IESelfJoinOperator.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/IESelfJoinOperator.java
similarity index 100%
rename from wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/IESelfJoinOperator.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/IESelfJoinOperator.java
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/JavaIEJoinOperator.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/JavaIEJoinOperator.java
similarity index 100%
rename from wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/JavaIEJoinOperator.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/JavaIEJoinOperator.java
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/JavaIESelfJoinOperator.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/JavaIESelfJoinOperator.java
similarity index 100%
rename from wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/JavaIESelfJoinOperator.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/JavaIESelfJoinOperator.java
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperator.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/SparkIEJoinOperator.java
similarity index 100%
rename from wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperator.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/SparkIEJoinOperator.java
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/SparkIESelfJoinOperator.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/SparkIESelfJoinOperator.java
similarity index 100%
rename from wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/SparkIESelfJoinOperator.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/SparkIESelfJoinOperator.java
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/BitSetJoin.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/java_helpers/BitSetJoin.java
similarity index 100%
rename from wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/BitSetJoin.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/java_helpers/BitSetJoin.java
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/DataComparator.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/java_helpers/DataComparator.java
similarity index 100%
rename from wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/DataComparator.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/java_helpers/DataComparator.java
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/extractData.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/java_helpers/extractData.java
similarity index 100%
rename from wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/extractData.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/java_helpers/extractData.java
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/myMergeSort.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/java_helpers/myMergeSort.java
similarity index 100%
rename from wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/myMergeSort.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/java_helpers/myMergeSort.java
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/revDataComparator.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/java_helpers/revDataComparator.java
similarity index 100%
rename from wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/java_helpers/revDataComparator.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/java_helpers/revDataComparator.java
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/BitSetJoin.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/BitSetJoin.java
similarity index 100%
rename from wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/BitSetJoin.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/BitSetJoin.java
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/List2AttributesObjectSkinny.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/List2AttributesObjectSkinny.java
similarity index 100%
rename from wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/List2AttributesObjectSkinny.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/List2AttributesObjectSkinny.java
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/addUniqueID.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/addUniqueID.java
similarity index 100%
rename from wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/addUniqueID.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/addUniqueID.java
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/build2ListObject.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/build2ListObject.java
similarity index 100%
rename from wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/build2ListObject.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/build2ListObject.java
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/extractData.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/extractData.java
similarity index 100%
rename from wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/extractData.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/extractData.java
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/filterUnwantedBlocks.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/filterUnwantedBlocks.java
similarity index 100%
rename from wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/filterUnwantedBlocks.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/filterUnwantedBlocks.java
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/myMergeSort.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/myMergeSort.java
similarity index 100%
rename from wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/myMergeSort.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/myMergeSort.java
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/revDataComparator.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/revDataComparator.java
similarity index 100%
rename from wayang-extensions/wayang-iejoin/src/main/java/org/apache/incubator/wayang/iejoin/operators/spark_helpers/revDataComparator.java
rename to wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/revDataComparator.java
diff --git a/wayang-extensions/wayang-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/JavaExecutionOperatorTestBase.java b/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/JavaExecutionOperatorTestBase.java
similarity index 100%
rename from wayang-extensions/wayang-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/JavaExecutionOperatorTestBase.java
rename to wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/JavaExecutionOperatorTestBase.java
diff --git a/wayang-extensions/wayang-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/JavaIEJoinOperatorTest.java b/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/JavaIEJoinOperatorTest.java
similarity index 100%
rename from wayang-extensions/wayang-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/JavaIEJoinOperatorTest.java
rename to wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/JavaIEJoinOperatorTest.java
diff --git a/wayang-extensions/wayang-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperatorTest.java b/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/SparkIEJoinOperatorTest.java
similarity index 100%
rename from wayang-extensions/wayang-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperatorTest.java
rename to wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/SparkIEJoinOperatorTest.java
diff --git a/wayang-extensions/wayang-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperatorTest2.java b/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/SparkIEJoinOperatorTest2.java
similarity index 100%
rename from wayang-extensions/wayang-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperatorTest2.java
rename to wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/SparkIEJoinOperatorTest2.java
diff --git a/wayang-extensions/wayang-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperatorTest3.java b/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/SparkIEJoinOperatorTest3.java
similarity index 100%
rename from wayang-extensions/wayang-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperatorTest3.java
rename to wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/SparkIEJoinOperatorTest3.java
diff --git a/wayang-extensions/wayang-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperatorTest4.java b/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/SparkIEJoinOperatorTest4.java
similarity index 100%
rename from wayang-extensions/wayang-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIEJoinOperatorTest4.java
rename to wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/SparkIEJoinOperatorTest4.java
diff --git a/wayang-extensions/wayang-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIESelfJoinOperatorTest.java b/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/SparkIESelfJoinOperatorTest.java
similarity index 100%
rename from wayang-extensions/wayang-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkIESelfJoinOperatorTest.java
rename to wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/SparkIESelfJoinOperatorTest.java
diff --git a/wayang-extensions/wayang-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkOperatorTestBase.java b/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/SparkOperatorTestBase.java
similarity index 100%
rename from wayang-extensions/wayang-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/operators/SparkOperatorTestBase.java
rename to wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/SparkOperatorTestBase.java
diff --git a/wayang-extensions/wayang-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/test/ChannelFactory.java b/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/test/ChannelFactory.java
similarity index 100%
rename from wayang-extensions/wayang-iejoin/src/test/java/org/apache/incubator/wayang/iejoin/test/ChannelFactory.java
rename to wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/test/ChannelFactory.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/Flink.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/Flink.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/Flink.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/Flink.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/channels/ChannelConversions.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/channels/ChannelConversions.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/channels/ChannelConversions.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/channels/ChannelConversions.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/channels/DataSetChannel.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/channels/DataSetChannel.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/channels/DataSetChannel.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/channels/DataSetChannel.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/FlinkCoGroupFunction.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/compiler/FlinkCoGroupFunction.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/FlinkCoGroupFunction.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/compiler/FlinkCoGroupFunction.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/FunctionCompiler.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/compiler/FunctionCompiler.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/FunctionCompiler.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/compiler/FunctionCompiler.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/KeySelectorDistinct.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/compiler/KeySelectorDistinct.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/KeySelectorDistinct.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/compiler/KeySelectorDistinct.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/KeySelectorFunction.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/compiler/KeySelectorFunction.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/KeySelectorFunction.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/compiler/KeySelectorFunction.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/OutputFormatConsumer.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/compiler/OutputFormatConsumer.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/OutputFormatConsumer.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/compiler/OutputFormatConsumer.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/WayangFileOutputFormat.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/compiler/WayangFileOutputFormat.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/WayangFileOutputFormat.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/compiler/WayangFileOutputFormat.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/DummyFilter.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/compiler/criterion/DummyFilter.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/DummyFilter.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/compiler/criterion/DummyFilter.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/DummyMap.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/compiler/criterion/DummyMap.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/DummyMap.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/compiler/criterion/DummyMap.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangAggregator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/compiler/criterion/WayangAggregator.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangAggregator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/compiler/criterion/WayangAggregator.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangConvergenceCriterion.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/compiler/criterion/WayangConvergenceCriterion.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangConvergenceCriterion.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/compiler/criterion/WayangConvergenceCriterion.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangFilterCriterion.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/compiler/criterion/WayangFilterCriterion.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangFilterCriterion.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/compiler/criterion/WayangFilterCriterion.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangListValue.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/compiler/criterion/WayangListValue.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangListValue.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/compiler/criterion/WayangListValue.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangValue.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/compiler/criterion/WayangValue.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/compiler/criterion/WayangValue.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/compiler/criterion/WayangValue.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/execution/FlinkContextReference.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/execution/FlinkContextReference.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/execution/FlinkContextReference.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/execution/FlinkContextReference.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/execution/FlinkExecutionContext.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/execution/FlinkExecutionContext.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/execution/FlinkExecutionContext.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/execution/FlinkExecutionContext.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/execution/FlinkExecutor.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/execution/FlinkExecutor.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/execution/FlinkExecutor.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/execution/FlinkExecutor.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/CartesianMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/CartesianMapping.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/CartesianMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/CartesianMapping.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/CoGroupMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/CoGroupMapping.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/CoGroupMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/CoGroupMapping.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/CollectionSourceMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/CollectionSourceMapping.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/CollectionSourceMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/CollectionSourceMapping.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/CountMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/CountMapping.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/CountMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/CountMapping.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/DistinctMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/DistinctMapping.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/DistinctMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/DistinctMapping.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/DoWhileMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/DoWhileMapping.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/DoWhileMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/DoWhileMapping.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/FilterMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/FilterMapping.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/FilterMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/FilterMapping.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/FlatMapMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/FlatMapMapping.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/FlatMapMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/FlatMapMapping.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/GlobalMaterializedGroupMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/GlobalMaterializedGroupMapping.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/GlobalMaterializedGroupMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/GlobalMaterializedGroupMapping.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/GlobalReduceMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/GlobalReduceMapping.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/GlobalReduceMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/GlobalReduceMapping.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/GroupByMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/GroupByMapping.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/GroupByMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/GroupByMapping.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/IntersectMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/IntersectMapping.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/IntersectMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/IntersectMapping.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/JoinMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/JoinMapping.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/JoinMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/JoinMapping.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/LocalCallbackSinkMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/LocalCallbackSinkMapping.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/LocalCallbackSinkMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/LocalCallbackSinkMapping.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/LoopMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/LoopMapping.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/LoopMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/LoopMapping.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/MapMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/MapMapping.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/MapMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/MapMapping.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/MapPartitionsMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/MapPartitionsMapping.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/MapPartitionsMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/MapPartitionsMapping.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/Mappings.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/Mappings.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/Mappings.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/Mappings.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/MaterializedGroupByMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/MaterializedGroupByMapping.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/MaterializedGroupByMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/MaterializedGroupByMapping.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/PageRankMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/PageRankMapping.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/PageRankMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/PageRankMapping.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/ReduceByMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/ReduceByMapping.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/ReduceByMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/ReduceByMapping.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/RepeatMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/RepeatMapping.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/RepeatMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/RepeatMapping.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/SampleMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/SampleMapping.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/SampleMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/SampleMapping.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/SortMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/SortMapping.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/SortMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/SortMapping.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/TextFileSinkMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/TextFileSinkMapping.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/TextFileSinkMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/TextFileSinkMapping.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/TextFileSourceMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/TextFileSourceMapping.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/TextFileSourceMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/TextFileSourceMapping.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/UnionAllMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/UnionAllMapping.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/UnionAllMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/UnionAllMapping.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/ZipWithIdMapping.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/ZipWithIdMapping.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/mapping/ZipWithIdMapping.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/mapping/ZipWithIdMapping.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCartesianOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkCartesianOperator.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCartesianOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkCartesianOperator.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCoGroupOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkCoGroupOperator.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCoGroupOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkCoGroupOperator.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCollectionSink.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkCollectionSink.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCollectionSink.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkCollectionSink.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCollectionSource.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkCollectionSource.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCollectionSource.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkCollectionSource.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCountOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkCountOperator.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkCountOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkCountOperator.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkDistinctOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkDistinctOperator.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkDistinctOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkDistinctOperator.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkDoWhileOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkDoWhileOperator.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkDoWhileOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkDoWhileOperator.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkExecutionOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkExecutionOperator.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkExecutionOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkExecutionOperator.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkFilterOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkFilterOperator.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkFilterOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkFilterOperator.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkFlatMapOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkFlatMapOperator.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkFlatMapOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkFlatMapOperator.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkGlobalMaterializedGroupOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkGlobalMaterializedGroupOperator.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkGlobalMaterializedGroupOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkGlobalMaterializedGroupOperator.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkGlobalReduceOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkGlobalReduceOperator.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkGlobalReduceOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkGlobalReduceOperator.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkGroupByOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkGroupByOperator.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkGroupByOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkGroupByOperator.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkIntersectOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkIntersectOperator.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkIntersectOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkIntersectOperator.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkJoinOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkJoinOperator.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkJoinOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkJoinOperator.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkLocalCallbackSink.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkLocalCallbackSink.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkLocalCallbackSink.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkLocalCallbackSink.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkLoopOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkLoopOperator.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkLoopOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkLoopOperator.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkMapOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkMapOperator.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkMapOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkMapOperator.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkMapPartitionsOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkMapPartitionsOperator.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkMapPartitionsOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkMapPartitionsOperator.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkMaterializedGroupByOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkMaterializedGroupByOperator.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkMaterializedGroupByOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkMaterializedGroupByOperator.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkObjectFileSink.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkObjectFileSink.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkObjectFileSink.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkObjectFileSink.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkObjectFileSource.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkObjectFileSource.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkObjectFileSource.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkObjectFileSource.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkPageRankOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkPageRankOperator.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkPageRankOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkPageRankOperator.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkReduceByOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkReduceByOperator.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkReduceByOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkReduceByOperator.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkRepeatExpandedOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkRepeatExpandedOperator.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkRepeatExpandedOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkRepeatExpandedOperator.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkRepeatOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkRepeatOperator.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkRepeatOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkRepeatOperator.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkSampleOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkSampleOperator.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkSampleOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkSampleOperator.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkSortOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkSortOperator.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkSortOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkSortOperator.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkTextFileSink.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkTextFileSink.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkTextFileSink.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkTextFileSink.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkTextFileSource.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkTextFileSource.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkTextFileSource.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkTextFileSource.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkTsvFileSink.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkTsvFileSink.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkTsvFileSink.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkTsvFileSink.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkUnionAllOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkUnionAllOperator.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkUnionAllOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkUnionAllOperator.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkZipWithIdOperator.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkZipWithIdOperator.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/operators/FlinkZipWithIdOperator.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/operators/FlinkZipWithIdOperator.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/platform/FlinkPlatform.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/platform/FlinkPlatform.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/platform/FlinkPlatform.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/platform/FlinkPlatform.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/plugin/FlinkBasicPlugin.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/plugin/FlinkBasicPlugin.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/plugin/FlinkBasicPlugin.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/plugin/FlinkBasicPlugin.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/plugin/FlinkConversionPlugin.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/plugin/FlinkConversionPlugin.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/plugin/FlinkConversionPlugin.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/plugin/FlinkConversionPlugin.java
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/plugin/FlinkGraphPlugin.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/plugin/FlinkGraphPlugin.java
similarity index 100%
rename from wayang-platforms/wayang-flink/src/main/java/org/apache/incubator/wayang/flink/plugin/FlinkGraphPlugin.java
rename to wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/plugin/FlinkGraphPlugin.java
diff --git a/wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/Algorithm/PageRankAlgorithm.java b/wayang-platforms/wayang-giraph/src/main/java/org/apache/wayang/giraph/Algorithm/PageRankAlgorithm.java
similarity index 100%
rename from wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/Algorithm/PageRankAlgorithm.java
rename to wayang-platforms/wayang-giraph/src/main/java/org/apache/wayang/giraph/Algorithm/PageRankAlgorithm.java
diff --git a/wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/Algorithm/PageRankParameters.java b/wayang-platforms/wayang-giraph/src/main/java/org/apache/wayang/giraph/Algorithm/PageRankParameters.java
similarity index 100%
rename from wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/Algorithm/PageRankParameters.java
rename to wayang-platforms/wayang-giraph/src/main/java/org/apache/wayang/giraph/Algorithm/PageRankParameters.java
diff --git a/wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/Giraph.java b/wayang-platforms/wayang-giraph/src/main/java/org/apache/wayang/giraph/Giraph.java
similarity index 100%
rename from wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/Giraph.java
rename to wayang-platforms/wayang-giraph/src/main/java/org/apache/wayang/giraph/Giraph.java
diff --git a/wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/channels/ChannelConversions.java b/wayang-platforms/wayang-giraph/src/main/java/org/apache/wayang/giraph/channels/ChannelConversions.java
similarity index 100%
rename from wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/channels/ChannelConversions.java
rename to wayang-platforms/wayang-giraph/src/main/java/org/apache/wayang/giraph/channels/ChannelConversions.java
diff --git a/wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/execution/GiraphExecutor.java b/wayang-platforms/wayang-giraph/src/main/java/org/apache/wayang/giraph/execution/GiraphExecutor.java
similarity index 100%
rename from wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/execution/GiraphExecutor.java
rename to wayang-platforms/wayang-giraph/src/main/java/org/apache/wayang/giraph/execution/GiraphExecutor.java
diff --git a/wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/mappings/Mappings.java b/wayang-platforms/wayang-giraph/src/main/java/org/apache/wayang/giraph/mappings/Mappings.java
similarity index 100%
rename from wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/mappings/Mappings.java
rename to wayang-platforms/wayang-giraph/src/main/java/org/apache/wayang/giraph/mappings/Mappings.java
diff --git a/wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/mappings/PageRankMapping.java b/wayang-platforms/wayang-giraph/src/main/java/org/apache/wayang/giraph/mappings/PageRankMapping.java
similarity index 100%
rename from wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/mappings/PageRankMapping.java
rename to wayang-platforms/wayang-giraph/src/main/java/org/apache/wayang/giraph/mappings/PageRankMapping.java
diff --git a/wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/operators/GiraphExecutionOperator.java b/wayang-platforms/wayang-giraph/src/main/java/org/apache/wayang/giraph/operators/GiraphExecutionOperator.java
similarity index 100%
rename from wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/operators/GiraphExecutionOperator.java
rename to wayang-platforms/wayang-giraph/src/main/java/org/apache/wayang/giraph/operators/GiraphExecutionOperator.java
diff --git a/wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/operators/GiraphPageRankOperator.java b/wayang-platforms/wayang-giraph/src/main/java/org/apache/wayang/giraph/operators/GiraphPageRankOperator.java
similarity index 100%
rename from wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/operators/GiraphPageRankOperator.java
rename to wayang-platforms/wayang-giraph/src/main/java/org/apache/wayang/giraph/operators/GiraphPageRankOperator.java
diff --git a/wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/platform/GiraphPlatform.java b/wayang-platforms/wayang-giraph/src/main/java/org/apache/wayang/giraph/platform/GiraphPlatform.java
similarity index 100%
rename from wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/platform/GiraphPlatform.java
rename to wayang-platforms/wayang-giraph/src/main/java/org/apache/wayang/giraph/platform/GiraphPlatform.java
diff --git a/wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/plugin/GiraphPlugin.java b/wayang-platforms/wayang-giraph/src/main/java/org/apache/wayang/giraph/plugin/GiraphPlugin.java
similarity index 100%
rename from wayang-platforms/wayang-giraph/src/main/java/org/apache/incubator/wayang/giraph/plugin/GiraphPlugin.java
rename to wayang-platforms/wayang-giraph/src/main/java/org/apache/wayang/giraph/plugin/GiraphPlugin.java
diff --git a/wayang-platforms/wayang-giraph/src/test/java/org/apache/incubator/wayang/giraph/operators/GiraphPagaRankOperatorTest.java b/wayang-platforms/wayang-giraph/src/test/java/org/apache/wayang/giraph/operators/GiraphPagaRankOperatorTest.java
similarity index 100%
rename from wayang-platforms/wayang-giraph/src/test/java/org/apache/incubator/wayang/giraph/operators/GiraphPagaRankOperatorTest.java
rename to wayang-platforms/wayang-giraph/src/test/java/org/apache/wayang/giraph/operators/GiraphPagaRankOperatorTest.java
diff --git a/wayang-platforms/wayang-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/GraphChi.java b/wayang-platforms/wayang-graphchi/src/main/java/org/apache/wayang/graphchi/GraphChi.java
similarity index 100%
rename from wayang-platforms/wayang-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/GraphChi.java
rename to wayang-platforms/wayang-graphchi/src/main/java/org/apache/wayang/graphchi/GraphChi.java
diff --git a/wayang-platforms/wayang-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/channels/ChannelConversions.java b/wayang-platforms/wayang-graphchi/src/main/java/org/apache/wayang/graphchi/channels/ChannelConversions.java
similarity index 100%
rename from wayang-platforms/wayang-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/channels/ChannelConversions.java
rename to wayang-platforms/wayang-graphchi/src/main/java/org/apache/wayang/graphchi/channels/ChannelConversions.java
diff --git a/wayang-platforms/wayang-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/execution/GraphChiExecutor.java b/wayang-platforms/wayang-graphchi/src/main/java/org/apache/wayang/graphchi/execution/GraphChiExecutor.java
similarity index 100%
rename from wayang-platforms/wayang-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/execution/GraphChiExecutor.java
rename to wayang-platforms/wayang-graphchi/src/main/java/org/apache/wayang/graphchi/execution/GraphChiExecutor.java
diff --git a/wayang-platforms/wayang-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/mappings/Mappings.java b/wayang-platforms/wayang-graphchi/src/main/java/org/apache/wayang/graphchi/mappings/Mappings.java
similarity index 100%
rename from wayang-platforms/wayang-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/mappings/Mappings.java
rename to wayang-platforms/wayang-graphchi/src/main/java/org/apache/wayang/graphchi/mappings/Mappings.java
diff --git a/wayang-platforms/wayang-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/mappings/PageRankMapping.java b/wayang-platforms/wayang-graphchi/src/main/java/org/apache/wayang/graphchi/mappings/PageRankMapping.java
similarity index 100%
rename from wayang-platforms/wayang-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/mappings/PageRankMapping.java
rename to wayang-platforms/wayang-graphchi/src/main/java/org/apache/wayang/graphchi/mappings/PageRankMapping.java
diff --git a/wayang-platforms/wayang-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/operators/GraphChiExecutionOperator.java b/wayang-platforms/wayang-graphchi/src/main/java/org/apache/wayang/graphchi/operators/GraphChiExecutionOperator.java
similarity index 100%
rename from wayang-platforms/wayang-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/operators/GraphChiExecutionOperator.java
rename to wayang-platforms/wayang-graphchi/src/main/java/org/apache/wayang/graphchi/operators/GraphChiExecutionOperator.java
diff --git a/wayang-platforms/wayang-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/operators/GraphChiPageRankOperator.java b/wayang-platforms/wayang-graphchi/src/main/java/org/apache/wayang/graphchi/operators/GraphChiPageRankOperator.java
similarity index 100%
rename from wayang-platforms/wayang-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/operators/GraphChiPageRankOperator.java
rename to wayang-platforms/wayang-graphchi/src/main/java/org/apache/wayang/graphchi/operators/GraphChiPageRankOperator.java
diff --git a/wayang-platforms/wayang-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/platform/GraphChiPlatform.java b/wayang-platforms/wayang-graphchi/src/main/java/org/apache/wayang/graphchi/platform/GraphChiPlatform.java
similarity index 100%
rename from wayang-platforms/wayang-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/platform/GraphChiPlatform.java
rename to wayang-platforms/wayang-graphchi/src/main/java/org/apache/wayang/graphchi/platform/GraphChiPlatform.java
diff --git a/wayang-platforms/wayang-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/plugin/GraphChiPlugin.java b/wayang-platforms/wayang-graphchi/src/main/java/org/apache/wayang/graphchi/plugin/GraphChiPlugin.java
similarity index 100%
rename from wayang-platforms/wayang-graphchi/src/main/java/org/apache/incubator/wayang/graphchi/plugin/GraphChiPlugin.java
rename to wayang-platforms/wayang-graphchi/src/main/java/org/apache/wayang/graphchi/plugin/GraphChiPlugin.java
diff --git a/wayang-platforms/wayang-graphchi/src/test/java/org/apache/incubator/wayang/graphchi/operators/GraphChiPageRankOperatorTest.java b/wayang-platforms/wayang-graphchi/src/test/java/org/apache/wayang/graphchi/operators/GraphChiPageRankOperatorTest.java
similarity index 100%
rename from wayang-platforms/wayang-graphchi/src/test/java/org/apache/incubator/wayang/graphchi/operators/GraphChiPageRankOperatorTest.java
rename to wayang-platforms/wayang-graphchi/src/test/java/org/apache/wayang/graphchi/operators/GraphChiPageRankOperatorTest.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/Java.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/Java.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/Java.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/Java.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/channels/ChannelConversions.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/channels/ChannelConversions.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/channels/ChannelConversions.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/channels/ChannelConversions.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/channels/CollectionChannel.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/channels/CollectionChannel.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/channels/CollectionChannel.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/channels/CollectionChannel.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/channels/JavaChannelInstance.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/channels/JavaChannelInstance.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/channels/JavaChannelInstance.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/channels/JavaChannelInstance.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/channels/StreamChannel.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/channels/StreamChannel.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/channels/StreamChannel.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/channels/StreamChannel.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/compiler/FunctionCompiler.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/compiler/FunctionCompiler.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/compiler/FunctionCompiler.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/compiler/FunctionCompiler.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/execution/JavaExecutionContext.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/execution/JavaExecutionContext.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/execution/JavaExecutionContext.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/execution/JavaExecutionContext.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/execution/JavaExecutor.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/execution/JavaExecutor.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/execution/JavaExecutor.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/execution/JavaExecutor.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/CartesianMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/CartesianMapping.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/CartesianMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/CartesianMapping.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/CoGroupMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/CoGroupMapping.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/CoGroupMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/CoGroupMapping.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/CollectionSourceMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/CollectionSourceMapping.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/CollectionSourceMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/CollectionSourceMapping.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/CountMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/CountMapping.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/CountMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/CountMapping.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/DistinctMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/DistinctMapping.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/DistinctMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/DistinctMapping.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/DoWhileMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/DoWhileMapping.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/DoWhileMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/DoWhileMapping.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/FilterMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/FilterMapping.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/FilterMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/FilterMapping.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/FlatMapMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/FlatMapMapping.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/FlatMapMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/FlatMapMapping.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/GlobalMaterializedGroupMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/GlobalMaterializedGroupMapping.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/GlobalMaterializedGroupMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/GlobalMaterializedGroupMapping.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/GlobalReduceMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/GlobalReduceMapping.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/GlobalReduceMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/GlobalReduceMapping.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/IntersectMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/IntersectMapping.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/IntersectMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/IntersectMapping.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/JoinMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/JoinMapping.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/JoinMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/JoinMapping.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/LocalCallbackSinkMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/LocalCallbackSinkMapping.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/LocalCallbackSinkMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/LocalCallbackSinkMapping.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/LoopMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/LoopMapping.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/LoopMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/LoopMapping.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/MapMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/MapMapping.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/MapMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/MapMapping.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/MapPartitionsMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/MapPartitionsMapping.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/MapPartitionsMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/MapPartitionsMapping.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/Mappings.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/Mappings.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/Mappings.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/Mappings.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/MaterializedGroupByMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/MaterializedGroupByMapping.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/MaterializedGroupByMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/MaterializedGroupByMapping.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/ReduceByMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/ReduceByMapping.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/ReduceByMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/ReduceByMapping.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/RepeatMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/RepeatMapping.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/RepeatMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/RepeatMapping.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/SampleMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/SampleMapping.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/SampleMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/SampleMapping.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/SortMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/SortMapping.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/SortMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/SortMapping.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/TextFileSinkMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/TextFileSinkMapping.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/TextFileSinkMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/TextFileSinkMapping.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/TextFileSourceMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/TextFileSourceMapping.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/TextFileSourceMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/TextFileSourceMapping.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/UnionAllMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/UnionAllMapping.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/UnionAllMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/UnionAllMapping.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/ZipWithIdMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/ZipWithIdMapping.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/ZipWithIdMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/ZipWithIdMapping.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/graph/PageRankMapping.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/graph/PageRankMapping.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/mapping/graph/PageRankMapping.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/mapping/graph/PageRankMapping.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCartesianOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaCartesianOperator.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCartesianOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaCartesianOperator.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCoGroupOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaCoGroupOperator.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCoGroupOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaCoGroupOperator.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCollectOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaCollectOperator.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCollectOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaCollectOperator.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCollectionSource.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaCollectionSource.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCollectionSource.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaCollectionSource.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCountOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaCountOperator.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaCountOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaCountOperator.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaDistinctOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaDistinctOperator.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaDistinctOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaDistinctOperator.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaDoWhileOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaDoWhileOperator.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaDoWhileOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaDoWhileOperator.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaExecutionOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaExecutionOperator.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaExecutionOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaExecutionOperator.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaFilterOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaFilterOperator.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaFilterOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaFilterOperator.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaFlatMapOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaFlatMapOperator.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaFlatMapOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaFlatMapOperator.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaGlobalMaterializedGroupOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaGlobalMaterializedGroupOperator.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaGlobalMaterializedGroupOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaGlobalMaterializedGroupOperator.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaGlobalReduceOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaGlobalReduceOperator.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaGlobalReduceOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaGlobalReduceOperator.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaIntersectOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaIntersectOperator.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaIntersectOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaIntersectOperator.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaJoinOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaJoinOperator.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaJoinOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaJoinOperator.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaLocalCallbackSink.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaLocalCallbackSink.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaLocalCallbackSink.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaLocalCallbackSink.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaLoopOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaLoopOperator.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaLoopOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaLoopOperator.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaMapOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaMapOperator.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaMapOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaMapOperator.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaMapPartitionsOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaMapPartitionsOperator.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaMapPartitionsOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaMapPartitionsOperator.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaMaterializedGroupByOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaMaterializedGroupByOperator.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaMaterializedGroupByOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaMaterializedGroupByOperator.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaObjectFileSink.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaObjectFileSink.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaObjectFileSink.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaObjectFileSink.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaObjectFileSource.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaObjectFileSource.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaObjectFileSource.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaObjectFileSource.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaRandomSampleOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaRandomSampleOperator.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaRandomSampleOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaRandomSampleOperator.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaReduceByOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaReduceByOperator.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaReduceByOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaReduceByOperator.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaRepeatOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaRepeatOperator.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaRepeatOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaRepeatOperator.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaReservoirSampleOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaReservoirSampleOperator.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaReservoirSampleOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaReservoirSampleOperator.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaSortOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaSortOperator.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaSortOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaSortOperator.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaTextFileSink.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaTextFileSink.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaTextFileSink.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaTextFileSink.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaTextFileSource.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaTextFileSource.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaTextFileSource.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaTextFileSource.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaTsvFileSink.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaTsvFileSink.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaTsvFileSink.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaTsvFileSink.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaTsvFileSource.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaTsvFileSource.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaTsvFileSource.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaTsvFileSource.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaUnionAllOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaUnionAllOperator.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/JavaUnionAllOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/JavaUnionAllOperator.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/graph/JavaPageRankOperator.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/graph/JavaPageRankOperator.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/operators/graph/JavaPageRankOperator.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/operators/graph/JavaPageRankOperator.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/platform/JavaPlatform.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/platform/JavaPlatform.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/platform/JavaPlatform.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/platform/JavaPlatform.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/plugin/JavaBasicPlugin.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/plugin/JavaBasicPlugin.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/plugin/JavaBasicPlugin.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/plugin/JavaBasicPlugin.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/plugin/JavaChannelConversionPlugin.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/plugin/JavaChannelConversionPlugin.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/plugin/JavaChannelConversionPlugin.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/plugin/JavaChannelConversionPlugin.java
diff --git a/wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/plugin/JavaGraphPlugin.java b/wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/plugin/JavaGraphPlugin.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/main/java/org/apache/incubator/wayang/java/plugin/JavaGraphPlugin.java
rename to wayang-platforms/wayang-java/src/main/java/org/apache/wayang/java/plugin/JavaGraphPlugin.java
diff --git a/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/execution/JavaExecutorTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/execution/JavaExecutorTest.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/execution/JavaExecutorTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/execution/JavaExecutorTest.java
diff --git a/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaCartesianOperatorTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaCartesianOperatorTest.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaCartesianOperatorTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaCartesianOperatorTest.java
diff --git a/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaCoGroupOperatorTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaCoGroupOperatorTest.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaCoGroupOperatorTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaCoGroupOperatorTest.java
diff --git a/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaCollectionSourceTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaCollectionSourceTest.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaCollectionSourceTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaCollectionSourceTest.java
diff --git a/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaCountOperatorTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaCountOperatorTest.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaCountOperatorTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaCountOperatorTest.java
diff --git a/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaDistinctOperatorTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaDistinctOperatorTest.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaDistinctOperatorTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaDistinctOperatorTest.java
diff --git a/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaExecutionOperatorTestBase.java b/wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaExecutionOperatorTestBase.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaExecutionOperatorTestBase.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaExecutionOperatorTestBase.java
diff --git a/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaFilterOperatorTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaFilterOperatorTest.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaFilterOperatorTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaFilterOperatorTest.java
diff --git a/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaGlobalMaterializedGroupOperatorTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaGlobalMaterializedGroupOperatorTest.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaGlobalMaterializedGroupOperatorTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaGlobalMaterializedGroupOperatorTest.java
diff --git a/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaGlobalReduceOperatorTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaGlobalReduceOperatorTest.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaGlobalReduceOperatorTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaGlobalReduceOperatorTest.java
diff --git a/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaJoinOperatorTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaJoinOperatorTest.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaJoinOperatorTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaJoinOperatorTest.java
diff --git a/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaLocalCallbackSinkTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaLocalCallbackSinkTest.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaLocalCallbackSinkTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaLocalCallbackSinkTest.java
diff --git a/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaMaterializedGroupByOperatorTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaMaterializedGroupByOperatorTest.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaMaterializedGroupByOperatorTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaMaterializedGroupByOperatorTest.java
diff --git a/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaObjectFileSinkTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaObjectFileSinkTest.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaObjectFileSinkTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaObjectFileSinkTest.java
diff --git a/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaObjectFileSourceTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaObjectFileSourceTest.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaObjectFileSourceTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaObjectFileSourceTest.java
diff --git a/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaRandomSampleOperatorTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaRandomSampleOperatorTest.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaRandomSampleOperatorTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaRandomSampleOperatorTest.java
diff --git a/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaReduceByOperatorTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaReduceByOperatorTest.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaReduceByOperatorTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaReduceByOperatorTest.java
diff --git a/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaReservoirSampleOperatorTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaReservoirSampleOperatorTest.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaReservoirSampleOperatorTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaReservoirSampleOperatorTest.java
diff --git a/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaSortOperatorTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaSortOperatorTest.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaSortOperatorTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaSortOperatorTest.java
diff --git a/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaTextFileSinkTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaTextFileSinkTest.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaTextFileSinkTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaTextFileSinkTest.java
diff --git a/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaUnionAllOperatorTest.java b/wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaUnionAllOperatorTest.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/operators/JavaUnionAllOperatorTest.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/operators/JavaUnionAllOperatorTest.java
diff --git a/wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/test/ChannelFactory.java b/wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/test/ChannelFactory.java
similarity index 100%
rename from wayang-platforms/wayang-java/src/test/java/org/apache/incubator/wayang/java/test/ChannelFactory.java
rename to wayang-platforms/wayang-java/src/test/java/org/apache/wayang/java/test/ChannelFactory.java
diff --git a/wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/channels/SqlQueryChannel.java b/wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/wayang/jdbc/channels/SqlQueryChannel.java
similarity index 100%
rename from wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/channels/SqlQueryChannel.java
rename to wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/wayang/jdbc/channels/SqlQueryChannel.java
diff --git a/wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/compiler/FunctionCompiler.java b/wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/wayang/jdbc/compiler/FunctionCompiler.java
similarity index 100%
rename from wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/compiler/FunctionCompiler.java
rename to wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/wayang/jdbc/compiler/FunctionCompiler.java
diff --git a/wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/execution/DatabaseDescriptor.java b/wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/wayang/jdbc/execution/DatabaseDescriptor.java
similarity index 100%
rename from wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/execution/DatabaseDescriptor.java
rename to wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/wayang/jdbc/execution/DatabaseDescriptor.java
diff --git a/wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/execution/JdbcExecutor.java b/wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/wayang/jdbc/execution/JdbcExecutor.java
similarity index 100%
rename from wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/execution/JdbcExecutor.java
rename to wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/wayang/jdbc/execution/JdbcExecutor.java
diff --git a/wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/JdbcExecutionOperator.java b/wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/wayang/jdbc/operators/JdbcExecutionOperator.java
similarity index 100%
rename from wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/JdbcExecutionOperator.java
rename to wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/wayang/jdbc/operators/JdbcExecutionOperator.java
diff --git a/wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/JdbcFilterOperator.java b/wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/wayang/jdbc/operators/JdbcFilterOperator.java
similarity index 100%
rename from wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/JdbcFilterOperator.java
rename to wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/wayang/jdbc/operators/JdbcFilterOperator.java
diff --git a/wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/JdbcProjectionOperator.java b/wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/wayang/jdbc/operators/JdbcProjectionOperator.java
similarity index 100%
rename from wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/JdbcProjectionOperator.java
rename to wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/wayang/jdbc/operators/JdbcProjectionOperator.java
diff --git a/wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/JdbcTableSource.java b/wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/wayang/jdbc/operators/JdbcTableSource.java
similarity index 100%
rename from wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/JdbcTableSource.java
rename to wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/wayang/jdbc/operators/JdbcTableSource.java
diff --git a/wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/SqlToStreamOperator.java b/wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/wayang/jdbc/operators/SqlToStreamOperator.java
similarity index 100%
rename from wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/operators/SqlToStreamOperator.java
rename to wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/wayang/jdbc/operators/SqlToStreamOperator.java
diff --git a/wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/platform/JdbcPlatformTemplate.java b/wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/wayang/jdbc/platform/JdbcPlatformTemplate.java
similarity index 100%
rename from wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/incubator/wayang/jdbc/platform/JdbcPlatformTemplate.java
rename to wayang-platforms/wayang-jdbc-template/src/main/java/org/apache/wayang/jdbc/platform/JdbcPlatformTemplate.java
diff --git a/wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/execution/JdbcExecutorTest.java b/wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/wayang/jdbc/execution/JdbcExecutorTest.java
similarity index 100%
rename from wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/execution/JdbcExecutorTest.java
rename to wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/wayang/jdbc/execution/JdbcExecutorTest.java
diff --git a/wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/operators/JdbcTableSourceTest.java b/wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/wayang/jdbc/operators/JdbcTableSourceTest.java
similarity index 100%
rename from wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/operators/JdbcTableSourceTest.java
rename to wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/wayang/jdbc/operators/JdbcTableSourceTest.java
diff --git a/wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/operators/OperatorTestBase.java b/wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/wayang/jdbc/operators/OperatorTestBase.java
similarity index 100%
rename from wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/operators/OperatorTestBase.java
rename to wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/wayang/jdbc/operators/OperatorTestBase.java
diff --git a/wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/operators/SqlToStreamOperatorTest.java b/wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/wayang/jdbc/operators/SqlToStreamOperatorTest.java
similarity index 100%
rename from wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/operators/SqlToStreamOperatorTest.java
rename to wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/wayang/jdbc/operators/SqlToStreamOperatorTest.java
diff --git a/wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/test/HsqldbFilterOperator.java b/wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/wayang/jdbc/test/HsqldbFilterOperator.java
similarity index 100%
rename from wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/test/HsqldbFilterOperator.java
rename to wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/wayang/jdbc/test/HsqldbFilterOperator.java
diff --git a/wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/test/HsqldbPlatform.java b/wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/wayang/jdbc/test/HsqldbPlatform.java
similarity index 100%
rename from wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/test/HsqldbPlatform.java
rename to wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/wayang/jdbc/test/HsqldbPlatform.java
diff --git a/wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/test/HsqldbProjectionOperator.java b/wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/wayang/jdbc/test/HsqldbProjectionOperator.java
similarity index 100%
rename from wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/test/HsqldbProjectionOperator.java
rename to wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/wayang/jdbc/test/HsqldbProjectionOperator.java
diff --git a/wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/test/HsqldbTableSource.java b/wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/wayang/jdbc/test/HsqldbTableSource.java
similarity index 100%
rename from wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/incubator/wayang/jdbc/test/HsqldbTableSource.java
rename to wayang-platforms/wayang-jdbc-template/src/test/java/org/apache/wayang/jdbc/test/HsqldbTableSource.java
diff --git a/wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/Postgres.java b/wayang-platforms/wayang-postgres/src/main/java/org/apache/wayang/postgres/Postgres.java
similarity index 100%
rename from wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/Postgres.java
rename to wayang-platforms/wayang-postgres/src/main/java/org/apache/wayang/postgres/Postgres.java
diff --git a/wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/channels/ChannelConversions.java b/wayang-platforms/wayang-postgres/src/main/java/org/apache/wayang/postgres/channels/ChannelConversions.java
similarity index 100%
rename from wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/channels/ChannelConversions.java
rename to wayang-platforms/wayang-postgres/src/main/java/org/apache/wayang/postgres/channels/ChannelConversions.java
diff --git a/wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/mapping/FilterMapping.java b/wayang-platforms/wayang-postgres/src/main/java/org/apache/wayang/postgres/mapping/FilterMapping.java
similarity index 100%
rename from wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/mapping/FilterMapping.java
rename to wayang-platforms/wayang-postgres/src/main/java/org/apache/wayang/postgres/mapping/FilterMapping.java
diff --git a/wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/mapping/Mappings.java b/wayang-platforms/wayang-postgres/src/main/java/org/apache/wayang/postgres/mapping/Mappings.java
similarity index 100%
rename from wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/mapping/Mappings.java
rename to wayang-platforms/wayang-postgres/src/main/java/org/apache/wayang/postgres/mapping/Mappings.java
diff --git a/wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/mapping/ProjectionMapping.java b/wayang-platforms/wayang-postgres/src/main/java/org/apache/wayang/postgres/mapping/ProjectionMapping.java
similarity index 100%
rename from wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/mapping/ProjectionMapping.java
rename to wayang-platforms/wayang-postgres/src/main/java/org/apache/wayang/postgres/mapping/ProjectionMapping.java
diff --git a/wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/operators/PostgresExecutionOperator.java b/wayang-platforms/wayang-postgres/src/main/java/org/apache/wayang/postgres/operators/PostgresExecutionOperator.java
similarity index 100%
rename from wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/operators/PostgresExecutionOperator.java
rename to wayang-platforms/wayang-postgres/src/main/java/org/apache/wayang/postgres/operators/PostgresExecutionOperator.java
diff --git a/wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/operators/PostgresFilterOperator.java b/wayang-platforms/wayang-postgres/src/main/java/org/apache/wayang/postgres/operators/PostgresFilterOperator.java
similarity index 100%
rename from wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/operators/PostgresFilterOperator.java
rename to wayang-platforms/wayang-postgres/src/main/java/org/apache/wayang/postgres/operators/PostgresFilterOperator.java
diff --git a/wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/operators/PostgresProjectionOperator.java b/wayang-platforms/wayang-postgres/src/main/java/org/apache/wayang/postgres/operators/PostgresProjectionOperator.java
similarity index 100%
rename from wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/operators/PostgresProjectionOperator.java
rename to wayang-platforms/wayang-postgres/src/main/java/org/apache/wayang/postgres/operators/PostgresProjectionOperator.java
diff --git a/wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/operators/PostgresTableSource.java b/wayang-platforms/wayang-postgres/src/main/java/org/apache/wayang/postgres/operators/PostgresTableSource.java
similarity index 100%
rename from wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/operators/PostgresTableSource.java
rename to wayang-platforms/wayang-postgres/src/main/java/org/apache/wayang/postgres/operators/PostgresTableSource.java
diff --git a/wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/platform/PostgresPlatform.java b/wayang-platforms/wayang-postgres/src/main/java/org/apache/wayang/postgres/platform/PostgresPlatform.java
similarity index 100%
rename from wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/platform/PostgresPlatform.java
rename to wayang-platforms/wayang-postgres/src/main/java/org/apache/wayang/postgres/platform/PostgresPlatform.java
diff --git a/wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/plugin/PostgresConversionsPlugin.java b/wayang-platforms/wayang-postgres/src/main/java/org/apache/wayang/postgres/plugin/PostgresConversionsPlugin.java
similarity index 100%
rename from wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/plugin/PostgresConversionsPlugin.java
rename to wayang-platforms/wayang-postgres/src/main/java/org/apache/wayang/postgres/plugin/PostgresConversionsPlugin.java
diff --git a/wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/plugin/PostgresPlugin.java b/wayang-platforms/wayang-postgres/src/main/java/org/apache/wayang/postgres/plugin/PostgresPlugin.java
similarity index 100%
rename from wayang-platforms/wayang-postgres/src/main/java/org/apache/incubator/wayang/postgres/plugin/PostgresPlugin.java
rename to wayang-platforms/wayang-postgres/src/main/java/org/apache/wayang/postgres/plugin/PostgresPlugin.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/Spark.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/Spark.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/Spark.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/Spark.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/channels/BroadcastChannel.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/channels/BroadcastChannel.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/channels/BroadcastChannel.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/channels/BroadcastChannel.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/channels/ChannelConversions.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/channels/ChannelConversions.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/channels/ChannelConversions.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/channels/ChannelConversions.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/channels/FileChannels.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/channels/FileChannels.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/channels/FileChannels.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/channels/FileChannels.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/channels/RddChannel.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/channels/RddChannel.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/channels/RddChannel.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/channels/RddChannel.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/BinaryOperatorAdapter.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/compiler/BinaryOperatorAdapter.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/BinaryOperatorAdapter.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/compiler/BinaryOperatorAdapter.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedBinaryOperatorAdapter.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/compiler/ExtendedBinaryOperatorAdapter.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedBinaryOperatorAdapter.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/compiler/ExtendedBinaryOperatorAdapter.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedFlatMapFunctionAdapter.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/compiler/ExtendedFlatMapFunctionAdapter.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedFlatMapFunctionAdapter.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/compiler/ExtendedFlatMapFunctionAdapter.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedFunction.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/compiler/ExtendedFunction.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedFunction.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/compiler/ExtendedFunction.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedMapFunctionAdapter.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/compiler/ExtendedMapFunctionAdapter.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedMapFunctionAdapter.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/compiler/ExtendedMapFunctionAdapter.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedMapPartitionsFunctionAdapter.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/compiler/ExtendedMapPartitionsFunctionAdapter.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedMapPartitionsFunctionAdapter.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/compiler/ExtendedMapPartitionsFunctionAdapter.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedPredicateAdapater.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/compiler/ExtendedPredicateAdapater.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/ExtendedPredicateAdapater.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/compiler/ExtendedPredicateAdapater.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/FlatMapFunctionAdapter.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/compiler/FlatMapFunctionAdapter.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/FlatMapFunctionAdapter.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/compiler/FlatMapFunctionAdapter.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/FunctionCompiler.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/compiler/FunctionCompiler.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/FunctionCompiler.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/compiler/FunctionCompiler.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/MapFunctionAdapter.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/compiler/MapFunctionAdapter.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/MapFunctionAdapter.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/compiler/MapFunctionAdapter.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/MapPartitionsFunctionAdapter.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/compiler/MapPartitionsFunctionAdapter.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/MapPartitionsFunctionAdapter.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/compiler/MapPartitionsFunctionAdapter.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/PredicateAdapter.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/compiler/PredicateAdapter.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/compiler/PredicateAdapter.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/compiler/PredicateAdapter.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/execution/SparkContextReference.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/execution/SparkContextReference.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/execution/SparkContextReference.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/execution/SparkContextReference.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/execution/SparkExecutionContext.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/execution/SparkExecutionContext.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/execution/SparkExecutionContext.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/execution/SparkExecutionContext.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/execution/SparkExecutor.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/execution/SparkExecutor.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/execution/SparkExecutor.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/execution/SparkExecutor.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/CartesianMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/CartesianMapping.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/CartesianMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/CartesianMapping.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/CoGroupMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/CoGroupMapping.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/CoGroupMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/CoGroupMapping.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/CollectionSourceMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/CollectionSourceMapping.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/CollectionSourceMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/CollectionSourceMapping.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/CountMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/CountMapping.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/CountMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/CountMapping.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/DistinctMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/DistinctMapping.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/DistinctMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/DistinctMapping.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/DoWhileMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/DoWhileMapping.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/DoWhileMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/DoWhileMapping.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/FilterMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/FilterMapping.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/FilterMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/FilterMapping.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/FlatMapMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/FlatMapMapping.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/FlatMapMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/FlatMapMapping.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/GlobalMaterializedGroupMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/GlobalMaterializedGroupMapping.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/GlobalMaterializedGroupMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/GlobalMaterializedGroupMapping.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/GlobalReduceMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/GlobalReduceMapping.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/GlobalReduceMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/GlobalReduceMapping.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/IntersectMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/IntersectMapping.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/IntersectMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/IntersectMapping.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/JoinMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/JoinMapping.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/JoinMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/JoinMapping.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/LocalCallbackSinkMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/LocalCallbackSinkMapping.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/LocalCallbackSinkMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/LocalCallbackSinkMapping.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/LoopMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/LoopMapping.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/LoopMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/LoopMapping.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/MapMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/MapMapping.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/MapMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/MapMapping.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/MapPartitionsMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/MapPartitionsMapping.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/MapPartitionsMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/MapPartitionsMapping.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/Mappings.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/Mappings.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/Mappings.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/Mappings.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/MaterializedGroupByMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/MaterializedGroupByMapping.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/MaterializedGroupByMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/MaterializedGroupByMapping.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/ReduceByMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/ReduceByMapping.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/ReduceByMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/ReduceByMapping.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/RepeatMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/RepeatMapping.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/RepeatMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/RepeatMapping.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/SampleMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/SampleMapping.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/SampleMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/SampleMapping.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/SortMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/SortMapping.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/SortMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/SortMapping.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/TextFileSinkMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/TextFileSinkMapping.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/TextFileSinkMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/TextFileSinkMapping.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/TextFileSourceMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/TextFileSourceMapping.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/TextFileSourceMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/TextFileSourceMapping.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/UnionAllMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/UnionAllMapping.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/UnionAllMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/UnionAllMapping.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/ZipWithIdMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/ZipWithIdMapping.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/ZipWithIdMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/ZipWithIdMapping.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/graph/PageRankMapping.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/graph/PageRankMapping.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/mapping/graph/PageRankMapping.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/mapping/graph/PageRankMapping.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkBernoulliSampleOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkBernoulliSampleOperator.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkBernoulliSampleOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkBernoulliSampleOperator.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkBroadcastOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkBroadcastOperator.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkBroadcastOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkBroadcastOperator.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCacheOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkCacheOperator.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCacheOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkCacheOperator.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCartesianOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkCartesianOperator.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCartesianOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkCartesianOperator.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCoGroupOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkCoGroupOperator.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCoGroupOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkCoGroupOperator.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCollectOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkCollectOperator.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCollectOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkCollectOperator.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCollectionSource.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkCollectionSource.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCollectionSource.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkCollectionSource.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCountOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkCountOperator.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkCountOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkCountOperator.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkDistinctOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkDistinctOperator.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkDistinctOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkDistinctOperator.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkDoWhileOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkDoWhileOperator.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkDoWhileOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkDoWhileOperator.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkExecutionOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkExecutionOperator.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkExecutionOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkExecutionOperator.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkFilterOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkFilterOperator.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkFilterOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkFilterOperator.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkFlatMapOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkFlatMapOperator.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkFlatMapOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkFlatMapOperator.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkGlobalMaterializedGroupOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkGlobalMaterializedGroupOperator.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkGlobalMaterializedGroupOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkGlobalMaterializedGroupOperator.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkGlobalReduceOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkGlobalReduceOperator.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkGlobalReduceOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkGlobalReduceOperator.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkIntersectOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkIntersectOperator.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkIntersectOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkIntersectOperator.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkJoinOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkJoinOperator.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkJoinOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkJoinOperator.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkLocalCallbackSink.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkLocalCallbackSink.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkLocalCallbackSink.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkLocalCallbackSink.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkLoopOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkLoopOperator.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkLoopOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkLoopOperator.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkMapOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkMapOperator.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkMapOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkMapOperator.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkMapPartitionsOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkMapPartitionsOperator.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkMapPartitionsOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkMapPartitionsOperator.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkMaterializedGroupByOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkMaterializedGroupByOperator.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkMaterializedGroupByOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkMaterializedGroupByOperator.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkObjectFileSink.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkObjectFileSink.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkObjectFileSink.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkObjectFileSink.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkObjectFileSource.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkObjectFileSource.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkObjectFileSource.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkObjectFileSource.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkRandomPartitionSampleOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkRandomPartitionSampleOperator.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkRandomPartitionSampleOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkRandomPartitionSampleOperator.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkReduceByOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkReduceByOperator.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkReduceByOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkReduceByOperator.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkRepeatOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkRepeatOperator.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkRepeatOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkRepeatOperator.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkShufflePartitionSampleOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkShufflePartitionSampleOperator.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkShufflePartitionSampleOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkShufflePartitionSampleOperator.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkSortOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkSortOperator.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkSortOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkSortOperator.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkTextFileSink.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkTextFileSink.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkTextFileSink.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkTextFileSink.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkTextFileSource.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkTextFileSource.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkTextFileSource.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkTextFileSource.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkTsvFileSink.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkTsvFileSink.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkTsvFileSink.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkTsvFileSink.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkTsvFileSource.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkTsvFileSource.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkTsvFileSource.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkTsvFileSource.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkUnionAllOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkUnionAllOperator.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkUnionAllOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkUnionAllOperator.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkZipWithIdOperator.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkZipWithIdOperator.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/operators/SparkZipWithIdOperator.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/operators/SparkZipWithIdOperator.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/platform/SparkPlatform.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/platform/SparkPlatform.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/platform/SparkPlatform.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/platform/SparkPlatform.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/plugin/SparkBasicPlugin.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/plugin/SparkBasicPlugin.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/plugin/SparkBasicPlugin.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/plugin/SparkBasicPlugin.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/plugin/SparkConversionPlugin.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/plugin/SparkConversionPlugin.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/plugin/SparkConversionPlugin.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/plugin/SparkConversionPlugin.java
diff --git a/wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/plugin/SparkGraphPlugin.java b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/plugin/SparkGraphPlugin.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/java/org/apache/incubator/wayang/spark/plugin/SparkGraphPlugin.java
rename to wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/plugin/SparkGraphPlugin.java
diff --git a/wayang-platforms/wayang-spark/src/main/scala/org/apache/incubator/wayang/spark/operators/graph/SparkPageRankOperator.scala b/wayang-platforms/wayang-spark/src/main/scala/org/apache/wayang/spark/operators/graph/SparkPageRankOperator.scala
similarity index 100%
rename from wayang-platforms/wayang-spark/src/main/scala/org/apache/incubator/wayang/spark/operators/graph/SparkPageRankOperator.scala
rename to wayang-platforms/wayang-spark/src/main/scala/org/apache/wayang/spark/operators/graph/SparkPageRankOperator.scala
diff --git a/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkBernoulliSampleOperatorTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkBernoulliSampleOperatorTest.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkBernoulliSampleOperatorTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkBernoulliSampleOperatorTest.java
diff --git a/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkCartesianOperatorTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkCartesianOperatorTest.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkCartesianOperatorTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkCartesianOperatorTest.java
diff --git a/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkCoGroupOperatorTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkCoGroupOperatorTest.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkCoGroupOperatorTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkCoGroupOperatorTest.java
diff --git a/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkCollectionSourceTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkCollectionSourceTest.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkCollectionSourceTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkCollectionSourceTest.java
diff --git a/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkCountOperatorTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkCountOperatorTest.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkCountOperatorTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkCountOperatorTest.java
diff --git a/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkDistinctOperatorTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkDistinctOperatorTest.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkDistinctOperatorTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkDistinctOperatorTest.java
diff --git a/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkFilterOperatorTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkFilterOperatorTest.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkFilterOperatorTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkFilterOperatorTest.java
diff --git a/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkFlatMapOperatorTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkFlatMapOperatorTest.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkFlatMapOperatorTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkFlatMapOperatorTest.java
diff --git a/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkGlobalMaterializedGroupOperatorTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkGlobalMaterializedGroupOperatorTest.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkGlobalMaterializedGroupOperatorTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkGlobalMaterializedGroupOperatorTest.java
diff --git a/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkGlobalReduceOperatorTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkGlobalReduceOperatorTest.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkGlobalReduceOperatorTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkGlobalReduceOperatorTest.java
diff --git a/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkJoinOperatorTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkJoinOperatorTest.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkJoinOperatorTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkJoinOperatorTest.java
diff --git a/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkMapPartitionsOperatorTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkMapPartitionsOperatorTest.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkMapPartitionsOperatorTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkMapPartitionsOperatorTest.java
diff --git a/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkMaterializedGroupByOperatorTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkMaterializedGroupByOperatorTest.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkMaterializedGroupByOperatorTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkMaterializedGroupByOperatorTest.java
diff --git a/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkObjectFileSinkTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkObjectFileSinkTest.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkObjectFileSinkTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkObjectFileSinkTest.java
diff --git a/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkObjectFileSourceTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkObjectFileSourceTest.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkObjectFileSourceTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkObjectFileSourceTest.java
diff --git a/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkOperatorTestBase.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkOperatorTestBase.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkOperatorTestBase.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkOperatorTestBase.java
diff --git a/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkRandomPartitionSampleOperatorTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkRandomPartitionSampleOperatorTest.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkRandomPartitionSampleOperatorTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkRandomPartitionSampleOperatorTest.java
diff --git a/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkReduceByOperatorTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkReduceByOperatorTest.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkReduceByOperatorTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkReduceByOperatorTest.java
diff --git a/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkShufflePartitionSampleOperatorTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkShufflePartitionSampleOperatorTest.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkShufflePartitionSampleOperatorTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkShufflePartitionSampleOperatorTest.java
diff --git a/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkSortOperatorTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkSortOperatorTest.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkSortOperatorTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkSortOperatorTest.java
diff --git a/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkTextFileSinkTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkTextFileSinkTest.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkTextFileSinkTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkTextFileSinkTest.java
diff --git a/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkUnionAllOperatorTest.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkUnionAllOperatorTest.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/operators/SparkUnionAllOperatorTest.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkUnionAllOperatorTest.java
diff --git a/wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/test/ChannelFactory.java b/wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/test/ChannelFactory.java
similarity index 100%
rename from wayang-platforms/wayang-spark/src/test/java/org/apache/incubator/wayang/spark/test/ChannelFactory.java
rename to wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/test/ChannelFactory.java
diff --git a/wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/Sqlite3.java b/wayang-platforms/wayang-sqlite3/src/main/java/org/apache/wayang/sqlite3/Sqlite3.java
similarity index 100%
rename from wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/Sqlite3.java
rename to wayang-platforms/wayang-sqlite3/src/main/java/org/apache/wayang/sqlite3/Sqlite3.java
diff --git a/wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/channels/ChannelConversions.java b/wayang-platforms/wayang-sqlite3/src/main/java/org/apache/wayang/sqlite3/channels/ChannelConversions.java
similarity index 100%
rename from wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/channels/ChannelConversions.java
rename to wayang-platforms/wayang-sqlite3/src/main/java/org/apache/wayang/sqlite3/channels/ChannelConversions.java
diff --git a/wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/mapping/FilterMapping.java b/wayang-platforms/wayang-sqlite3/src/main/java/org/apache/wayang/sqlite3/mapping/FilterMapping.java
similarity index 100%
rename from wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/mapping/FilterMapping.java
rename to wayang-platforms/wayang-sqlite3/src/main/java/org/apache/wayang/sqlite3/mapping/FilterMapping.java
diff --git a/wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/mapping/Mappings.java b/wayang-platforms/wayang-sqlite3/src/main/java/org/apache/wayang/sqlite3/mapping/Mappings.java
similarity index 100%
rename from wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/mapping/Mappings.java
rename to wayang-platforms/wayang-sqlite3/src/main/java/org/apache/wayang/sqlite3/mapping/Mappings.java
diff --git a/wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/mapping/ProjectionMapping.java b/wayang-platforms/wayang-sqlite3/src/main/java/org/apache/wayang/sqlite3/mapping/ProjectionMapping.java
similarity index 100%
rename from wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/mapping/ProjectionMapping.java
rename to wayang-platforms/wayang-sqlite3/src/main/java/org/apache/wayang/sqlite3/mapping/ProjectionMapping.java
diff --git a/wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/operators/Sqlite3FilterOperator.java b/wayang-platforms/wayang-sqlite3/src/main/java/org/apache/wayang/sqlite3/operators/Sqlite3FilterOperator.java
similarity index 100%
rename from wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/operators/Sqlite3FilterOperator.java
rename to wayang-platforms/wayang-sqlite3/src/main/java/org/apache/wayang/sqlite3/operators/Sqlite3FilterOperator.java
diff --git a/wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/operators/Sqlite3ProjectionOperator.java b/wayang-platforms/wayang-sqlite3/src/main/java/org/apache/wayang/sqlite3/operators/Sqlite3ProjectionOperator.java
similarity index 100%
rename from wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/operators/Sqlite3ProjectionOperator.java
rename to wayang-platforms/wayang-sqlite3/src/main/java/org/apache/wayang/sqlite3/operators/Sqlite3ProjectionOperator.java
diff --git a/wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/operators/Sqlite3TableSource.java b/wayang-platforms/wayang-sqlite3/src/main/java/org/apache/wayang/sqlite3/operators/Sqlite3TableSource.java
similarity index 100%
rename from wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/operators/Sqlite3TableSource.java
rename to wayang-platforms/wayang-sqlite3/src/main/java/org/apache/wayang/sqlite3/operators/Sqlite3TableSource.java
diff --git a/wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/platform/Sqlite3Platform.java b/wayang-platforms/wayang-sqlite3/src/main/java/org/apache/wayang/sqlite3/platform/Sqlite3Platform.java
similarity index 100%
rename from wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/platform/Sqlite3Platform.java
rename to wayang-platforms/wayang-sqlite3/src/main/java/org/apache/wayang/sqlite3/platform/Sqlite3Platform.java
diff --git a/wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/plugin/Sqlite3ConversionPlugin.java b/wayang-platforms/wayang-sqlite3/src/main/java/org/apache/wayang/sqlite3/plugin/Sqlite3ConversionPlugin.java
similarity index 100%
rename from wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/plugin/Sqlite3ConversionPlugin.java
rename to wayang-platforms/wayang-sqlite3/src/main/java/org/apache/wayang/sqlite3/plugin/Sqlite3ConversionPlugin.java
diff --git a/wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/plugin/Sqlite3Plugin.java b/wayang-platforms/wayang-sqlite3/src/main/java/org/apache/wayang/sqlite3/plugin/Sqlite3Plugin.java
similarity index 100%
rename from wayang-platforms/wayang-sqlite3/src/main/java/org/apache/incubator/wayang/sqlite3/plugin/Sqlite3Plugin.java
rename to wayang-platforms/wayang-sqlite3/src/main/java/org/apache/wayang/sqlite3/plugin/Sqlite3Plugin.java
diff --git a/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/data/DataGenerators.java b/wayang-profiler/src/main/java/org/apache/wayang/profiler/data/DataGenerators.java
similarity index 100%
rename from wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/data/DataGenerators.java
rename to wayang-profiler/src/main/java/org/apache/wayang/profiler/data/DataGenerators.java
diff --git a/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/hardware/DiskProfiler.java b/wayang-profiler/src/main/java/org/apache/wayang/profiler/hardware/DiskProfiler.java
similarity index 100%
rename from wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/hardware/DiskProfiler.java
rename to wayang-profiler/src/main/java/org/apache/wayang/profiler/hardware/DiskProfiler.java
diff --git a/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/BinaryOperatorProfiler.java b/wayang-profiler/src/main/java/org/apache/wayang/profiler/java/BinaryOperatorProfiler.java
similarity index 100%
rename from wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/BinaryOperatorProfiler.java
rename to wayang-profiler/src/main/java/org/apache/wayang/profiler/java/BinaryOperatorProfiler.java
diff --git a/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/JavaCollectionSourceProfiler.java b/wayang-profiler/src/main/java/org/apache/wayang/profiler/java/JavaCollectionSourceProfiler.java
similarity index 100%
rename from wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/JavaCollectionSourceProfiler.java
rename to wayang-profiler/src/main/java/org/apache/wayang/profiler/java/JavaCollectionSourceProfiler.java
diff --git a/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/JavaTextFileSourceProfiler.java b/wayang-profiler/src/main/java/org/apache/wayang/profiler/java/JavaTextFileSourceProfiler.java
similarity index 100%
rename from wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/JavaTextFileSourceProfiler.java
rename to wayang-profiler/src/main/java/org/apache/wayang/profiler/java/JavaTextFileSourceProfiler.java
diff --git a/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/OperatorProfiler.java b/wayang-profiler/src/main/java/org/apache/wayang/profiler/java/OperatorProfiler.java
similarity index 100%
rename from wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/OperatorProfiler.java
rename to wayang-profiler/src/main/java/org/apache/wayang/profiler/java/OperatorProfiler.java
diff --git a/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/OperatorProfilers.java b/wayang-profiler/src/main/java/org/apache/wayang/profiler/java/OperatorProfilers.java
similarity index 100%
rename from wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/OperatorProfilers.java
rename to wayang-profiler/src/main/java/org/apache/wayang/profiler/java/OperatorProfilers.java
diff --git a/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/Profiler.java b/wayang-profiler/src/main/java/org/apache/wayang/profiler/java/Profiler.java
similarity index 100%
rename from wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/Profiler.java
rename to wayang-profiler/src/main/java/org/apache/wayang/profiler/java/Profiler.java
diff --git a/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/SinkProfiler.java b/wayang-profiler/src/main/java/org/apache/wayang/profiler/java/SinkProfiler.java
similarity index 100%
rename from wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/SinkProfiler.java
rename to wayang-profiler/src/main/java/org/apache/wayang/profiler/java/SinkProfiler.java
diff --git a/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/SourceProfiler.java b/wayang-profiler/src/main/java/org/apache/wayang/profiler/java/SourceProfiler.java
similarity index 100%
rename from wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/SourceProfiler.java
rename to wayang-profiler/src/main/java/org/apache/wayang/profiler/java/SourceProfiler.java
diff --git a/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/UnaryOperatorProfiler.java b/wayang-profiler/src/main/java/org/apache/wayang/profiler/java/UnaryOperatorProfiler.java
similarity index 100%
rename from wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/java/UnaryOperatorProfiler.java
rename to wayang-profiler/src/main/java/org/apache/wayang/profiler/java/UnaryOperatorProfiler.java
diff --git a/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/DynamicEstimationContext.java b/wayang-profiler/src/main/java/org/apache/wayang/profiler/log/DynamicEstimationContext.java
similarity index 100%
rename from wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/DynamicEstimationContext.java
rename to wayang-profiler/src/main/java/org/apache/wayang/profiler/log/DynamicEstimationContext.java
diff --git a/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/DynamicLoadEstimator.java b/wayang-profiler/src/main/java/org/apache/wayang/profiler/log/DynamicLoadEstimator.java
similarity index 100%
rename from wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/DynamicLoadEstimator.java
rename to wayang-profiler/src/main/java/org/apache/wayang/profiler/log/DynamicLoadEstimator.java
diff --git a/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/DynamicLoadProfileEstimator.java b/wayang-profiler/src/main/java/org/apache/wayang/profiler/log/DynamicLoadProfileEstimator.java
similarity index 100%
rename from wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/DynamicLoadProfileEstimator.java
rename to wayang-profiler/src/main/java/org/apache/wayang/profiler/log/DynamicLoadProfileEstimator.java
diff --git a/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/DynamicLoadProfileEstimators.java b/wayang-profiler/src/main/java/org/apache/wayang/profiler/log/DynamicLoadProfileEstimators.java
similarity index 100%
rename from wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/DynamicLoadProfileEstimators.java
rename to wayang-profiler/src/main/java/org/apache/wayang/profiler/log/DynamicLoadProfileEstimators.java
diff --git a/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/GeneticOptimizer.java b/wayang-profiler/src/main/java/org/apache/wayang/profiler/log/GeneticOptimizer.java
similarity index 100%
rename from wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/GeneticOptimizer.java
rename to wayang-profiler/src/main/java/org/apache/wayang/profiler/log/GeneticOptimizer.java
diff --git a/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/GeneticOptimizerApp.java b/wayang-profiler/src/main/java/org/apache/wayang/profiler/log/GeneticOptimizerApp.java
similarity index 100%
rename from wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/GeneticOptimizerApp.java
rename to wayang-profiler/src/main/java/org/apache/wayang/profiler/log/GeneticOptimizerApp.java
diff --git a/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/Individual.java b/wayang-profiler/src/main/java/org/apache/wayang/profiler/log/Individual.java
similarity index 100%
rename from wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/Individual.java
rename to wayang-profiler/src/main/java/org/apache/wayang/profiler/log/Individual.java
diff --git a/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/LogEvaluator.java b/wayang-profiler/src/main/java/org/apache/wayang/profiler/log/LogEvaluator.java
similarity index 100%
rename from wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/LogEvaluator.java
rename to wayang-profiler/src/main/java/org/apache/wayang/profiler/log/LogEvaluator.java
diff --git a/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/OptimizationSpace.java b/wayang-profiler/src/main/java/org/apache/wayang/profiler/log/OptimizationSpace.java
similarity index 100%
rename from wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/OptimizationSpace.java
rename to wayang-profiler/src/main/java/org/apache/wayang/profiler/log/OptimizationSpace.java
diff --git a/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/Variable.java b/wayang-profiler/src/main/java/org/apache/wayang/profiler/log/Variable.java
similarity index 100%
rename from wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/Variable.java
rename to wayang-profiler/src/main/java/org/apache/wayang/profiler/log/Variable.java
diff --git a/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/sampling/Battle.java b/wayang-profiler/src/main/java/org/apache/wayang/profiler/log/sampling/Battle.java
similarity index 100%
rename from wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/sampling/Battle.java
rename to wayang-profiler/src/main/java/org/apache/wayang/profiler/log/sampling/Battle.java
diff --git a/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/sampling/ReservoirSampler.java b/wayang-profiler/src/main/java/org/apache/wayang/profiler/log/sampling/ReservoirSampler.java
similarity index 100%
rename from wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/sampling/ReservoirSampler.java
rename to wayang-profiler/src/main/java/org/apache/wayang/profiler/log/sampling/ReservoirSampler.java
diff --git a/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/sampling/Sampler.java b/wayang-profiler/src/main/java/org/apache/wayang/profiler/log/sampling/Sampler.java
similarity index 100%
rename from wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/sampling/Sampler.java
rename to wayang-profiler/src/main/java/org/apache/wayang/profiler/log/sampling/Sampler.java
diff --git a/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/sampling/TournamentSampler.java b/wayang-profiler/src/main/java/org/apache/wayang/profiler/log/sampling/TournamentSampler.java
similarity index 100%
rename from wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/log/sampling/TournamentSampler.java
rename to wayang-profiler/src/main/java/org/apache/wayang/profiler/log/sampling/TournamentSampler.java
diff --git a/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/BinaryOperatorProfiler.java b/wayang-profiler/src/main/java/org/apache/wayang/profiler/spark/BinaryOperatorProfiler.java
similarity index 100%
rename from wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/BinaryOperatorProfiler.java
rename to wayang-profiler/src/main/java/org/apache/wayang/profiler/spark/BinaryOperatorProfiler.java
diff --git a/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/Main.java b/wayang-profiler/src/main/java/org/apache/wayang/profiler/spark/Main.java
similarity index 100%
rename from wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/Main.java
rename to wayang-profiler/src/main/java/org/apache/wayang/profiler/spark/Main.java
diff --git a/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/OperatorProfilers.java b/wayang-profiler/src/main/java/org/apache/wayang/profiler/spark/OperatorProfilers.java
similarity index 100%
rename from wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/OperatorProfilers.java
rename to wayang-profiler/src/main/java/org/apache/wayang/profiler/spark/OperatorProfilers.java
diff --git a/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SinkProfiler.java b/wayang-profiler/src/main/java/org/apache/wayang/profiler/spark/SinkProfiler.java
similarity index 100%
rename from wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SinkProfiler.java
rename to wayang-profiler/src/main/java/org/apache/wayang/profiler/spark/SinkProfiler.java
diff --git a/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkCollectionSourceProfiler.java b/wayang-profiler/src/main/java/org/apache/wayang/profiler/spark/SparkCollectionSourceProfiler.java
similarity index 100%
rename from wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkCollectionSourceProfiler.java
rename to wayang-profiler/src/main/java/org/apache/wayang/profiler/spark/SparkCollectionSourceProfiler.java
diff --git a/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkOperatorProfiler.java b/wayang-profiler/src/main/java/org/apache/wayang/profiler/spark/SparkOperatorProfiler.java
similarity index 100%
rename from wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkOperatorProfiler.java
rename to wayang-profiler/src/main/java/org/apache/wayang/profiler/spark/SparkOperatorProfiler.java
diff --git a/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkSourceProfiler.java b/wayang-profiler/src/main/java/org/apache/wayang/profiler/spark/SparkSourceProfiler.java
similarity index 100%
rename from wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkSourceProfiler.java
rename to wayang-profiler/src/main/java/org/apache/wayang/profiler/spark/SparkSourceProfiler.java
diff --git a/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkTextFileSourceProfiler.java b/wayang-profiler/src/main/java/org/apache/wayang/profiler/spark/SparkTextFileSourceProfiler.java
similarity index 100%
rename from wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkTextFileSourceProfiler.java
rename to wayang-profiler/src/main/java/org/apache/wayang/profiler/spark/SparkTextFileSourceProfiler.java
diff --git a/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkUnaryOperatorProfiler.java b/wayang-profiler/src/main/java/org/apache/wayang/profiler/spark/SparkUnaryOperatorProfiler.java
similarity index 100%
rename from wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/spark/SparkUnaryOperatorProfiler.java
rename to wayang-profiler/src/main/java/org/apache/wayang/profiler/spark/SparkUnaryOperatorProfiler.java
diff --git a/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/util/ProfilingUtils.java b/wayang-profiler/src/main/java/org/apache/wayang/profiler/util/ProfilingUtils.java
similarity index 100%
rename from wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/util/ProfilingUtils.java
rename to wayang-profiler/src/main/java/org/apache/wayang/profiler/util/ProfilingUtils.java
diff --git a/wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/util/RrdAccessor.java b/wayang-profiler/src/main/java/org/apache/wayang/profiler/util/RrdAccessor.java
similarity index 100%
rename from wayang-profiler/src/main/java/org/apache/incubator/wayang/profiler/util/RrdAccessor.java
rename to wayang-profiler/src/main/java/org/apache/wayang/profiler/util/RrdAccessor.java
diff --git a/wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/FlinkIntegrationIT.java b/wayang-tests/src/test/java/org/apache/wayang/tests/FlinkIntegrationIT.java
similarity index 100%
rename from wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/FlinkIntegrationIT.java
rename to wayang-tests/src/test/java/org/apache/wayang/tests/FlinkIntegrationIT.java
diff --git a/wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/FullIntegrationIT.java b/wayang-tests/src/test/java/org/apache/wayang/tests/FullIntegrationIT.java
similarity index 100%
rename from wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/FullIntegrationIT.java
rename to wayang-tests/src/test/java/org/apache/wayang/tests/FullIntegrationIT.java
diff --git a/wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/GiraphIntegrationIT.java b/wayang-tests/src/test/java/org/apache/wayang/tests/GiraphIntegrationIT.java
similarity index 100%
rename from wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/GiraphIntegrationIT.java
rename to wayang-tests/src/test/java/org/apache/wayang/tests/GiraphIntegrationIT.java
diff --git a/wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/GraphChiIntegrationIT.java b/wayang-tests/src/test/java/org/apache/wayang/tests/GraphChiIntegrationIT.java
similarity index 100%
rename from wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/GraphChiIntegrationIT.java
rename to wayang-tests/src/test/java/org/apache/wayang/tests/GraphChiIntegrationIT.java
diff --git a/wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/JavaIntegrationIT.java b/wayang-tests/src/test/java/org/apache/wayang/tests/JavaIntegrationIT.java
similarity index 100%
rename from wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/JavaIntegrationIT.java
rename to wayang-tests/src/test/java/org/apache/wayang/tests/JavaIntegrationIT.java
diff --git a/wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/PostgresIntegrationIT.java b/wayang-tests/src/test/java/org/apache/wayang/tests/PostgresIntegrationIT.java
similarity index 100%
rename from wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/PostgresIntegrationIT.java
rename to wayang-tests/src/test/java/org/apache/wayang/tests/PostgresIntegrationIT.java
diff --git a/wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/RegressionIT.java b/wayang-tests/src/test/java/org/apache/wayang/tests/RegressionIT.java
similarity index 100%
rename from wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/RegressionIT.java
rename to wayang-tests/src/test/java/org/apache/wayang/tests/RegressionIT.java
diff --git a/wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/SparkIntegrationIT.java b/wayang-tests/src/test/java/org/apache/wayang/tests/SparkIntegrationIT.java
similarity index 100%
rename from wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/SparkIntegrationIT.java
rename to wayang-tests/src/test/java/org/apache/wayang/tests/SparkIntegrationIT.java
diff --git a/wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/WayangPlans.java b/wayang-tests/src/test/java/org/apache/wayang/tests/WayangPlans.java
similarity index 100%
rename from wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/WayangPlans.java
rename to wayang-tests/src/test/java/org/apache/wayang/tests/WayangPlans.java
diff --git a/wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/WayangPlansOperators.java b/wayang-tests/src/test/java/org/apache/wayang/tests/WayangPlansOperators.java
similarity index 100%
rename from wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/WayangPlansOperators.java
rename to wayang-tests/src/test/java/org/apache/wayang/tests/WayangPlansOperators.java
diff --git a/wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/WordCountIT.java b/wayang-tests/src/test/java/org/apache/wayang/tests/WordCountIT.java
similarity index 100%
rename from wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/WordCountIT.java
rename to wayang-tests/src/test/java/org/apache/wayang/tests/WordCountIT.java
diff --git a/wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/platform/MyMadeUpPlatform.java b/wayang-tests/src/test/java/org/apache/wayang/tests/platform/MyMadeUpPlatform.java
similarity index 100%
rename from wayang-tests/src/test/java/org/org/apache/incubator/wayang/tests/platform/MyMadeUpPlatform.java
rename to wayang-tests/src/test/java/org/apache/wayang/tests/platform/MyMadeUpPlatform.java


[incubator-wayang] 05/05: minnor correction on the rebranding

Posted by be...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bertty pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-wayang.git

commit 5f3acb97a567b4713065a05fcd52c4f5acf52ad1
Author: Bertty Contreras-Rojas <be...@scalytics.io>
AuthorDate: Wed Feb 3 13:55:06 2021 -0300

    minnor correction on the rebranding
---
 .travis.yml                                        |  18 +--
 LICENSE.TXT                                        |   2 +-
 NOTICE.TXT                                         |   2 +-
 README.md                                          |  54 +++----
 pom.xml                                            |   2 +-
 wayang-api/pom.xml                                 |  16 +-
 .../scala/org/apache/wayang/api/DataQuanta.scala   |  24 +--
 .../org/apache/wayang/api/DataQuantaBuilder.scala  | 176 ++++++++++-----------
 .../org/apache/wayang/api/JavaPlanBuilder.scala    |  16 +-
 .../scala/org/apache/wayang/api/PlanBuilder.scala  |  16 +-
 .../org/apache/wayang/api/RecordDataQuanta.scala   |  12 +-
 .../wayang/api/RecordDataQuantaBuilder.scala       |  18 +--
 .../scala/org/apache/wayang/api/graph/Edge.scala   |   2 +-
 .../apache/wayang/api/graph/EdgeDataQuanta.scala   |  10 +-
 .../wayang/api/graph/EdgeDataQuantaBuilder.scala   |  12 +-
 .../org/apache/wayang/api/graph/package.scala      |   4 +-
 .../main/scala/org/apache/wayang/api/package.scala |  18 +--
 .../wayang/api/util/DataQuantaBuilderCache.scala   |   8 +-
 .../api/util/DataQuantaBuilderDecorator.scala      |  10 +-
 .../org/apache/wayang/api/util/TypeTrap.scala      |   6 +-
 .../java/org/apache/wayang/api/JavaApiTest.java    |  36 ++---
 .../test/scala/org/apache/wayang/api/ApiTest.scala |  24 +--
 wayang-basic/pom.xml                               |   4 +-
 .../java/org/apache/wayang/basic/WayangBasics.java |   6 +-
 .../apache/wayang/basic/channels/FileChannel.java  |  28 ++--
 .../java/org/apache/wayang/basic/data/Record.java  |   6 +-
 .../java/org/apache/wayang/basic/data/Tuple2.java  |   2 +-
 .../java/org/apache/wayang/basic/data/Tuple5.java  |   2 +-
 .../basic/function/ProjectionDescriptor.java       |  12 +-
 .../wayang/basic/mapping/GlobalReduceMapping.java  |  28 ++--
 .../org/apache/wayang/basic/mapping/Mappings.java  |   4 +-
 .../basic/mapping/MaterializedGroupByMapping.java  |  24 +--
 .../wayang/basic/mapping/PageRankMapping.java      |  54 +++----
 .../wayang/basic/mapping/ReduceByMapping.java      |  24 +--
 .../apache/wayang/basic/mapping/RepeatMapping.java |  26 +--
 .../wayang/basic/operators/CartesianOperator.java  |  14 +-
 .../wayang/basic/operators/CoGroupOperator.java    |  18 +--
 .../wayang/basic/operators/CollectionSource.java   |  14 +-
 .../wayang/basic/operators/CountOperator.java      |  12 +-
 .../wayang/basic/operators/DistinctOperator.java   |  12 +-
 .../wayang/basic/operators/DoWhileOperator.java    |  28 ++--
 .../wayang/basic/operators/FilterOperator.java     |  22 +--
 .../wayang/basic/operators/FlatMapOperator.java    |  24 +--
 .../operators/GlobalMaterializedGroupOperator.java |  12 +-
 .../basic/operators/GlobalReduceOperator.java      |  18 +--
 .../wayang/basic/operators/GroupByOperator.java    |  10 +-
 .../wayang/basic/operators/IntersectOperator.java  |  12 +-
 .../wayang/basic/operators/JoinOperator.java       |  18 +--
 .../wayang/basic/operators/LocalCallbackSink.java  |  16 +-
 .../wayang/basic/operators/LoopOperator.java       |  28 ++--
 .../apache/wayang/basic/operators/MapOperator.java |  22 +--
 .../basic/operators/MapPartitionsOperator.java     |  24 +--
 .../operators/MaterializedGroupByOperator.java     |  16 +-
 .../wayang/basic/operators/PageRankOperator.java   |  22 +--
 .../wayang/basic/operators/ReduceByOperator.java   |  18 +--
 .../wayang/basic/operators/ReduceOperator.java     |  16 +-
 .../wayang/basic/operators/RepeatOperator.java     |  24 +--
 .../wayang/basic/operators/SampleOperator.java     |  14 +-
 .../wayang/basic/operators/SortOperator.java       |  16 +-
 .../apache/wayang/basic/operators/TableSource.java |  10 +-
 .../wayang/basic/operators/TextFileSink.java       |  12 +-
 .../wayang/basic/operators/TextFileSource.java     |  24 +--
 .../wayang/basic/operators/UnionAllOperator.java   |  16 +-
 .../wayang/basic/operators/ZipWithIdOperator.java  |  14 +-
 .../apache/wayang/basic/plugin/WayangBasic.java    |  22 +--
 .../wayang/basic/plugin/WayangBasicGraph.java      |  16 +-
 .../org/apache/wayang/basic/types/RecordType.java  |   6 +-
 .../basic/function/ProjectionDescriptorTest.java   |   6 +-
 .../wayang/basic/mapping/ReduceByMappingTest.java  |  34 ++--
 .../operators/MaterializedGroupByOperatorTest.java |   8 +-
 .../wayang/basic/operators/TextFileSourceTest.java |  12 +-
 .../wayang/basic/operators/test/TestSink.java      |   6 +-
 .../wayang/basic/operators/test/TestSource.java    |   6 +-
 .../apache/wayang/basic/types/RecordTypeTest.java  |   6 +-
 wayang-core/pom.xml                                |   2 +-
 .../org/apache/wayang/core/api/Configuration.java  |  82 +++++-----
 .../main/java/org/apache/wayang/core/api/Job.java  |  94 +++++------
 .../org/apache/wayang/core/api/WayangContext.java  |  16 +-
 .../core/api/configuration/CollectionProvider.java |   4 +-
 .../api/configuration/ConstantValueProvider.java   |   4 +-
 .../configuration/ExplicitCollectionProvider.java  |   4 +-
 .../FunctionalCollectionProvider.java              |   4 +-
 .../configuration/FunctionalKeyValueProvider.java  |   4 +-
 .../api/configuration/FunctionalValueProvider.java |   4 +-
 .../core/api/configuration/KeyValueProvider.java   |   6 +-
 .../configuration/MapBasedKeyValueProvider.java    |   4 +-
 .../core/api/configuration/ValueProvider.java      |   6 +-
 .../wayang/core/api/exception/WayangException.java |   2 +-
 .../core/function/AggregationDescriptor.java       |  14 +-
 .../wayang/core/function/ConsumerDescriptor.java   |   8 +-
 .../wayang/core/function/ExecutionContext.java     |   6 +-
 .../wayang/core/function/ExtendedFunction.java     |   4 +-
 .../wayang/core/function/FlatMapDescriptor.java    |  10 +-
 .../wayang/core/function/FunctionDescriptor.java   |  10 +-
 .../core/function/MapPartitionsDescriptor.java     |  10 +-
 .../wayang/core/function/PredicateDescriptor.java  |   8 +-
 .../wayang/core/function/ReduceDescriptor.java     |  14 +-
 .../core/function/TransformationDescriptor.java    |  10 +-
 .../org/apache/wayang/core/mapping/Mapping.java    |   2 +-
 .../apache/wayang/core/mapping/OperatorMatch.java  |   4 +-
 .../wayang/core/mapping/OperatorPattern.java       |  18 +--
 .../wayang/core/mapping/PlanTransformation.java    |  18 +--
 .../core/mapping/ReplacementSubplanFactory.java    |  16 +-
 .../apache/wayang/core/mapping/SubplanMatch.java   |   6 +-
 .../apache/wayang/core/mapping/SubplanPattern.java |  18 +--
 .../wayang/core/monitor/DisabledMonitor.java       |   4 +-
 .../apache/wayang/core/monitor/FileMonitor.java    |   8 +-
 .../apache/wayang/core/monitor/HttpMonitor.java    |   4 +-
 .../org/apache/wayang/core/monitor/Monitor.java    |   4 +-
 .../apache/wayang/core/monitor/ZeroMQMonitor.java  |   4 +-
 .../optimizer/AggregateOptimizationContext.java    |   6 +-
 .../core/optimizer/DefaultOptimizationContext.java |  22 +--
 .../wayang/core/optimizer/OptimizationContext.java |  58 +++----
 .../wayang/core/optimizer/OptimizationUtils.java   |  26 +--
 .../optimizer/ProbabilisticDoubleInterval.java     |   2 +-
 .../optimizer/ProbabilisticIntervalEstimate.java   |   4 +-
 .../wayang/core/optimizer/SanityChecker.java       |  14 +-
 .../AbstractAlternativeCardinalityPusher.java      |  12 +-
 .../AggregatingCardinalityEstimator.java           |   4 +-
 .../optimizer/cardinality/CardinalityEstimate.java |  10 +-
 .../CardinalityEstimationTraversal.java            |  20 +--
 .../cardinality/CardinalityEstimator.java          |  10 +-
 .../cardinality/CardinalityEstimatorManager.java   |  28 ++--
 .../optimizer/cardinality/CardinalityPusher.java   |  12 +-
 .../cardinality/DefaultCardinalityEstimator.java   |   6 +-
 .../cardinality/DefaultCardinalityPusher.java      |  12 +-
 .../cardinality/FallbackCardinalityEstimator.java  |   4 +-
 .../cardinality/FixedSizeCardinalityEstimator.java |   6 +-
 .../LoopHeadAlternativeCardinalityPusher.java      |  22 +--
 .../cardinality/LoopSubplanCardinalityPusher.java  |  18 +--
 .../OperatorAlternativeCardinalityPusher.java      |  10 +-
 .../cardinality/SubplanCardinalityPusher.java      |  20 +--
 .../SwitchForwardCardinalityEstimator.java         |   6 +-
 .../core/optimizer/channels/ChannelConversion.java |  16 +-
 .../optimizer/channels/ChannelConversionGraph.java |  46 +++---
 .../channels/DefaultChannelConversion.java         |  22 +--
 .../costs/ConstantLoadProfileEstimator.java        |   2 +-
 .../core/optimizer/costs/DefaultLoadEstimator.java |   6 +-
 .../core/optimizer/costs/EstimationContext.java    |  10 +-
 .../optimizer/costs/IntervalLoadEstimator.java     |   6 +-
 .../wayang/core/optimizer/costs/LoadEstimate.java  |   8 +-
 .../wayang/core/optimizer/costs/LoadEstimator.java |   8 +-
 .../wayang/core/optimizer/costs/LoadProfile.java   |  10 +-
 .../core/optimizer/costs/LoadProfileEstimator.java |   4 +-
 .../optimizer/costs/LoadProfileEstimators.java     |  32 ++--
 .../costs/LoadProfileToTimeConverter.java          |   2 +-
 .../core/optimizer/costs/LoadToTimeConverter.java  |   2 +-
 .../costs/NestableLoadProfileEstimator.java        |   8 +-
 .../optimizer/costs/SimpleEstimationContext.java   |   8 +-
 .../wayang/core/optimizer/costs/TimeEstimate.java  |   6 +-
 .../core/optimizer/costs/TimeToCostConverter.java  |   4 +-
 .../optimizer/enumeration/ExecutionTaskFlow.java   |  16 +-
 .../enumeration/ExecutionTaskFlowCompiler.java     |  34 ++--
 .../enumeration/LatentOperatorPruningStrategy.java |  14 +-
 .../core/optimizer/enumeration/LoopEnumerator.java |  20 +--
 .../optimizer/enumeration/LoopImplementation.java  |  20 +--
 .../optimizer/enumeration/PlanEnumeration.java     |  32 ++--
 .../PlanEnumerationPruningStrategy.java            |   4 +-
 .../core/optimizer/enumeration/PlanEnumerator.java |  42 ++---
 .../optimizer/enumeration/PlanImplementation.java  |  44 +++---
 .../enumeration/RandomPruningStrategy.java         |   4 +-
 .../enumeration/SinglePlatformPruningStrategy.java |  10 +-
 .../enumeration/StageAssignmentTraversal.java      |  34 ++--
 .../optimizer/enumeration/TopKPruningStrategy.java |   4 +-
 .../partition/EnumerationAlternative.java          |   2 +-
 .../optimizer/partition/EnumerationBranch.java     |   6 +-
 .../wayang/core/plan/executionplan/Channel.java    |  30 ++--
 .../plan/executionplan/ChannelInitializer.java     |  16 +-
 .../core/plan/executionplan/ExecutionPlan.java     |   8 +-
 .../core/plan/executionplan/ExecutionStage.java    |   8 +-
 .../plan/executionplan/ExecutionStageLoop.java     |   8 +-
 .../core/plan/executionplan/ExecutionTask.java     |  18 +--
 .../core/plan/executionplan/PlatformExecution.java |   4 +-
 .../core/plan/wayangplan/ActualOperator.java       |   2 +-
 .../plan/wayangplan/BinaryToUnaryOperator.java     |   4 +-
 .../core/plan/wayangplan/CompositeOperator.java    |   2 +-
 .../core/plan/wayangplan/ElementaryOperator.java   |   6 +-
 .../plan/wayangplan/EstimationContextProperty.java |   4 +-
 .../core/plan/wayangplan/ExecutionOperator.java    |  32 ++--
 .../wayang/core/plan/wayangplan/InputSlot.java     |   4 +-
 .../core/plan/wayangplan/LoopHeadAlternative.java  |  10 +-
 .../core/plan/wayangplan/LoopHeadOperator.java     |   8 +-
 .../wayang/core/plan/wayangplan/LoopIsolator.java  |   4 +-
 .../wayang/core/plan/wayangplan/LoopSubplan.java   |  10 +-
 .../wayang/core/plan/wayangplan/Operator.java      |  16 +-
 .../core/plan/wayangplan/OperatorAlternative.java  |  12 +-
 .../wayang/core/plan/wayangplan/OperatorBase.java  |  24 +--
 .../core/plan/wayangplan/OperatorContainer.java    |   8 +-
 .../core/plan/wayangplan/OperatorContainers.java   |   2 +-
 .../wayang/core/plan/wayangplan/Operators.java     |   2 +-
 .../wayang/core/plan/wayangplan/OutputSlot.java    |   4 +-
 .../wayang/core/plan/wayangplan/PlanMetrics.java   |   2 +-
 .../wayang/core/plan/wayangplan/PlanTraversal.java |   2 +-
 .../apache/wayang/core/plan/wayangplan/Slot.java   |   6 +-
 .../wayang/core/plan/wayangplan/SlotMapping.java   |   4 +-
 .../wayang/core/plan/wayangplan/Subplan.java       |  10 +-
 .../core/plan/wayangplan/TopDownPlanVisitor.java   |   2 +-
 .../wayang/core/plan/wayangplan/UnarySink.java     |   4 +-
 .../wayang/core/plan/wayangplan/UnarySource.java   |   4 +-
 .../core/plan/wayangplan/UnaryToUnaryOperator.java |   4 +-
 .../wayang/core/plan/wayangplan/WayangPlan.java    |  10 +-
 .../traversal/AbstractTopologicalTraversal.java    |  12 +-
 .../core/platform/AbstractChannelInstance.java     |  10 +-
 .../wayang/core/platform/AtomicExecution.java      |  20 +--
 .../wayang/core/platform/AtomicExecutionGroup.java |  18 +--
 .../apache/wayang/core/platform/Breakpoint.java    |   8 +-
 .../core/platform/CardinalityBreakpoint.java       |  18 +--
 .../wayang/core/platform/ChannelDescriptor.java    |  10 +-
 .../wayang/core/platform/ChannelInstance.java      |  12 +-
 .../core/platform/CompositeExecutionResource.java  |   2 +-
 .../core/platform/ConjunctiveBreakpoint.java       |   6 +-
 .../core/platform/CrossPlatformExecutor.java       |  34 ++--
 .../wayang/core/platform/ExecutionResource.java    |   6 +-
 .../core/platform/ExecutionResourceTemplate.java   |   6 +-
 .../wayang/core/platform/ExecutionState.java       |   6 +-
 .../org/apache/wayang/core/platform/Executor.java  |  10 +-
 .../wayang/core/platform/ExecutorTemplate.java     |  18 +--
 .../apache/wayang/core/platform/FixBreakpoint.java |   8 +-
 .../org/apache/wayang/core/platform/Junction.java  |  22 +--
 .../core/platform/NoIterationBreakpoint.java       |   8 +-
 .../wayang/core/platform/PartialExecution.java     |  22 +--
 .../org/apache/wayang/core/platform/Platform.java  |  26 +--
 .../wayang/core/platform/PushExecutorTemplate.java |  26 +--
 .../core/platform/lineage/ChannelLineageNode.java  |   4 +-
 .../platform/lineage/ExecutionLineageNode.java     |  10 +-
 .../platform/lineage/LazyExecutionLineageNode.java |   6 +-
 .../apache/wayang/core/plugin/DynamicPlugin.java   |  18 +--
 .../java/org/apache/wayang/core/plugin/Plugin.java |  12 +-
 .../core/profiling/CardinalityRepository.java      |  22 +--
 .../wayang/core/profiling/CostMeasurement.java     |   2 +-
 .../apache/wayang/core/profiling/ExecutionLog.java |  14 +-
 .../core/profiling/ExecutionPlanMeasurement.java   |  12 +-
 .../profiling/FullInstrumentationStrategy.java     |   6 +-
 .../core/profiling/InstrumentationStrategy.java    |   8 +-
 .../core/profiling/NoInstrumentationStrategy.java  |   6 +-
 .../profiling/OutboundInstrumentationStrategy.java |   6 +-
 .../profiling/PartialExecutionMeasurement.java     |   8 +-
 .../apache/wayang/core/profiling/ProfileDBs.java   |   8 +-
 .../wayang/core/types/BasicDataUnitType.java       |   2 +-
 .../org/apache/wayang/core/types/DataSetType.java  |   4 +-
 .../wayang/core/types/DataUnitGroupType.java       |   4 +-
 .../org/apache/wayang/core/types/DataUnitType.java |   2 +-
 .../core/util/AbstractReferenceCountable.java      |   2 +-
 .../java/org/apache/wayang/core/util/Action.java   |   2 +-
 .../java/org/apache/wayang/core/util/Actions.java  |   2 +-
 .../java/org/apache/wayang/core/util/Bitmask.java  |   2 +-
 .../org/apache/wayang/core/util/Canonicalizer.java |   2 +-
 .../wayang/core/util/ConsumerIteratorAdapter.java  |   2 +-
 .../java/org/apache/wayang/core/util/Copyable.java |   2 +-
 .../java/org/apache/wayang/core/util/Counter.java  |   2 +-
 .../wayang/core/util/CrossProductIterable.java     |   2 +-
 .../java/org/apache/wayang/core/util/Formats.java  |   2 +-
 .../org/apache/wayang/core/util/Iterators.java     |   2 +-
 .../apache/wayang/core/util/JsonSerializable.java  |   4 +-
 .../apache/wayang/core/util/JsonSerializables.java |   2 +-
 .../apache/wayang/core/util/JsonSerializer.java    |   2 +-
 .../org/apache/wayang/core/util/JuelUtils.java     |   6 +-
 .../wayang/core/util/LimitedInputStream.java       |   2 +-
 .../java/org/apache/wayang/core/util/Logging.java  |   2 +-
 .../java/org/apache/wayang/core/util/LruCache.java |   2 +-
 .../java/org/apache/wayang/core/util/MultiMap.java |   2 +-
 .../apache/wayang/core/util/OneTimeExecutable.java |   2 +-
 .../java/org/apache/wayang/core/util/Optional.java |   2 +-
 .../wayang/core/util/ReferenceCountable.java       |   2 +-
 .../apache/wayang/core/util/ReflectionUtils.java   |   4 +-
 .../java/org/apache/wayang/core/util/Tuple.java    |   2 +-
 .../org/apache/wayang/core/util/WayangArrays.java  |   2 +-
 .../apache/wayang/core/util/WayangCollections.java |   2 +-
 .../org/apache/wayang/core/util/fs/FileSystem.java |   2 +-
 .../apache/wayang/core/util/fs/FileSystems.java    |   6 +-
 .../org/apache/wayang/core/util/fs/FileUtils.java  |   4 +-
 .../wayang/core/util/fs/HadoopFileSystem.java      |   4 +-
 .../wayang/core/util/fs/LocalFileSystem.java       |   4 +-
 .../apache/wayang/core/util/mathex/Context.java    |   4 +-
 .../wayang/core/util/mathex/DefaultContext.java    |   4 +-
 .../apache/wayang/core/util/mathex/Expression.java |   6 +-
 .../wayang/core/util/mathex/ExpressionBuilder.java |  20 +--
 .../mathex/exceptions/EvaluationException.java     |   6 +-
 .../util/mathex/exceptions/MathExException.java    |   6 +-
 .../util/mathex/exceptions/ParseException.java     |   6 +-
 .../core/util/mathex/model/BinaryOperation.java    |   8 +-
 .../core/util/mathex/model/CompiledFunction.java   |   6 +-
 .../wayang/core/util/mathex/model/Constant.java    |   6 +-
 .../core/util/mathex/model/NamedFunction.java      |   8 +-
 .../core/util/mathex/model/UnaryOperation.java     |   8 +-
 .../wayang/core/util/mathex/model/Variable.java    |   6 +-
 .../main/resources/wayang-core-defaults.properties |  10 +-
 .../test/java/org/apache/wayang/core/SlotTest.java |  14 +-
 .../wayang/core/mapping/OperatorPatternTest.java   |   4 +-
 .../core/mapping/PlanTransformationTest.java       |  26 +--
 .../wayang/core/mapping/SubplanPatternTest.java    |  18 +--
 .../wayang/core/mapping/test/TestSinkMapping.java  |  22 +--
 .../mapping/test/TestSinkToTestSink2Factory.java   |  14 +-
 .../AggregatingCardinalityEstimatorTest.java       |   6 +-
 .../DefaultCardinalityEstimatorTest.java           |   6 +-
 .../LoopSubplanCardinalityPusherTest.java          |  36 ++---
 .../cardinality/SubplanCardinalityPusherTest.java  |  30 ++--
 .../channels/ChannelConversionGraphTest.java       |  36 ++---
 .../costs/NestableLoadProfileEstimatorTest.java    |  16 +-
 .../enumeration/StageAssignmentTraversalTest.java  |  18 +--
 .../core/plan/executionplan/test/TestChannel.java  |  12 +-
 .../core/plan/wayangplan/LoopIsolatorTest.java     |  10 +-
 .../wayang/core/plan/wayangplan/OperatorTest.java  |   6 +-
 .../core/plan/wayangplan/SlotMappingTest.java      |   8 +-
 .../wayangplan/test/TestCustomMapOperator.java     |   8 +-
 .../plan/wayangplan/test/TestFilterOperator.java   |  16 +-
 .../wayang/core/plan/wayangplan/test/TestJoin.java |  26 +--
 .../core/plan/wayangplan/test/TestLoopHead.java    |  22 +--
 .../core/plan/wayangplan/test/TestMapOperator.java |  14 +-
 .../wayang/core/plan/wayangplan/test/TestSink.java |  12 +-
 .../core/plan/wayangplan/test/TestSink2.java       |   6 +-
 .../core/plan/wayangplan/test/TestSource.java      |  16 +-
 .../wayang/core/platform/PartialExecutionTest.java |  26 +--
 .../wayang/core/plugin/DynamicPluginTest.java      |  28 ++--
 .../wayang/core/test/DummyExecutionOperator.java   |  18 +--
 .../core/test/DummyExternalReusableChannel.java    |  14 +-
 .../wayang/core/test/DummyNonReusableChannel.java  |  14 +-
 .../org/apache/wayang/core/test/DummyPlatform.java |  18 +--
 .../wayang/core/test/DummyReusableChannel.java     |  14 +-
 .../org/apache/wayang/core/test/MockFactory.java   |  22 +--
 .../test/SerializableDummyExecutionOperator.java   |   6 +-
 .../org/apache/wayang/core/test/TestDataUnit.java  |   2 +-
 .../org/apache/wayang/core/test/TestDataUnit2.java |   2 +-
 .../org/apache/wayang/core/util/BitmaskTest.java   |   2 +-
 .../core/util/ConsumerIteratorAdapterTest.java     |   2 +-
 .../wayang/core/util/CrossProductIterableTest.java |   2 +-
 .../wayang/core/util/LimitedInputStreamTest.java   |   2 +-
 .../wayang/core/util/ReflectionUtilsTest.java      |   6 +-
 .../wayang/core/util/WayangCollectionsTest.java    |   2 +-
 .../core/util/mathex/ExpressionBuilderTest.java    |   4 +-
 .../wayang/core/util/mathex/ExpressionTest.java    |  10 +-
 wayang-core/src/test/resources/partial-plugin.yaml |   4 +-
 wayang-core/src/test/resources/test-plugin.yaml    |  12 +-
 wayang-distro/pom.xml                              |  24 +--
 wayang-extensions/pom.xml                          |   2 +-
 wayang-extensions/wayang-iejoin/pom.xml            |  10 +-
 .../main/java/org/apache/wayang/iejoin/IEJoin.java |  28 ++--
 .../java/org/apache/wayang/iejoin/data/Data.java   |   2 +-
 .../org/apache/wayang/iejoin/mapping/Mappings.java |  16 +-
 .../wayang/iejoin/mapping/java/IEJoinMapping.java  |  22 +--
 .../iejoin/mapping/java/IESelfJoinMapping.java     |  22 +--
 .../wayang/iejoin/mapping/spark/IEJoinMapping.java |  28 ++--
 .../iejoin/mapping/spark/IESelfJoinMapping.java    |  28 ++--
 .../iejoin/operators/IEJoinMasterOperator.java     |   4 +-
 .../wayang/iejoin/operators/IEJoinOperator.java    |  12 +-
 .../iejoin/operators/IESelfJoinOperator.java       |  12 +-
 .../iejoin/operators/JavaIEJoinOperator.java       |  42 ++---
 .../iejoin/operators/JavaIESelfJoinOperator.java   |  44 +++---
 .../iejoin/operators/SparkIEJoinOperator.java      |  44 +++---
 .../iejoin/operators/SparkIESelfJoinOperator.java  |  44 +++---
 .../iejoin/operators/java_helpers/BitSetJoin.java  |   6 +-
 .../operators/java_helpers/DataComparator.java     |   4 +-
 .../iejoin/operators/java_helpers/extractData.java |   4 +-
 .../iejoin/operators/java_helpers/myMergeSort.java |   4 +-
 .../operators/java_helpers/revDataComparator.java  |   4 +-
 .../iejoin/operators/spark_helpers/BitSetJoin.java |   6 +-
 .../spark_helpers/List2AttributesObjectSkinny.java |   4 +-
 .../operators/spark_helpers/addUniqueID.java       |   4 +-
 .../operators/spark_helpers/build2ListObject.java  |   6 +-
 .../operators/spark_helpers/extractData.java       |   4 +-
 .../spark_helpers/filterUnwantedBlocks.java        |   4 +-
 .../operators/spark_helpers/myMergeSort.java       |   4 +-
 .../operators/spark_helpers/revDataComparator.java |   4 +-
 .../operators/JavaExecutionOperatorTestBase.java   |  26 +--
 .../iejoin/operators/JavaIEJoinOperatorTest.java   |  14 +-
 .../iejoin/operators/SparkIEJoinOperatorTest.java  |  16 +-
 .../iejoin/operators/SparkIEJoinOperatorTest2.java |  16 +-
 .../iejoin/operators/SparkIEJoinOperatorTest3.java |  16 +-
 .../iejoin/operators/SparkIEJoinOperatorTest4.java |  16 +-
 .../operators/SparkIESelfJoinOperatorTest.java     |  16 +-
 .../iejoin/operators/SparkOperatorTestBase.java    |  28 ++--
 .../apache/wayang/iejoin/test/ChannelFactory.java  |  20 +--
 wayang-platforms/pom.xml                           |   2 +-
 wayang-platforms/wayang-flink/pom.xml              |   8 +-
 .../main/java/org/apache/wayang/flink/Flink.java   |  10 +-
 .../wayang/flink/channels/ChannelConversions.java  |  28 ++--
 .../wayang/flink/channels/DataSetChannel.java      |  18 +--
 .../flink/compiler/FlinkCoGroupFunction.java       |   4 +-
 .../wayang/flink/compiler/FunctionCompiler.java    |  18 +--
 .../wayang/flink/compiler/KeySelectorDistinct.java |   2 +-
 .../wayang/flink/compiler/KeySelectorFunction.java |   4 +-
 .../flink/compiler/OutputFormatConsumer.java       |   4 +-
 .../flink/compiler/WayangFileOutputFormat.java     |   4 +-
 .../flink/compiler/criterion/DummyFilter.java      |   2 +-
 .../wayang/flink/compiler/criterion/DummyMap.java  |   2 +-
 .../flink/compiler/criterion/WayangAggregator.java |   2 +-
 .../criterion/WayangConvergenceCriterion.java      |   4 +-
 .../compiler/criterion/WayangFilterCriterion.java  |   2 +-
 .../flink/compiler/criterion/WayangListValue.java  |   2 +-
 .../flink/compiler/criterion/WayangValue.java      |   2 +-
 .../flink/execution/FlinkContextReference.java     |   8 +-
 .../flink/execution/FlinkExecutionContext.java     |  10 +-
 .../wayang/flink/execution/FlinkExecutor.java      |  34 ++--
 .../wayang/flink/mapping/CartesianMapping.java     |  20 +--
 .../wayang/flink/mapping/CoGroupMapping.java       |  20 +--
 .../flink/mapping/CollectionSourceMapping.java     |  20 +--
 .../apache/wayang/flink/mapping/CountMapping.java  |  20 +--
 .../wayang/flink/mapping/DistinctMapping.java      |  20 +--
 .../wayang/flink/mapping/DoWhileMapping.java       |  22 +--
 .../apache/wayang/flink/mapping/FilterMapping.java |  24 +--
 .../wayang/flink/mapping/FlatMapMapping.java       |  20 +--
 .../mapping/GlobalMaterializedGroupMapping.java    |  20 +--
 .../wayang/flink/mapping/GlobalReduceMapping.java  |  20 +--
 .../wayang/flink/mapping/GroupByMapping.java       |  20 +--
 .../wayang/flink/mapping/IntersectMapping.java     |  20 +--
 .../apache/wayang/flink/mapping/JoinMapping.java   |  20 +--
 .../flink/mapping/LocalCallbackSinkMapping.java    |  22 +--
 .../apache/wayang/flink/mapping/LoopMapping.java   |  22 +--
 .../apache/wayang/flink/mapping/MapMapping.java    |  20 +--
 .../wayang/flink/mapping/MapPartitionsMapping.java |  20 +--
 .../org/apache/wayang/flink/mapping/Mappings.java  |   4 +-
 .../flink/mapping/MaterializedGroupByMapping.java  |  20 +--
 .../wayang/flink/mapping/PageRankMapping.java      |  18 +--
 .../wayang/flink/mapping/ReduceByMapping.java      |  20 +--
 .../apache/wayang/flink/mapping/RepeatMapping.java |  22 +--
 .../apache/wayang/flink/mapping/SampleMapping.java |  20 +--
 .../apache/wayang/flink/mapping/SortMapping.java   |  20 +--
 .../wayang/flink/mapping/TextFileSinkMapping.java  |  20 +--
 .../flink/mapping/TextFileSourceMapping.java       |  18 +--
 .../wayang/flink/mapping/UnionAllMapping.java      |  20 +--
 .../wayang/flink/mapping/ZipWithIdMapping.java     |  20 +--
 .../flink/operators/FlinkCartesianOperator.java    |  26 +--
 .../flink/operators/FlinkCoGroupOperator.java      |  32 ++--
 .../flink/operators/FlinkCollectionSink.java       |  30 ++--
 .../flink/operators/FlinkCollectionSource.java     |  24 +--
 .../wayang/flink/operators/FlinkCountOperator.java |  24 +--
 .../flink/operators/FlinkDistinctOperator.java     |  24 +--
 .../flink/operators/FlinkDoWhileOperator.java      |  38 ++---
 .../flink/operators/FlinkExecutionOperator.java    |  18 +--
 .../flink/operators/FlinkFilterOperator.java       |  30 ++--
 .../flink/operators/FlinkFlatMapOperator.java      |  34 ++--
 .../FlinkGlobalMaterializedGroupOperator.java      |  24 +--
 .../flink/operators/FlinkGlobalReduceOperator.java |  30 ++--
 .../flink/operators/FlinkGroupByOperator.java      |  32 ++--
 .../flink/operators/FlinkIntersectOperator.java    |  24 +--
 .../wayang/flink/operators/FlinkJoinOperator.java  |  34 ++--
 .../flink/operators/FlinkLocalCallbackSink.java    |  24 +--
 .../wayang/flink/operators/FlinkLoopOperator.java  |  30 ++--
 .../wayang/flink/operators/FlinkMapOperator.java   |  32 ++--
 .../operators/FlinkMapPartitionsOperator.java      |  32 ++--
 .../FlinkMaterializedGroupByOperator.java          |  30 ++--
 .../flink/operators/FlinkObjectFileSink.java       |  30 ++--
 .../flink/operators/FlinkObjectFileSource.java     |  30 ++--
 .../flink/operators/FlinkPageRankOperator.java     |  34 ++--
 .../flink/operators/FlinkReduceByOperator.java     |  34 ++--
 .../operators/FlinkRepeatExpandedOperator.java     |  24 +--
 .../flink/operators/FlinkRepeatOperator.java       |  22 +--
 .../flink/operators/FlinkSampleOperator.java       |  24 +--
 .../wayang/flink/operators/FlinkSortOperator.java  |  26 +--
 .../wayang/flink/operators/FlinkTextFileSink.java  |  28 ++--
 .../flink/operators/FlinkTextFileSource.java       |  22 +--
 .../wayang/flink/operators/FlinkTsvFileSink.java   |  26 +--
 .../flink/operators/FlinkUnionAllOperator.java     |  22 +--
 .../flink/operators/FlinkZipWithIdOperator.java    |  28 ++--
 .../wayang/flink/platform/FlinkPlatform.java       |  26 +--
 .../wayang/flink/plugin/FlinkBasicPlugin.java      |  22 +--
 .../wayang/flink/plugin/FlinkConversionPlugin.java |  18 +--
 .../wayang/flink/plugin/FlinkGraphPlugin.java      |   8 +-
 wayang-platforms/wayang-giraph/pom.xml             |   8 +-
 .../wayang/giraph/Algorithm/PageRankAlgorithm.java |   2 +-
 .../giraph/Algorithm/PageRankParameters.java       |   4 +-
 .../main/java/org/apache/wayang/giraph/Giraph.java |   6 +-
 .../wayang/giraph/channels/ChannelConversions.java |   6 +-
 .../wayang/giraph/execution/GiraphExecutor.java    |  22 +--
 .../apache/wayang/giraph/mappings/Mappings.java    |   4 +-
 .../wayang/giraph/mappings/PageRankMapping.java    |  14 +-
 .../giraph/operators/GiraphExecutionOperator.java  |  16 +-
 .../giraph/operators/GiraphPageRankOperator.java   |  44 +++---
 .../wayang/giraph/platform/GiraphPlatform.java     |  18 +--
 .../apache/wayang/giraph/plugin/GiraphPlugin.java  |  20 +--
 .../operators/GiraphPagaRankOperatorTest.java      |  28 ++--
 wayang-platforms/wayang-graphchi/pom.xml           |   8 +-
 .../java/org/apache/wayang/graphchi/GraphChi.java  |   6 +-
 .../graphchi/channels/ChannelConversions.java      |   6 +-
 .../graphchi/execution/GraphChiExecutor.java       |  32 ++--
 .../apache/wayang/graphchi/mappings/Mappings.java  |   4 +-
 .../wayang/graphchi/mappings/PageRankMapping.java  |  18 +--
 .../operators/GraphChiExecutionOperator.java       |  16 +-
 .../operators/GraphChiPageRankOperator.java        |  40 ++---
 .../wayang/graphchi/platform/GraphChiPlatform.java |  18 +--
 .../wayang/graphchi/plugin/GraphChiPlugin.java     |  22 +--
 .../operators/GraphChiPageRankOperatorTest.java    |  29 ++--
 wayang-platforms/wayang-java/pom.xml               |   6 +-
 .../src/main/java/org/apache/wayang/java/Java.java |  10 +-
 .../wayang/java/channels/ChannelConversions.java   |  24 +--
 .../wayang/java/channels/CollectionChannel.java    |  18 +--
 .../wayang/java/channels/JavaChannelInstance.java  |   6 +-
 .../apache/wayang/java/channels/StreamChannel.java |  20 +--
 .../wayang/java/compiler/FunctionCompiler.java     |  14 +-
 .../java/execution/JavaExecutionContext.java       |  18 +--
 .../apache/wayang/java/execution/JavaExecutor.java |  36 ++---
 .../wayang/java/mapping/CartesianMapping.java      |  20 +--
 .../apache/wayang/java/mapping/CoGroupMapping.java |  24 +--
 .../java/mapping/CollectionSourceMapping.java      |  20 +--
 .../apache/wayang/java/mapping/CountMapping.java   |  20 +--
 .../wayang/java/mapping/DistinctMapping.java       |  20 +--
 .../apache/wayang/java/mapping/DoWhileMapping.java |  26 +--
 .../apache/wayang/java/mapping/FilterMapping.java  |  22 +--
 .../apache/wayang/java/mapping/FlatMapMapping.java |  20 +--
 .../mapping/GlobalMaterializedGroupMapping.java    |  20 +--
 .../wayang/java/mapping/GlobalReduceMapping.java   |  20 +--
 .../wayang/java/mapping/IntersectMapping.java      |  20 +--
 .../apache/wayang/java/mapping/JoinMapping.java    |  20 +--
 .../java/mapping/LocalCallbackSinkMapping.java     |  20 +--
 .../apache/wayang/java/mapping/LoopMapping.java    |  22 +--
 .../org/apache/wayang/java/mapping/MapMapping.java |  20 +--
 .../wayang/java/mapping/MapPartitionsMapping.java  |  20 +--
 .../org/apache/wayang/java/mapping/Mappings.java   |   6 +-
 .../java/mapping/MaterializedGroupByMapping.java   |  20 +--
 .../wayang/java/mapping/ReduceByMapping.java       |  20 +--
 .../apache/wayang/java/mapping/RepeatMapping.java  |  20 +--
 .../apache/wayang/java/mapping/SampleMapping.java  |  24 +--
 .../apache/wayang/java/mapping/SortMapping.java    |  20 +--
 .../wayang/java/mapping/TextFileSinkMapping.java   |  20 +--
 .../wayang/java/mapping/TextFileSourceMapping.java |  20 +--
 .../wayang/java/mapping/UnionAllMapping.java       |  20 +--
 .../wayang/java/mapping/ZipWithIdMapping.java      |  28 ++--
 .../wayang/java/mapping/graph/PageRankMapping.java |  18 +--
 .../java/operators/JavaCartesianOperator.java      |  32 ++--
 .../wayang/java/operators/JavaCoGroupOperator.java |  40 ++---
 .../wayang/java/operators/JavaCollectOperator.java |  30 ++--
 .../java/operators/JavaCollectionSource.java       |  24 +--
 .../wayang/java/operators/JavaCountOperator.java   |  26 +--
 .../java/operators/JavaDistinctOperator.java       |  26 +--
 .../wayang/java/operators/JavaDoWhileOperator.java |  36 ++---
 .../java/operators/JavaExecutionOperator.java      |  26 +--
 .../wayang/java/operators/JavaFilterOperator.java  |  36 ++---
 .../wayang/java/operators/JavaFlatMapOperator.java |  36 ++---
 .../JavaGlobalMaterializedGroupOperator.java       |  24 +--
 .../java/operators/JavaGlobalReduceOperator.java   |  34 ++--
 .../java/operators/JavaIntersectOperator.java      |  32 ++--
 .../wayang/java/operators/JavaJoinOperator.java    |  40 ++---
 .../java/operators/JavaLocalCallbackSink.java      |  26 +--
 .../wayang/java/operators/JavaLoopOperator.java    |  36 ++---
 .../wayang/java/operators/JavaMapOperator.java     |  36 ++---
 .../java/operators/JavaMapPartitionsOperator.java  |  38 ++---
 .../operators/JavaMaterializedGroupByOperator.java |  36 ++---
 .../wayang/java/operators/JavaObjectFileSink.java  |  34 ++--
 .../java/operators/JavaObjectFileSource.java       |  32 ++--
 .../java/operators/JavaRandomSampleOperator.java   |  28 ++--
 .../java/operators/JavaReduceByOperator.java       |  38 ++---
 .../wayang/java/operators/JavaRepeatOperator.java  |  30 ++--
 .../operators/JavaReservoirSampleOperator.java     |  28 ++--
 .../wayang/java/operators/JavaSortOperator.java    |  28 ++--
 .../wayang/java/operators/JavaTextFileSink.java    |  42 ++---
 .../wayang/java/operators/JavaTextFileSource.java  |  28 ++--
 .../wayang/java/operators/JavaTsvFileSink.java     |  40 ++---
 .../wayang/java/operators/JavaTsvFileSource.java   |  40 ++---
 .../java/operators/JavaUnionAllOperator.java       |  26 +--
 .../java/operators/graph/JavaPageRankOperator.java |  26 +--
 .../apache/wayang/java/platform/JavaPlatform.java  |  18 +--
 .../apache/wayang/java/plugin/JavaBasicPlugin.java |  22 +--
 .../java/plugin/JavaChannelConversionPlugin.java   |  18 +--
 .../apache/wayang/java/plugin/JavaGraphPlugin.java |  20 +--
 .../wayang/java/execution/JavaExecutorTest.java    |  28 ++--
 .../java/operators/JavaCartesianOperatorTest.java  |   8 +-
 .../java/operators/JavaCoGroupOperatorTest.java    |  18 +--
 .../java/operators/JavaCollectionSourceTest.java   |   6 +-
 .../java/operators/JavaCountOperatorTest.java      |   6 +-
 .../java/operators/JavaDistinctOperatorTest.java   |   6 +-
 .../operators/JavaExecutionOperatorTestBase.java   |  30 ++--
 .../java/operators/JavaFilterOperatorTest.java     |   8 +-
 .../JavaGlobalMaterializedGroupOperatorTest.java   |   8 +-
 .../operators/JavaGlobalReduceOperatorTest.java    |  12 +-
 .../java/operators/JavaJoinOperatorTest.java       |  12 +-
 .../java/operators/JavaLocalCallbackSinkTest.java  |   6 +-
 .../JavaMaterializedGroupByOperatorTest.java       |  12 +-
 .../java/operators/JavaObjectFileSinkTest.java     |   8 +-
 .../java/operators/JavaObjectFileSourceTest.java   |   8 +-
 .../operators/JavaRandomSampleOperatorTest.java    |   6 +-
 .../java/operators/JavaReduceByOperatorTest.java   |  14 +-
 .../operators/JavaReservoirSampleOperatorTest.java |   6 +-
 .../java/operators/JavaSortOperatorTest.java       |   8 +-
 .../java/operators/JavaTextFileSinkTest.java       |  22 +--
 .../java/operators/JavaUnionAllOperatorTest.java   |   6 +-
 .../apache/wayang/java/test/ChannelFactory.java    |  12 +-
 wayang-platforms/wayang-jdbc-template/pom.xml      |   8 +-
 .../wayang/jdbc/channels/SqlQueryChannel.java      |  26 +--
 .../wayang/jdbc/compiler/FunctionCompiler.java     |   6 +-
 .../wayang/jdbc/execution/DatabaseDescriptor.java  |   4 +-
 .../apache/wayang/jdbc/execution/JdbcExecutor.java |  48 +++---
 .../jdbc/operators/JdbcExecutionOperator.java      |  12 +-
 .../wayang/jdbc/operators/JdbcFilterOperator.java  |  18 +--
 .../jdbc/operators/JdbcProjectionOperator.java     |  18 +--
 .../wayang/jdbc/operators/JdbcTableSource.java     |  12 +-
 .../wayang/jdbc/operators/SqlToStreamOperator.java |  40 ++---
 .../wayang/jdbc/platform/JdbcPlatformTemplate.java |  26 +--
 .../wayang/jdbc/execution/JdbcExecutorTest.java    |  38 ++---
 .../wayang/jdbc/operators/JdbcTableSourceTest.java |  16 +-
 .../wayang/jdbc/operators/OperatorTestBase.java    |  26 +--
 .../jdbc/operators/SqlToStreamOperatorTest.java    |  36 ++---
 .../wayang/jdbc/test/HsqldbFilterOperator.java     |   8 +-
 .../apache/wayang/jdbc/test/HsqldbPlatform.java    |   4 +-
 .../wayang/jdbc/test/HsqldbProjectionOperator.java |   8 +-
 .../apache/wayang/jdbc/test/HsqldbTableSource.java |  10 +-
 wayang-platforms/wayang-postgres/pom.xml           |   6 +-
 .../java/org/apache/wayang/postgres/Postgres.java  |   8 +-
 .../postgres/channels/ChannelConversions.java      |  12 +-
 .../wayang/postgres/mapping/FilterMapping.java     |  22 +--
 .../apache/wayang/postgres/mapping/Mappings.java   |   4 +-
 .../wayang/postgres/mapping/ProjectionMapping.java |  24 +--
 .../operators/PostgresExecutionOperator.java       |   6 +-
 .../postgres/operators/PostgresFilterOperator.java |  10 +-
 .../operators/PostgresProjectionOperator.java      |  12 +-
 .../postgres/operators/PostgresTableSource.java    |   8 +-
 .../wayang/postgres/platform/PostgresPlatform.java |   6 +-
 .../postgres/plugin/PostgresConversionsPlugin.java |  20 +--
 .../wayang/postgres/plugin/PostgresPlugin.java     |  22 +--
 wayang-platforms/wayang-spark/pom.xml              |   8 +-
 .../main/java/org/apache/wayang/spark/Spark.java   |  10 +-
 .../wayang/spark/channels/BroadcastChannel.java    |  18 +--
 .../wayang/spark/channels/ChannelConversions.java  |  32 ++--
 .../apache/wayang/spark/channels/FileChannels.java |   4 +-
 .../apache/wayang/spark/channels/RddChannel.java   |  22 +--
 .../spark/compiler/BinaryOperatorAdapter.java      |   2 +-
 .../compiler/ExtendedBinaryOperatorAdapter.java    |  10 +-
 .../compiler/ExtendedFlatMapFunctionAdapter.java   |  10 +-
 .../wayang/spark/compiler/ExtendedFunction.java    |  12 +-
 .../spark/compiler/ExtendedMapFunctionAdapter.java |  10 +-
 .../ExtendedMapPartitionsFunctionAdapter.java      |   8 +-
 .../spark/compiler/ExtendedPredicateAdapater.java  |  10 +-
 .../spark/compiler/FlatMapFunctionAdapter.java     |   2 +-
 .../wayang/spark/compiler/FunctionCompiler.java    |  22 +--
 .../wayang/spark/compiler/MapFunctionAdapter.java  |   2 +-
 .../compiler/MapPartitionsFunctionAdapter.java     |   4 +-
 .../wayang/spark/compiler/PredicateAdapter.java    |   2 +-
 .../spark/execution/SparkContextReference.java     |   6 +-
 .../spark/execution/SparkExecutionContext.java     |  16 +-
 .../wayang/spark/execution/SparkExecutor.java      |  34 ++--
 .../wayang/spark/mapping/CartesianMapping.java     |  20 +--
 .../wayang/spark/mapping/CoGroupMapping.java       |  20 +--
 .../spark/mapping/CollectionSourceMapping.java     |  20 +--
 .../apache/wayang/spark/mapping/CountMapping.java  |  20 +--
 .../wayang/spark/mapping/DistinctMapping.java      |  20 +--
 .../wayang/spark/mapping/DoWhileMapping.java       |  26 +--
 .../apache/wayang/spark/mapping/FilterMapping.java |  22 +--
 .../wayang/spark/mapping/FlatMapMapping.java       |  20 +--
 .../mapping/GlobalMaterializedGroupMapping.java    |  20 +--
 .../wayang/spark/mapping/GlobalReduceMapping.java  |  20 +--
 .../wayang/spark/mapping/IntersectMapping.java     |  20 +--
 .../apache/wayang/spark/mapping/JoinMapping.java   |  20 +--
 .../spark/mapping/LocalCallbackSinkMapping.java    |  20 +--
 .../apache/wayang/spark/mapping/LoopMapping.java   |  22 +--
 .../apache/wayang/spark/mapping/MapMapping.java    |  20 +--
 .../wayang/spark/mapping/MapPartitionsMapping.java |  20 +--
 .../org/apache/wayang/spark/mapping/Mappings.java  |   6 +-
 .../spark/mapping/MaterializedGroupByMapping.java  |  20 +--
 .../wayang/spark/mapping/ReduceByMapping.java      |  20 +--
 .../apache/wayang/spark/mapping/RepeatMapping.java |  20 +--
 .../apache/wayang/spark/mapping/SampleMapping.java |  26 +--
 .../apache/wayang/spark/mapping/SortMapping.java   |  20 +--
 .../wayang/spark/mapping/TextFileSinkMapping.java  |  24 +--
 .../spark/mapping/TextFileSourceMapping.java       |  22 +--
 .../wayang/spark/mapping/UnionAllMapping.java      |  20 +--
 .../wayang/spark/mapping/ZipWithIdMapping.java     |  20 +--
 .../spark/mapping/graph/PageRankMapping.java       |  24 +--
 .../operators/SparkBernoulliSampleOperator.java    |  24 +--
 .../spark/operators/SparkBroadcastOperator.java    |  24 +--
 .../wayang/spark/operators/SparkCacheOperator.java |  28 ++--
 .../spark/operators/SparkCartesianOperator.java    |  24 +--
 .../spark/operators/SparkCoGroupOperator.java      |  32 ++--
 .../spark/operators/SparkCollectOperator.java      |  32 ++--
 .../spark/operators/SparkCollectionSource.java     |  30 ++--
 .../wayang/spark/operators/SparkCountOperator.java |  26 +--
 .../spark/operators/SparkDistinctOperator.java     |  22 +--
 .../spark/operators/SparkDoWhileOperator.java      |  34 ++--
 .../spark/operators/SparkExecutionOperator.java    |  18 +--
 .../spark/operators/SparkFilterOperator.java       |  32 ++--
 .../spark/operators/SparkFlatMapOperator.java      |  32 ++--
 .../SparkGlobalMaterializedGroupOperator.java      |  24 +--
 .../spark/operators/SparkGlobalReduceOperator.java |  34 ++--
 .../spark/operators/SparkIntersectOperator.java    |  24 +--
 .../wayang/spark/operators/SparkJoinOperator.java  |  34 ++--
 .../spark/operators/SparkLocalCallbackSink.java    |  22 +--
 .../wayang/spark/operators/SparkLoopOperator.java  |  36 ++---
 .../wayang/spark/operators/SparkMapOperator.java   |  34 ++--
 .../operators/SparkMapPartitionsOperator.java      |  32 ++--
 .../SparkMaterializedGroupByOperator.java          |  30 ++--
 .../spark/operators/SparkObjectFileSink.java       |  30 ++--
 .../spark/operators/SparkObjectFileSource.java     |  30 ++--
 .../SparkRandomPartitionSampleOperator.java        |  26 +--
 .../spark/operators/SparkReduceByOperator.java     |  34 ++--
 .../spark/operators/SparkRepeatOperator.java       |  24 +--
 .../SparkShufflePartitionSampleOperator.java       |  24 +--
 .../wayang/spark/operators/SparkSortOperator.java  |  26 +--
 .../wayang/spark/operators/SparkTextFileSink.java  |  28 ++--
 .../spark/operators/SparkTextFileSource.java       |  22 +--
 .../wayang/spark/operators/SparkTsvFileSink.java   |  30 ++--
 .../wayang/spark/operators/SparkTsvFileSource.java |  32 ++--
 .../spark/operators/SparkUnionAllOperator.java     |  22 +--
 .../spark/operators/SparkZipWithIdOperator.java    |  28 ++--
 .../wayang/spark/platform/SparkPlatform.java       |  36 ++---
 .../wayang/spark/plugin/SparkBasicPlugin.java      |  24 +--
 .../wayang/spark/plugin/SparkConversionPlugin.java |  20 +--
 .../wayang/spark/plugin/SparkGraphPlugin.java      |  22 +--
 .../operators/graph/SparkPageRankOperator.scala    |  20 +--
 .../SparkBernoulliSampleOperatorTest.java          |  10 +-
 .../operators/SparkCartesianOperatorTest.java      |  10 +-
 .../spark/operators/SparkCoGroupOperatorTest.java  |  18 +--
 .../spark/operators/SparkCollectionSourceTest.java |   8 +-
 .../spark/operators/SparkCountOperatorTest.java    |  10 +-
 .../spark/operators/SparkDistinctOperatorTest.java |   8 +-
 .../spark/operators/SparkFilterOperatorTest.java   |  10 +-
 .../spark/operators/SparkFlatMapOperatorTest.java  |  10 +-
 .../SparkGlobalMaterializedGroupOperatorTest.java  |  10 +-
 .../operators/SparkGlobalReduceOperatorTest.java   |  18 +--
 .../spark/operators/SparkJoinOperatorTest.java     |  14 +-
 .../operators/SparkMapPartitionsOperatorTest.java  |   8 +-
 .../SparkMaterializedGroupByOperatorTest.java      |  14 +-
 .../spark/operators/SparkObjectFileSinkTest.java   |  12 +-
 .../spark/operators/SparkObjectFileSourceTest.java |  10 +-
 .../spark/operators/SparkOperatorTestBase.java     |  28 ++--
 .../SparkRandomPartitionSampleOperatorTest.java    |  12 +-
 .../spark/operators/SparkReduceByOperatorTest.java |  16 +-
 .../SparkShufflePartitionSampleOperatorTest.java   |  12 +-
 .../spark/operators/SparkSortOperatorTest.java     |  10 +-
 .../spark/operators/SparkTextFileSinkTest.java     |   8 +-
 .../spark/operators/SparkUnionAllOperatorTest.java |   8 +-
 .../apache/wayang/spark/test/ChannelFactory.java   |  16 +-
 wayang-platforms/wayang-sqlite3/pom.xml            |   8 +-
 .../java/org/apache/wayang/sqlite3/Sqlite3.java    |   8 +-
 .../sqlite3/channels/ChannelConversions.java       |  12 +-
 .../wayang/sqlite3/mapping/FilterMapping.java      |  20 +--
 .../apache/wayang/sqlite3/mapping/Mappings.java    |   4 +-
 .../wayang/sqlite3/mapping/ProjectionMapping.java  |  22 +--
 .../sqlite3/operators/Sqlite3FilterOperator.java   |  12 +-
 .../operators/Sqlite3ProjectionOperator.java       |  12 +-
 .../sqlite3/operators/Sqlite3TableSource.java      |  10 +-
 .../wayang/sqlite3/platform/Sqlite3Platform.java   |   6 +-
 .../sqlite3/plugin/Sqlite3ConversionPlugin.java    |  18 +--
 .../wayang/sqlite3/plugin/Sqlite3Plugin.java       |  22 +--
 wayang-profiler/pom.xml                            |  12 +-
 .../wayang/profiler/data/DataGenerators.java       |   2 +-
 .../wayang/profiler/hardware/DiskProfiler.java     |  10 +-
 .../profiler/java/BinaryOperatorProfiler.java      |   8 +-
 .../java/JavaCollectionSourceProfiler.java         |   6 +-
 .../profiler/java/JavaTextFileSourceProfiler.java  |   4 +-
 .../wayang/profiler/java/OperatorProfiler.java     |  28 ++--
 .../wayang/profiler/java/OperatorProfilers.java    |  46 +++---
 .../org/apache/wayang/profiler/java/Profiler.java  |  14 +-
 .../apache/wayang/profiler/java/SinkProfiler.java  |   6 +-
 .../wayang/profiler/java/SourceProfiler.java       |   6 +-
 .../profiler/java/UnaryOperatorProfiler.java       |   8 +-
 .../profiler/log/DynamicEstimationContext.java     |   6 +-
 .../wayang/profiler/log/DynamicLoadEstimator.java  |  26 +--
 .../profiler/log/DynamicLoadProfileEstimator.java  |  12 +-
 .../profiler/log/DynamicLoadProfileEstimators.java |  20 +--
 .../wayang/profiler/log/GeneticOptimizer.java      |  20 +--
 .../wayang/profiler/log/GeneticOptimizerApp.java   |  44 +++---
 .../org/apache/wayang/profiler/log/Individual.java |  20 +--
 .../apache/wayang/profiler/log/LogEvaluator.java   |  24 +--
 .../wayang/profiler/log/OptimizationSpace.java     |   4 +-
 .../org/apache/wayang/profiler/log/Variable.java   |   2 +-
 .../wayang/profiler/log/sampling/Battle.java       |   2 +-
 .../profiler/log/sampling/ReservoirSampler.java    |   2 +-
 .../wayang/profiler/log/sampling/Sampler.java      |   2 +-
 .../profiler/log/sampling/TournamentSampler.java   |   2 +-
 .../profiler/spark/BinaryOperatorProfiler.java     |  12 +-
 .../org/apache/wayang/profiler/spark/Main.java     |  18 +--
 .../wayang/profiler/spark/OperatorProfilers.java   |  52 +++---
 .../apache/wayang/profiler/spark/SinkProfiler.java |  10 +-
 .../spark/SparkCollectionSourceProfiler.java       |  10 +-
 .../profiler/spark/SparkOperatorProfiler.java      |  30 ++--
 .../wayang/profiler/spark/SparkSourceProfiler.java |  12 +-
 .../spark/SparkTextFileSourceProfiler.java         |  12 +-
 .../profiler/spark/SparkUnaryOperatorProfiler.java |  12 +-
 .../wayang/profiler/util/ProfilingUtils.java       |  20 +--
 .../apache/wayang/profiler/util/RrdAccessor.java   |   2 +-
 wayang-tests/pom.xml                               |  24 +--
 .../apache/wayang/tests/FlinkIntegrationIT.java    |  22 +--
 .../org/apache/wayang/tests/FullIntegrationIT.java |  46 +++---
 .../apache/wayang/tests/GiraphIntegrationIT.java   |  18 +--
 .../apache/wayang/tests/GraphChiIntegrationIT.java |  14 +-
 .../org/apache/wayang/tests/JavaIntegrationIT.java |  40 ++---
 .../apache/wayang/tests/PostgresIntegrationIT.java |   6 +-
 .../java/org/apache/wayang/tests/RegressionIT.java |  18 +--
 .../apache/wayang/tests/SparkIntegrationIT.java    |  34 ++--
 .../java/org/apache/wayang/tests/WayangPlans.java  |  84 +++++-----
 .../apache/wayang/tests/WayangPlansOperators.java  |  48 +++---
 .../java/org/apache/wayang/tests/WordCountIT.java  |  52 +++---
 .../wayang/tests/platform/MyMadeUpPlatform.java    |  18 +--
 781 files changed, 6367 insertions(+), 6366 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 48fd2f8..be25fc5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,15 +14,15 @@ notification:
 install: true
 before_script:
   - mkdir -p travis/tmp
-  - echo "rheem.basic.tempdir = file://$(pwd)/travis/tmp" >> travis/rheem.properties
-  - echo "spark.driver.host = localhost" >> travis/rheem.properties
-  - echo "spark.master = local[1]" >> travis/rheem.properties
-  - echo "rheem.giraph.job.tracker = localhost:50300" >> travis/rheem.properties
-  - echo "rheem.giraph.maxWorkers = 1" >> travis/rheem.properties
-  - echo "rheem.giraph.minWorkers = 1" >> travis/rheem.properties
-  - echo "rheem.mapreduce.job.counters.limit = 200" >> travis/rheem.properties
-  - cat travis/rheem.properties
-  - mvn_opts=("-Dorg.slf4j.simpleLogger.defaultLogLevel=error" "-Drheem.configuration=file://$(pwd)/travis/rheem.properties")
+  - echo "wayang.basic.tempdir = file://$(pwd)/travis/tmp" >> travis/wayang.properties
+  - echo "spark.driver.host = localhost" >> travis/wayang.properties
+  - echo "spark.master = local[1]" >> travis/wayang.properties
+  - echo "wayang.giraph.job.tracker = localhost:50300" >> travis/wayang.properties
+  - echo "wayang.giraph.maxWorkers = 1" >> travis/wayang.properties
+  - echo "wayang.giraph.minWorkers = 1" >> travis/wayang.properties
+  - echo "wayang.mapreduce.job.counters.limit = 200" >> travis/wayang.properties
+  - cat travis/wayang.properties
+  - mvn_opts=("-Dorg.slf4j.simpleLogger.defaultLogLevel=error" "-Dwayang.configuration=file://$(pwd)/travis/wayang.properties")
 script:
   - bin/change-scala-version.sh 2.11.8 && mvn clean install -Pdistro "${mvn_opts[@]}"
 
diff --git a/LICENSE.TXT b/LICENSE.TXT
index 46d6467..d645695 100644
--- a/LICENSE.TXT
+++ b/LICENSE.TXT
@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2016 Wayang Project
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/NOTICE.TXT b/NOTICE.TXT
index 030c74f..c6c3c60 100644
--- a/NOTICE.TXT
+++ b/NOTICE.TXT
@@ -1,4 +1,4 @@
-Copyright 2020 Wayang Ecosystem
+Copyright 2020 Rheem Ecosystem
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/README.md b/README.md
index 083fc2d..ed6896e 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,13 @@
-# Wayang <img align="right" width="128px" src="https://wayang-ecosystem.github.io/img/logo.png" alt="Wayang logo">
+# Apache Wayang <img align="right" width="128px" src="https://wayang-ecosystem.github.io/img/logo.png" alt="Wayang logo">
 
 [![Build Status (Travis)](https://travis-ci.org/wayang-ecosystem/wayang.svg?branch=master)](https://travis-ci.org/wayang-ecosystem/wayang)
 [![Gitter chat](https://badges.gitter.im/wayang-ecosystem/Lobby.png)](https://gitter.im/wayang-ecosystem/Lobby)
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.incubator.wayang/wayang/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.apache.incubator.wayang/wayang)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.wayang/wayang/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.apache.wayang/wayang)
 
-#### Turning the Zoo of Data Processing Systems into a Circus
+#### Turning a shadows into a show
 
 
-Wayang is an efficient and scalable data processing framework developed by the [data analytics](http://da.qcri.org) group at [Qatar Computing Research Institute](http://qcri.com/) in collaboration with the [information systems group](https://www.hpi.de/naumann) at the Hasso Plattner Institute. In contrast to classical data processing systems that provide one dedicated execution engine, Wayang rather is a *meta processing framework*: You can specify your data processing app via one of Way [...]
+Apache Wayang in contrast to classical data processing systems that provide one dedicated execution engine, Apache Wayang rather is a *meta processing framework*: You can specify your data processing app via one of Wayang's API and then Wayang will pick an optimal configuration of classical processing frameworks, such as Java Streams or Apache Spark, to run your app on. Finally, Wayang will also perform the execution, thereby hiding the different specific platform APIs and coordinate int [...]
 
 This approach aims at freeing data engineers and software developers from the burden of knowing the zoo of different data processing systems, their APIs, strengths and weakness; the intricacies of coordinating and integrating different processing platforms; and the inflexibility when tying to a fix set of processing platforms. As of now, Wayang has built in support for the following processing platforms:
 - Java 8 Streams
@@ -19,13 +19,13 @@ This approach aims at freeing data engineers and software developers from the bu
 ## How to use Wayang
 
 **Requirements.**
-Wayang is built with Java 8 and Scala 2.11. However, to execute Wayang it is sufficient to have Java 8 installed. If you want to build Wayang yourself, you will also need to have [Apache Maven](http://maven.apache.org) installed. Please also consider that processing platforms employed by Wayang might have further requirements.
+Apache Wayang is built with Java 8 and Scala 2.11. However, to execute Wayang it is sufficient to have Java 8 installed. If you want to build Wayang yourself, you will also need to have [Apache Maven](http://maven.apache.org) installed. Please also consider that processing platforms employed by Wayang might have further requirements.
 
 **Get Wayang.**
 Wayang is available via Maven Central. To use it with Maven, for instance, include the following into you POM file:
 ```xml
 <dependency>

-  <groupId>org.apache.incubator.wayang</groupId>
+  <groupId>org.apache.wayang</groupId>
   <artifactId>wayang-***</artifactId>
   <version>0.3.0</version>

 </dependency>
@@ -74,7 +74,7 @@ You can find the most relevant settings in the following:
   * `wayang.core.log.enabled (= true)`: whether to log execution statistics to allow learning better cardinality and cost estimators for the optimizer
   * `wayang.core.log.executions (= ~/.wayang/executions.json)` where to log execution times of operator groups
   * `wayang.core.log.cardinalities (= ~/.wayang/cardinalities.json)` where to log cardinality measurements
-  * `wayang.core.optimizer.instrumentation (= org.apache.incubator.wayang.core.profiling.OutboundInstrumentationStrategy)`: where to measure cardinalities in Wayang plans; other options are `org.apache.incubator.wayang.core.profiling.NoInstrumentationStrategy` and `org.apache.incubator.wayang.core.profiling.FullInstrumentationStrategy`
+  * `wayang.core.optimizer.instrumentation (= org.apache.wayang.core.profiling.OutboundInstrumentationStrategy)`: where to measure cardinalities in Wayang plans; other options are `org.apache.wayang.core.profiling.NoInstrumentationStrategy` and `org.apache.wayang.core.profiling.FullInstrumentationStrategy`
   * `wayang.core.optimizer.reoptimize (= false)`: whether to progressively optimize Wayang plans
   * `wayang.basic.tempdir (= file:///tmp)`: where to store temporary files, in particular for inter-platform communication
 * Java Streams
@@ -130,7 +130,7 @@ In particular, you can use
 While Wayang specifies templates for all execution operators, you will need to specify that your UDFs are modelled by some configuration-based cost function (see the k-means example below) and create the according initial specification and template yourself.
 Once, you gathered execution data, you can run
 ```shell
-java ... org.apache.incubator.wayang.profiler.ga.GeneticOptimizerApp [configuration URL [execution log]]
+java ... org.apache.wayang.profiler.ga.GeneticOptimizerApp [configuration URL [execution log]]
 ```
 This app will try to find appropriate values for the question marks (`?`) in the load profile estimator templates to fit the gathered execution data and ready-made configuration entries for the load profile estimators.
 You can then copy them into your configuration.
@@ -145,13 +145,13 @@ The "Hello World!" of data processing systems is the wordcount.
 
 #### Java API
 ```java
-import org.apache.incubator.wayang.api.JavaPlanBuilder;
-import org.apache.incubator.wayang.basic.data.Tuple2;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.api.WayangContext;
-import org.apache.incubator.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
-import org.apache.incubator.wayang.java.Java;
-import org.apache.incubator.wayang.spark.Spark;
+import org.apache.wayang.api.JavaPlanBuilder;
+import org.apache.wayang.basic.data.Tuple2;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.WayangContext;
+import org.apache.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
+import org.apache.wayang.java.Java;
+import org.apache.wayang.spark.Spark;
 import java.util.Collection;
 import java.util.Arrays;
 
@@ -207,10 +207,10 @@ public class WordcountJava {
 #### Scala API
 
 ```scala
-import org.apache.incubator.wayang.api._
-import org.apache.incubator.wayang.core.api.{Configuration, WayangContext}
-import org.apache.incubator.wayang.java.Java
-import org.apache.incubator.wayang.spark.Spark
+import org.apache.wayang.api._
+import org.apache.wayang.core.api.{Configuration, WayangContext}
+import org.apache.wayang.java.Java
+import org.apache.wayang.spark.Spark
 
 object WordcountScala {
   def main(args: Array[String]) {
@@ -258,13 +258,13 @@ Wayang is also capable of iterative processing, which is, e.g., very important f
 #### Scala API
 
 ```scala
-import org.apache.incubator.wayang.api._
-import org.apache.incubator.wayang.core.api.{Configuration, WayangContext}
-import org.apache.incubator.wayang.core.function.FunctionDescriptor.ExtendedSerializableFunction
-import org.apache.incubator.wayang.core.function.ExecutionContext
-import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileEstimators
-import org.apache.incubator.wayang.java.Java
-import org.apache.incubator.wayang.spark.Spark
+import org.apache.wayang.api._
+import org.apache.wayang.core.api.{Configuration, WayangContext}
+import org.apache.wayang.core.function.FunctionDescriptor.ExtendedSerializableFunction
+import org.apache.wayang.core.function.ExecutionContext
+import org.apache.wayang.core.optimizer.costs.LoadProfileEstimators
+import org.apache.wayang.java.Java
+import org.apache.wayang.spark.Spark
 
 import scala.util.Random
 import scala.collection.JavaConversions._
@@ -356,7 +356,7 @@ object kmeans {
 
 Unless explicitly stated otherwise all files in this repository are licensed under the Apache Software License 2.0
 
-Copyright 2020 Wayang Ecosystem
+Copyright 2020 Rheem Ecosystem
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/pom.xml b/pom.xml
index a313219..c51482a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
         <external.platforms.scope>provided</external.platforms.scope>
     </properties>
 
-    <groupId>org.apache.incubator.wayang</groupId>
+    <groupId>org.apache.wayang</groupId>
     <artifactId>wayang</artifactId>
     <packaging>pom</packaging>
     <version>1.0.0-SNAPSHOT</version>
diff --git a/wayang-api/pom.xml b/wayang-api/pom.xml
index f247995..fb9fba9 100644
--- a/wayang-api/pom.xml
+++ b/wayang-api/pom.xml
@@ -2,7 +2,7 @@
 <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>wayang</artifactId>
-        <groupId>org.apache.incubator.wayang</groupId>
+        <groupId>org.apache.wayang</groupId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -39,35 +39,35 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.incubator.wayang</groupId>
+            <groupId>org.apache.wayang</groupId>
             <artifactId>wayang-core</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.incubator.wayang</groupId>
+            <groupId>org.apache.wayang</groupId>
             <artifactId>wayang-basic</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.incubator.wayang</groupId>
+            <groupId>org.apache.wayang</groupId>
             <artifactId>wayang-java</artifactId>
             <version>1.0.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.incubator.wayang</groupId>
+            <groupId>org.apache.wayang</groupId>
             <artifactId>wayang-spark_2.11</artifactId>
             <version>1.0.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.incubator.wayang</groupId>
+            <groupId>org.apache.wayang</groupId>
             <artifactId>wayang-sqlite3</artifactId>
             <version>1.0.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.incubator.wayang</groupId>
+            <groupId>org.apache.wayang</groupId>
             <artifactId>wayang-jdbc-template</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
@@ -77,7 +77,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.incubator.wayang</groupId>
+            <groupId>org.apache.wayang</groupId>
             <artifactId>wayang-graphchi_2.11</artifactId>
             <version>1.0.0-SNAPSHOT</version>
             <scope>test</scope>
diff --git a/wayang-api/src/main/scala/org/apache/wayang/api/DataQuanta.scala b/wayang-api/src/main/scala/org/apache/wayang/api/DataQuanta.scala
index 13179e6..ab5ca33 100644
--- a/wayang-api/src/main/scala/org/apache/wayang/api/DataQuanta.scala
+++ b/wayang-api/src/main/scala/org/apache/wayang/api/DataQuanta.scala
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.api
+package org.apache.wayang.api
 
 import _root_.java.lang.{Iterable => JavaIterable}
 import _root_.java.util.function.{Consumer, IntUnaryOperator, BiFunction => JavaBiFunction, Function => JavaFunction}
@@ -6,17 +6,17 @@ import _root_.java.util.{Collection => JavaCollection}
 
 import de.hpi.isg.profiledb.store.model.Experiment
 import org.apache.commons.lang3.Validate
-import org.apache.incubator.wayang.basic.function.ProjectionDescriptor
-import org.apache.incubator.wayang.basic.operators._
-import org.apache.incubator.wayang.core.function.FunctionDescriptor.{SerializableBinaryOperator, SerializableFunction, SerializablePredicate}
-import org.apache.incubator.wayang.core.function._
-import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator
-import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileEstimator
-import org.apache.incubator.wayang.core.plan.wayangplan._
-import org.apache.incubator.wayang.core.platform.Platform
-import org.apache.incubator.wayang.core.util.{Tuple => WayangTuple}
-import org.apache.incubator.wayang.basic.data.{Tuple2 => WayangTuple2}
+import org.apache.wayang.basic.function.ProjectionDescriptor
+import org.apache.wayang.basic.operators._
+import org.apache.wayang.core.function.FunctionDescriptor.{SerializableBinaryOperator, SerializableFunction, SerializablePredicate}
+import org.apache.wayang.core.function._
+import org.apache.wayang.core.optimizer.ProbabilisticDoubleInterval
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator
+import org.apache.wayang.core.optimizer.costs.LoadProfileEstimator
+import org.apache.wayang.core.plan.wayangplan._
+import org.apache.wayang.core.platform.Platform
+import org.apache.wayang.core.util.{Tuple => WayangTuple}
+import org.apache.wayang.basic.data.{Tuple2 => WayangTuple2}
 
 import scala.collection.JavaConversions
 import scala.collection.JavaConversions._
diff --git a/wayang-api/src/main/scala/org/apache/wayang/api/DataQuantaBuilder.scala b/wayang-api/src/main/scala/org/apache/wayang/api/DataQuantaBuilder.scala
index 8c064d0..573661e 100644
--- a/wayang-api/src/main/scala/org/apache/wayang/api/DataQuantaBuilder.scala
+++ b/wayang-api/src/main/scala/org/apache/wayang/api/DataQuantaBuilder.scala
@@ -1,22 +1,22 @@
-package org.apache.incubator.wayang.api
+package org.apache.wayang.api
 
 
 import java.util.function.{Consumer, IntUnaryOperator, Function => JavaFunction}
 import java.util.{Collection => JavaCollection}
 
 import de.hpi.isg.profiledb.store.model.Experiment
-import org.apache.incubator.wayang.api.graph.{Edge, EdgeDataQuantaBuilder, EdgeDataQuantaBuilderDecorator}
-import org.apache.incubator.wayang.api.util.{DataQuantaBuilderCache, TypeTrap}
-import org.apache.incubator.wayang.basic.data.{Record, Tuple2 => RT2}
-import org.apache.incubator.wayang.basic.operators.{GlobalReduceOperator, LocalCallbackSink, MapOperator, SampleOperator}
-import org.apache.incubator.wayang.core.function.FunctionDescriptor.{SerializableBiFunction, SerializableBinaryOperator, SerializableFunction, SerializablePredicate}
-import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator
-import org.apache.incubator.wayang.core.optimizer.costs.{LoadEstimator, LoadProfile, LoadProfileEstimator}
-import org.apache.incubator.wayang.core.plan.wayangplan.{Operator, OutputSlot, WayangPlan, UnarySource}
-import org.apache.incubator.wayang.core.platform.Platform
-import org.apache.incubator.wayang.core.types.DataSetType
-import org.apache.incubator.wayang.core.util.{Logging, ReflectionUtils, WayangCollections, Tuple => WayangTuple}
+import org.apache.wayang.api.graph.{Edge, EdgeDataQuantaBuilder, EdgeDataQuantaBuilderDecorator}
+import org.apache.wayang.api.util.{DataQuantaBuilderCache, TypeTrap}
+import org.apache.wayang.basic.data.{Record, Tuple2 => RT2}
+import org.apache.wayang.basic.operators.{GlobalReduceOperator, LocalCallbackSink, MapOperator, SampleOperator}
+import org.apache.wayang.core.function.FunctionDescriptor.{SerializableBiFunction, SerializableBinaryOperator, SerializableFunction, SerializablePredicate}
+import org.apache.wayang.core.optimizer.ProbabilisticDoubleInterval
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator
+import org.apache.wayang.core.optimizer.costs.{LoadEstimator, LoadProfile, LoadProfileEstimator}
+import org.apache.wayang.core.plan.wayangplan.{Operator, OutputSlot, WayangPlan, UnarySource}
+import org.apache.wayang.core.platform.Platform
+import org.apache.wayang.core.types.DataSetType
+import org.apache.wayang.core.util.{Logging, ReflectionUtils, WayangCollections, Tuple => WayangTuple}
 
 import scala.collection.mutable.ListBuffer
 import scala.reflect.ClassTag
@@ -38,7 +38,7 @@ trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging
   protected[api] implicit def javaPlanBuilder: JavaPlanBuilder
 
   /**
-    * Set a name for the [[DataQuanta]] and its associated [[org.apache.incubator.wayang.core.plan.wayangplan.Operator]]s.
+    * Set a name for the [[DataQuanta]] and its associated [[org.apache.wayang.core.plan.wayangplan.Operator]]s.
     *
     * @param name the name
     * @return this instance
@@ -46,7 +46,7 @@ trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging
   def withName(name: String): This
 
   /**
-    * Set an [[Experiment]] for the currently built [[org.apache.incubator.wayang.core.api.Job]].
+    * Set an [[Experiment]] for the currently built [[org.apache.wayang.core.api.Job]].
     *
     * @param experiment the [[Experiment]]
     * @return this instance
@@ -98,7 +98,7 @@ trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging
   def withTargetPlatform(platform: Platform): This
 
   /**
-    * Register the JAR file containing the given [[Class]] with the currently built [[org.apache.incubator.wayang.core.api.Job]].
+    * Register the JAR file containing the given [[Class]] with the currently built [[org.apache.wayang.core.api.Job]].
     *
     * @param cls the [[Class]]
     * @return this instance
@@ -106,7 +106,7 @@ trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging
   def withUdfJarOf(cls: Class[_]): This
 
   /**
-    * Register a JAR file with the currently built [[org.apache.incubator.wayang.core.api.Job]].
+    * Register a JAR file with the currently built [[org.apache.wayang.core.api.Job]].
     *
     * @param path the path of the JAR file
     * @return this instance
@@ -129,15 +129,15 @@ trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging
   def map[NewOut](udf: SerializableFunction[Out, NewOut]) = new MapDataQuantaBuilder(this, udf)
 
   /**
-    * Feed the built [[DataQuanta]] into a [[MapOperator]] with a [[org.apache.incubator.wayang.basic.function.ProjectionDescriptor]].
+    * Feed the built [[DataQuanta]] into a [[MapOperator]] with a [[org.apache.wayang.basic.function.ProjectionDescriptor]].
     *
-    * @param fieldNames field names for the [[org.apache.incubator.wayang.basic.function.ProjectionDescriptor]]
+    * @param fieldNames field names for the [[org.apache.wayang.basic.function.ProjectionDescriptor]]
     * @return a [[MapDataQuantaBuilder]]
     */
   def project[NewOut](fieldNames: Array[String]) = new ProjectionDataQuantaBuilder(this, fieldNames)
 
   /**
-    * Feed the built [[DataQuanta]] into a [[org.apache.incubator.wayang.basic.operators.FilterOperator]].
+    * Feed the built [[DataQuanta]] into a [[org.apache.wayang.basic.operators.FilterOperator]].
     *
     * @param udf filter UDF
     * @return a [[FilterDataQuantaBuilder]]
@@ -145,24 +145,24 @@ trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging
   def filter(udf: SerializablePredicate[Out]) = new FilterDataQuantaBuilder(this, udf)
 
   /**
-    * Feed the built [[DataQuanta]] into a [[org.apache.incubator.wayang.basic.operators.FlatMapOperator]].
+    * Feed the built [[DataQuanta]] into a [[org.apache.wayang.basic.operators.FlatMapOperator]].
     *
-    * @param udf the UDF for the [[org.apache.incubator.wayang.basic.operators.FlatMapOperator]]
+    * @param udf the UDF for the [[org.apache.wayang.basic.operators.FlatMapOperator]]
     * @return a [[FlatMapDataQuantaBuilder]]
     */
   def flatMap[NewOut](udf: SerializableFunction[Out, java.lang.Iterable[NewOut]]) = new FlatMapDataQuantaBuilder(this, udf)
 
   /**
-    * Feed the built [[DataQuanta]] into a [[org.apache.incubator.wayang.basic.operators.MapPartitionsOperator]].
+    * Feed the built [[DataQuanta]] into a [[org.apache.wayang.basic.operators.MapPartitionsOperator]].
     *
-    * @param udf the UDF for the [[org.apache.incubator.wayang.basic.operators.MapPartitionsOperator]]
+    * @param udf the UDF for the [[org.apache.wayang.basic.operators.MapPartitionsOperator]]
     * @return a [[MapPartitionsDataQuantaBuilder]]
     */
   def mapPartitions[NewOut](udf: SerializableFunction[java.lang.Iterable[Out], java.lang.Iterable[NewOut]]) =
     new MapPartitionsDataQuantaBuilder(this, udf)
 
   /**
-    * Feed the built [[DataQuanta]] into a [[org.apache.incubator.wayang.basic.operators.SampleOperator]].
+    * Feed the built [[DataQuanta]] into a [[org.apache.wayang.basic.operators.SampleOperator]].
     *
     * @param sampleSize the absolute size of the sample
     * @return a [[SampleDataQuantaBuilder]]
@@ -173,7 +173,7 @@ trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging
 
 
   /**
-    * Feed the built [[DataQuanta]] into a [[org.apache.incubator.wayang.basic.operators.SampleOperator]].
+    * Feed the built [[DataQuanta]] into a [[org.apache.wayang.basic.operators.SampleOperator]].
     *
     * @param sampleSizeFunction the absolute size of the sample as a function of the current iteration number
     * @return a [[SampleDataQuantaBuilder]]
@@ -196,26 +196,26 @@ trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging
   def reduce(udf: SerializableBinaryOperator[Out]) = new GlobalReduceDataQuantaBuilder(this, udf)
 
   /**
-    * Feed the built [[DataQuanta]] into a [[org.apache.incubator.wayang.basic.operators.ReduceByOperator]].
+    * Feed the built [[DataQuanta]] into a [[org.apache.wayang.basic.operators.ReduceByOperator]].
     *
-    * @param keyUdf the key UDF for the [[org.apache.incubator.wayang.basic.operators.ReduceByOperator]]
-    * @param udf    the UDF for the [[org.apache.incubator.wayang.basic.operators.ReduceByOperator]]
+    * @param keyUdf the key UDF for the [[org.apache.wayang.basic.operators.ReduceByOperator]]
+    * @param udf    the UDF for the [[org.apache.wayang.basic.operators.ReduceByOperator]]
     * @return a [[ReduceByDataQuantaBuilder]]
     */
   def reduceByKey[Key](keyUdf: SerializableFunction[Out, Key], udf: SerializableBinaryOperator[Out]) =
     new ReduceByDataQuantaBuilder(this, keyUdf, udf)
 
   /**
-    * Feed the built [[DataQuanta]] into a [[org.apache.incubator.wayang.basic.operators.MaterializedGroupByOperator]].
+    * Feed the built [[DataQuanta]] into a [[org.apache.wayang.basic.operators.MaterializedGroupByOperator]].
     *
-    * @param keyUdf the key UDF for the [[org.apache.incubator.wayang.basic.operators.MaterializedGroupByOperator]]
+    * @param keyUdf the key UDF for the [[org.apache.wayang.basic.operators.MaterializedGroupByOperator]]
     * @return a [[GroupByDataQuantaBuilder]]
     */
   def groupByKey[Key](keyUdf: SerializableFunction[Out, Key]) =
     new GroupByDataQuantaBuilder(this, keyUdf)
 
   /**
-    * Feed the built [[DataQuanta]] into a [[org.apache.incubator.wayang.basic.operators.GlobalMaterializedGroupOperator]].
+    * Feed the built [[DataQuanta]] into a [[org.apache.wayang.basic.operators.GlobalMaterializedGroupOperator]].
     *
     * @return a [[GlobalGroupDataQuantaBuilder]]
     */
@@ -223,7 +223,7 @@ trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging
 
   /**
     * Feed the built [[DataQuanta]] of this and the given instance into a
-    * [[org.apache.incubator.wayang.basic.operators.UnionAllOperator]].
+    * [[org.apache.wayang.basic.operators.UnionAllOperator]].
     *
     * @param that the other [[DataQuantaBuilder]] to union with
     * @return a [[UnionDataQuantaBuilder]]
@@ -232,7 +232,7 @@ trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging
 
   /**
     * Feed the built [[DataQuanta]] of this and the given instance into a
-    * [[org.apache.incubator.wayang.basic.operators.IntersectOperator]].
+    * [[org.apache.wayang.basic.operators.IntersectOperator]].
     *
     * @param that the other [[DataQuantaBuilder]] to intersect with
     * @return an [[IntersectDataQuantaBuilder]]
@@ -241,7 +241,7 @@ trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging
 
   /**
     * Feed the built [[DataQuanta]] of this and the given instance into a
-    * [[org.apache.incubator.wayang.basic.operators.JoinOperator]].
+    * [[org.apache.wayang.basic.operators.JoinOperator]].
     *
     * @param thisKeyUdf the key extraction UDF for this instance
     * @param that       the other [[DataQuantaBuilder]] to join with
@@ -255,7 +255,7 @@ trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging
 
   /**
     * Feed the built [[DataQuanta]] of this and the given instance into a
-    * [[org.apache.incubator.wayang.basic.operators.CoGroupOperator]].
+    * [[org.apache.wayang.basic.operators.CoGroupOperator]].
     *
     * @param thisKeyUdf the key extraction UDF for this instance
     * @param that       the other [[DataQuantaBuilder]] to join with
@@ -270,7 +270,7 @@ trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging
 
   /**
     * Feed the built [[DataQuanta]] of this and the given instance into a
-    * [[org.apache.incubator.wayang.basic.operators.SortOperator]].
+    * [[org.apache.wayang.basic.operators.SortOperator]].
     *
     * @param keyUdf the key extraction UDF for this instance
     * @return a [[SortDataQuantaBuilder]]
@@ -280,35 +280,35 @@ trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging
 
   /**
     * Feed the built [[DataQuanta]] of this and the given instance into a
-    * [[org.apache.incubator.wayang.basic.operators.CartesianOperator]].
+    * [[org.apache.wayang.basic.operators.CartesianOperator]].
     *
     * @return a [[CartesianDataQuantaBuilder]]
     */
   def cartesian[ThatOut](that: DataQuantaBuilder[_, ThatOut]) = new CartesianDataQuantaBuilder(this, that)
 
   /**
-    * Feed the built [[DataQuanta]] into a [[org.apache.incubator.wayang.basic.operators.ZipWithIdOperator]].
+    * Feed the built [[DataQuanta]] into a [[org.apache.wayang.basic.operators.ZipWithIdOperator]].
     *
-    * @return a [[ZipWithIdDataQuantaBuilder]] representing the [[org.apache.incubator.wayang.basic.operators.ZipWithIdOperator]]'s output
+    * @return a [[ZipWithIdDataQuantaBuilder]] representing the [[org.apache.wayang.basic.operators.ZipWithIdOperator]]'s output
     */
   def zipWithId = new ZipWithIdDataQuantaBuilder(this)
 
   /**
-    * Feed the built [[DataQuanta]] into a [[org.apache.incubator.wayang.basic.operators.DistinctOperator]].
+    * Feed the built [[DataQuanta]] into a [[org.apache.wayang.basic.operators.DistinctOperator]].
     *
-    * @return a [[DistinctDataQuantaBuilder]] representing the [[org.apache.incubator.wayang.basic.operators.DistinctOperator]]'s output
+    * @return a [[DistinctDataQuantaBuilder]] representing the [[org.apache.wayang.basic.operators.DistinctOperator]]'s output
     */
   def distinct = new DistinctDataQuantaBuilder(this)
 
   /**
-    * Feed the built [[DataQuanta]] into a [[org.apache.incubator.wayang.basic.operators.CountOperator]].
+    * Feed the built [[DataQuanta]] into a [[org.apache.wayang.basic.operators.CountOperator]].
     *
-    * @return a [[CountDataQuantaBuilder]] representing the [[org.apache.incubator.wayang.basic.operators.CountOperator]]'s output
+    * @return a [[CountDataQuantaBuilder]] representing the [[org.apache.wayang.basic.operators.CountOperator]]'s output
     */
   def count = new CountDataQuantaBuilder(this)
 
   /**
-    * Feed the built [[DataQuanta]] into a [[org.apache.incubator.wayang.basic.operators.DoWhileOperator]].
+    * Feed the built [[DataQuanta]] into a [[org.apache.wayang.basic.operators.DoWhileOperator]].
     *
     * @return a [[DoWhileDataQuantaBuilder]]
     */
@@ -317,7 +317,7 @@ trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging
     new DoWhileDataQuantaBuilder(this, conditionUdf.asInstanceOf[SerializablePredicate[JavaCollection[Conv]]], bodyBuilder)
 
   /**
-    * Feed the built [[DataQuanta]] into a [[org.apache.incubator.wayang.basic.operators.RepeatOperator]].
+    * Feed the built [[DataQuanta]] into a [[org.apache.wayang.basic.operators.RepeatOperator]].
     *
     * @return a [[DoWhileDataQuantaBuilder]]
     */
@@ -325,7 +325,7 @@ trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging
     new RepeatDataQuantaBuilder(this, numRepetitions, bodyBuilder)
 
   /**
-    * Feed the built [[DataQuanta]] into a custom [[Operator]] with a single [[org.apache.incubator.wayang.core.plan.wayangplan.InputSlot]]
+    * Feed the built [[DataQuanta]] into a custom [[Operator]] with a single [[org.apache.wayang.core.plan.wayangplan.InputSlot]]
     * and a single [[OutputSlot]].
     *
     * @param operator the custom [[Operator]]
@@ -359,7 +359,7 @@ trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging
   def forEach(f: Consumer[Out]): Unit = this.dataQuanta().foreachJava(f)
 
   /**
-    * Feed the built [[DataQuanta]] into a [[org.apache.incubator.wayang.basic.operators.TextFileSink]]. This triggers
+    * Feed the built [[DataQuanta]] into a [[org.apache.wayang.basic.operators.TextFileSink]]. This triggers
     * execution of the constructed [[WayangPlan]].
     *
     * @param url     the URL of the file to be written
@@ -370,7 +370,7 @@ trait DataQuantaBuilder[+This <: DataQuantaBuilder[_, Out], Out] extends Logging
     this.writeTextFile(url, formatterUdf, jobName, null)
 
   /**
-    * Feed the built [[DataQuanta]] into a [[org.apache.incubator.wayang.basic.operators.TextFileSink]]. This triggers
+    * Feed the built [[DataQuanta]] into a [[org.apache.wayang.basic.operators.TextFileSink]]. This triggers
     * execution of the constructed [[WayangPlan]].
     *
     * @param url the URL of the file to be written
@@ -543,7 +543,7 @@ abstract class BasicDataQuantaBuilder[This <: DataQuantaBuilder[_, Out], Out](im
 }
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.core.plan.wayangplan.UnarySource]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.wayang.core.plan.wayangplan.UnarySource]]s.
   *
   * @param source          the [[UnarySource]]
   * @param javaPlanBuilder the [[JavaPlanBuilder]]
@@ -557,7 +557,7 @@ class UnarySourceDataQuantaBuilder[This <: DataQuantaBuilder[_, Out], Out](sourc
 }
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.CollectionSource]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.wayang.basic.operators.CollectionSource]]s.
   *
   * @param collection      the [[JavaCollection]] to be loaded
   * @param javaPlanBuilder the [[JavaPlanBuilder]]
@@ -580,7 +580,7 @@ class LoadCollectionDataQuantaBuilder[Out](collection: JavaCollection[Out])(impl
 }
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.MapOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.wayang.basic.operators.MapOperator]]s.
   *
   * @param inputDataQuanta [[DataQuantaBuilder]] for the input [[DataQuanta]]
   * @param udf             UDF for the [[MapOperator]]
@@ -622,11 +622,11 @@ class MapDataQuantaBuilder[In, Out](inputDataQuanta: DataQuantaBuilder[_, In],
 }
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.MapOperator]]s with
-  * [[org.apache.incubator.wayang.basic.function.ProjectionDescriptor]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.wayang.basic.operators.MapOperator]]s with
+  * [[org.apache.wayang.basic.function.ProjectionDescriptor]]s.
   *
   * @param inputDataQuanta [[DataQuantaBuilder]] for the input [[DataQuanta]]
-  * @param fieldNames      field names for the [[org.apache.incubator.wayang.basic.function.ProjectionDescriptor]]
+  * @param fieldNames      field names for the [[org.apache.wayang.basic.function.ProjectionDescriptor]]
   */
 class ProjectionDataQuantaBuilder[In, Out](inputDataQuanta: DataQuantaBuilder[_, In], fieldNames: Array[String])
                                           (implicit javaPlanBuilder: JavaPlanBuilder)
@@ -638,7 +638,7 @@ class ProjectionDataQuantaBuilder[In, Out](inputDataQuanta: DataQuantaBuilder[_,
 
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.MapOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.wayang.basic.operators.MapOperator]]s.
   *
   * @param inputDataQuanta [[DataQuantaBuilder]] for the input [[DataQuanta]]
   * @param udf             UDF for the [[MapOperator]]
@@ -712,10 +712,10 @@ class FilterDataQuantaBuilder[T](inputDataQuanta: DataQuantaBuilder[_, T], udf:
 
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.SortOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.wayang.basic.operators.SortOperator]]s.
   *
   * @param inputDataQuanta [[DataQuantaBuilder]] for the input [[DataQuanta]]
-  * @param keyUdf             UDF for the [[org.apache.incubator.wayang.basic.operators.SortOperator]]
+  * @param keyUdf             UDF for the [[org.apache.wayang.basic.operators.SortOperator]]
   */
 class SortDataQuantaBuilder[T, Key](inputDataQuanta: DataQuantaBuilder[_, T],
                                     keyUdf: SerializableFunction[T, Key])
@@ -781,10 +781,10 @@ class SortDataQuantaBuilder[T, Key](inputDataQuanta: DataQuantaBuilder[_, T],
 
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.FlatMapOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.wayang.basic.operators.FlatMapOperator]]s.
   *
   * @param inputDataQuanta [[DataQuantaBuilder]] for the input [[DataQuanta]]
-  * @param udf             UDF for the [[org.apache.incubator.wayang.basic.operators.FlatMapOperator]]
+  * @param udf             UDF for the [[org.apache.wayang.basic.operators.FlatMapOperator]]
   */
 class FlatMapDataQuantaBuilder[In, Out](inputDataQuanta: DataQuantaBuilder[_, In],
                                         udf: SerializableFunction[In, java.lang.Iterable[Out]])
@@ -845,10 +845,10 @@ class FlatMapDataQuantaBuilder[In, Out](inputDataQuanta: DataQuantaBuilder[_, In
 }
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.MapPartitionsOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.wayang.basic.operators.MapPartitionsOperator]]s.
   *
   * @param inputDataQuanta [[DataQuantaBuilder]] for the input [[DataQuanta]]
-  * @param udf             UDF for the [[org.apache.incubator.wayang.basic.operators.MapPartitionsOperator]]
+  * @param udf             UDF for the [[org.apache.wayang.basic.operators.MapPartitionsOperator]]
   */
 class MapPartitionsDataQuantaBuilder[In, Out](inputDataQuanta: DataQuantaBuilder[_, In],
                                               udf: SerializableFunction[java.lang.Iterable[In], java.lang.Iterable[Out]])
@@ -911,7 +911,7 @@ class MapPartitionsDataQuantaBuilder[In, Out](inputDataQuanta: DataQuantaBuilder
 }
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.SampleOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.wayang.basic.operators.SampleOperator]]s.
   *
   * @param inputDataQuanta    [[DataQuantaBuilder]] for the input [[DataQuanta]]
   * @param sampleSizeFunction the absolute size of the sample as a function of the current iteration number
@@ -977,11 +977,11 @@ class SampleDataQuantaBuilder[T](inputDataQuanta: DataQuantaBuilder[_, T], sampl
 }
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.ReduceByOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.wayang.basic.operators.ReduceByOperator]]s.
   *
   * @param inputDataQuanta [[DataQuantaBuilder]] for the input [[DataQuanta]]
-  * @param udf             UDF for the [[org.apache.incubator.wayang.basic.operators.ReduceByOperator]]
-  * @param keyUdf          key extraction UDF for the [[org.apache.incubator.wayang.basic.operators.ReduceByOperator]]
+  * @param udf             UDF for the [[org.apache.wayang.basic.operators.ReduceByOperator]]
+  * @param keyUdf          key extraction UDF for the [[org.apache.wayang.basic.operators.ReduceByOperator]]
   */
 class ReduceByDataQuantaBuilder[Key, T](inputDataQuanta: DataQuantaBuilder[_, T],
                                         keyUdf: SerializableFunction[T, Key],
@@ -1042,10 +1042,10 @@ class ReduceByDataQuantaBuilder[Key, T](inputDataQuanta: DataQuantaBuilder[_, T]
 }
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.MaterializedGroupByOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.wayang.basic.operators.MaterializedGroupByOperator]]s.
   *
   * @param inputDataQuanta [[DataQuantaBuilder]] for the input [[DataQuanta]]
-  * @param keyUdf          key extraction UDF for the [[org.apache.incubator.wayang.basic.operators.MaterializedGroupByOperator]]
+  * @param keyUdf          key extraction UDF for the [[org.apache.wayang.basic.operators.MaterializedGroupByOperator]]
   */
 class GroupByDataQuantaBuilder[Key, T](inputDataQuanta: DataQuantaBuilder[_, T], keyUdf: SerializableFunction[T, Key])
                                       (implicit javaPlanBuilder: JavaPlanBuilder)
@@ -1090,7 +1090,7 @@ class GroupByDataQuantaBuilder[Key, T](inputDataQuanta: DataQuantaBuilder[_, T],
 }
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.GlobalMaterializedGroupOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.wayang.basic.operators.GlobalMaterializedGroupOperator]]s.
   *
   * @param inputDataQuanta [[DataQuantaBuilder]] for the input [[DataQuanta]]
   */
@@ -1103,10 +1103,10 @@ class GlobalGroupDataQuantaBuilder[T](inputDataQuanta: DataQuantaBuilder[_, T])(
 
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.GlobalReduceOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.wayang.basic.operators.GlobalReduceOperator]]s.
   *
   * @param inputDataQuanta [[DataQuantaBuilder]] for the input [[DataQuanta]]
-  * @param udf             UDF for the [[org.apache.incubator.wayang.basic.operators.GlobalReduceOperator]]
+  * @param udf             UDF for the [[org.apache.wayang.basic.operators.GlobalReduceOperator]]
   */
 class GlobalReduceDataQuantaBuilder[T](inputDataQuanta: DataQuantaBuilder[_, T],
                                        udf: SerializableBinaryOperator[T])
@@ -1144,7 +1144,7 @@ class GlobalReduceDataQuantaBuilder[T](inputDataQuanta: DataQuantaBuilder[_, T],
 }
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.UnionAllOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.wayang.basic.operators.UnionAllOperator]]s.
   *
   * @param inputDataQuanta0 [[DataQuantaBuilder]] for the first input [[DataQuanta]]
   * @param inputDataQuanta1 [[DataQuantaBuilder]] for the first input [[DataQuanta]]
@@ -1161,7 +1161,7 @@ class UnionDataQuantaBuilder[T](inputDataQuanta0: DataQuantaBuilder[_, T],
 }
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.IntersectOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.wayang.basic.operators.IntersectOperator]]s.
   *
   * @param inputDataQuanta0 [[DataQuantaBuilder]] for the first input [[DataQuanta]]
   * @param inputDataQuanta1 [[DataQuantaBuilder]] for the first input [[DataQuanta]]
@@ -1178,12 +1178,12 @@ class IntersectDataQuantaBuilder[T](inputDataQuanta0: DataQuantaBuilder[_, T],
 }
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.JoinOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.wayang.basic.operators.JoinOperator]]s.
   *
   * @param inputDataQuanta0 [[DataQuantaBuilder]] for the first input [[DataQuanta]]
   * @param inputDataQuanta1 [[DataQuantaBuilder]] for the first input [[DataQuanta]]
-  * @param keyUdf0          first key extraction UDF for the [[org.apache.incubator.wayang.basic.operators.JoinOperator]]
-  * @param keyUdf1          first key extraction UDF for the [[org.apache.incubator.wayang.basic.operators.JoinOperator]]
+  * @param keyUdf0          first key extraction UDF for the [[org.apache.wayang.basic.operators.JoinOperator]]
+  * @param keyUdf1          first key extraction UDF for the [[org.apache.wayang.basic.operators.JoinOperator]]
   */
 class JoinDataQuantaBuilder[In0, In1, Key](inputDataQuanta0: DataQuantaBuilder[_, In0],
                                            inputDataQuanta1: DataQuantaBuilder[_, In1],
@@ -1302,12 +1302,12 @@ class JoinDataQuantaBuilder[In0, In1, Key](inputDataQuanta0: DataQuantaBuilder[_
 }
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.CoGroupOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.wayang.basic.operators.CoGroupOperator]]s.
   *
   * @param inputDataQuanta0 [[DataQuantaBuilder]] for the first input [[DataQuanta]]
   * @param inputDataQuanta1 [[DataQuantaBuilder]] for the first input [[DataQuanta]]
-  * @param keyUdf0          first key extraction UDF for the [[org.apache.incubator.wayang.basic.operators.CoGroupOperator]]
-  * @param keyUdf1          first key extraction UDF for the [[org.apache.incubator.wayang.basic.operators.CoGroupOperator]]
+  * @param keyUdf0          first key extraction UDF for the [[org.apache.wayang.basic.operators.CoGroupOperator]]
+  * @param keyUdf1          first key extraction UDF for the [[org.apache.wayang.basic.operators.CoGroupOperator]]
   */
 class CoGroupDataQuantaBuilder[In0, In1, Key](inputDataQuanta0: DataQuantaBuilder[_, In0],
                                            inputDataQuanta1: DataQuantaBuilder[_, In1],
@@ -1416,7 +1416,7 @@ class CoGroupDataQuantaBuilder[In0, In1, Key](inputDataQuanta0: DataQuantaBuilde
 
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.CartesianOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.wayang.basic.operators.CartesianOperator]]s.
   *
   * @param inputDataQuanta0 [[DataQuantaBuilder]] for the first input [[DataQuanta]]
   * @param inputDataQuanta1 [[DataQuantaBuilder]] for the first input [[DataQuanta]]
@@ -1437,7 +1437,7 @@ class CartesianDataQuantaBuilder[In0, In1](inputDataQuanta0: DataQuantaBuilder[_
 }
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.ZipWithIdOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.wayang.basic.operators.ZipWithIdOperator]]s.
   *
   * @param inputDataQuanta [[DataQuantaBuilder]] for the input [[DataQuanta]]
   */
@@ -1455,7 +1455,7 @@ class ZipWithIdDataQuantaBuilder[T](inputDataQuanta: DataQuantaBuilder[_, T])
 }
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.DistinctOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.wayang.basic.operators.DistinctOperator]]s.
   *
   * @param inputDataQuanta [[DataQuantaBuilder]] for the input [[DataQuanta]]
   */
@@ -1471,7 +1471,7 @@ class DistinctDataQuantaBuilder[T](inputDataQuanta: DataQuantaBuilder[_, T])
 }
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.CountOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.wayang.basic.operators.CountOperator]]s.
   *
   * @param inputDataQuanta [[DataQuantaBuilder]] for the input [[DataQuanta]]
   */
@@ -1490,10 +1490,10 @@ class CountDataQuantaBuilder[T](inputDataQuanta: DataQuantaBuilder[_, T])
 
 
 /**
-  * [[DataQuantaBuilder]] implementation for any [[org.apache.incubator.wayang.core.plan.wayangplan.Operator]]s. Does not offer
+  * [[DataQuantaBuilder]] implementation for any [[org.apache.wayang.core.plan.wayangplan.Operator]]s. Does not offer
   * any convenience methods, though.
   *
-  * @param operator        the custom [[org.apache.incubator.wayang.core.plan.wayangplan.Operator]]
+  * @param operator        the custom [[org.apache.wayang.core.plan.wayangplan.Operator]]
   * @param outputIndex     index of the [[OutputSlot]] addressed by the new instance
   * @param buildCache      a [[DataQuantaBuilderCache]] that must be shared across instances addressing the same [[Operator]]
   * @param inputDataQuanta [[DataQuantaBuilder]]s for the input [[DataQuanta]]
@@ -1518,7 +1518,7 @@ class CustomOperatorDataQuantaBuilder[T](operator: Operator,
 }
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.DoWhileOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.wayang.basic.operators.DoWhileOperator]]s.
   *
   * @param inputDataQuanta [[DataQuantaBuilder]] for the input [[DataQuanta]]
   * @param conditionUdf    UDF for the looping condition
@@ -1580,7 +1580,7 @@ class DoWhileDataQuantaBuilder[T, ConvOut](inputDataQuanta: DataQuantaBuilder[_,
   }
 
   /**
-    * Set the number of expected iterations for the built [[org.apache.incubator.wayang.basic.operators.DoWhileOperator]].
+    * Set the number of expected iterations for the built [[org.apache.wayang.basic.operators.DoWhileOperator]].
     *
     * @param numExpectedIterations the expected number of iterations
     * @return this instance
@@ -1613,7 +1613,7 @@ class DoWhileDataQuantaBuilder[T, ConvOut](inputDataQuanta: DataQuantaBuilder[_,
 }
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.DoWhileOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.wayang.basic.operators.DoWhileOperator]]s.
   *
   * @param inputDataQuanta [[DataQuantaBuilder]] for the input [[DataQuanta]]
   * @param numRepetitions  number of repetitions of the loop
diff --git a/wayang-api/src/main/scala/org/apache/wayang/api/JavaPlanBuilder.scala b/wayang-api/src/main/scala/org/apache/wayang/api/JavaPlanBuilder.scala
index 36d76aa..1f01888 100644
--- a/wayang-api/src/main/scala/org/apache/wayang/api/JavaPlanBuilder.scala
+++ b/wayang-api/src/main/scala/org/apache/wayang/api/JavaPlanBuilder.scala
@@ -1,15 +1,15 @@
-package org.apache.incubator.wayang.api
+package org.apache.wayang.api
 
 import java.util.{Collection => JavaCollection}
 
 import de.hpi.isg.profiledb.store.model.Experiment
 import org.apache.commons.lang3.Validate
-import org.apache.incubator.wayang.api.util.DataQuantaBuilderCache
-import org.apache.incubator.wayang.basic.data.Record
-import org.apache.incubator.wayang.basic.operators.{TableSource, TextFileSource}
-import org.apache.incubator.wayang.core.api.WayangContext
-import org.apache.incubator.wayang.core.plan.wayangplan._
-import org.apache.incubator.wayang.core.types.DataSetType
+import org.apache.wayang.api.util.DataQuantaBuilderCache
+import org.apache.wayang.basic.data.Record
+import org.apache.wayang.basic.operators.{TableSource, TextFileSource}
+import org.apache.wayang.core.api.WayangContext
+import org.apache.wayang.core.plan.wayangplan._
+import org.apache.wayang.core.types.DataSetType
 
 import scala.reflect.ClassTag
 
@@ -26,7 +26,7 @@ class JavaPlanBuilder(wayangCtx: WayangContext, jobName: String) {
   protected[api] val planBuilder = new PlanBuilder(wayangCtx, jobName = jobName)
 
   /**
-    * Feed a [[JavaCollection]] into a [[org.apache.incubator.wayang.basic.operators.CollectionSource]].
+    * Feed a [[JavaCollection]] into a [[org.apache.wayang.basic.operators.CollectionSource]].
     *
     * @param collection the [[JavaCollection]]
     * @return a [[DataQuantaBuilder]] to further develop and configure the just started [[WayangPlan]]
diff --git a/wayang-api/src/main/scala/org/apache/wayang/api/PlanBuilder.scala b/wayang-api/src/main/scala/org/apache/wayang/api/PlanBuilder.scala
index 31871c4..d1971ce 100644
--- a/wayang-api/src/main/scala/org/apache/wayang/api/PlanBuilder.scala
+++ b/wayang-api/src/main/scala/org/apache/wayang/api/PlanBuilder.scala
@@ -1,13 +1,13 @@
-package org.apache.incubator.wayang.api
+package org.apache.wayang.api
 
 import de.hpi.isg.profiledb.store.model.Experiment
 import org.apache.commons.lang3.Validate
-import org.apache.incubator.wayang.api
-import org.apache.incubator.wayang.basic.data.Record
-import org.apache.incubator.wayang.basic.operators.{CollectionSource, TableSource, TextFileSource}
-import org.apache.incubator.wayang.core.api.WayangContext
-import org.apache.incubator.wayang.core.plan.wayangplan._
-import org.apache.incubator.wayang.core.util.ReflectionUtils
+import org.apache.wayang.api
+import org.apache.wayang.basic.data.Record
+import org.apache.wayang.basic.operators.{CollectionSource, TableSource, TextFileSource}
+import org.apache.wayang.core.api.WayangContext
+import org.apache.wayang.core.plan.wayangplan._
+import org.apache.wayang.core.util.ReflectionUtils
 
 import scala.collection.JavaConversions
 import scala.collection.mutable.ListBuffer
@@ -77,7 +77,7 @@ class PlanBuilder(wayangContext: WayangContext, private var jobName: String = nu
 
 
   /**
-    * Build the [[org.apache.incubator.wayang.core.api.Job]] and execute it.
+    * Build the [[org.apache.wayang.core.api.Job]] and execute it.
     */
   def buildAndExecute(): Unit = {
     val plan: WayangPlan = new WayangPlan(this.sinks.toArray: _*)
diff --git a/wayang-api/src/main/scala/org/apache/wayang/api/RecordDataQuanta.scala b/wayang-api/src/main/scala/org/apache/wayang/api/RecordDataQuanta.scala
index 1557bc4..aa8dd6b 100644
--- a/wayang-api/src/main/scala/org/apache/wayang/api/RecordDataQuanta.scala
+++ b/wayang-api/src/main/scala/org/apache/wayang/api/RecordDataQuanta.scala
@@ -1,10 +1,10 @@
-package org.apache.incubator.wayang.api
+package org.apache.wayang.api
 
-import org.apache.incubator.wayang.basic.data.Record
-import org.apache.incubator.wayang.basic.function.ProjectionDescriptor
-import org.apache.incubator.wayang.basic.operators.MapOperator
-import org.apache.incubator.wayang.basic.types.RecordType
-import org.apache.incubator.wayang.core.optimizer.costs.LoadEstimator
+import org.apache.wayang.basic.data.Record
+import org.apache.wayang.basic.function.ProjectionDescriptor
+import org.apache.wayang.basic.operators.MapOperator
+import org.apache.wayang.basic.types.RecordType
+import org.apache.wayang.core.optimizer.costs.LoadEstimator
 
 /**
   * This class enhances the functionality of [[DataQuanta]] with [[Record]]s.
diff --git a/wayang-api/src/main/scala/org/apache/wayang/api/RecordDataQuantaBuilder.scala b/wayang-api/src/main/scala/org/apache/wayang/api/RecordDataQuantaBuilder.scala
index 28f70b2..a4ef9ad 100644
--- a/wayang-api/src/main/scala/org/apache/wayang/api/RecordDataQuantaBuilder.scala
+++ b/wayang-api/src/main/scala/org/apache/wayang/api/RecordDataQuantaBuilder.scala
@@ -1,10 +1,10 @@
-package org.apache.incubator.wayang.api
+package org.apache.wayang.api
 
-import org.apache.incubator.wayang.api.util.DataQuantaBuilderDecorator
-import org.apache.incubator.wayang.basic.data.Record
-import org.apache.incubator.wayang.basic.function.ProjectionDescriptor
-import org.apache.incubator.wayang.basic.operators.MapOperator
-import org.apache.incubator.wayang.core.optimizer.costs.LoadEstimator
+import org.apache.wayang.api.util.DataQuantaBuilderDecorator
+import org.apache.wayang.basic.data.Record
+import org.apache.wayang.basic.function.ProjectionDescriptor
+import org.apache.wayang.basic.operators.MapOperator
+import org.apache.wayang.core.optimizer.costs.LoadEstimator
 
 
 /**
@@ -34,11 +34,11 @@ class RecordDataQuantaBuilderDecorator[This <: RecordDataQuantaBuilder[This]]
   extends DataQuantaBuilderDecorator[This, Record](baseBuilder) with RecordDataQuantaBuilder[This]
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.MapOperator]]s with
-  * [[org.apache.incubator.wayang.basic.function.ProjectionDescriptor]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.wayang.basic.operators.MapOperator]]s with
+  * [[org.apache.wayang.basic.function.ProjectionDescriptor]]s.
   *
   * @param inputDataQuanta [[DataQuantaBuilder]] for the input [[DataQuanta]]
-  * @param fieldNames      field names for the [[org.apache.incubator.wayang.basic.function.ProjectionDescriptor]]
+  * @param fieldNames      field names for the [[org.apache.wayang.basic.function.ProjectionDescriptor]]
   */
 class ProjectRecordsDataQuantaBuilder(inputDataQuanta: DataQuantaBuilder[_, Record], fieldNames: Array[String])
                                      (implicit javaPlanBuilder: JavaPlanBuilder)
diff --git a/wayang-api/src/main/scala/org/apache/wayang/api/graph/Edge.scala b/wayang-api/src/main/scala/org/apache/wayang/api/graph/Edge.scala
index 3e9fa98..8552036 100644
--- a/wayang-api/src/main/scala/org/apache/wayang/api/graph/Edge.scala
+++ b/wayang-api/src/main/scala/org/apache/wayang/api/graph/Edge.scala
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.api.graph
+package org.apache.wayang.api.graph
 
 /**
   * Helper to handle [[Edge]]s.
diff --git a/wayang-api/src/main/scala/org/apache/wayang/api/graph/EdgeDataQuanta.scala b/wayang-api/src/main/scala/org/apache/wayang/api/graph/EdgeDataQuanta.scala
index d256a4c..697755f 100644
--- a/wayang-api/src/main/scala/org/apache/wayang/api/graph/EdgeDataQuanta.scala
+++ b/wayang-api/src/main/scala/org/apache/wayang/api/graph/EdgeDataQuanta.scala
@@ -1,9 +1,9 @@
-package org.apache.incubator.wayang.api.graph
+package org.apache.wayang.api.graph
 
-import org.apache.incubator.wayang.api._
-import org.apache.incubator.wayang.basic.data.Record
-import org.apache.incubator.wayang.basic.operators.{MapOperator, PageRankOperator}
-import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval
+import org.apache.wayang.api._
+import org.apache.wayang.basic.data.Record
+import org.apache.wayang.basic.operators.{MapOperator, PageRankOperator}
+import org.apache.wayang.core.optimizer.ProbabilisticDoubleInterval
 
 /**
   * This class enhances the functionality of [[DataQuanta]] with [[Record]]s.
diff --git a/wayang-api/src/main/scala/org/apache/wayang/api/graph/EdgeDataQuantaBuilder.scala b/wayang-api/src/main/scala/org/apache/wayang/api/graph/EdgeDataQuantaBuilder.scala
index 8e0b9bd..00428ce 100644
--- a/wayang-api/src/main/scala/org/apache/wayang/api/graph/EdgeDataQuantaBuilder.scala
+++ b/wayang-api/src/main/scala/org/apache/wayang/api/graph/EdgeDataQuantaBuilder.scala
@@ -1,9 +1,9 @@
-package org.apache.incubator.wayang.api.graph
+package org.apache.wayang.api.graph
 
-import org.apache.incubator.wayang.api.util.DataQuantaBuilderDecorator
-import org.apache.incubator.wayang.api.{BasicDataQuantaBuilder, DataQuanta, DataQuantaBuilder, JavaPlanBuilder, _}
-import org.apache.incubator.wayang.basic.operators.PageRankOperator
-import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval
+import org.apache.wayang.api.util.DataQuantaBuilderDecorator
+import org.apache.wayang.api.{BasicDataQuantaBuilder, DataQuanta, DataQuantaBuilder, JavaPlanBuilder, _}
+import org.apache.wayang.basic.operators.PageRankOperator
+import org.apache.wayang.core.optimizer.ProbabilisticDoubleInterval
 
 /**
   * Enriches [[DataQuantaBuilder]] by graph-specific operations.
@@ -31,7 +31,7 @@ class EdgeDataQuantaBuilderDecorator[This <: EdgeDataQuantaBuilderDecorator[This
   extends DataQuantaBuilderDecorator[This, Edge](baseBuilder) with EdgeDataQuantaBuilder[This]
 
 /**
-  * [[DataQuantaBuilder]] implementation for [[org.apache.incubator.wayang.basic.operators.MapOperator]]s.
+  * [[DataQuantaBuilder]] implementation for [[org.apache.wayang.basic.operators.MapOperator]]s.
   *
   * @param inputDataQuanta [[DataQuantaBuilder]] for the input [[DataQuanta]]
   * @param numIterations   number of PageRank iterations to do
diff --git a/wayang-api/src/main/scala/org/apache/wayang/api/graph/package.scala b/wayang-api/src/main/scala/org/apache/wayang/api/graph/package.scala
index 6242d7e..2ce793b 100644
--- a/wayang-api/src/main/scala/org/apache/wayang/api/graph/package.scala
+++ b/wayang-api/src/main/scala/org/apache/wayang/api/graph/package.scala
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.api
+package org.apache.wayang.api
 
-import org.apache.incubator.wayang.basic.data.{Tuple2 => T2}
+import org.apache.wayang.basic.data.{Tuple2 => T2}
 
 /**
   * Provides implicits for Wayang's graph API.
diff --git a/wayang-api/src/main/scala/org/apache/wayang/api/package.scala b/wayang-api/src/main/scala/org/apache/wayang/api/package.scala
index 6580535..cd2852f 100644
--- a/wayang-api/src/main/scala/org/apache/wayang/api/package.scala
+++ b/wayang-api/src/main/scala/org/apache/wayang/api/package.scala
@@ -1,16 +1,16 @@
-package org.apache.incubator.wayang
+package org.apache.wayang
 
 import _root_.java.lang.{Class => JavaClass, Iterable => JavaIterable}
 import _root_.java.util.function.{Consumer, ToLongBiFunction, ToLongFunction}
 
-import org.apache.incubator.wayang.basic.data.{Record, Tuple2 => WayangTuple2}
-import org.apache.incubator.wayang.core.api.WayangContext
-import org.apache.incubator.wayang.core.function.FunctionDescriptor.{SerializableBinaryOperator, SerializableFunction, SerializablePredicate}
-import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval
-import org.apache.incubator.wayang.core.optimizer.cardinality.{CardinalityEstimate, CardinalityEstimator, DefaultCardinalityEstimator, FixedSizeCardinalityEstimator}
-import org.apache.incubator.wayang.core.optimizer.costs.{DefaultLoadEstimator, LoadEstimator, LoadProfileEstimator, NestableLoadProfileEstimator}
-import org.apache.incubator.wayang.core.plan.wayangplan.ElementaryOperator
-import org.apache.incubator.wayang.core.types.{BasicDataUnitType, DataSetType, DataUnitGroupType, DataUnitType}
+import org.apache.wayang.basic.data.{Record, Tuple2 => WayangTuple2}
+import org.apache.wayang.core.api.WayangContext
+import org.apache.wayang.core.function.FunctionDescriptor.{SerializableBinaryOperator, SerializableFunction, SerializablePredicate}
+import org.apache.wayang.core.optimizer.ProbabilisticDoubleInterval
+import org.apache.wayang.core.optimizer.cardinality.{CardinalityEstimate, CardinalityEstimator, DefaultCardinalityEstimator, FixedSizeCardinalityEstimator}
+import org.apache.wayang.core.optimizer.costs.{DefaultLoadEstimator, LoadEstimator, LoadProfileEstimator, NestableLoadProfileEstimator}
+import org.apache.wayang.core.plan.wayangplan.ElementaryOperator
+import org.apache.wayang.core.types.{BasicDataUnitType, DataSetType, DataUnitGroupType, DataUnitType}
 
 import scala.collection.JavaConversions
 import scala.language.implicitConversions
diff --git a/wayang-api/src/main/scala/org/apache/wayang/api/util/DataQuantaBuilderCache.scala b/wayang-api/src/main/scala/org/apache/wayang/api/util/DataQuantaBuilderCache.scala
index 009f4fe..01f2fe3 100644
--- a/wayang-api/src/main/scala/org/apache/wayang/api/util/DataQuantaBuilderCache.scala
+++ b/wayang-api/src/main/scala/org/apache/wayang/api/util/DataQuantaBuilderCache.scala
@@ -1,10 +1,10 @@
-package org.apache.incubator.wayang.api.util
+package org.apache.wayang.api.util
 
-import org.apache.incubator.wayang.api.DataQuanta
+import org.apache.wayang.api.DataQuanta
 
 /**
-  * Caches products of [[org.apache.incubator.wayang.api.DataQuantaBuilder]]s that need to be executed at once, e.g., because they
-  * belong to different [[org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot]]s of the same custom [[org.apache.incubator.wayang.core.plan.wayangplan.Operator]].
+  * Caches products of [[org.apache.wayang.api.DataQuantaBuilder]]s that need to be executed at once, e.g., because they
+  * belong to different [[org.apache.wayang.core.plan.wayangplan.OutputSlot]]s of the same custom [[org.apache.wayang.core.plan.wayangplan.Operator]].
   */
 class DataQuantaBuilderCache {
 
diff --git a/wayang-api/src/main/scala/org/apache/wayang/api/util/DataQuantaBuilderDecorator.scala b/wayang-api/src/main/scala/org/apache/wayang/api/util/DataQuantaBuilderDecorator.scala
index e8b0759..86b7953 100644
--- a/wayang-api/src/main/scala/org/apache/wayang/api/util/DataQuantaBuilderDecorator.scala
+++ b/wayang-api/src/main/scala/org/apache/wayang/api/util/DataQuantaBuilderDecorator.scala
@@ -1,10 +1,10 @@
-package org.apache.incubator.wayang.api.util
+package org.apache.wayang.api.util
 
 import de.hpi.isg.profiledb.store.model.Experiment
-import org.apache.incubator.wayang.api.{DataQuanta, DataQuantaBuilder, JavaPlanBuilder}
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator
-import org.apache.incubator.wayang.core.platform.Platform
-import org.apache.incubator.wayang.core.types.DataSetType
+import org.apache.wayang.api.{DataQuanta, DataQuantaBuilder, JavaPlanBuilder}
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator
+import org.apache.wayang.core.platform.Platform
+import org.apache.wayang.core.types.DataSetType
 
 /**
   * Utility to extend a [[DataQuantaBuilder]]'s functionality by decoration.
diff --git a/wayang-api/src/main/scala/org/apache/wayang/api/util/TypeTrap.scala b/wayang-api/src/main/scala/org/apache/wayang/api/util/TypeTrap.scala
index 6f7c3ce..ee0ff48 100644
--- a/wayang-api/src/main/scala/org/apache/wayang/api/util/TypeTrap.scala
+++ b/wayang-api/src/main/scala/org/apache/wayang/api/util/TypeTrap.scala
@@ -1,9 +1,9 @@
-package org.apache.incubator.wayang.api.util
+package org.apache.wayang.api.util
 
-import org.apache.incubator.wayang.core.types.DataSetType
+import org.apache.wayang.core.types.DataSetType
 
 /**
-  * This class waits for a [[org.apache.incubator.wayang.core.types.DataSetType]] to be set and verifies that there are no
+  * This class waits for a [[org.apache.wayang.core.types.DataSetType]] to be set and verifies that there are no
   * two different sets.
   */
 class TypeTrap {
diff --git a/wayang-api/src/test/java/org/apache/wayang/api/JavaApiTest.java b/wayang-api/src/test/java/org/apache/wayang/api/JavaApiTest.java
index c6595f0..2381b90 100644
--- a/wayang-api/src/test/java/org/apache/wayang/api/JavaApiTest.java
+++ b/wayang-api/src/test/java/org/apache/wayang/api/JavaApiTest.java
@@ -1,25 +1,25 @@
-package org.apache.incubator.wayang.api;
+package org.apache.wayang.api;
 
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.apache.incubator.wayang.basic.data.Tuple2;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.api.WayangContext;
-import org.apache.incubator.wayang.core.function.ExecutionContext;
-import org.apache.incubator.wayang.core.function.FunctionDescriptor;
-import org.apache.incubator.wayang.core.function.PredicateDescriptor;
-import org.apache.incubator.wayang.core.function.TransformationDescriptor;
-import org.apache.incubator.wayang.core.types.DataSetType;
-import org.apache.incubator.wayang.core.util.WayangArrays;
-import org.apache.incubator.wayang.core.util.WayangCollections;
-import org.apache.incubator.wayang.core.util.Tuple;
-import org.apache.incubator.wayang.core.util.fs.LocalFileSystem;
-import org.apache.incubator.wayang.java.Java;
-import org.apache.incubator.wayang.java.operators.JavaMapOperator;
-import org.apache.incubator.wayang.spark.Spark;
-import org.apache.incubator.wayang.sqlite3.Sqlite3;
-import org.apache.incubator.wayang.sqlite3.operators.Sqlite3TableSource;
+import org.apache.wayang.basic.data.Tuple2;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.WayangContext;
+import org.apache.wayang.core.function.ExecutionContext;
+import org.apache.wayang.core.function.FunctionDescriptor;
+import org.apache.wayang.core.function.PredicateDescriptor;
+import org.apache.wayang.core.function.TransformationDescriptor;
+import org.apache.wayang.core.types.DataSetType;
+import org.apache.wayang.core.util.WayangArrays;
+import org.apache.wayang.core.util.WayangCollections;
+import org.apache.wayang.core.util.Tuple;
+import org.apache.wayang.core.util.fs.LocalFileSystem;
+import org.apache.wayang.java.Java;
+import org.apache.wayang.java.operators.JavaMapOperator;
+import org.apache.wayang.spark.Spark;
+import org.apache.wayang.sqlite3.Sqlite3;
+import org.apache.wayang.sqlite3.operators.Sqlite3TableSource;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/wayang-api/src/test/scala/org/apache/wayang/api/ApiTest.scala b/wayang-api/src/test/scala/org/apache/wayang/api/ApiTest.scala
index dba64ab..aac908b 100644
--- a/wayang-api/src/test/scala/org/apache/wayang/api/ApiTest.scala
+++ b/wayang-api/src/test/scala/org/apache/wayang/api/ApiTest.scala
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.api
+package org.apache.wayang.api
 
 import java.io.File
 import java.net.URI
@@ -7,16 +7,16 @@ import java.sql.{Connection, Statement}
 import java.util.function.Consumer
 
 import org.junit.{Assert, Test}
-import org.apache.incubator.wayang.basic.WayangBasics
-import org.apache.incubator.wayang.core.api.{Configuration, WayangContext}
-import org.apache.incubator.wayang.core.function.FunctionDescriptor.ExtendedSerializablePredicate
-import org.apache.incubator.wayang.core.function.{ExecutionContext, TransformationDescriptor}
-import org.apache.incubator.wayang.core.util.fs.LocalFileSystem
-import org.apache.incubator.wayang.java.Java
-import org.apache.incubator.wayang.java.operators.JavaMapOperator
-import org.apache.incubator.wayang.spark.Spark
-import org.apache.incubator.wayang.sqlite3.Sqlite3
-import org.apache.incubator.wayang.sqlite3.operators.Sqlite3TableSource
+import org.apache.wayang.basic.WayangBasics
+import org.apache.wayang.core.api.{Configuration, WayangContext}
+import org.apache.wayang.core.function.FunctionDescriptor.ExtendedSerializablePredicate
+import org.apache.wayang.core.function.{ExecutionContext, TransformationDescriptor}
+import org.apache.wayang.core.util.fs.LocalFileSystem
+import org.apache.wayang.java.Java
+import org.apache.wayang.java.operators.JavaMapOperator
+import org.apache.wayang.spark.Spark
+import org.apache.wayang.sqlite3.Sqlite3
+import org.apache.wayang.sqlite3.operators.Sqlite3TableSource
 
 /**
   * Tests the Wayang API.
@@ -399,7 +399,7 @@ class ApiTest {
       .withPlugin(Java.graphPlugin)
       .withPlugin(WayangBasics.graphPlugin)
       .withPlugin(Java.basicPlugin)
-    import org.apache.incubator.wayang.api.graph._
+    import org.apache.wayang.api.graph._
 
     val edges = Seq((0, 1), (0, 2), (0, 3), (1, 0), (2, 1), (3, 2), (3, 1)).map(t => Edge(t._1, t._2))
 
diff --git a/wayang-basic/pom.xml b/wayang-basic/pom.xml
index 6bd6e37..61c3e31 100644
--- a/wayang-basic/pom.xml
+++ b/wayang-basic/pom.xml
@@ -2,7 +2,7 @@
 <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>wayang</artifactId>
-        <groupId>org.apache.incubator.wayang</groupId>
+        <groupId>org.apache.wayang</groupId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -12,7 +12,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.incubator.wayang</groupId>
+            <groupId>org.apache.wayang</groupId>
             <artifactId>wayang-core</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/WayangBasics.java b/wayang-basic/src/main/java/org/apache/wayang/basic/WayangBasics.java
index 57c3a63..cb6e14e 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/WayangBasics.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/WayangBasics.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.basic;
+package org.apache.wayang.basic;
 
-import org.apache.incubator.wayang.basic.plugin.WayangBasic;
-import org.apache.incubator.wayang.basic.plugin.WayangBasicGraph;
+import org.apache.wayang.basic.plugin.WayangBasic;
+import org.apache.wayang.basic.plugin.WayangBasicGraph;
 
 /**
  * Register for plugins in the module.
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/channels/FileChannel.java b/wayang-basic/src/main/java/org/apache/wayang/basic/channels/FileChannel.java
index c4a8579..67d5850 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/channels/FileChannel.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/channels/FileChannel.java
@@ -1,17 +1,17 @@
-package org.apache.incubator.wayang.basic.channels;
-
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.api.exception.WayangException;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.plan.executionplan.Channel;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.platform.AbstractChannelInstance;
-import org.apache.incubator.wayang.core.platform.ChannelDescriptor;
-import org.apache.incubator.wayang.core.platform.ChannelInstance;
-import org.apache.incubator.wayang.core.platform.Executor;
-import org.apache.incubator.wayang.core.util.Actions;
-import org.apache.incubator.wayang.core.util.fs.FileSystem;
-import org.apache.incubator.wayang.core.util.fs.FileSystems;
+package org.apache.wayang.basic.channels;
+
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.exception.WayangException;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.plan.executionplan.Channel;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.platform.AbstractChannelInstance;
+import org.apache.wayang.core.platform.ChannelDescriptor;
+import org.apache.wayang.core.platform.ChannelInstance;
+import org.apache.wayang.core.platform.Executor;
+import org.apache.wayang.core.util.Actions;
+import org.apache.wayang.core.util.fs.FileSystem;
+import org.apache.wayang.core.util.fs.FileSystems;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/data/Record.java b/wayang-basic/src/main/java/org/apache/wayang/basic/data/Record.java
index ab8a13f..0c4fd87 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/data/Record.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/data/Record.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.basic.data;
+package org.apache.wayang.basic.data;
 
-import org.apache.incubator.wayang.core.util.Copyable;
-import org.apache.incubator.wayang.core.util.ReflectionUtils;
+import org.apache.wayang.core.util.Copyable;
+import org.apache.wayang.core.util.ReflectionUtils;
 
 import java.io.Serializable;
 import java.util.Arrays;
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/data/Tuple2.java b/wayang-basic/src/main/java/org/apache/wayang/basic/data/Tuple2.java
index 52c7ed7..af2027e 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/data/Tuple2.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/data/Tuple2.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.basic.data;
+package org.apache.wayang.basic.data;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/data/Tuple5.java b/wayang-basic/src/main/java/org/apache/wayang/basic/data/Tuple5.java
index 5c06255..fd89eac 100755
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/data/Tuple5.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/data/Tuple5.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.basic.data;
+package org.apache.wayang.basic.data;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/function/ProjectionDescriptor.java b/wayang-basic/src/main/java/org/apache/wayang/basic/function/ProjectionDescriptor.java
index aeefe6c..b3e9dfb 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/function/ProjectionDescriptor.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/function/ProjectionDescriptor.java
@@ -1,10 +1,10 @@
-package org.apache.incubator.wayang.basic.function;
+package org.apache.wayang.basic.function;
 
-import org.apache.incubator.wayang.basic.data.Record;
-import org.apache.incubator.wayang.basic.types.RecordType;
-import org.apache.incubator.wayang.core.function.FunctionDescriptor;
-import org.apache.incubator.wayang.core.function.TransformationDescriptor;
-import org.apache.incubator.wayang.core.types.BasicDataUnitType;
+import org.apache.wayang.basic.data.Record;
+import org.apache.wayang.basic.types.RecordType;
+import org.apache.wayang.core.function.FunctionDescriptor;
+import org.apache.wayang.core.function.TransformationDescriptor;
+import org.apache.wayang.core.types.BasicDataUnitType;
 
 import java.lang.reflect.Field;
 import java.util.Arrays;
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/mapping/GlobalReduceMapping.java b/wayang-basic/src/main/java/org/apache/wayang/basic/mapping/GlobalReduceMapping.java
index 88c67d3..f605eb0 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/mapping/GlobalReduceMapping.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/mapping/GlobalReduceMapping.java
@@ -1,17 +1,17 @@
-package org.apache.incubator.wayang.basic.mapping;
-
-import org.apache.incubator.wayang.basic.operators.GlobalReduceOperator;
-import org.apache.incubator.wayang.basic.operators.GroupByOperator;
-import org.apache.incubator.wayang.basic.operators.ReduceByOperator;
-import org.apache.incubator.wayang.basic.operators.ReduceOperator;
-import org.apache.incubator.wayang.core.mapping.Mapping;
-import org.apache.incubator.wayang.core.mapping.OperatorPattern;
-import org.apache.incubator.wayang.core.mapping.PlanTransformation;
-import org.apache.incubator.wayang.core.mapping.ReplacementSubplanFactory;
-import org.apache.incubator.wayang.core.mapping.SubplanMatch;
-import org.apache.incubator.wayang.core.mapping.SubplanPattern;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.types.DataSetType;
+package org.apache.wayang.basic.mapping;
+
+import org.apache.wayang.basic.operators.GlobalReduceOperator;
+import org.apache.wayang.basic.operators.GroupByOperator;
+import org.apache.wayang.basic.operators.ReduceByOperator;
+import org.apache.wayang.basic.operators.ReduceOperator;
+import org.apache.wayang.core.mapping.Mapping;
+import org.apache.wayang.core.mapping.OperatorPattern;
+import org.apache.wayang.core.mapping.PlanTransformation;
+import org.apache.wayang.core.mapping.ReplacementSubplanFactory;
+import org.apache.wayang.core.mapping.SubplanMatch;
+import org.apache.wayang.core.mapping.SubplanPattern;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.types.DataSetType;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/mapping/Mappings.java b/wayang-basic/src/main/java/org/apache/wayang/basic/mapping/Mappings.java
index 4eed237..1a22a46 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/mapping/Mappings.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/mapping/Mappings.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.basic.mapping;
+package org.apache.wayang.basic.mapping;
 
-import org.apache.incubator.wayang.core.mapping.Mapping;
+import org.apache.wayang.core.mapping.Mapping;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/mapping/MaterializedGroupByMapping.java b/wayang-basic/src/main/java/org/apache/wayang/basic/mapping/MaterializedGroupByMapping.java
index bc98f1c..d9eea43 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/mapping/MaterializedGroupByMapping.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/mapping/MaterializedGroupByMapping.java
@@ -1,15 +1,15 @@
-package org.apache.incubator.wayang.basic.mapping;
-
-import org.apache.incubator.wayang.basic.operators.GroupByOperator;
-import org.apache.incubator.wayang.basic.operators.MaterializedGroupByOperator;
-import org.apache.incubator.wayang.core.mapping.Mapping;
-import org.apache.incubator.wayang.core.mapping.OperatorPattern;
-import org.apache.incubator.wayang.core.mapping.PlanTransformation;
-import org.apache.incubator.wayang.core.mapping.ReplacementSubplanFactory;
-import org.apache.incubator.wayang.core.mapping.SubplanMatch;
-import org.apache.incubator.wayang.core.mapping.SubplanPattern;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.types.DataSetType;
+package org.apache.wayang.basic.mapping;
+
+import org.apache.wayang.basic.operators.GroupByOperator;
+import org.apache.wayang.basic.operators.MaterializedGroupByOperator;
+import org.apache.wayang.core.mapping.Mapping;
+import org.apache.wayang.core.mapping.OperatorPattern;
+import org.apache.wayang.core.mapping.PlanTransformation;
+import org.apache.wayang.core.mapping.ReplacementSubplanFactory;
+import org.apache.wayang.core.mapping.SubplanMatch;
+import org.apache.wayang.core.mapping.SubplanPattern;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.types.DataSetType;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/mapping/PageRankMapping.java b/wayang-basic/src/main/java/org/apache/wayang/basic/mapping/PageRankMapping.java
index f49fbab..39a1fbf 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/mapping/PageRankMapping.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/mapping/PageRankMapping.java
@@ -1,30 +1,30 @@
-package org.apache.incubator.wayang.basic.mapping;
-
-import org.apache.incubator.wayang.basic.data.Tuple2;
-import org.apache.incubator.wayang.basic.operators.CountOperator;
-import org.apache.incubator.wayang.basic.operators.DistinctOperator;
-import org.apache.incubator.wayang.basic.operators.FlatMapOperator;
-import org.apache.incubator.wayang.basic.operators.JoinOperator;
-import org.apache.incubator.wayang.basic.operators.MapOperator;
-import org.apache.incubator.wayang.basic.operators.PageRankOperator;
-import org.apache.incubator.wayang.basic.operators.ReduceByOperator;
-import org.apache.incubator.wayang.basic.operators.RepeatOperator;
-import org.apache.incubator.wayang.core.function.ExecutionContext;
-import org.apache.incubator.wayang.core.function.FlatMapDescriptor;
-import org.apache.incubator.wayang.core.function.FunctionDescriptor;
-import org.apache.incubator.wayang.core.mapping.Mapping;
-import org.apache.incubator.wayang.core.mapping.OperatorPattern;
-import org.apache.incubator.wayang.core.mapping.PlanTransformation;
-import org.apache.incubator.wayang.core.mapping.ReplacementSubplanFactory;
-import org.apache.incubator.wayang.core.mapping.SubplanPattern;
-import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
-import org.apache.incubator.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
-import org.apache.incubator.wayang.core.plan.wayangplan.LoopIsolator;
-import org.apache.incubator.wayang.core.plan.wayangplan.LoopSubplan;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.plan.wayangplan.Subplan;
-import org.apache.incubator.wayang.core.util.ReflectionUtils;
-import org.apache.incubator.wayang.core.util.WayangCollections;
+package org.apache.wayang.basic.mapping;
+
+import org.apache.wayang.basic.data.Tuple2;
+import org.apache.wayang.basic.operators.CountOperator;
+import org.apache.wayang.basic.operators.DistinctOperator;
+import org.apache.wayang.basic.operators.FlatMapOperator;
+import org.apache.wayang.basic.operators.JoinOperator;
+import org.apache.wayang.basic.operators.MapOperator;
+import org.apache.wayang.basic.operators.PageRankOperator;
+import org.apache.wayang.basic.operators.ReduceByOperator;
+import org.apache.wayang.basic.operators.RepeatOperator;
+import org.apache.wayang.core.function.ExecutionContext;
+import org.apache.wayang.core.function.FlatMapDescriptor;
+import org.apache.wayang.core.function.FunctionDescriptor;
+import org.apache.wayang.core.mapping.Mapping;
+import org.apache.wayang.core.mapping.OperatorPattern;
+import org.apache.wayang.core.mapping.PlanTransformation;
+import org.apache.wayang.core.mapping.ReplacementSubplanFactory;
+import org.apache.wayang.core.mapping.SubplanPattern;
+import org.apache.wayang.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
+import org.apache.wayang.core.plan.wayangplan.LoopIsolator;
+import org.apache.wayang.core.plan.wayangplan.LoopSubplan;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.plan.wayangplan.Subplan;
+import org.apache.wayang.core.util.ReflectionUtils;
+import org.apache.wayang.core.util.WayangCollections;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/mapping/ReduceByMapping.java b/wayang-basic/src/main/java/org/apache/wayang/basic/mapping/ReduceByMapping.java
index 31afc7e..83fbd0b 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/mapping/ReduceByMapping.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/mapping/ReduceByMapping.java
@@ -1,16 +1,16 @@
-package org.apache.incubator.wayang.basic.mapping;
+package org.apache.wayang.basic.mapping;
 
-import org.apache.incubator.wayang.basic.operators.GroupByOperator;
-import org.apache.incubator.wayang.basic.operators.ReduceByOperator;
-import org.apache.incubator.wayang.basic.operators.ReduceOperator;
-import org.apache.incubator.wayang.core.mapping.Mapping;
-import org.apache.incubator.wayang.core.mapping.OperatorPattern;
-import org.apache.incubator.wayang.core.mapping.PlanTransformation;
-import org.apache.incubator.wayang.core.mapping.ReplacementSubplanFactory;
-import org.apache.incubator.wayang.core.mapping.SubplanMatch;
-import org.apache.incubator.wayang.core.mapping.SubplanPattern;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.basic.operators.GroupByOperator;
+import org.apache.wayang.basic.operators.ReduceByOperator;
+import org.apache.wayang.basic.operators.ReduceOperator;
+import org.apache.wayang.core.mapping.Mapping;
+import org.apache.wayang.core.mapping.OperatorPattern;
+import org.apache.wayang.core.mapping.PlanTransformation;
+import org.apache.wayang.core.mapping.ReplacementSubplanFactory;
+import org.apache.wayang.core.mapping.SubplanMatch;
+import org.apache.wayang.core.mapping.SubplanPattern;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.types.DataSetType;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/mapping/RepeatMapping.java b/wayang-basic/src/main/java/org/apache/wayang/basic/mapping/RepeatMapping.java
index c005338..91c64dc 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/mapping/RepeatMapping.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/mapping/RepeatMapping.java
@@ -1,17 +1,17 @@
-package org.apache.incubator.wayang.basic.mapping;
+package org.apache.wayang.basic.mapping;
 
-import org.apache.incubator.wayang.basic.operators.CollectionSource;
-import org.apache.incubator.wayang.basic.operators.LoopOperator;
-import org.apache.incubator.wayang.basic.operators.MapOperator;
-import org.apache.incubator.wayang.basic.operators.RepeatOperator;
-import org.apache.incubator.wayang.core.mapping.Mapping;
-import org.apache.incubator.wayang.core.mapping.OperatorPattern;
-import org.apache.incubator.wayang.core.mapping.PlanTransformation;
-import org.apache.incubator.wayang.core.mapping.ReplacementSubplanFactory;
-import org.apache.incubator.wayang.core.mapping.SubplanPattern;
-import org.apache.incubator.wayang.core.plan.wayangplan.Subplan;
-import org.apache.incubator.wayang.core.types.DataSetType;
-import org.apache.incubator.wayang.core.util.WayangCollections;
+import org.apache.wayang.basic.operators.CollectionSource;
+import org.apache.wayang.basic.operators.LoopOperator;
+import org.apache.wayang.basic.operators.MapOperator;
+import org.apache.wayang.basic.operators.RepeatOperator;
+import org.apache.wayang.core.mapping.Mapping;
+import org.apache.wayang.core.mapping.OperatorPattern;
+import org.apache.wayang.core.mapping.PlanTransformation;
+import org.apache.wayang.core.mapping.ReplacementSubplanFactory;
+import org.apache.wayang.core.mapping.SubplanPattern;
+import org.apache.wayang.core.plan.wayangplan.Subplan;
+import org.apache.wayang.core.types.DataSetType;
+import org.apache.wayang.core.util.WayangCollections;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/CartesianOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/CartesianOperator.java
index b512973..c94dd9d 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/CartesianOperator.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/CartesianOperator.java
@@ -1,12 +1,12 @@
-package org.apache.incubator.wayang.basic.operators;
+package org.apache.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.basic.data.Tuple2;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
-import org.apache.incubator.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
-import org.apache.incubator.wayang.core.plan.wayangplan.BinaryToUnaryOperator;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.basic.data.Tuple2;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
+import org.apache.wayang.core.plan.wayangplan.BinaryToUnaryOperator;
+import org.apache.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/CoGroupOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/CoGroupOperator.java
index 7fa8748..54ed359 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/CoGroupOperator.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/CoGroupOperator.java
@@ -1,14 +1,14 @@
-package org.apache.incubator.wayang.basic.operators;
+package org.apache.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.basic.data.Tuple2;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.function.FunctionDescriptor;
-import org.apache.incubator.wayang.core.function.TransformationDescriptor;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
-import org.apache.incubator.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
-import org.apache.incubator.wayang.core.plan.wayangplan.BinaryToUnaryOperator;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.basic.data.Tuple2;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.function.FunctionDescriptor;
+import org.apache.wayang.core.function.TransformationDescriptor;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
+import org.apache.wayang.core.plan.wayangplan.BinaryToUnaryOperator;
+import org.apache.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/CollectionSource.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/CollectionSource.java
index 41708f3..0a7f8b6 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/CollectionSource.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/CollectionSource.java
@@ -1,12 +1,12 @@
-package org.apache.incubator.wayang.basic.operators;
+package org.apache.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
-import org.apache.incubator.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
-import org.apache.incubator.wayang.core.plan.wayangplan.ElementaryOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.UnarySource;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
+import org.apache.wayang.core.plan.wayangplan.ElementaryOperator;
+import org.apache.wayang.core.plan.wayangplan.UnarySource;
+import org.apache.wayang.core.types.DataSetType;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/CountOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/CountOperator.java
index eda119d..3bbc535 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/CountOperator.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/CountOperator.java
@@ -1,11 +1,11 @@
-package org.apache.incubator.wayang.basic.operators;
+package org.apache.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
-import org.apache.incubator.wayang.core.optimizer.cardinality.FixedSizeCardinalityEstimator;
-import org.apache.incubator.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.wayang.core.optimizer.cardinality.FixedSizeCardinalityEstimator;
+import org.apache.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
+import org.apache.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/DistinctOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/DistinctOperator.java
index 2b3eae0..cc936a5 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/DistinctOperator.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/DistinctOperator.java
@@ -1,11 +1,11 @@
-package org.apache.incubator.wayang.basic.operators;
+package org.apache.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
-import org.apache.incubator.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
-import org.apache.incubator.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
+import org.apache.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
+import org.apache.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/DoWhileOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/DoWhileOperator.java
index 4fee82e..3a73da2 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/DoWhileOperator.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/DoWhileOperator.java
@@ -1,17 +1,17 @@
-package org.apache.incubator.wayang.basic.operators;
-
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.function.PredicateDescriptor;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
-import org.apache.incubator.wayang.core.optimizer.cardinality.SwitchForwardCardinalityEstimator;
-import org.apache.incubator.wayang.core.plan.wayangplan.ElementaryOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.LoopHeadOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.plan.wayangplan.OperatorBase;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.types.DataSetType;
-import org.apache.incubator.wayang.core.util.ReflectionUtils;
+package org.apache.wayang.basic.operators;
+
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.function.PredicateDescriptor;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.wayang.core.optimizer.cardinality.SwitchForwardCardinalityEstimator;
+import org.apache.wayang.core.plan.wayangplan.ElementaryOperator;
+import org.apache.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.wayang.core.plan.wayangplan.LoopHeadOperator;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.plan.wayangplan.OperatorBase;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.types.DataSetType;
+import org.apache.wayang.core.util.ReflectionUtils;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/FilterOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/FilterOperator.java
index ee43bca..4fbd993 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/FilterOperator.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/FilterOperator.java
@@ -1,13 +1,13 @@
-package org.apache.incubator.wayang.basic.operators;
+package org.apache.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.function.PredicateDescriptor;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
-import org.apache.incubator.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.function.PredicateDescriptor;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
+import org.apache.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
@@ -73,7 +73,7 @@ public class FilterOperator<Type> extends UnaryToUnaryOperator<Type, Type> {
     }
 
     @Override
-    public Optional<org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator> createCardinalityEstimator(
+    public Optional<org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator> createCardinalityEstimator(
             final int outputIndex,
             final Configuration configuration) {
         Validate.inclusiveBetween(0, this.getNumOutputs() - 1, outputIndex);
@@ -85,9 +85,9 @@ public class FilterOperator<Type> extends UnaryToUnaryOperator<Type, Type> {
     }
 
     /**
-     * Custom {@link org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator} for {@link FilterOperator}s.
+     * Custom {@link org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator} for {@link FilterOperator}s.
      */
-    private class CardinalityEstimator implements org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator {
+    private class CardinalityEstimator implements org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator {
 
         /**
          * The expected selectivity to be applied in this instance.
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/FlatMapOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/FlatMapOperator.java
index 67a4529..22b14e8 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/FlatMapOperator.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/FlatMapOperator.java
@@ -1,14 +1,14 @@
-package org.apache.incubator.wayang.basic.operators;
+package org.apache.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.function.FlatMapDescriptor;
-import org.apache.incubator.wayang.core.function.FunctionDescriptor;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
-import org.apache.incubator.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.function.FlatMapDescriptor;
+import org.apache.wayang.core.function.FunctionDescriptor;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
+import org.apache.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
@@ -68,7 +68,7 @@ public class FlatMapOperator<InputType, OutputType> extends UnaryToUnaryOperator
     }
 
     @Override
-    public Optional<org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator> createCardinalityEstimator(
+    public Optional<org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator> createCardinalityEstimator(
             final int outputIndex,
             final Configuration configuration) {
         Validate.inclusiveBetween(0, this.getNumOutputs() - 1, outputIndex);
@@ -76,9 +76,9 @@ public class FlatMapOperator<InputType, OutputType> extends UnaryToUnaryOperator
     }
 
     /**
-     * Custom {@link org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator} for {@link FlatMapOperator}s.
+     * Custom {@link org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator} for {@link FlatMapOperator}s.
      */
-    private class CardinalityEstimator implements org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator {
+    private class CardinalityEstimator implements org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator {
 
         /**
          * The selectivity of this instance.
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/GlobalMaterializedGroupOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/GlobalMaterializedGroupOperator.java
index 89cc45f..f629e8d 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/GlobalMaterializedGroupOperator.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/GlobalMaterializedGroupOperator.java
@@ -1,10 +1,10 @@
-package org.apache.incubator.wayang.basic.operators;
+package org.apache.wayang.basic.operators;
 
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
-import org.apache.incubator.wayang.core.optimizer.cardinality.FixedSizeCardinalityEstimator;
-import org.apache.incubator.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.wayang.core.optimizer.cardinality.FixedSizeCardinalityEstimator;
+import org.apache.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
+import org.apache.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/GlobalReduceOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/GlobalReduceOperator.java
index d380890..621ff54 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/GlobalReduceOperator.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/GlobalReduceOperator.java
@@ -1,14 +1,14 @@
-package org.apache.incubator.wayang.basic.operators;
+package org.apache.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.function.FunctionDescriptor;
-import org.apache.incubator.wayang.core.function.ReduceDescriptor;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
-import org.apache.incubator.wayang.core.optimizer.cardinality.FixedSizeCardinalityEstimator;
-import org.apache.incubator.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
-import org.apache.incubator.wayang.core.types.BasicDataUnitType;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.function.FunctionDescriptor;
+import org.apache.wayang.core.function.ReduceDescriptor;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.wayang.core.optimizer.cardinality.FixedSizeCardinalityEstimator;
+import org.apache.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
+import org.apache.wayang.core.types.BasicDataUnitType;
+import org.apache.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/GroupByOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/GroupByOperator.java
index b3ceacc..f0253f4 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/GroupByOperator.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/GroupByOperator.java
@@ -1,9 +1,9 @@
-package org.apache.incubator.wayang.basic.operators;
+package org.apache.wayang.basic.operators;
 
-import org.apache.incubator.wayang.core.function.FunctionDescriptor;
-import org.apache.incubator.wayang.core.function.TransformationDescriptor;
-import org.apache.incubator.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.core.function.FunctionDescriptor;
+import org.apache.wayang.core.function.TransformationDescriptor;
+import org.apache.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
+import org.apache.wayang.core.types.DataSetType;
 
 /**
  * This is the auxiliary GroupBy operator, i.e., it behaves differently depending on its context. If it is followed
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/IntersectOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/IntersectOperator.java
index e79891d..9210d80 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/IntersectOperator.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/IntersectOperator.java
@@ -1,11 +1,11 @@
-package org.apache.incubator.wayang.basic.operators;
+package org.apache.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
-import org.apache.incubator.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
-import org.apache.incubator.wayang.core.plan.wayangplan.BinaryToUnaryOperator;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
+import org.apache.wayang.core.plan.wayangplan.BinaryToUnaryOperator;
+import org.apache.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/JoinOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/JoinOperator.java
index dadae7f..e12b645 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/JoinOperator.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/JoinOperator.java
@@ -1,14 +1,14 @@
-package org.apache.incubator.wayang.basic.operators;
+package org.apache.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.basic.data.Tuple2;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.function.FunctionDescriptor;
-import org.apache.incubator.wayang.core.function.TransformationDescriptor;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
-import org.apache.incubator.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
-import org.apache.incubator.wayang.core.plan.wayangplan.BinaryToUnaryOperator;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.basic.data.Tuple2;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.function.FunctionDescriptor;
+import org.apache.wayang.core.function.TransformationDescriptor;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
+import org.apache.wayang.core.plan.wayangplan.BinaryToUnaryOperator;
+import org.apache.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/LocalCallbackSink.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/LocalCallbackSink.java
index b9ac3ca..17428e9 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/LocalCallbackSink.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/LocalCallbackSink.java
@@ -1,13 +1,13 @@
-package org.apache.incubator.wayang.basic.operators;
+package org.apache.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.function.ConsumerDescriptor;
-import org.apache.incubator.wayang.core.function.FunctionDescriptor;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
-import org.apache.incubator.wayang.core.plan.wayangplan.UnarySink;
-import org.apache.incubator.wayang.core.types.BasicDataUnitType;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.function.ConsumerDescriptor;
+import org.apache.wayang.core.function.FunctionDescriptor;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.wayang.core.plan.wayangplan.UnarySink;
+import org.apache.wayang.core.types.BasicDataUnitType;
+import org.apache.wayang.core.types.DataSetType;
 
 import java.util.Collection;
 import java.util.Optional;
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/LoopOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/LoopOperator.java
index 8c9df0b..8c44ff2 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/LoopOperator.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/LoopOperator.java
@@ -1,17 +1,17 @@
-package org.apache.incubator.wayang.basic.operators;
-
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.function.PredicateDescriptor;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
-import org.apache.incubator.wayang.core.optimizer.cardinality.SwitchForwardCardinalityEstimator;
-import org.apache.incubator.wayang.core.plan.wayangplan.ElementaryOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.LoopHeadOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.plan.wayangplan.OperatorBase;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.types.DataSetType;
-import org.apache.incubator.wayang.core.util.ReflectionUtils;
+package org.apache.wayang.basic.operators;
+
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.function.PredicateDescriptor;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.wayang.core.optimizer.cardinality.SwitchForwardCardinalityEstimator;
+import org.apache.wayang.core.plan.wayangplan.ElementaryOperator;
+import org.apache.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.wayang.core.plan.wayangplan.LoopHeadOperator;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.plan.wayangplan.OperatorBase;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.types.DataSetType;
+import org.apache.wayang.core.util.ReflectionUtils;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/MapOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/MapOperator.java
index 02dbe1f..95eb850 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/MapOperator.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/MapOperator.java
@@ -1,16 +1,16 @@
-package org.apache.incubator.wayang.basic.operators;
+package org.apache.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.basic.data.Record;
-import org.apache.incubator.wayang.basic.function.ProjectionDescriptor;
-import org.apache.incubator.wayang.basic.types.RecordType;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.function.FunctionDescriptor;
-import org.apache.incubator.wayang.core.function.TransformationDescriptor;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
-import org.apache.incubator.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
-import org.apache.incubator.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.basic.data.Record;
+import org.apache.wayang.basic.function.ProjectionDescriptor;
+import org.apache.wayang.basic.types.RecordType;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.function.FunctionDescriptor;
+import org.apache.wayang.core.function.TransformationDescriptor;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
+import org.apache.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
+import org.apache.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/MapPartitionsOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/MapPartitionsOperator.java
index 36bd211..b73c96e 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/MapPartitionsOperator.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/MapPartitionsOperator.java
@@ -1,14 +1,14 @@
-package org.apache.incubator.wayang.basic.operators;
+package org.apache.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.function.FunctionDescriptor;
-import org.apache.incubator.wayang.core.function.MapPartitionsDescriptor;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
-import org.apache.incubator.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.function.FunctionDescriptor;
+import org.apache.wayang.core.function.MapPartitionsDescriptor;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
+import org.apache.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
@@ -72,7 +72,7 @@ public class MapPartitionsOperator<InputType, OutputType> extends UnaryToUnaryOp
     }
 
     @Override
-    public Optional<org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator> createCardinalityEstimator(
+    public Optional<org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator> createCardinalityEstimator(
             final int outputIndex,
             final Configuration configuration) {
         Validate.inclusiveBetween(0, this.getNumOutputs() - 1, outputIndex);
@@ -80,9 +80,9 @@ public class MapPartitionsOperator<InputType, OutputType> extends UnaryToUnaryOp
     }
 
     /**
-     * Custom {@link org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator} for {@link FlatMapOperator}s.
+     * Custom {@link org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator} for {@link FlatMapOperator}s.
      */
-    private class CardinalityEstimator implements org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator {
+    private class CardinalityEstimator implements org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator {
 
         /**
          * The selectivity of this instance.
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/MaterializedGroupByOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/MaterializedGroupByOperator.java
index 0ff2496..3aa90b5 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/MaterializedGroupByOperator.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/MaterializedGroupByOperator.java
@@ -1,13 +1,13 @@
-package org.apache.incubator.wayang.basic.operators;
+package org.apache.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.function.FunctionDescriptor;
-import org.apache.incubator.wayang.core.function.TransformationDescriptor;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
-import org.apache.incubator.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
-import org.apache.incubator.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.function.FunctionDescriptor;
+import org.apache.wayang.core.function.TransformationDescriptor;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
+import org.apache.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
+import org.apache.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/PageRankOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/PageRankOperator.java
index e77217c..0df0838 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/PageRankOperator.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/PageRankOperator.java
@@ -1,14 +1,14 @@
-package org.apache.incubator.wayang.basic.operators;
-
-import org.apache.incubator.wayang.basic.data.Tuple2;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
-import org.apache.incubator.wayang.core.plan.wayangplan.EstimationContextProperty;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
-import org.apache.incubator.wayang.core.types.DataSetType;
+package org.apache.wayang.basic.operators;
+
+import org.apache.wayang.basic.data.Tuple2;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.wayang.core.plan.wayangplan.EstimationContextProperty;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
+import org.apache.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/ReduceByOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/ReduceByOperator.java
index 914734b..91b701b 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/ReduceByOperator.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/ReduceByOperator.java
@@ -1,14 +1,14 @@
-package org.apache.incubator.wayang.basic.operators;
+package org.apache.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.function.FunctionDescriptor;
-import org.apache.incubator.wayang.core.function.ReduceDescriptor;
-import org.apache.incubator.wayang.core.function.TransformationDescriptor;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
-import org.apache.incubator.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
-import org.apache.incubator.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.function.FunctionDescriptor;
+import org.apache.wayang.core.function.ReduceDescriptor;
+import org.apache.wayang.core.function.TransformationDescriptor;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
+import org.apache.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
+import org.apache.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/ReduceOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/ReduceOperator.java
index a6815f0..ad0e487 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/ReduceOperator.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/ReduceOperator.java
@@ -1,12 +1,12 @@
-package org.apache.incubator.wayang.basic.operators;
+package org.apache.wayang.basic.operators;
 
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.function.FunctionDescriptor;
-import org.apache.incubator.wayang.core.function.ReduceDescriptor;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
-import org.apache.incubator.wayang.core.optimizer.cardinality.FixedSizeCardinalityEstimator;
-import org.apache.incubator.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.function.FunctionDescriptor;
+import org.apache.wayang.core.function.ReduceDescriptor;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.wayang.core.optimizer.cardinality.FixedSizeCardinalityEstimator;
+import org.apache.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
+import org.apache.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/RepeatOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/RepeatOperator.java
index 4618567..79e7609 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/RepeatOperator.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/RepeatOperator.java
@@ -1,15 +1,15 @@
-package org.apache.incubator.wayang.basic.operators;
-
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
-import org.apache.incubator.wayang.core.optimizer.cardinality.SwitchForwardCardinalityEstimator;
-import org.apache.incubator.wayang.core.plan.wayangplan.ElementaryOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.LoopHeadOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.plan.wayangplan.OperatorBase;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.types.DataSetType;
+package org.apache.wayang.basic.operators;
+
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.wayang.core.optimizer.cardinality.SwitchForwardCardinalityEstimator;
+import org.apache.wayang.core.plan.wayangplan.ElementaryOperator;
+import org.apache.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.wayang.core.plan.wayangplan.LoopHeadOperator;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.plan.wayangplan.OperatorBase;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.types.DataSetType;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/SampleOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/SampleOperator.java
index fa74510..4685977 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/SampleOperator.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/SampleOperator.java
@@ -1,12 +1,12 @@
-package org.apache.incubator.wayang.basic.operators;
+package org.apache.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
-import org.apache.incubator.wayang.core.optimizer.cardinality.FixedSizeCardinalityEstimator;
-import org.apache.incubator.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.wayang.core.optimizer.cardinality.FixedSizeCardinalityEstimator;
+import org.apache.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
+import org.apache.wayang.core.types.DataSetType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/SortOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/SortOperator.java
index ad0c054..6c22b49 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/SortOperator.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/SortOperator.java
@@ -1,13 +1,13 @@
-package org.apache.incubator.wayang.basic.operators;
+package org.apache.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.function.FunctionDescriptor;
-import org.apache.incubator.wayang.core.function.TransformationDescriptor;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
-import org.apache.incubator.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
-import org.apache.incubator.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.function.FunctionDescriptor;
+import org.apache.wayang.core.function.TransformationDescriptor;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
+import org.apache.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
+import org.apache.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/TableSource.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/TableSource.java
index 92953f1..c740527 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/TableSource.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/TableSource.java
@@ -1,9 +1,9 @@
-package org.apache.incubator.wayang.basic.operators;
+package org.apache.wayang.basic.operators;
 
-import org.apache.incubator.wayang.basic.data.Record;
-import org.apache.incubator.wayang.basic.types.RecordType;
-import org.apache.incubator.wayang.core.plan.wayangplan.UnarySource;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.basic.data.Record;
+import org.apache.wayang.basic.types.RecordType;
+import org.apache.wayang.core.plan.wayangplan.UnarySource;
+import org.apache.wayang.core.types.DataSetType;
 
 /**
  * {@link UnarySource} that provides the tuples from a database table.
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/TextFileSink.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/TextFileSink.java
index e9a4a85..d35cb85 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/TextFileSink.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/TextFileSink.java
@@ -1,10 +1,10 @@
-package org.apache.incubator.wayang.basic.operators;
+package org.apache.wayang.basic.operators;
 
-import org.apache.incubator.wayang.core.function.TransformationDescriptor;
-import org.apache.incubator.wayang.core.optimizer.costs.DefaultLoadEstimator;
-import org.apache.incubator.wayang.core.optimizer.costs.NestableLoadProfileEstimator;
-import org.apache.incubator.wayang.core.plan.wayangplan.UnarySink;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.core.function.TransformationDescriptor;
+import org.apache.wayang.core.optimizer.costs.DefaultLoadEstimator;
+import org.apache.wayang.core.optimizer.costs.NestableLoadProfileEstimator;
+import org.apache.wayang.core.plan.wayangplan.UnarySink;
+import org.apache.wayang.core.types.DataSetType;
 
 import java.util.Objects;
 
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/TextFileSource.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/TextFileSource.java
index 76ff7b4..61d1e8f 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/TextFileSource.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/TextFileSource.java
@@ -1,15 +1,15 @@
-package org.apache.incubator.wayang.basic.operators;
+package org.apache.wayang.basic.operators;
 
 import de.hpi.isg.profiledb.store.model.TimeMeasurement;
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
-import org.apache.incubator.wayang.core.plan.wayangplan.UnarySource;
-import org.apache.incubator.wayang.core.types.DataSetType;
-import org.apache.incubator.wayang.core.util.LimitedInputStream;
-import org.apache.incubator.wayang.core.util.fs.FileSystem;
-import org.apache.incubator.wayang.core.util.fs.FileSystems;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.wayang.core.plan.wayangplan.UnarySource;
+import org.apache.wayang.core.types.DataSetType;
+import org.apache.wayang.core.util.LimitedInputStream;
+import org.apache.wayang.core.util.fs.FileSystem;
+import org.apache.wayang.core.util.fs.FileSystems;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -57,7 +57,7 @@ public class TextFileSource extends UnarySource<String> {
     }
 
     @Override
-    public Optional<org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator> createCardinalityEstimator(
+    public Optional<org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator> createCardinalityEstimator(
             final int outputIndex,
             final Configuration configuration) {
         Validate.inclusiveBetween(0, this.getNumOutputs() - 1, outputIndex);
@@ -69,9 +69,9 @@ public class TextFileSource extends UnarySource<String> {
     }
 
     /**
-     * Custom {@link org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator} for {@link FlatMapOperator}s.
+     * Custom {@link org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator} for {@link FlatMapOperator}s.
      */
-    protected class CardinalityEstimator implements org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator {
+    protected class CardinalityEstimator implements org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator {
 
         public final CardinalityEstimate FALLBACK_ESTIMATE = new CardinalityEstimate(1000L, 100000000L, 0.7);
 
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/UnionAllOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/UnionAllOperator.java
index 2e5947c..d8fa7f2 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/UnionAllOperator.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/UnionAllOperator.java
@@ -1,13 +1,13 @@
-package org.apache.incubator.wayang.basic.operators;
+package org.apache.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
-import org.apache.incubator.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
-import org.apache.incubator.wayang.core.plan.wayangplan.BinaryToUnaryOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
+import org.apache.wayang.core.plan.wayangplan.BinaryToUnaryOperator;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/ZipWithIdOperator.java b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/ZipWithIdOperator.java
index d3cb5a2..b43864c 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/operators/ZipWithIdOperator.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/operators/ZipWithIdOperator.java
@@ -1,12 +1,12 @@
-package org.apache.incubator.wayang.basic.operators;
+package org.apache.wayang.basic.operators;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.basic.data.Tuple2;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
-import org.apache.incubator.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
-import org.apache.incubator.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.basic.data.Tuple2;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
+import org.apache.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
+import org.apache.wayang.core.types.DataSetType;
 
 import java.util.Optional;
 
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/plugin/WayangBasic.java b/wayang-basic/src/main/java/org/apache/wayang/basic/plugin/WayangBasic.java
index 7125862..cc6e51b 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/plugin/WayangBasic.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/plugin/WayangBasic.java
@@ -1,13 +1,13 @@
-package org.apache.incubator.wayang.basic.plugin;
+package org.apache.wayang.basic.plugin;
 
-import org.apache.incubator.wayang.basic.mapping.Mappings;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.mapping.Mapping;
-import org.apache.incubator.wayang.core.optimizer.channels.ChannelConversion;
-import org.apache.incubator.wayang.core.platform.Platform;
-import org.apache.incubator.wayang.core.plugin.Plugin;
-import org.apache.incubator.wayang.core.util.ReflectionUtils;
-import org.apache.incubator.wayang.core.util.fs.LocalFileSystem;
+import org.apache.wayang.basic.mapping.Mappings;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.mapping.Mapping;
+import org.apache.wayang.core.optimizer.channels.ChannelConversion;
+import org.apache.wayang.core.platform.Platform;
+import org.apache.wayang.core.plugin.Plugin;
+import org.apache.wayang.core.util.ReflectionUtils;
+import org.apache.wayang.core.util.fs.LocalFileSystem;
 
 import java.io.File;
 import java.util.Collection;
@@ -21,11 +21,11 @@ public class WayangBasic implements Plugin {
 
     public static final String TEMP_DIR_PROPERTY = "wayang.basic.tempdir";
 
-    private static final String RHEEM_BASIC_DEFAULTS_PROPERTIES = "wayang-basic-defaults.properties";
+    private static final String WAYANG_BASIC_DEFAULTS_PROPERTIES = "wayang-basic-defaults.properties";
 
     @Override
     public void setProperties(Configuration configuration) {
-        configuration.load(ReflectionUtils.loadResource(RHEEM_BASIC_DEFAULTS_PROPERTIES));
+        configuration.load(ReflectionUtils.loadResource(WAYANG_BASIC_DEFAULTS_PROPERTIES));
         final File localTempDir = LocalFileSystem.findTempDir();
         if (localTempDir != null) {
             configuration.setProperty(TEMP_DIR_PROPERTY, LocalFileSystem.toURL(localTempDir));
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/plugin/WayangBasicGraph.java b/wayang-basic/src/main/java/org/apache/wayang/basic/plugin/WayangBasicGraph.java
index 5b35553..2418bb1 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/plugin/WayangBasicGraph.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/plugin/WayangBasicGraph.java
@@ -1,11 +1,11 @@
-package org.apache.incubator.wayang.basic.plugin;
-
-import org.apache.incubator.wayang.basic.mapping.Mappings;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.mapping.Mapping;
-import org.apache.incubator.wayang.core.optimizer.channels.ChannelConversion;
-import org.apache.incubator.wayang.core.platform.Platform;
-import org.apache.incubator.wayang.core.plugin.Plugin;
+package org.apache.wayang.basic.plugin;
+
+import org.apache.wayang.basic.mapping.Mappings;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.mapping.Mapping;
+import org.apache.wayang.core.optimizer.channels.ChannelConversion;
+import org.apache.wayang.core.platform.Platform;
+import org.apache.wayang.core.plugin.Plugin;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/wayang-basic/src/main/java/org/apache/wayang/basic/types/RecordType.java b/wayang-basic/src/main/java/org/apache/wayang/basic/types/RecordType.java
index 9424675..bd55f54 100644
--- a/wayang-basic/src/main/java/org/apache/wayang/basic/types/RecordType.java
+++ b/wayang-basic/src/main/java/org/apache/wayang/basic/types/RecordType.java
@@ -1,8 +1,8 @@
-package org.apache.incubator.wayang.basic.types;
+package org.apache.wayang.basic.types;
 
 
-import org.apache.incubator.wayang.basic.data.Record;
-import org.apache.incubator.wayang.core.types.BasicDataUnitType;
+import org.apache.wayang.basic.data.Record;
+import org.apache.wayang.core.types.BasicDataUnitType;
 
 import java.util.Arrays;
 import java.util.Objects;
diff --git a/wayang-basic/src/test/java/org/apache/wayang/basic/function/ProjectionDescriptorTest.java b/wayang-basic/src/test/java/org/apache/wayang/basic/function/ProjectionDescriptorTest.java
index 6460acb..8998a63 100644
--- a/wayang-basic/src/test/java/org/apache/wayang/basic/function/ProjectionDescriptorTest.java
+++ b/wayang-basic/src/test/java/org/apache/wayang/basic/function/ProjectionDescriptorTest.java
@@ -1,9 +1,9 @@
-package org.apache.incubator.wayang.basic.function;
+package org.apache.wayang.basic.function;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.apache.incubator.wayang.basic.data.Record;
-import org.apache.incubator.wayang.basic.types.RecordType;
+import org.apache.wayang.basic.data.Record;
+import org.apache.wayang.basic.types.RecordType;
 
 import java.util.function.Function;
 
diff --git a/wayang-basic/src/test/java/org/apache/wayang/basic/mapping/ReduceByMappingTest.java b/wayang-basic/src/test/java/org/apache/wayang/basic/mapping/ReduceByMappingTest.java
index 38e3176..bb8ee80 100644
--- a/wayang-basic/src/test/java/org/apache/wayang/basic/mapping/ReduceByMappingTest.java
+++ b/wayang-basic/src/test/java/org/apache/wayang/basic/mapping/ReduceByMappingTest.java
@@ -1,23 +1,23 @@
-package org.apache.incubator.wayang.basic.mapping;
+package org.apache.wayang.basic.mapping;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.apache.incubator.wayang.basic.data.Tuple2;
-import org.apache.incubator.wayang.basic.function.ProjectionDescriptor;
-import org.apache.incubator.wayang.basic.operators.GroupByOperator;
-import org.apache.incubator.wayang.basic.operators.ReduceByOperator;
-import org.apache.incubator.wayang.basic.operators.ReduceOperator;
-import org.apache.incubator.wayang.basic.operators.test.TestSink;
-import org.apache.incubator.wayang.basic.operators.test.TestSource;
-import org.apache.incubator.wayang.core.function.ReduceDescriptor;
-import org.apache.incubator.wayang.core.mapping.Mapping;
-import org.apache.incubator.wayang.core.mapping.PlanTransformation;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
-import org.apache.incubator.wayang.core.plan.wayangplan.UnarySink;
-import org.apache.incubator.wayang.core.plan.wayangplan.UnarySource;
-import org.apache.incubator.wayang.core.types.DataSetType;
-import org.apache.incubator.wayang.core.types.DataUnitType;
+import org.apache.wayang.basic.data.Tuple2;
+import org.apache.wayang.basic.function.ProjectionDescriptor;
+import org.apache.wayang.basic.operators.GroupByOperator;
+import org.apache.wayang.basic.operators.ReduceByOperator;
+import org.apache.wayang.basic.operators.ReduceOperator;
+import org.apache.wayang.basic.operators.test.TestSink;
+import org.apache.wayang.basic.operators.test.TestSource;
+import org.apache.wayang.core.function.ReduceDescriptor;
+import org.apache.wayang.core.mapping.Mapping;
+import org.apache.wayang.core.mapping.PlanTransformation;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.wayang.core.plan.wayangplan.UnarySink;
+import org.apache.wayang.core.plan.wayangplan.UnarySource;
+import org.apache.wayang.core.types.DataSetType;
+import org.apache.wayang.core.types.DataUnitType;
 
 /**
  * Test suite for the {@link ReduceByMapping}.
diff --git a/wayang-basic/src/test/java/org/apache/wayang/basic/operators/MaterializedGroupByOperatorTest.java b/wayang-basic/src/test/java/org/apache/wayang/basic/operators/MaterializedGroupByOperatorTest.java
index db130ae..cea0670 100644
--- a/wayang-basic/src/test/java/org/apache/wayang/basic/operators/MaterializedGroupByOperatorTest.java
+++ b/wayang-basic/src/test/java/org/apache/wayang/basic/operators/MaterializedGroupByOperatorTest.java
@@ -1,9 +1,9 @@
-package org.apache.incubator.wayang.basic.operators;
+package org.apache.wayang.basic.operators;
 
 import org.junit.Test;
-import org.apache.incubator.wayang.core.function.TransformationDescriptor;
-import org.apache.incubator.wayang.core.types.DataSetType;
-import org.apache.incubator.wayang.core.types.DataUnitType;
+import org.apache.wayang.core.function.TransformationDescriptor;
+import org.apache.wayang.core.types.DataSetType;
+import org.apache.wayang.core.types.DataUnitType;
 
 import java.util.stream.StreamSupport;
 
diff --git a/wayang-basic/src/test/java/org/apache/wayang/basic/operators/TextFileSourceTest.java b/wayang-basic/src/test/java/org/apache/wayang/basic/operators/TextFileSourceTest.java
index c522531..3b8351e 100644
--- a/wayang-basic/src/test/java/org/apache/wayang/basic/operators/TextFileSourceTest.java
+++ b/wayang-basic/src/test/java/org/apache/wayang/basic/operators/TextFileSourceTest.java
@@ -1,15 +1,15 @@
-package org.apache.incubator.wayang.basic.operators;
+package org.apache.wayang.basic.operators;
 
 import de.hpi.isg.profiledb.instrumentation.StopWatch;
 import de.hpi.isg.profiledb.store.model.Experiment;
 import de.hpi.isg.profiledb.store.model.Subject;
 import org.junit.Assert;
 import org.junit.Test;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.api.Job;
-import org.apache.incubator.wayang.core.optimizer.DefaultOptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.Job;
+import org.apache.wayang.core.optimizer.DefaultOptimizationContext;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/wayang-basic/src/test/java/org/apache/wayang/basic/operators/test/TestSink.java b/wayang-basic/src/test/java/org/apache/wayang/basic/operators/test/TestSink.java
index ed0584f..d08f08d 100644
--- a/wayang-basic/src/test/java/org/apache/wayang/basic/operators/test/TestSink.java
+++ b/wayang-basic/src/test/java/org/apache/wayang/basic/operators/test/TestSink.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.basic.operators.test;
+package org.apache.wayang.basic.operators.test;
 
-import org.apache.incubator.wayang.core.plan.wayangplan.UnarySink;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.core.plan.wayangplan.UnarySink;
+import org.apache.wayang.core.types.DataSetType;
 
 /**
  * Dummy sink for testing purposes.
diff --git a/wayang-basic/src/test/java/org/apache/wayang/basic/operators/test/TestSource.java b/wayang-basic/src/test/java/org/apache/wayang/basic/operators/test/TestSource.java
index fd20e95..60ae059 100644
--- a/wayang-basic/src/test/java/org/apache/wayang/basic/operators/test/TestSource.java
+++ b/wayang-basic/src/test/java/org/apache/wayang/basic/operators/test/TestSource.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.basic.operators.test;
+package org.apache.wayang.basic.operators.test;
 
-import org.apache.incubator.wayang.core.plan.wayangplan.UnarySource;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.core.plan.wayangplan.UnarySource;
+import org.apache.wayang.core.types.DataSetType;
 
 /**
  * Dummy source for testing purposes.
diff --git a/wayang-basic/src/test/java/org/apache/wayang/basic/types/RecordTypeTest.java b/wayang-basic/src/test/java/org/apache/wayang/basic/types/RecordTypeTest.java
index 6d6812f..6e7f57e 100644
--- a/wayang-basic/src/test/java/org/apache/wayang/basic/types/RecordTypeTest.java
+++ b/wayang-basic/src/test/java/org/apache/wayang/basic/types/RecordTypeTest.java
@@ -1,9 +1,9 @@
-package org.apache.incubator.wayang.basic.types;
+package org.apache.wayang.basic.types;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.apache.incubator.wayang.basic.data.Record;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.basic.data.Record;
+import org.apache.wayang.core.types.DataSetType;
 
 /**
  * Tests for the {@link RecordType}.
diff --git a/wayang-core/pom.xml b/wayang-core/pom.xml
index 38f5a96..915e1bf 100644
--- a/wayang-core/pom.xml
+++ b/wayang-core/pom.xml
@@ -2,7 +2,7 @@
 <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>wayang</artifactId>
-        <groupId>org.apache.incubator.wayang</groupId>
+        <groupId>org.apache.wayang</groupId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/api/Configuration.java b/wayang-core/src/main/java/org/apache/wayang/core/api/Configuration.java
index ca99135..0cf57b8 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/api/Configuration.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/api/Configuration.java
@@ -1,45 +1,45 @@
-package org.apache.incubator.wayang.core.api;
+package org.apache.wayang.core.api;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.incubator.wayang.core.api.configuration.CollectionProvider;
-import org.apache.incubator.wayang.core.api.configuration.ConstantValueProvider;
-import org.apache.incubator.wayang.core.api.configuration.ExplicitCollectionProvider;
-import org.apache.incubator.wayang.core.api.configuration.FunctionalCollectionProvider;
-import org.apache.incubator.wayang.core.api.configuration.FunctionalKeyValueProvider;
-import org.apache.incubator.wayang.core.api.configuration.FunctionalValueProvider;
-import org.apache.incubator.wayang.core.api.configuration.KeyValueProvider;
-import org.apache.incubator.wayang.core.api.configuration.MapBasedKeyValueProvider;
-import org.apache.incubator.wayang.core.api.configuration.ValueProvider;
-import org.apache.incubator.wayang.core.api.exception.WayangException;
-import org.apache.incubator.wayang.core.function.FlatMapDescriptor;
-import org.apache.incubator.wayang.core.function.FunctionDescriptor;
-import org.apache.incubator.wayang.core.function.MapPartitionsDescriptor;
-import org.apache.incubator.wayang.core.function.PredicateDescriptor;
-import org.apache.incubator.wayang.core.mapping.Mapping;
-import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
-import org.apache.incubator.wayang.core.optimizer.cardinality.FallbackCardinalityEstimator;
-import org.apache.incubator.wayang.core.optimizer.channels.ChannelConversion;
-import org.apache.incubator.wayang.core.optimizer.costs.IntervalLoadEstimator;
-import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileEstimator;
-import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileToTimeConverter;
-import org.apache.incubator.wayang.core.optimizer.costs.LoadToTimeConverter;
-import org.apache.incubator.wayang.core.optimizer.costs.NestableLoadProfileEstimator;
-import org.apache.incubator.wayang.core.optimizer.costs.TimeToCostConverter;
-import org.apache.incubator.wayang.core.optimizer.enumeration.PlanEnumerationPruningStrategy;
-import org.apache.incubator.wayang.core.plan.wayangplan.ElementaryOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.platform.Platform;
-import org.apache.incubator.wayang.core.plugin.Plugin;
-import org.apache.incubator.wayang.core.profiling.InstrumentationStrategy;
-import org.apache.incubator.wayang.core.profiling.OutboundInstrumentationStrategy;
-import org.apache.incubator.wayang.core.util.Actions;
-import org.apache.incubator.wayang.core.util.ReflectionUtils;
-import org.apache.incubator.wayang.core.util.fs.FileSystem;
-import org.apache.incubator.wayang.core.util.fs.FileSystems;
+import org.apache.wayang.core.api.configuration.CollectionProvider;
+import org.apache.wayang.core.api.configuration.ConstantValueProvider;
+import org.apache.wayang.core.api.configuration.ExplicitCollectionProvider;
+import org.apache.wayang.core.api.configuration.FunctionalCollectionProvider;
+import org.apache.wayang.core.api.configuration.FunctionalKeyValueProvider;
+import org.apache.wayang.core.api.configuration.FunctionalValueProvider;
+import org.apache.wayang.core.api.configuration.KeyValueProvider;
+import org.apache.wayang.core.api.configuration.MapBasedKeyValueProvider;
+import org.apache.wayang.core.api.configuration.ValueProvider;
+import org.apache.wayang.core.api.exception.WayangException;
+import org.apache.wayang.core.function.FlatMapDescriptor;
+import org.apache.wayang.core.function.FunctionDescriptor;
+import org.apache.wayang.core.function.MapPartitionsDescriptor;
+import org.apache.wayang.core.function.PredicateDescriptor;
+import org.apache.wayang.core.mapping.Mapping;
+import org.apache.wayang.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.wayang.core.optimizer.cardinality.FallbackCardinalityEstimator;
+import org.apache.wayang.core.optimizer.channels.ChannelConversion;
+import org.apache.wayang.core.optimizer.costs.IntervalLoadEstimator;
+import org.apache.wayang.core.optimizer.costs.LoadProfileEstimator;
+import org.apache.wayang.core.optimizer.costs.LoadProfileToTimeConverter;
+import org.apache.wayang.core.optimizer.costs.LoadToTimeConverter;
+import org.apache.wayang.core.optimizer.costs.NestableLoadProfileEstimator;
+import org.apache.wayang.core.optimizer.costs.TimeToCostConverter;
+import org.apache.wayang.core.optimizer.enumeration.PlanEnumerationPruningStrategy;
+import org.apache.wayang.core.plan.wayangplan.ElementaryOperator;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.platform.Platform;
+import org.apache.wayang.core.plugin.Plugin;
+import org.apache.wayang.core.profiling.InstrumentationStrategy;
+import org.apache.wayang.core.profiling.OutboundInstrumentationStrategy;
+import org.apache.wayang.core.util.Actions;
+import org.apache.wayang.core.util.ReflectionUtils;
+import org.apache.wayang.core.util.fs.FileSystem;
+import org.apache.wayang.core.util.fs.FileSystems;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -59,7 +59,7 @@ import java.util.Properties;
 import java.util.Random;
 import java.util.function.ToDoubleFunction;
 
-import static org.apache.incubator.wayang.core.util.ReflectionUtils.instantiateDefault;
+import static org.apache.wayang.core.util.ReflectionUtils.instantiateDefault;
 
 /**
  * Describes both the configuration of a {@link WayangContext} and {@link Job}s.
@@ -82,7 +82,7 @@ public class Configuration {
         Actions.doSafe(() -> bootstrapPlugins(defaultConfiguration));
     }
 
-    private static final String BASIC_PLUGIN = "org.apache.incubator.wayang.basic.WayangBasics.defaultPlugin()";
+    private static final String BASIC_PLUGIN = "org.apache.wayang.basic.WayangBasics.defaultPlugin()";
 
     private String name = "(no name)";
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/api/Job.java b/wayang-core/src/main/java/org/apache/wayang/core/api/Job.java
index ef629d5..a9935bc 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/api/Job.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/api/Job.java
@@ -1,54 +1,54 @@
-package org.apache.incubator.wayang.core.api;
+package org.apache.wayang.core.api;
 
 import de.hpi.isg.profiledb.instrumentation.StopWatch;
 import de.hpi.isg.profiledb.store.model.Experiment;
 import de.hpi.isg.profiledb.store.model.TimeMeasurement;
-import org.apache.incubator.wayang.core.api.exception.WayangException;
-import org.apache.incubator.wayang.core.mapping.PlanTransformation;
-import org.apache.incubator.wayang.core.monitor.DisabledMonitor;
-import org.apache.incubator.wayang.core.monitor.FileMonitor;
-import org.apache.incubator.wayang.core.monitor.Monitor;
-import org.apache.incubator.wayang.core.optimizer.DefaultOptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimatorManager;
-import org.apache.incubator.wayang.core.optimizer.costs.TimeEstimate;
-import org.apache.incubator.wayang.core.optimizer.costs.TimeToCostConverter;
-import org.apache.incubator.wayang.core.optimizer.enumeration.ExecutionTaskFlow;
-import org.apache.incubator.wayang.core.optimizer.enumeration.PlanEnumeration;
-import org.apache.incubator.wayang.core.optimizer.enumeration.PlanEnumerator;
-import org.apache.incubator.wayang.core.optimizer.enumeration.PlanImplementation;
-import org.apache.incubator.wayang.core.optimizer.enumeration.StageAssignmentTraversal;
-import org.apache.incubator.wayang.core.plan.executionplan.Channel;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionPlan;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionStage;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionTask;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.PlanMetrics;
-import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
-import org.apache.incubator.wayang.core.platform.AtomicExecutionGroup;
-import org.apache.incubator.wayang.core.platform.Breakpoint;
-import org.apache.incubator.wayang.core.platform.CardinalityBreakpoint;
-import org.apache.incubator.wayang.core.platform.ConjunctiveBreakpoint;
-import org.apache.incubator.wayang.core.platform.CrossPlatformExecutor;
-import org.apache.incubator.wayang.core.platform.ExecutionState;
-import org.apache.incubator.wayang.core.platform.FixBreakpoint;
-import org.apache.incubator.wayang.core.platform.NoIterationBreakpoint;
-import org.apache.incubator.wayang.core.platform.PartialExecution;
-import org.apache.incubator.wayang.core.platform.Platform;
-import org.apache.incubator.wayang.core.profiling.CardinalityRepository;
-import org.apache.incubator.wayang.core.profiling.CostMeasurement;
-import org.apache.incubator.wayang.core.profiling.ExecutionLog;
-import org.apache.incubator.wayang.core.profiling.ExecutionPlanMeasurement;
-import org.apache.incubator.wayang.core.profiling.InstrumentationStrategy;
-import org.apache.incubator.wayang.core.profiling.PartialExecutionMeasurement;
-import org.apache.incubator.wayang.core.util.Formats;
-import org.apache.incubator.wayang.core.util.OneTimeExecutable;
-import org.apache.incubator.wayang.core.util.ReflectionUtils;
-import org.apache.incubator.wayang.core.util.WayangCollections;
+import org.apache.wayang.core.api.exception.WayangException;
+import org.apache.wayang.core.mapping.PlanTransformation;
+import org.apache.wayang.core.monitor.DisabledMonitor;
+import org.apache.wayang.core.monitor.FileMonitor;
+import org.apache.wayang.core.monitor.Monitor;
+import org.apache.wayang.core.optimizer.DefaultOptimizationContext;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimatorManager;
+import org.apache.wayang.core.optimizer.costs.TimeEstimate;
+import org.apache.wayang.core.optimizer.costs.TimeToCostConverter;
+import org.apache.wayang.core.optimizer.enumeration.ExecutionTaskFlow;
+import org.apache.wayang.core.optimizer.enumeration.PlanEnumeration;
+import org.apache.wayang.core.optimizer.enumeration.PlanEnumerator;
+import org.apache.wayang.core.optimizer.enumeration.PlanImplementation;
+import org.apache.wayang.core.optimizer.enumeration.StageAssignmentTraversal;
+import org.apache.wayang.core.plan.executionplan.Channel;
+import org.apache.wayang.core.plan.executionplan.ExecutionPlan;
+import org.apache.wayang.core.plan.executionplan.ExecutionStage;
+import org.apache.wayang.core.plan.executionplan.ExecutionTask;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.plan.wayangplan.PlanMetrics;
+import org.apache.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.wayang.core.platform.AtomicExecutionGroup;
+import org.apache.wayang.core.platform.Breakpoint;
+import org.apache.wayang.core.platform.CardinalityBreakpoint;
+import org.apache.wayang.core.platform.ConjunctiveBreakpoint;
+import org.apache.wayang.core.platform.CrossPlatformExecutor;
+import org.apache.wayang.core.platform.ExecutionState;
+import org.apache.wayang.core.platform.FixBreakpoint;
+import org.apache.wayang.core.platform.NoIterationBreakpoint;
+import org.apache.wayang.core.platform.PartialExecution;
+import org.apache.wayang.core.platform.Platform;
+import org.apache.wayang.core.profiling.CardinalityRepository;
+import org.apache.wayang.core.profiling.CostMeasurement;
+import org.apache.wayang.core.profiling.ExecutionLog;
+import org.apache.wayang.core.profiling.ExecutionPlanMeasurement;
+import org.apache.wayang.core.profiling.InstrumentationStrategy;
+import org.apache.wayang.core.profiling.PartialExecutionMeasurement;
+import org.apache.wayang.core.util.Formats;
+import org.apache.wayang.core.util.OneTimeExecutable;
+import org.apache.wayang.core.util.ReflectionUtils;
+import org.apache.wayang.core.util.WayangCollections;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/api/WayangContext.java b/wayang-core/src/main/java/org/apache/wayang/core/api/WayangContext.java
index 17aa77d..4ae3d4c 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/api/WayangContext.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/api/WayangContext.java
@@ -1,14 +1,14 @@
-package org.apache.incubator.wayang.core.api;
+package org.apache.wayang.core.api;
 
 import de.hpi.isg.profiledb.store.model.Experiment;
 import de.hpi.isg.profiledb.store.model.Subject;
-import org.apache.incubator.wayang.core.monitor.Monitor;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionPlan;
-import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
-import org.apache.incubator.wayang.core.plugin.Plugin;
-import org.apache.incubator.wayang.core.profiling.CardinalityRepository;
-import org.apache.incubator.wayang.core.util.ReflectionUtils;
+import org.apache.wayang.core.monitor.Monitor;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.wayang.core.plan.executionplan.ExecutionPlan;
+import org.apache.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.wayang.core.plugin.Plugin;
+import org.apache.wayang.core.profiling.CardinalityRepository;
+import org.apache.wayang.core.util.ReflectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/CollectionProvider.java b/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/CollectionProvider.java
index cd12b63..31c6a26 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/CollectionProvider.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/CollectionProvider.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.core.api.configuration;
+package org.apache.wayang.core.api.configuration;
 
-import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.Configuration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/ConstantValueProvider.java b/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/ConstantValueProvider.java
index cf1ad05..a8db06d 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/ConstantValueProvider.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/ConstantValueProvider.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.core.api.configuration;
+package org.apache.wayang.core.api.configuration;
 
-import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.Configuration;
 
 /**
  * Used by {@link Configuration}s to provide some value.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/ExplicitCollectionProvider.java b/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/ExplicitCollectionProvider.java
index 7066edd..b2e1ac6 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/ExplicitCollectionProvider.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/ExplicitCollectionProvider.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.core.api.configuration;
+package org.apache.wayang.core.api.configuration;
 
-import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.Configuration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/FunctionalCollectionProvider.java b/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/FunctionalCollectionProvider.java
index dac542f..aefa902 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/FunctionalCollectionProvider.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/FunctionalCollectionProvider.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.core.api.configuration;
+package org.apache.wayang.core.api.configuration;
 
-import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.Configuration;
 
 import java.util.Collection;
 import java.util.HashSet;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/FunctionalKeyValueProvider.java b/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/FunctionalKeyValueProvider.java
index 4d2c5c3..c133ada 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/FunctionalKeyValueProvider.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/FunctionalKeyValueProvider.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.core.api.configuration;
+package org.apache.wayang.core.api.configuration;
 
-import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.Configuration;
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/FunctionalValueProvider.java b/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/FunctionalValueProvider.java
index 8bdcee6..5c704db 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/FunctionalValueProvider.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/FunctionalValueProvider.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.core.api.configuration;
+package org.apache.wayang.core.api.configuration;
 
-import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.Configuration;
 
 import java.util.function.Function;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/KeyValueProvider.java b/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/KeyValueProvider.java
index 80f04e2..574f404 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/KeyValueProvider.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/KeyValueProvider.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.core.api.configuration;
+package org.apache.wayang.core.api.configuration;
 
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.api.exception.WayangException;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.exception.WayangException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/MapBasedKeyValueProvider.java b/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/MapBasedKeyValueProvider.java
index c364498..1f50fdb 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/MapBasedKeyValueProvider.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/MapBasedKeyValueProvider.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.core.api.configuration;
+package org.apache.wayang.core.api.configuration;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.Configuration;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/ValueProvider.java b/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/ValueProvider.java
index e8de0e1..7723064 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/ValueProvider.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/api/configuration/ValueProvider.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.core.api.configuration;
+package org.apache.wayang.core.api.configuration;
 
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.api.exception.WayangException;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.exception.WayangException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/api/exception/WayangException.java b/wayang-core/src/main/java/org/apache/wayang/core/api/exception/WayangException.java
index 96c97aa..92910a4 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/api/exception/WayangException.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/api/exception/WayangException.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.api.exception;
+package org.apache.wayang.core.api.exception;
 
 /**
  * Exception that declares a problem of Wayang.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/function/AggregationDescriptor.java b/wayang-core/src/main/java/org/apache/wayang/core/function/AggregationDescriptor.java
index b3a785a..91ea506 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/function/AggregationDescriptor.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/function/AggregationDescriptor.java
@@ -1,11 +1,11 @@
-package org.apache.incubator.wayang.core.function;
+package org.apache.wayang.core.function;
 
-import org.apache.incubator.wayang.core.optimizer.costs.LoadEstimator;
-import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileEstimator;
-import org.apache.incubator.wayang.core.optimizer.costs.NestableLoadProfileEstimator;
-import org.apache.incubator.wayang.core.types.BasicDataUnitType;
-import org.apache.incubator.wayang.core.types.DataUnitGroupType;
-import org.apache.incubator.wayang.core.types.DataUnitType;
+import org.apache.wayang.core.optimizer.costs.LoadEstimator;
+import org.apache.wayang.core.optimizer.costs.LoadProfileEstimator;
+import org.apache.wayang.core.optimizer.costs.NestableLoadProfileEstimator;
+import org.apache.wayang.core.types.BasicDataUnitType;
+import org.apache.wayang.core.types.DataUnitGroupType;
+import org.apache.wayang.core.types.DataUnitType;
 
 import java.util.Iterator;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/function/ConsumerDescriptor.java b/wayang-core/src/main/java/org/apache/wayang/core/function/ConsumerDescriptor.java
index 970e680..cc4c1ad 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/function/ConsumerDescriptor.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/function/ConsumerDescriptor.java
@@ -1,8 +1,8 @@
-package org.apache.incubator.wayang.core.function;
+package org.apache.wayang.core.function;
 
-import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
-import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileEstimator;
-import org.apache.incubator.wayang.core.types.BasicDataUnitType;
+import org.apache.wayang.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.wayang.core.optimizer.costs.LoadProfileEstimator;
+import org.apache.wayang.core.types.BasicDataUnitType;
 
 import java.util.Optional;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/function/ExecutionContext.java b/wayang-core/src/main/java/org/apache/wayang/core/function/ExecutionContext.java
index 2184534..bd86a61 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/function/ExecutionContext.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/function/ExecutionContext.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.core.function;
+package org.apache.wayang.core.function;
 
-import org.apache.incubator.wayang.core.plan.wayangplan.LoopSubplan;
-import org.apache.incubator.wayang.core.platform.Platform;
+import org.apache.wayang.core.plan.wayangplan.LoopSubplan;
+import org.apache.wayang.core.platform.Platform;
 
 import java.util.Collection;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/function/ExtendedFunction.java b/wayang-core/src/main/java/org/apache/wayang/core/function/ExtendedFunction.java
index 0953afb..c95e45a 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/function/ExtendedFunction.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/function/ExtendedFunction.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.core.function;
+package org.apache.wayang.core.function;
 
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.plan.wayangplan.Operator;
 
 /**
  * Used to enrich regular functions with additional life-cycle methods of {@link Operator}s.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/function/FlatMapDescriptor.java b/wayang-core/src/main/java/org/apache/wayang/core/function/FlatMapDescriptor.java
index 5b210df..a4d2fa1 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/function/FlatMapDescriptor.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/function/FlatMapDescriptor.java
@@ -1,9 +1,9 @@
-package org.apache.incubator.wayang.core.function;
+package org.apache.wayang.core.function;
 
-import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
-import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileEstimator;
-import org.apache.incubator.wayang.core.types.BasicDataUnitType;
-import org.apache.incubator.wayang.core.types.DataUnitType;
+import org.apache.wayang.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.wayang.core.optimizer.costs.LoadProfileEstimator;
+import org.apache.wayang.core.types.BasicDataUnitType;
+import org.apache.wayang.core.types.DataUnitType;
 
 import java.util.Optional;
 import java.util.function.Function;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/function/FunctionDescriptor.java b/wayang-core/src/main/java/org/apache/wayang/core/function/FunctionDescriptor.java
index 1805942..1253d08 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/function/FunctionDescriptor.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/function/FunctionDescriptor.java
@@ -1,9 +1,9 @@
-package org.apache.incubator.wayang.core.function;
+package org.apache.wayang.core.function;
 
-import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
-import org.apache.incubator.wayang.core.optimizer.costs.LoadEstimator;
-import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileEstimator;
-import org.apache.incubator.wayang.core.optimizer.costs.NestableLoadProfileEstimator;
+import org.apache.wayang.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.wayang.core.optimizer.costs.LoadEstimator;
+import org.apache.wayang.core.optimizer.costs.LoadProfileEstimator;
+import org.apache.wayang.core.optimizer.costs.NestableLoadProfileEstimator;
 
 import java.io.Serializable;
 import java.util.Optional;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/function/MapPartitionsDescriptor.java b/wayang-core/src/main/java/org/apache/wayang/core/function/MapPartitionsDescriptor.java
index 42b335f..9c361dc 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/function/MapPartitionsDescriptor.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/function/MapPartitionsDescriptor.java
@@ -1,9 +1,9 @@
-package org.apache.incubator.wayang.core.function;
+package org.apache.wayang.core.function;
 
-import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
-import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileEstimator;
-import org.apache.incubator.wayang.core.types.BasicDataUnitType;
-import org.apache.incubator.wayang.core.types.DataUnitType;
+import org.apache.wayang.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.wayang.core.optimizer.costs.LoadProfileEstimator;
+import org.apache.wayang.core.types.BasicDataUnitType;
+import org.apache.wayang.core.types.DataUnitType;
 
 import java.util.Optional;
 import java.util.function.Function;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/function/PredicateDescriptor.java b/wayang-core/src/main/java/org/apache/wayang/core/function/PredicateDescriptor.java
index d1db9ad..18f8334 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/function/PredicateDescriptor.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/function/PredicateDescriptor.java
@@ -1,8 +1,8 @@
-package org.apache.incubator.wayang.core.function;
+package org.apache.wayang.core.function;
 
-import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
-import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileEstimator;
-import org.apache.incubator.wayang.core.types.BasicDataUnitType;
+import org.apache.wayang.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.wayang.core.optimizer.costs.LoadProfileEstimator;
+import org.apache.wayang.core.types.BasicDataUnitType;
 
 import java.util.Optional;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/function/ReduceDescriptor.java b/wayang-core/src/main/java/org/apache/wayang/core/function/ReduceDescriptor.java
index 5551a97..fd29548 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/function/ReduceDescriptor.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/function/ReduceDescriptor.java
@@ -1,11 +1,11 @@
-package org.apache.incubator.wayang.core.function;
+package org.apache.wayang.core.function;
 
-import org.apache.incubator.wayang.core.optimizer.costs.LoadEstimator;
-import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileEstimator;
-import org.apache.incubator.wayang.core.optimizer.costs.NestableLoadProfileEstimator;
-import org.apache.incubator.wayang.core.types.BasicDataUnitType;
-import org.apache.incubator.wayang.core.types.DataUnitGroupType;
-import org.apache.incubator.wayang.core.types.DataUnitType;
+import org.apache.wayang.core.optimizer.costs.LoadEstimator;
+import org.apache.wayang.core.optimizer.costs.LoadProfileEstimator;
+import org.apache.wayang.core.optimizer.costs.NestableLoadProfileEstimator;
+import org.apache.wayang.core.types.BasicDataUnitType;
+import org.apache.wayang.core.types.DataUnitGroupType;
+import org.apache.wayang.core.types.DataUnitType;
 
 import java.util.function.BinaryOperator;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/function/TransformationDescriptor.java b/wayang-core/src/main/java/org/apache/wayang/core/function/TransformationDescriptor.java
index 94aa3df..e295f25 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/function/TransformationDescriptor.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/function/TransformationDescriptor.java
@@ -1,9 +1,9 @@
-package org.apache.incubator.wayang.core.function;
+package org.apache.wayang.core.function;
 
-import org.apache.incubator.wayang.core.optimizer.costs.LoadEstimator;
-import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileEstimator;
-import org.apache.incubator.wayang.core.optimizer.costs.NestableLoadProfileEstimator;
-import org.apache.incubator.wayang.core.types.BasicDataUnitType;
+import org.apache.wayang.core.optimizer.costs.LoadEstimator;
+import org.apache.wayang.core.optimizer.costs.LoadProfileEstimator;
+import org.apache.wayang.core.optimizer.costs.NestableLoadProfileEstimator;
+import org.apache.wayang.core.types.BasicDataUnitType;
 
 import java.util.function.Function;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/mapping/Mapping.java b/wayang-core/src/main/java/org/apache/wayang/core/mapping/Mapping.java
index cfc142c..e8769f4 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/mapping/Mapping.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/mapping/Mapping.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.mapping;
+package org.apache.wayang.core.mapping;
 
 import java.util.Collection;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/mapping/OperatorMatch.java b/wayang-core/src/main/java/org/apache/wayang/core/mapping/OperatorMatch.java
index b3c5257..917e68e 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/mapping/OperatorMatch.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/mapping/OperatorMatch.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.core.mapping;
+package org.apache.wayang.core.mapping;
 
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.plan.wayangplan.Operator;
 
 /**
  * An operator match correlates an {@link OperatorPattern} to an actually matched {@link Operator}.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/mapping/OperatorPattern.java b/wayang-core/src/main/java/org/apache/wayang/core/mapping/OperatorPattern.java
index 70e9fd9..63deae3 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/mapping/OperatorPattern.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/mapping/OperatorPattern.java
@@ -1,12 +1,12 @@
-package org.apache.incubator.wayang.core.mapping;
-
-import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.plan.wayangplan.OperatorBase;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.Slot;
-import org.apache.incubator.wayang.core.plan.wayangplan.TopDownPlanVisitor;
-import org.apache.incubator.wayang.core.types.DataSetType;
+package org.apache.wayang.core.mapping;
+
+import org.apache.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.plan.wayangplan.OperatorBase;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.plan.wayangplan.Slot;
+import org.apache.wayang.core.plan.wayangplan.TopDownPlanVisitor;
+import org.apache.wayang.core.types.DataSetType;
 
 import java.util.Collection;
 import java.util.LinkedList;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/mapping/PlanTransformation.java b/wayang-core/src/main/java/org/apache/wayang/core/mapping/PlanTransformation.java
index 17b73c8..d777723 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/mapping/PlanTransformation.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/mapping/PlanTransformation.java
@@ -1,12 +1,12 @@
-package org.apache.incubator.wayang.core.mapping;
-
-import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.plan.wayangplan.OperatorAlternative;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.PlanTraversal;
-import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
-import org.apache.incubator.wayang.core.platform.Platform;
+package org.apache.wayang.core.mapping;
+
+import org.apache.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.plan.wayangplan.OperatorAlternative;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.plan.wayangplan.PlanTraversal;
+import org.apache.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.wayang.core.platform.Platform;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/mapping/ReplacementSubplanFactory.java b/wayang-core/src/main/java/org/apache/wayang/core/mapping/ReplacementSubplanFactory.java
index 2b50099..181ddc6 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/mapping/ReplacementSubplanFactory.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/mapping/ReplacementSubplanFactory.java
@@ -1,13 +1,13 @@
-package org.apache.incubator.wayang.core.mapping;
+package org.apache.wayang.core.mapping;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.core.plan.wayangplan.ActualOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.plan.wayangplan.OperatorAlternative;
-import org.apache.incubator.wayang.core.plan.wayangplan.OperatorBase;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.Subplan;
+import org.apache.wayang.core.plan.wayangplan.ActualOperator;
+import org.apache.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.plan.wayangplan.OperatorAlternative;
+import org.apache.wayang.core.plan.wayangplan.OperatorBase;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.plan.wayangplan.Subplan;
 
 import java.util.Map;
 import java.util.function.BiFunction;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/mapping/SubplanMatch.java b/wayang-core/src/main/java/org/apache/wayang/core/mapping/SubplanMatch.java
index d1b1946..345ba35 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/mapping/SubplanMatch.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/mapping/SubplanMatch.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.core.mapping;
+package org.apache.wayang.core.mapping;
 
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.platform.Platform;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.platform.Platform;
 
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/mapping/SubplanPattern.java b/wayang-core/src/main/java/org/apache/wayang/core/mapping/SubplanPattern.java
index 36f17b6..4349d5f 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/mapping/SubplanPattern.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/mapping/SubplanPattern.java
@@ -1,14 +1,14 @@
-package org.apache.incubator.wayang.core.mapping;
+package org.apache.wayang.core.mapping;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.core.api.exception.WayangException;
-import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.plan.wayangplan.OperatorBase;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.PlanTraversal;
-import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
-import org.apache.incubator.wayang.core.plan.wayangplan.TopDownPlanVisitor;
+import org.apache.wayang.core.api.exception.WayangException;
+import org.apache.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.plan.wayangplan.OperatorBase;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.plan.wayangplan.PlanTraversal;
+import org.apache.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.wayang.core.plan.wayangplan.TopDownPlanVisitor;
 
 import java.util.Arrays;
 import java.util.HashSet;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/monitor/DisabledMonitor.java b/wayang-core/src/main/java/org/apache/wayang/core/monitor/DisabledMonitor.java
index 889b183..ec20bb5 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/monitor/DisabledMonitor.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/monitor/DisabledMonitor.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.core.monitor;
+package org.apache.wayang.core.monitor;
 
-import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.Configuration;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/monitor/FileMonitor.java b/wayang-core/src/main/java/org/apache/wayang/core/monitor/FileMonitor.java
index 0accea9..7e427e1 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/monitor/FileMonitor.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/monitor/FileMonitor.java
@@ -1,10 +1,10 @@
-package org.apache.incubator.wayang.core.monitor;
+package org.apache.wayang.core.monitor;
 
 
 import org.json.JSONObject;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.util.fs.FileSystem;
-import org.apache.incubator.wayang.core.util.fs.FileSystems;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.util.fs.FileSystem;
+import org.apache.wayang.core.util.fs.FileSystems;
 
 import java.io.IOException;
 import java.io.OutputStreamWriter;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/monitor/HttpMonitor.java b/wayang-core/src/main/java/org/apache/wayang/core/monitor/HttpMonitor.java
index 6d63155..6f3b386 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/monitor/HttpMonitor.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/monitor/HttpMonitor.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.core.monitor;
+package org.apache.wayang.core.monitor;
 
-import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.Configuration;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/monitor/Monitor.java b/wayang-core/src/main/java/org/apache/wayang/core/monitor/Monitor.java
index 829d65c..9594faf 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/monitor/Monitor.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/monitor/Monitor.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.core.monitor;
+package org.apache.wayang.core.monitor;
 
-import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.Configuration;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/monitor/ZeroMQMonitor.java b/wayang-core/src/main/java/org/apache/wayang/core/monitor/ZeroMQMonitor.java
index 239ffad..e47ee5d 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/monitor/ZeroMQMonitor.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/monitor/ZeroMQMonitor.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.core.monitor;
+package org.apache.wayang.core.monitor;
 
-import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.Configuration;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/AggregateOptimizationContext.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/AggregateOptimizationContext.java
index ad07054..faeec03 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/AggregateOptimizationContext.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/AggregateOptimizationContext.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.core.optimizer;
+package org.apache.wayang.core.optimizer;
 
-import org.apache.incubator.wayang.core.plan.wayangplan.LoopSubplan;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.plan.wayangplan.LoopSubplan;
+import org.apache.wayang.core.plan.wayangplan.Operator;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/DefaultOptimizationContext.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/DefaultOptimizationContext.java
index 4fc794b..738bdc1 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/DefaultOptimizationContext.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/DefaultOptimizationContext.java
@@ -1,15 +1,15 @@
-package org.apache.incubator.wayang.core.optimizer;
+package org.apache.wayang.core.optimizer;
 
-import org.apache.incubator.wayang.core.api.Job;
-import org.apache.incubator.wayang.core.optimizer.channels.ChannelConversionGraph;
-import org.apache.incubator.wayang.core.optimizer.enumeration.PlanEnumerationPruningStrategy;
-import org.apache.incubator.wayang.core.plan.wayangplan.LoopSubplan;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.plan.wayangplan.OperatorAlternative;
-import org.apache.incubator.wayang.core.plan.wayangplan.PlanTraversal;
-import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
-import org.apache.incubator.wayang.core.plan.wayangplan.Subplan;
-import org.apache.incubator.wayang.core.util.WayangArrays;
+import org.apache.wayang.core.api.Job;
+import org.apache.wayang.core.optimizer.channels.ChannelConversionGraph;
+import org.apache.wayang.core.optimizer.enumeration.PlanEnumerationPruningStrategy;
+import org.apache.wayang.core.plan.wayangplan.LoopSubplan;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.plan.wayangplan.OperatorAlternative;
+import org.apache.wayang.core.plan.wayangplan.PlanTraversal;
+import org.apache.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.wayang.core.plan.wayangplan.Subplan;
+import org.apache.wayang.core.util.WayangArrays;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/OptimizationContext.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/OptimizationContext.java
index 25abc2b..75fc17e 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/OptimizationContext.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/OptimizationContext.java
@@ -1,32 +1,32 @@
-package org.apache.incubator.wayang.core.optimizer;
-
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.api.Job;
-import org.apache.incubator.wayang.core.api.exception.WayangException;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
-import org.apache.incubator.wayang.core.optimizer.channels.ChannelConversionGraph;
-import org.apache.incubator.wayang.core.optimizer.costs.EstimationContext;
-import org.apache.incubator.wayang.core.optimizer.costs.LoadProfile;
-import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileEstimator;
-import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileEstimators;
-import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileToTimeConverter;
-import org.apache.incubator.wayang.core.optimizer.costs.TimeEstimate;
-import org.apache.incubator.wayang.core.optimizer.costs.TimeToCostConverter;
-import org.apache.incubator.wayang.core.optimizer.enumeration.PlanEnumerationPruningStrategy;
-import org.apache.incubator.wayang.core.plan.wayangplan.CompositeOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.LoopHeadOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.LoopSubplan;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.plan.wayangplan.OperatorContainer;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.PlanTraversal;
-import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
-import org.apache.incubator.wayang.core.plan.wayangplan.Slot;
-import org.apache.incubator.wayang.core.platform.Platform;
-import org.apache.incubator.wayang.core.platform.lineage.ExecutionLineageNode;
-import org.apache.incubator.wayang.core.util.ReflectionUtils;
+package org.apache.wayang.core.optimizer;
+
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.Job;
+import org.apache.wayang.core.api.exception.WayangException;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.wayang.core.optimizer.channels.ChannelConversionGraph;
+import org.apache.wayang.core.optimizer.costs.EstimationContext;
+import org.apache.wayang.core.optimizer.costs.LoadProfile;
+import org.apache.wayang.core.optimizer.costs.LoadProfileEstimator;
+import org.apache.wayang.core.optimizer.costs.LoadProfileEstimators;
+import org.apache.wayang.core.optimizer.costs.LoadProfileToTimeConverter;
+import org.apache.wayang.core.optimizer.costs.TimeEstimate;
+import org.apache.wayang.core.optimizer.costs.TimeToCostConverter;
+import org.apache.wayang.core.optimizer.enumeration.PlanEnumerationPruningStrategy;
+import org.apache.wayang.core.plan.wayangplan.CompositeOperator;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.wayang.core.plan.wayangplan.LoopHeadOperator;
+import org.apache.wayang.core.plan.wayangplan.LoopSubplan;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.plan.wayangplan.OperatorContainer;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.plan.wayangplan.PlanTraversal;
+import org.apache.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.wayang.core.plan.wayangplan.Slot;
+import org.apache.wayang.core.platform.Platform;
+import org.apache.wayang.core.platform.lineage.ExecutionLineageNode;
+import org.apache.wayang.core.util.ReflectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/OptimizationUtils.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/OptimizationUtils.java
index c20aa2b..9775c30 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/OptimizationUtils.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/OptimizationUtils.java
@@ -1,16 +1,16 @@
-package org.apache.incubator.wayang.core.optimizer;
-
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.api.exception.WayangException;
-import org.apache.incubator.wayang.core.optimizer.enumeration.PlanEnumerationPruningStrategy;
-import org.apache.incubator.wayang.core.plan.executionplan.Channel;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionTask;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
-import org.apache.incubator.wayang.core.plan.wayangplan.Slot;
-import org.apache.incubator.wayang.core.plan.wayangplan.SlotMapping;
+package org.apache.wayang.core.optimizer;
+
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.exception.WayangException;
+import org.apache.wayang.core.optimizer.enumeration.PlanEnumerationPruningStrategy;
+import org.apache.wayang.core.plan.executionplan.Channel;
+import org.apache.wayang.core.plan.executionplan.ExecutionTask;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.wayang.core.plan.wayangplan.Slot;
+import org.apache.wayang.core.plan.wayangplan.SlotMapping;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/ProbabilisticDoubleInterval.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/ProbabilisticDoubleInterval.java
index d897703..f29871d 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/ProbabilisticDoubleInterval.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/ProbabilisticDoubleInterval.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.optimizer;
+package org.apache.wayang.core.optimizer;
 
 import java.util.Objects;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/ProbabilisticIntervalEstimate.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/ProbabilisticIntervalEstimate.java
index 4cc66f8..58a0c5e 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/ProbabilisticIntervalEstimate.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/ProbabilisticIntervalEstimate.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.core.optimizer;
+package org.apache.wayang.core.optimizer;
 
-import org.apache.incubator.wayang.core.util.Formats;
+import org.apache.wayang.core.util.Formats;
 
 import java.util.Comparator;
 import java.util.Objects;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/SanityChecker.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/SanityChecker.java
index 005d5ce..834fe32 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/SanityChecker.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/SanityChecker.java
@@ -1,11 +1,11 @@
-package org.apache.incubator.wayang.core.optimizer;
+package org.apache.wayang.core.optimizer;
 
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.plan.wayangplan.OperatorAlternative;
-import org.apache.incubator.wayang.core.plan.wayangplan.PlanTraversal;
-import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
-import org.apache.incubator.wayang.core.plan.wayangplan.Subplan;
-import org.apache.incubator.wayang.core.util.WayangCollections;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.plan.wayangplan.OperatorAlternative;
+import org.apache.wayang.core.plan.wayangplan.PlanTraversal;
+import org.apache.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.wayang.core.plan.wayangplan.Subplan;
+import org.apache.wayang.core.util.WayangCollections;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/AbstractAlternativeCardinalityPusher.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/AbstractAlternativeCardinalityPusher.java
index dd12931..11a9912 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/AbstractAlternativeCardinalityPusher.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/AbstractAlternativeCardinalityPusher.java
@@ -1,10 +1,10 @@
-package org.apache.incubator.wayang.core.optimizer.cardinality;
+package org.apache.wayang.core.optimizer.cardinality;
 
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.plan.wayangplan.OperatorAlternative;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.plan.wayangplan.OperatorAlternative;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
 
 /**
  * Abstract {@link CardinalityPusher} implementation for {@link OperatorAlternative}s and subclasses.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/AggregatingCardinalityEstimator.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/AggregatingCardinalityEstimator.java
index 13353cb..4d7e91c 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/AggregatingCardinalityEstimator.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/AggregatingCardinalityEstimator.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.core.optimizer.cardinality;
+package org.apache.wayang.core.optimizer.cardinality;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.optimizer.OptimizationContext;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/CardinalityEstimate.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/CardinalityEstimate.java
index 0ff4b90..e8c528f 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/CardinalityEstimate.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/CardinalityEstimate.java
@@ -1,10 +1,10 @@
-package org.apache.incubator.wayang.core.optimizer.cardinality;
+package org.apache.wayang.core.optimizer.cardinality;
 
 import org.json.JSONObject;
-import org.apache.incubator.wayang.core.optimizer.ProbabilisticIntervalEstimate;
-import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
-import org.apache.incubator.wayang.core.util.Formats;
-import org.apache.incubator.wayang.core.util.JsonSerializable;
+import org.apache.wayang.core.optimizer.ProbabilisticIntervalEstimate;
+import org.apache.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.wayang.core.util.Formats;
+import org.apache.wayang.core.util.JsonSerializable;
 
 /**
  * An estimate of cardinality within a {@link WayangPlan} expressed as a {@link ProbabilisticIntervalEstimate}.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/CardinalityEstimationTraversal.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/CardinalityEstimationTraversal.java
index f1dfc92..be1f9b5 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/CardinalityEstimationTraversal.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/CardinalityEstimationTraversal.java
@@ -1,15 +1,15 @@
-package org.apache.incubator.wayang.core.optimizer.cardinality;
+package org.apache.wayang.core.optimizer.cardinality;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.plan.wayangplan.OperatorContainer;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.PlanTraversal;
-import org.apache.incubator.wayang.core.util.OneTimeExecutable;
-import org.apache.incubator.wayang.core.util.WayangCollections;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.plan.wayangplan.OperatorContainer;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.plan.wayangplan.PlanTraversal;
+import org.apache.wayang.core.util.OneTimeExecutable;
+import org.apache.wayang.core.util.WayangCollections;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/CardinalityEstimator.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/CardinalityEstimator.java
index ba747e7..604ee5b 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/CardinalityEstimator.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/CardinalityEstimator.java
@@ -1,9 +1,9 @@
-package org.apache.incubator.wayang.core.optimizer.cardinality;
+package org.apache.wayang.core.optimizer.cardinality;
 
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
 
 /**
  * Computes {@link CardinalityEstimate}s.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/CardinalityEstimatorManager.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/CardinalityEstimatorManager.java
index abddfb2..fb1ad8f 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/CardinalityEstimatorManager.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/CardinalityEstimatorManager.java
@@ -1,17 +1,17 @@
-package org.apache.incubator.wayang.core.optimizer.cardinality;
-
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.OptimizationUtils;
-import org.apache.incubator.wayang.core.optimizer.enumeration.LoopImplementation;
-import org.apache.incubator.wayang.core.optimizer.enumeration.PlanImplementation;
-import org.apache.incubator.wayang.core.plan.wayangplan.LoopSubplan;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
-import org.apache.incubator.wayang.core.platform.ChannelInstance;
-import org.apache.incubator.wayang.core.platform.ExecutionState;
-import org.apache.incubator.wayang.core.platform.Junction;
+package org.apache.wayang.core.optimizer.cardinality;
+
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.optimizer.OptimizationUtils;
+import org.apache.wayang.core.optimizer.enumeration.LoopImplementation;
+import org.apache.wayang.core.optimizer.enumeration.PlanImplementation;
+import org.apache.wayang.core.plan.wayangplan.LoopSubplan;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.wayang.core.platform.ChannelInstance;
+import org.apache.wayang.core.platform.ExecutionState;
+import org.apache.wayang.core.platform.Junction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/CardinalityPusher.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/CardinalityPusher.java
index ae2e1d4..dcf8bcb 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/CardinalityPusher.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/CardinalityPusher.java
@@ -1,10 +1,10 @@
-package org.apache.incubator.wayang.core.optimizer.cardinality;
+package org.apache.wayang.core.optimizer.cardinality;
 
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.costs.TimeEstimate;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.util.WayangArrays;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.optimizer.costs.TimeEstimate;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.util.WayangArrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/DefaultCardinalityEstimator.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/DefaultCardinalityEstimator.java
index e747f19..47b3ab4 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/DefaultCardinalityEstimator.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/DefaultCardinalityEstimator.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.core.optimizer.cardinality;
+package org.apache.wayang.core.optimizer.cardinality;
 
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.OptimizationContext;
 
 import java.util.Arrays;
 import java.util.function.ToLongBiFunction;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/DefaultCardinalityPusher.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/DefaultCardinalityPusher.java
index c7b8797..401c03f 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/DefaultCardinalityPusher.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/DefaultCardinalityPusher.java
@@ -1,10 +1,10 @@
-package org.apache.incubator.wayang.core.optimizer.cardinality;
+package org.apache.wayang.core.optimizer.cardinality;
 
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.api.configuration.KeyValueProvider;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.configuration.KeyValueProvider;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
 
 /**
  * Default {@link CardinalityPusher} implementation. Bundles all {@link CardinalityEstimator}s of an {@link Operator}.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/FallbackCardinalityEstimator.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/FallbackCardinalityEstimator.java
index f490163..ea208f1 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/FallbackCardinalityEstimator.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/FallbackCardinalityEstimator.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.core.optimizer.cardinality;
+package org.apache.wayang.core.optimizer.cardinality;
 
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.optimizer.OptimizationContext;
 
 /**
  * Assumes with a confidence of 50% that the output cardinality will be somewhere between 1 and the product of
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/FixedSizeCardinalityEstimator.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/FixedSizeCardinalityEstimator.java
index 102a99f..9f7ab2c 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/FixedSizeCardinalityEstimator.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/FixedSizeCardinalityEstimator.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.core.optimizer.cardinality;
+package org.apache.wayang.core.optimizer.cardinality;
 
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.plan.wayangplan.Operator;
 
 /**
  * {@link CardinalityEstimator} implementation for {@link Operator}s with a fix-sized output.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/LoopHeadAlternativeCardinalityPusher.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/LoopHeadAlternativeCardinalityPusher.java
index def72bf..7fb7807 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/LoopHeadAlternativeCardinalityPusher.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/LoopHeadAlternativeCardinalityPusher.java
@@ -1,14 +1,14 @@
-package org.apache.incubator.wayang.core.optimizer.cardinality;
-
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.LoopHeadAlternative;
-import org.apache.incubator.wayang.core.plan.wayangplan.LoopHeadOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.OperatorAlternative;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.Slot;
-import org.apache.incubator.wayang.core.util.Tuple;
+package org.apache.wayang.core.optimizer.cardinality;
+
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.wayang.core.plan.wayangplan.LoopHeadAlternative;
+import org.apache.wayang.core.plan.wayangplan.LoopHeadOperator;
+import org.apache.wayang.core.plan.wayangplan.OperatorAlternative;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.plan.wayangplan.Slot;
+import org.apache.wayang.core.util.Tuple;
 
 import java.util.Collection;
 import java.util.function.BiFunction;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/LoopSubplanCardinalityPusher.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/LoopSubplanCardinalityPusher.java
index 9a838b1..8c06311 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/LoopSubplanCardinalityPusher.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/LoopSubplanCardinalityPusher.java
@@ -1,12 +1,12 @@
-package org.apache.incubator.wayang.core.optimizer.cardinality;
-
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.LoopHeadOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.LoopSubplan;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
+package org.apache.wayang.core.optimizer.cardinality;
+
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.wayang.core.plan.wayangplan.LoopHeadOperator;
+import org.apache.wayang.core.plan.wayangplan.LoopSubplan;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
 
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/OperatorAlternativeCardinalityPusher.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/OperatorAlternativeCardinalityPusher.java
index 94ea5b5..ccd21b6 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/OperatorAlternativeCardinalityPusher.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/OperatorAlternativeCardinalityPusher.java
@@ -1,9 +1,9 @@
-package org.apache.incubator.wayang.core.optimizer.cardinality;
+package org.apache.wayang.core.optimizer.cardinality;
 
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.plan.wayangplan.OperatorAlternative;
-import org.apache.incubator.wayang.core.util.Tuple;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.plan.wayangplan.OperatorAlternative;
+import org.apache.wayang.core.util.Tuple;
 
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/SubplanCardinalityPusher.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/SubplanCardinalityPusher.java
index ac805f2..1537da5 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/SubplanCardinalityPusher.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/SubplanCardinalityPusher.java
@@ -1,14 +1,14 @@
-package org.apache.incubator.wayang.core.optimizer.cardinality;
+package org.apache.wayang.core.optimizer.cardinality;
 
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.plan.wayangplan.CompositeOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.LoopSubplan;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.plan.wayangplan.OperatorContainer;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.Subplan;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.plan.wayangplan.CompositeOperator;
+import org.apache.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.wayang.core.plan.wayangplan.LoopSubplan;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.plan.wayangplan.OperatorContainer;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.plan.wayangplan.Subplan;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/SwitchForwardCardinalityEstimator.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/SwitchForwardCardinalityEstimator.java
index acf6b27..3e4e1c1 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/SwitchForwardCardinalityEstimator.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/cardinality/SwitchForwardCardinalityEstimator.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.core.optimizer.cardinality;
+package org.apache.wayang.core.optimizer.cardinality;
 
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.plan.wayangplan.InputSlot;
 import org.slf4j.LoggerFactory;
 
 /**
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/channels/ChannelConversion.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/channels/ChannelConversion.java
index 07ceead..51e4c9f 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/channels/ChannelConversion.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/channels/ChannelConversion.java
@@ -1,12 +1,12 @@
-package org.apache.incubator.wayang.core.optimizer.channels;
+package org.apache.wayang.core.optimizer.channels;
 
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
-import org.apache.incubator.wayang.core.plan.executionplan.Channel;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.platform.ChannelDescriptor;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.wayang.core.plan.executionplan.Channel;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.platform.ChannelDescriptor;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/channels/ChannelConversionGraph.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/channels/ChannelConversionGraph.java
index 59e7e50..a6e4c45 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/channels/ChannelConversionGraph.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/channels/ChannelConversionGraph.java
@@ -1,26 +1,26 @@
-package org.apache.incubator.wayang.core.optimizer.channels;
-
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.DefaultOptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.OptimizationUtils;
-import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
-import org.apache.incubator.wayang.core.optimizer.costs.TimeEstimate;
-import org.apache.incubator.wayang.core.plan.executionplan.Channel;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionTask;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.LoopHeadOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.LoopSubplan;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.platform.ChannelDescriptor;
-import org.apache.incubator.wayang.core.platform.Junction;
-import org.apache.incubator.wayang.core.util.Bitmask;
-import org.apache.incubator.wayang.core.util.OneTimeExecutable;
-import org.apache.incubator.wayang.core.util.ReflectionUtils;
-import org.apache.incubator.wayang.core.util.WayangCollections;
-import org.apache.incubator.wayang.core.util.Tuple;
+package org.apache.wayang.core.optimizer.channels;
+
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.DefaultOptimizationContext;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.optimizer.OptimizationUtils;
+import org.apache.wayang.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.wayang.core.optimizer.costs.TimeEstimate;
+import org.apache.wayang.core.plan.executionplan.Channel;
+import org.apache.wayang.core.plan.executionplan.ExecutionTask;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.wayang.core.plan.wayangplan.LoopHeadOperator;
+import org.apache.wayang.core.plan.wayangplan.LoopSubplan;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.platform.ChannelDescriptor;
+import org.apache.wayang.core.platform.Junction;
+import org.apache.wayang.core.util.Bitmask;
+import org.apache.wayang.core.util.OneTimeExecutable;
+import org.apache.wayang.core.util.ReflectionUtils;
+import org.apache.wayang.core.util.WayangCollections;
+import org.apache.wayang.core.util.Tuple;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/channels/DefaultChannelConversion.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/channels/DefaultChannelConversion.java
index 87e21f3..7a1dafc 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/channels/DefaultChannelConversion.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/channels/DefaultChannelConversion.java
@@ -1,14 +1,14 @@
-package org.apache.incubator.wayang.core.optimizer.channels;
-
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
-import org.apache.incubator.wayang.core.plan.executionplan.Channel;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionTask;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.platform.ChannelDescriptor;
+package org.apache.wayang.core.optimizer.channels;
+
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.wayang.core.plan.executionplan.Channel;
+import org.apache.wayang.core.plan.executionplan.ExecutionTask;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.platform.ChannelDescriptor;
 
 import java.util.Collection;
 import java.util.function.BiFunction;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/ConstantLoadProfileEstimator.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/ConstantLoadProfileEstimator.java
index 0b25564..e77ce03 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/ConstantLoadProfileEstimator.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/ConstantLoadProfileEstimator.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.optimizer.costs;
+package org.apache.wayang.core.optimizer.costs;
 
 import java.util.Collection;
 import java.util.LinkedList;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/DefaultLoadEstimator.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/DefaultLoadEstimator.java
index cd1da47..b52d756 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/DefaultLoadEstimator.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/DefaultLoadEstimator.java
@@ -1,8 +1,8 @@
-package org.apache.incubator.wayang.core.optimizer.costs;
+package org.apache.wayang.core.optimizer.costs;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
 
 import java.util.Arrays;
 import java.util.function.ToDoubleBiFunction;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/EstimationContext.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/EstimationContext.java
index f3f465f..83f8fb1 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/EstimationContext.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/EstimationContext.java
@@ -1,10 +1,10 @@
-package org.apache.incubator.wayang.core.optimizer.costs;
+package org.apache.wayang.core.optimizer.costs;
 
 import org.json.JSONObject;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.util.JsonSerializables;
-import org.apache.incubator.wayang.core.util.JsonSerializer;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.util.JsonSerializables;
+import org.apache.wayang.core.util.JsonSerializer;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/IntervalLoadEstimator.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/IntervalLoadEstimator.java
index 405a512..1cd0402 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/IntervalLoadEstimator.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/IntervalLoadEstimator.java
@@ -1,8 +1,8 @@
-package org.apache.incubator.wayang.core.optimizer.costs;
+package org.apache.wayang.core.optimizer.costs;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
 
 import java.util.Arrays;
 import java.util.function.ToDoubleBiFunction;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadEstimate.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadEstimate.java
index edc8c07..722de22 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadEstimate.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadEstimate.java
@@ -1,9 +1,9 @@
-package org.apache.incubator.wayang.core.optimizer.costs;
+package org.apache.wayang.core.optimizer.costs;
 
 import org.json.JSONObject;
-import org.apache.incubator.wayang.core.optimizer.ProbabilisticIntervalEstimate;
-import org.apache.incubator.wayang.core.util.JsonSerializable;
-import org.apache.incubator.wayang.core.util.JsonSerializables;
+import org.apache.wayang.core.optimizer.ProbabilisticIntervalEstimate;
+import org.apache.wayang.core.util.JsonSerializable;
+import org.apache.wayang.core.util.JsonSerializables;
 
 /**
  * An estimate of costs of some executable code expressed as a {@link ProbabilisticIntervalEstimate}.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadEstimator.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadEstimator.java
index fd754df..12aa25b 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadEstimator.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadEstimator.java
@@ -1,8 +1,8 @@
-package org.apache.incubator.wayang.core.optimizer.costs;
+package org.apache.wayang.core.optimizer.costs;
 
-import org.apache.incubator.wayang.core.function.FunctionDescriptor;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.function.FunctionDescriptor;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
 
 import java.util.Arrays;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadProfile.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadProfile.java
index 0e2d2cf..6f48836 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadProfile.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadProfile.java
@@ -1,10 +1,10 @@
-package org.apache.incubator.wayang.core.optimizer.costs;
+package org.apache.wayang.core.optimizer.costs;
 
 import org.json.JSONObject;
-import org.apache.incubator.wayang.core.function.FunctionDescriptor;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.util.JsonSerializable;
-import org.apache.incubator.wayang.core.util.JsonSerializables;
+import org.apache.wayang.core.function.FunctionDescriptor;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.util.JsonSerializable;
+import org.apache.wayang.core.util.JsonSerializables;
 
 import java.util.Collection;
 import java.util.LinkedList;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadProfileEstimator.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadProfileEstimator.java
index 4578b12..20653cb 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadProfileEstimator.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadProfileEstimator.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.core.optimizer.costs;
+package org.apache.wayang.core.optimizer.costs;
 
-import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.Configuration;
 
 import java.util.Collection;
 import java.util.LinkedList;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadProfileEstimators.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadProfileEstimators.java
index e87eaa5..67ebaff 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadProfileEstimators.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadProfileEstimators.java
@@ -1,20 +1,20 @@
-package org.apache.incubator.wayang.core.optimizer.costs;
+package org.apache.wayang.core.optimizer.costs;
 
 import org.json.JSONObject;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.api.exception.WayangException;
-import org.apache.incubator.wayang.core.function.FunctionDescriptor;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.OptimizationUtils;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
-import org.apache.incubator.wayang.core.optimizer.costs.LoadEstimator.SinglePointEstimationFunction;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
-import org.apache.incubator.wayang.core.util.JuelUtils;
-import org.apache.incubator.wayang.core.util.mathex.Context;
-import org.apache.incubator.wayang.core.util.mathex.DefaultContext;
-import org.apache.incubator.wayang.core.util.mathex.Expression;
-import org.apache.incubator.wayang.core.util.mathex.ExpressionBuilder;
-import org.apache.incubator.wayang.core.util.mathex.exceptions.EvaluationException;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.exception.WayangException;
+import org.apache.wayang.core.function.FunctionDescriptor;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.optimizer.OptimizationUtils;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.wayang.core.optimizer.costs.LoadEstimator.SinglePointEstimationFunction;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.util.JuelUtils;
+import org.apache.wayang.core.util.mathex.Context;
+import org.apache.wayang.core.util.mathex.DefaultContext;
+import org.apache.wayang.core.util.mathex.Expression;
+import org.apache.wayang.core.util.mathex.ExpressionBuilder;
+import org.apache.wayang.core.util.mathex.exceptions.EvaluationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -84,7 +84,7 @@ public class LoadProfileEstimators {
     /**
      * Creates a new instance from a specification {@link String}. Valid specifications are as follows:
      * <pre>
-     *     {"type":&lt;*juel*, org.apache.incubator.wayang.core.util.mathex.mathex&gt;,
+     *     {"type":&lt;*juel*, org.apache.wayang.core.util.mathex.mathex&gt;,
      *      "cpu":&lt;mathematical expression&gt;,
      *      "ram":&lt;mathematical expression&gt;,
      *      "disk":&lt;mathematical expression&gt;,
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadProfileToTimeConverter.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadProfileToTimeConverter.java
index 8e9080f..002a1a7 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadProfileToTimeConverter.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadProfileToTimeConverter.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.optimizer.costs;
+package org.apache.wayang.core.optimizer.costs;
 
 import java.util.Objects;
 import java.util.function.Function;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadToTimeConverter.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadToTimeConverter.java
index 94b3164..45ad79a 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadToTimeConverter.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/LoadToTimeConverter.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.optimizer.costs;
+package org.apache.wayang.core.optimizer.costs;
 
 /**
  * Converts a {@link LoadEstimate} into a time estimate.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/NestableLoadProfileEstimator.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/NestableLoadProfileEstimator.java
index 7f97d77..aae81bb 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/NestableLoadProfileEstimator.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/NestableLoadProfileEstimator.java
@@ -1,8 +1,8 @@
-package org.apache.incubator.wayang.core.optimizer.costs;
+package org.apache.wayang.core.optimizer.costs;
 
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.api.exception.WayangException;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.exception.WayangException;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimate;
 
 import java.util.Collection;
 import java.util.LinkedList;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/SimpleEstimationContext.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/SimpleEstimationContext.java
index e19fc3b..619bb1a 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/SimpleEstimationContext.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/SimpleEstimationContext.java
@@ -1,11 +1,11 @@
-package org.apache.incubator.wayang.core.optimizer.costs;
+package org.apache.wayang.core.optimizer.costs;
 
 import gnu.trove.map.TObjectDoubleMap;
 import gnu.trove.map.hash.TObjectDoubleHashMap;
 import org.json.JSONObject;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
-import org.apache.incubator.wayang.core.util.JsonSerializables;
-import org.apache.incubator.wayang.core.util.JsonSerializer;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.wayang.core.util.JsonSerializables;
+import org.apache.wayang.core.util.JsonSerializer;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/TimeEstimate.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/TimeEstimate.java
index 925c432..93d1168 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/TimeEstimate.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/TimeEstimate.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.core.optimizer.costs;
+package org.apache.wayang.core.optimizer.costs;
 
-import org.apache.incubator.wayang.core.optimizer.ProbabilisticIntervalEstimate;
-import org.apache.incubator.wayang.core.util.Formats;
+import org.apache.wayang.core.optimizer.ProbabilisticIntervalEstimate;
+import org.apache.wayang.core.util.Formats;
 
 /**
  * An estimate of time (in <b>milliseconds</b>) expressed as a {@link ProbabilisticIntervalEstimate}.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/TimeToCostConverter.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/TimeToCostConverter.java
index 353f13a..122ca38 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/TimeToCostConverter.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/costs/TimeToCostConverter.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.core.optimizer.costs;
+package org.apache.wayang.core.optimizer.costs;
 
-import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.wayang.core.optimizer.ProbabilisticDoubleInterval;
 
 /**
  * This (linear) converter turns {@link TimeEstimate}s into cost estimates.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/ExecutionTaskFlow.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/ExecutionTaskFlow.java
index 15b8bec..0e0a9ee 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/ExecutionTaskFlow.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/ExecutionTaskFlow.java
@@ -1,12 +1,12 @@
-package org.apache.incubator.wayang.core.optimizer.enumeration;
+package org.apache.wayang.core.optimizer.enumeration;
 
-import org.apache.incubator.wayang.core.plan.executionplan.Channel;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionPlan;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionStage;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionTask;
-import org.apache.incubator.wayang.core.plan.executionplan.PlatformExecution;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.traversal.AbstractTopologicalTraversal;
+import org.apache.wayang.core.plan.executionplan.Channel;
+import org.apache.wayang.core.plan.executionplan.ExecutionPlan;
+import org.apache.wayang.core.plan.executionplan.ExecutionStage;
+import org.apache.wayang.core.plan.executionplan.ExecutionTask;
+import org.apache.wayang.core.plan.executionplan.PlatformExecution;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.plan.wayangplan.traversal.AbstractTopologicalTraversal;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/ExecutionTaskFlowCompiler.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/ExecutionTaskFlowCompiler.java
index 76725bd..1c06756 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/ExecutionTaskFlowCompiler.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/ExecutionTaskFlowCompiler.java
@@ -1,20 +1,20 @@
-package org.apache.incubator.wayang.core.optimizer.enumeration;
-
-import org.apache.incubator.wayang.core.optimizer.OptimizationUtils;
-import org.apache.incubator.wayang.core.plan.executionplan.Channel;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionPlan;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionStage;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionTask;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.LoopSubplan;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.plan.wayangplan.OperatorAlternative;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
-import org.apache.incubator.wayang.core.plan.wayangplan.traversal.AbstractTopologicalTraversal;
-import org.apache.incubator.wayang.core.platform.Junction;
-import org.apache.incubator.wayang.core.platform.Platform;
+package org.apache.wayang.core.optimizer.enumeration;
+
+import org.apache.wayang.core.optimizer.OptimizationUtils;
+import org.apache.wayang.core.plan.executionplan.Channel;
+import org.apache.wayang.core.plan.executionplan.ExecutionPlan;
+import org.apache.wayang.core.plan.executionplan.ExecutionStage;
+import org.apache.wayang.core.plan.executionplan.ExecutionTask;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.wayang.core.plan.wayangplan.LoopSubplan;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.plan.wayangplan.OperatorAlternative;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.wayang.core.plan.wayangplan.traversal.AbstractTopologicalTraversal;
+import org.apache.wayang.core.platform.Junction;
+import org.apache.wayang.core.platform.Platform;
 import org.slf4j.LoggerFactory;
 
 import java.util.Collection;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/LatentOperatorPruningStrategy.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/LatentOperatorPruningStrategy.java
index b469752..298f4d1 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/LatentOperatorPruningStrategy.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/LatentOperatorPruningStrategy.java
@@ -1,11 +1,11 @@
-package org.apache.incubator.wayang.core.optimizer.enumeration;
+package org.apache.wayang.core.optimizer.enumeration;
 
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.api.exception.WayangException;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.Slot;
-import org.apache.incubator.wayang.core.platform.Platform;
-import org.apache.incubator.wayang.core.util.Tuple;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.exception.WayangException;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.plan.wayangplan.Slot;
+import org.apache.wayang.core.platform.Platform;
+import org.apache.wayang.core.util.Tuple;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/LoopEnumerator.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/LoopEnumerator.java
index 385be60..3fdfcd7 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/LoopEnumerator.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/LoopEnumerator.java
@@ -1,13 +1,13 @@
-package org.apache.incubator.wayang.core.optimizer.enumeration;
-
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.LoopHeadOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.LoopSubplan;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.platform.Junction;
-import org.apache.incubator.wayang.core.util.OneTimeExecutable;
-import org.apache.incubator.wayang.core.util.Tuple;
+package org.apache.wayang.core.optimizer.enumeration;
+
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.wayang.core.plan.wayangplan.LoopHeadOperator;
+import org.apache.wayang.core.plan.wayangplan.LoopSubplan;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.platform.Junction;
+import org.apache.wayang.core.util.OneTimeExecutable;
+import org.apache.wayang.core.util.Tuple;
 import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/LoopImplementation.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/LoopImplementation.java
index ff780c4..99f4040 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/LoopImplementation.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/LoopImplementation.java
@@ -1,13 +1,13 @@
-package org.apache.incubator.wayang.core.optimizer.enumeration;
-
-import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
-import org.apache.incubator.wayang.core.optimizer.costs.TimeEstimate;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.LoopHeadOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.LoopSubplan;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.platform.Junction;
+package org.apache.wayang.core.optimizer.enumeration;
+
+import org.apache.wayang.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.wayang.core.optimizer.costs.TimeEstimate;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.plan.wayangplan.LoopHeadOperator;
+import org.apache.wayang.core.plan.wayangplan.LoopSubplan;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.platform.Junction;
 
 import java.util.LinkedList;
 import java.util.List;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/PlanEnumeration.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/PlanEnumeration.java
index 96aaedf..529f93c 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/PlanEnumeration.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/PlanEnumeration.java
@@ -1,21 +1,21 @@
-package org.apache.incubator.wayang.core.optimizer.enumeration;
+package org.apache.wayang.core.optimizer.enumeration;
 
 import de.hpi.isg.profiledb.store.model.TimeMeasurement;
-import org.apache.incubator.wayang.core.api.Job;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.channels.ChannelConversionGraph;
-import org.apache.incubator.wayang.core.plan.executionplan.Channel;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionTask;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.plan.wayangplan.OperatorAlternative;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
-import org.apache.incubator.wayang.core.platform.Junction;
-import org.apache.incubator.wayang.core.util.MultiMap;
-import org.apache.incubator.wayang.core.util.WayangCollections;
-import org.apache.incubator.wayang.core.util.Tuple;
+import org.apache.wayang.core.api.Job;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.optimizer.channels.ChannelConversionGraph;
+import org.apache.wayang.core.plan.executionplan.Channel;
+import org.apache.wayang.core.plan.executionplan.ExecutionTask;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.plan.wayangplan.OperatorAlternative;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.wayang.core.platform.Junction;
+import org.apache.wayang.core.util.MultiMap;
+import org.apache.wayang.core.util.WayangCollections;
+import org.apache.wayang.core.util.Tuple;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/PlanEnumerationPruningStrategy.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/PlanEnumerationPruningStrategy.java
index 32d3b2d..a4245d5 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/PlanEnumerationPruningStrategy.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/PlanEnumerationPruningStrategy.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.core.optimizer.enumeration;
+package org.apache.wayang.core.optimizer.enumeration;
 
-import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.Configuration;
 
 /**
  * A strategy to prune {@link PlanImplementation}s from a {@link PlanEnumeration}.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/PlanEnumerator.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/PlanEnumerator.java
index 0db0105..0c624c4 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/PlanEnumerator.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/PlanEnumerator.java
@@ -1,26 +1,26 @@
-package org.apache.incubator.wayang.core.optimizer.enumeration;
+package org.apache.wayang.core.optimizer.enumeration;
 
 import de.hpi.isg.profiledb.store.model.TimeMeasurement;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.api.exception.WayangException;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.OptimizationUtils;
-import org.apache.incubator.wayang.core.plan.executionplan.Channel;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionPlan;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionTask;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.LoopHeadOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.LoopSubplan;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.plan.wayangplan.OperatorAlternative;
-import org.apache.incubator.wayang.core.plan.wayangplan.OperatorContainer;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operators;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
-import org.apache.incubator.wayang.core.plan.wayangplan.Slot;
-import org.apache.incubator.wayang.core.util.WayangCollections;
-import org.apache.incubator.wayang.core.util.Tuple;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.exception.WayangException;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.optimizer.OptimizationUtils;
+import org.apache.wayang.core.plan.executionplan.Channel;
+import org.apache.wayang.core.plan.executionplan.ExecutionPlan;
+import org.apache.wayang.core.plan.executionplan.ExecutionTask;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.wayang.core.plan.wayangplan.LoopHeadOperator;
+import org.apache.wayang.core.plan.wayangplan.LoopSubplan;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.plan.wayangplan.OperatorAlternative;
+import org.apache.wayang.core.plan.wayangplan.OperatorContainer;
+import org.apache.wayang.core.plan.wayangplan.Operators;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.wayang.core.plan.wayangplan.Slot;
+import org.apache.wayang.core.util.WayangCollections;
+import org.apache.wayang.core.util.Tuple;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/PlanImplementation.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/PlanImplementation.java
index 4f4cfef..b469932 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/PlanImplementation.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/PlanImplementation.java
@@ -1,27 +1,27 @@
-package org.apache.incubator.wayang.core.optimizer.enumeration;
+package org.apache.wayang.core.optimizer.enumeration;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
-import org.apache.incubator.wayang.core.optimizer.costs.TimeEstimate;
-import org.apache.incubator.wayang.core.optimizer.costs.TimeToCostConverter;
-import org.apache.incubator.wayang.core.plan.executionplan.Channel;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionTask;
-import org.apache.incubator.wayang.core.plan.wayangplan.ElementaryOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.LoopSubplan;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.plan.wayangplan.OperatorAlternative;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
-import org.apache.incubator.wayang.core.plan.wayangplan.Slot;
-import org.apache.incubator.wayang.core.platform.Junction;
-import org.apache.incubator.wayang.core.platform.Platform;
-import org.apache.incubator.wayang.core.util.Canonicalizer;
-import org.apache.incubator.wayang.core.util.WayangCollections;
-import org.apache.incubator.wayang.core.util.Tuple;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.wayang.core.optimizer.costs.TimeEstimate;
+import org.apache.wayang.core.optimizer.costs.TimeToCostConverter;
+import org.apache.wayang.core.plan.executionplan.Channel;
+import org.apache.wayang.core.plan.executionplan.ExecutionTask;
+import org.apache.wayang.core.plan.wayangplan.ElementaryOperator;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.wayang.core.plan.wayangplan.LoopSubplan;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.plan.wayangplan.OperatorAlternative;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.wayang.core.plan.wayangplan.Slot;
+import org.apache.wayang.core.platform.Junction;
+import org.apache.wayang.core.platform.Platform;
+import org.apache.wayang.core.util.Canonicalizer;
+import org.apache.wayang.core.util.WayangCollections;
+import org.apache.wayang.core.util.Tuple;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/RandomPruningStrategy.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/RandomPruningStrategy.java
index 5b45190..3a2ffb4 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/RandomPruningStrategy.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/RandomPruningStrategy.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.core.optimizer.enumeration;
+package org.apache.wayang.core.optimizer.enumeration;
 
-import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.Configuration;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/SinglePlatformPruningStrategy.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/SinglePlatformPruningStrategy.java
index 530a448..395f663 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/SinglePlatformPruningStrategy.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/SinglePlatformPruningStrategy.java
@@ -1,15 +1,15 @@
-package org.apache.incubator.wayang.core.optimizer.enumeration;
+package org.apache.wayang.core.optimizer.enumeration;
 
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.platform.Platform;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.platform.Platform;
 
 /**
  * This {@link PlanEnumerationPruningStrategy} retains only the best {@link PlanImplementation}s employing a single
  * {@link Platform} only.
  * <p>There is one caveat, though: If for some reason the most efficient way to communicate for two
- * {@link org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator}s from the same {@link Platform} goes over another
+ * {@link org.apache.wayang.core.plan.wayangplan.ExecutionOperator}s from the same {@link Platform} goes over another
  * {@link Platform}, then we will prune the corresponding {@link PlanImplementation}. The more complete way is to
- * look only for non-cross-platform {@link org.apache.incubator.wayang.core.platform.Junction}s. We neglect this issue for now.</p>
+ * look only for non-cross-platform {@link org.apache.wayang.core.platform.Junction}s. We neglect this issue for now.</p>
  */
 @SuppressWarnings("unused")
 public class SinglePlatformPruningStrategy implements PlanEnumerationPruningStrategy {
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/StageAssignmentTraversal.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/StageAssignmentTraversal.java
index cfbb01f..010eea2 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/StageAssignmentTraversal.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/StageAssignmentTraversal.java
@@ -1,21 +1,21 @@
-package org.apache.incubator.wayang.core.optimizer.enumeration;
+package org.apache.wayang.core.optimizer.enumeration;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.core.plan.executionplan.Channel;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionPlan;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionStage;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionStageLoop;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionTask;
-import org.apache.incubator.wayang.core.plan.executionplan.PlatformExecution;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.LoopHeadOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.LoopSubplan;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.platform.Platform;
-import org.apache.incubator.wayang.core.util.Iterators;
-import org.apache.incubator.wayang.core.util.OneTimeExecutable;
-import org.apache.incubator.wayang.core.util.Tuple;
+import org.apache.wayang.core.plan.executionplan.Channel;
+import org.apache.wayang.core.plan.executionplan.ExecutionPlan;
+import org.apache.wayang.core.plan.executionplan.ExecutionStage;
+import org.apache.wayang.core.plan.executionplan.ExecutionStageLoop;
+import org.apache.wayang.core.plan.executionplan.ExecutionTask;
+import org.apache.wayang.core.plan.executionplan.PlatformExecution;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.wayang.core.plan.wayangplan.LoopHeadOperator;
+import org.apache.wayang.core.plan.wayangplan.LoopSubplan;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.platform.Platform;
+import org.apache.wayang.core.util.Iterators;
+import org.apache.wayang.core.util.OneTimeExecutable;
+import org.apache.wayang.core.util.Tuple;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -132,7 +132,7 @@ public class StageAssignmentTraversal extends OneTimeExecutable {
     }
 
     /**
-     * Tells whether the given {@link Channel} lends itself to a {@link org.apache.incubator.wayang.core.platform.Breakpoint}. In
+     * Tells whether the given {@link Channel} lends itself to a {@link org.apache.wayang.core.platform.Breakpoint}. In
      * that case, we might want to split an {@link ExecutionStage} here.
      *
      * @see StageSplittingCriterion#shouldSplit(ExecutionTask, Channel, ExecutionTask)
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/TopKPruningStrategy.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/TopKPruningStrategy.java
index 190ebb2..9bf6868 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/TopKPruningStrategy.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/enumeration/TopKPruningStrategy.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.core.optimizer.enumeration;
+package org.apache.wayang.core.optimizer.enumeration;
 
-import org.apache.incubator.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.Configuration;
 
 import java.util.ArrayList;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/partition/EnumerationAlternative.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/partition/EnumerationAlternative.java
index 3ee40f2..a864221 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/partition/EnumerationAlternative.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/partition/EnumerationAlternative.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.optimizer.partition;
+package org.apache.wayang.core.optimizer.partition;
 
 /**
  * An enumeration alternative is embedded within an {@link EnumerationBranch}.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/partition/EnumerationBranch.java b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/partition/EnumerationBranch.java
index 1476763..a7587de 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/optimizer/partition/EnumerationBranch.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/optimizer/partition/EnumerationBranch.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.core.optimizer.partition;
+package org.apache.wayang.core.optimizer.partition;
 
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionPlan;
-import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.wayang.core.plan.executionplan.ExecutionPlan;
+import org.apache.wayang.core.plan.wayangplan.WayangPlan;
 
 /**
  * An enumeration branch is the basic unit for enumeration, i.e., translation from a {@link WayangPlan} to an
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/Channel.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/Channel.java
index 3e2e649..73394aa 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/Channel.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/Channel.java
@@ -1,18 +1,18 @@
-package org.apache.incubator.wayang.core.plan.executionplan;
-
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
-import org.apache.incubator.wayang.core.plan.wayangplan.Slot;
-import org.apache.incubator.wayang.core.platform.Breakpoint;
-import org.apache.incubator.wayang.core.platform.ChannelDescriptor;
-import org.apache.incubator.wayang.core.platform.ChannelInstance;
-import org.apache.incubator.wayang.core.platform.Executor;
-import org.apache.incubator.wayang.core.platform.Platform;
-import org.apache.incubator.wayang.core.types.DataSetType;
+package org.apache.wayang.core.plan.executionplan;
+
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.wayang.core.plan.wayangplan.Slot;
+import org.apache.wayang.core.platform.Breakpoint;
+import org.apache.wayang.core.platform.ChannelDescriptor;
+import org.apache.wayang.core.platform.ChannelInstance;
+import org.apache.wayang.core.platform.Executor;
+import org.apache.wayang.core.platform.Platform;
+import org.apache.wayang.core.types.DataSetType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/ChannelInitializer.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/ChannelInitializer.java
index 9e1fb1e..c183418 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/ChannelInitializer.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/ChannelInitializer.java
@@ -1,12 +1,12 @@
-package org.apache.incubator.wayang.core.plan.executionplan;
+package org.apache.wayang.core.plan.executionplan;
 
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.platform.ChannelDescriptor;
-import org.apache.incubator.wayang.core.platform.Platform;
-import org.apache.incubator.wayang.core.util.Tuple;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.platform.ChannelDescriptor;
+import org.apache.wayang.core.platform.Platform;
+import org.apache.wayang.core.util.Tuple;
 
 /**
  * Sets up the usage of {@link Channel} in an {@link ExecutionPlan} for a given {@link Platform}.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/ExecutionPlan.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/ExecutionPlan.java
index ca0aa99..282815e 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/ExecutionPlan.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/ExecutionPlan.java
@@ -1,8 +1,8 @@
-package org.apache.incubator.wayang.core.plan.executionplan;
+package org.apache.wayang.core.plan.executionplan;
 
-import org.apache.incubator.wayang.core.optimizer.enumeration.ExecutionTaskFlow;
-import org.apache.incubator.wayang.core.optimizer.enumeration.StageAssignmentTraversal;
-import org.apache.incubator.wayang.core.util.Counter;
+import org.apache.wayang.core.optimizer.enumeration.ExecutionTaskFlow;
+import org.apache.wayang.core.optimizer.enumeration.StageAssignmentTraversal;
+import org.apache.wayang.core.util.Counter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/ExecutionStage.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/ExecutionStage.java
index 9704468..3b674a9 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/ExecutionStage.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/ExecutionStage.java
@@ -1,9 +1,9 @@
-package org.apache.incubator.wayang.core.plan.executionplan;
+package org.apache.wayang.core.plan.executionplan;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.core.plan.wayangplan.LoopHeadOperator;
-import org.apache.incubator.wayang.core.platform.Platform;
-import org.apache.incubator.wayang.core.util.WayangCollections;
+import org.apache.wayang.core.plan.wayangplan.LoopHeadOperator;
+import org.apache.wayang.core.platform.Platform;
+import org.apache.wayang.core.util.WayangCollections;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/ExecutionStageLoop.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/ExecutionStageLoop.java
index e3aadb9..18ddc21 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/ExecutionStageLoop.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/ExecutionStageLoop.java
@@ -1,8 +1,8 @@
-package org.apache.incubator.wayang.core.plan.executionplan;
+package org.apache.wayang.core.plan.executionplan;
 
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.LoopHeadOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.LoopSubplan;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.plan.wayangplan.LoopHeadOperator;
+import org.apache.wayang.core.plan.wayangplan.LoopSubplan;
 
 import java.util.Collection;
 import java.util.HashSet;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/ExecutionTask.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/ExecutionTask.java
index b0b7950..8f2e72d 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/ExecutionTask.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/ExecutionTask.java
@@ -1,12 +1,12 @@
-package org.apache.incubator.wayang.core.plan.executionplan;
-
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
-import org.apache.incubator.wayang.core.platform.ChannelDescriptor;
-import org.apache.incubator.wayang.core.platform.Platform;
+package org.apache.wayang.core.plan.executionplan;
+
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.wayang.core.platform.ChannelDescriptor;
+import org.apache.wayang.core.platform.Platform;
 
 /**
  * Serves as an adapter to include {@link ExecutionOperator}s, which are usually parts of {@link WayangPlan}s, in
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/PlatformExecution.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/PlatformExecution.java
index 003b3d5..ef222d3 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/PlatformExecution.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plan/executionplan/PlatformExecution.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.core.plan.executionplan;
+package org.apache.wayang.core.plan.executionplan;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.core.platform.Platform;
+import org.apache.wayang.core.platform.Platform;
 
 import java.util.Collection;
 import java.util.LinkedList;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/ActualOperator.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/ActualOperator.java
index a207683..b631df1 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/ActualOperator.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/ActualOperator.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.plan.wayangplan;
+package org.apache.wayang.core.plan.wayangplan;
 
 /**
  * Operator free of ambiguities.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/BinaryToUnaryOperator.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/BinaryToUnaryOperator.java
index 76334f8..322c55c 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/BinaryToUnaryOperator.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/BinaryToUnaryOperator.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.core.plan.wayangplan;
+package org.apache.wayang.core.plan.wayangplan;
 
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.core.types.DataSetType;
 
 /**
  * This operator has two inputs and a single output.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/CompositeOperator.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/CompositeOperator.java
index 575a342..7423203 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/CompositeOperator.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/CompositeOperator.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.plan.wayangplan;
+package org.apache.wayang.core.plan.wayangplan;
 
 import java.util.Collection;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/ElementaryOperator.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/ElementaryOperator.java
index 1ee107b..f90f410 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/ElementaryOperator.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/ElementaryOperator.java
@@ -1,8 +1,8 @@
-package org.apache.incubator.wayang.core.plan.wayangplan;
+package org.apache.wayang.core.plan.wayangplan;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator;
 
 import java.util.Optional;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/EstimationContextProperty.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/EstimationContextProperty.java
index 3d652d1..3a431e0 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/EstimationContextProperty.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/EstimationContextProperty.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.core.plan.wayangplan;
+package org.apache.wayang.core.plan.wayangplan;
 
-import org.apache.incubator.wayang.core.optimizer.costs.EstimationContext;
+import org.apache.wayang.core.optimizer.costs.EstimationContext;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/ExecutionOperator.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/ExecutionOperator.java
index 3431c2c..f2da41a 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/ExecutionOperator.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/ExecutionOperator.java
@@ -1,20 +1,20 @@
-package org.apache.incubator.wayang.core.plan.wayangplan;
+package org.apache.wayang.core.plan.wayangplan;
 
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
-import org.apache.incubator.wayang.core.optimizer.costs.LoadProfile;
-import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileEstimator;
-import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileEstimators;
-import org.apache.incubator.wayang.core.plan.executionplan.Channel;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionTask;
-import org.apache.incubator.wayang.core.platform.ChannelDescriptor;
-import org.apache.incubator.wayang.core.platform.ChannelInstance;
-import org.apache.incubator.wayang.core.platform.Executor;
-import org.apache.incubator.wayang.core.platform.Platform;
-import org.apache.incubator.wayang.core.platform.lineage.ExecutionLineageNode;
-import org.apache.incubator.wayang.core.platform.lineage.LazyExecutionLineageNode;
-import org.apache.incubator.wayang.core.util.Tuple;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.wayang.core.optimizer.costs.LoadProfile;
+import org.apache.wayang.core.optimizer.costs.LoadProfileEstimator;
+import org.apache.wayang.core.optimizer.costs.LoadProfileEstimators;
+import org.apache.wayang.core.plan.executionplan.Channel;
+import org.apache.wayang.core.plan.executionplan.ExecutionTask;
+import org.apache.wayang.core.platform.ChannelDescriptor;
+import org.apache.wayang.core.platform.ChannelInstance;
+import org.apache.wayang.core.platform.Executor;
+import org.apache.wayang.core.platform.Platform;
+import org.apache.wayang.core.platform.lineage.ExecutionLineageNode;
+import org.apache.wayang.core.platform.lineage.LazyExecutionLineageNode;
+import org.apache.wayang.core.util.Tuple;
 import org.slf4j.LoggerFactory;
 
 import java.util.Collection;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/InputSlot.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/InputSlot.java
index 1a9942f..88f5d94 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/InputSlot.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/InputSlot.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.core.plan.wayangplan;
+package org.apache.wayang.core.plan.wayangplan;
 
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.core.types.DataSetType;
 
 import java.util.List;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/LoopHeadAlternative.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/LoopHeadAlternative.java
index d64c0f5..f3e585e 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/LoopHeadAlternative.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/LoopHeadAlternative.java
@@ -1,9 +1,9 @@
-package org.apache.incubator.wayang.core.plan.wayangplan;
+package org.apache.wayang.core.plan.wayangplan;
 
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityPusher;
-import org.apache.incubator.wayang.core.optimizer.cardinality.LoopHeadAlternativeCardinalityPusher;
-import org.apache.incubator.wayang.core.util.WayangCollections;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityPusher;
+import org.apache.wayang.core.optimizer.cardinality.LoopHeadAlternativeCardinalityPusher;
+import org.apache.wayang.core.util.WayangCollections;
 
 import java.util.Collection;
 import java.util.Objects;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/LoopHeadOperator.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/LoopHeadOperator.java
index e343ae1..c940030 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/LoopHeadOperator.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/LoopHeadOperator.java
@@ -1,8 +1,8 @@
-package org.apache.incubator.wayang.core.plan.wayangplan;
+package org.apache.wayang.core.plan.wayangplan;
 
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityPusher;
-import org.apache.incubator.wayang.core.optimizer.cardinality.DefaultCardinalityPusher;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityPusher;
+import org.apache.wayang.core.optimizer.cardinality.DefaultCardinalityPusher;
 
 import java.util.Collection;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/LoopIsolator.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/LoopIsolator.java
index 8c5ce38..0e30dfd 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/LoopIsolator.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/LoopIsolator.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.core.plan.wayangplan;
+package org.apache.wayang.core.plan.wayangplan;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.core.util.OneTimeExecutable;
+import org.apache.wayang.core.util.OneTimeExecutable;
 import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/LoopSubplan.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/LoopSubplan.java
index 301e162..9104ace 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/LoopSubplan.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/LoopSubplan.java
@@ -1,9 +1,9 @@
-package org.apache.incubator.wayang.core.plan.wayangplan;
+package org.apache.wayang.core.plan.wayangplan;
 
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityPusher;
-import org.apache.incubator.wayang.core.optimizer.cardinality.LoopSubplanCardinalityPusher;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityPusher;
+import org.apache.wayang.core.optimizer.cardinality.LoopSubplanCardinalityPusher;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/Operator.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/Operator.java
index 935903f..2a0efa9 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/Operator.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/Operator.java
@@ -1,12 +1,12 @@
-package org.apache.incubator.wayang.core.plan.wayangplan;
+package org.apache.wayang.core.plan.wayangplan;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityPusher;
-import org.apache.incubator.wayang.core.optimizer.cardinality.DefaultCardinalityPusher;
-import org.apache.incubator.wayang.core.platform.Platform;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityPusher;
+import org.apache.wayang.core.optimizer.cardinality.DefaultCardinalityPusher;
+import org.apache.wayang.core.platform.Platform;
 
 import java.lang.reflect.Field;
 import java.util.Arrays;
@@ -353,7 +353,7 @@ public interface Operator {
 
     /**
      * Checks whether this instance is not connected to any other instance via its {@link Slot}s. This is a typical
-     * property of instances used for {@link org.apache.incubator.wayang.core.optimizer.channels.ChannelConversion}s.
+     * property of instances used for {@link org.apache.wayang.core.optimizer.channels.ChannelConversion}s.
      *
      * @return whether this instance is unconnected
      */
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/OperatorAlternative.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/OperatorAlternative.java
index a663a32..bc6a519 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/OperatorAlternative.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/OperatorAlternative.java
@@ -1,10 +1,10 @@
-package org.apache.incubator.wayang.core.plan.wayangplan;
+package org.apache.wayang.core.plan.wayangplan;
 
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityPusher;
-import org.apache.incubator.wayang.core.optimizer.cardinality.OperatorAlternativeCardinalityPusher;
-import org.apache.incubator.wayang.core.util.WayangCollections;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityPusher;
+import org.apache.wayang.core.optimizer.cardinality.OperatorAlternativeCardinalityPusher;
+import org.apache.wayang.core.util.WayangCollections;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/OperatorBase.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/OperatorBase.java
index 57665d2..a349d2f 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/OperatorBase.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/OperatorBase.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.plan.wayangplan;
+package org.apache.wayang.core.plan.wayangplan;
 
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
@@ -9,17 +9,17 @@ import com.google.gson.JsonParseException;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.core.function.FlatMapDescriptor;
-import org.apache.incubator.wayang.core.function.FunctionDescriptor;
-import org.apache.incubator.wayang.core.function.PredicateDescriptor;
-import org.apache.incubator.wayang.core.function.ReduceDescriptor;
-import org.apache.incubator.wayang.core.function.TransformationDescriptor;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
-import org.apache.incubator.wayang.core.platform.Platform;
-import org.apache.incubator.wayang.core.types.DataSetType;
-import org.apache.incubator.wayang.core.util.Tuple;
+import org.apache.wayang.core.function.FlatMapDescriptor;
+import org.apache.wayang.core.function.FunctionDescriptor;
+import org.apache.wayang.core.function.PredicateDescriptor;
+import org.apache.wayang.core.function.ReduceDescriptor;
+import org.apache.wayang.core.function.TransformationDescriptor;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.wayang.core.platform.Platform;
+import org.apache.wayang.core.types.DataSetType;
+import org.apache.wayang.core.util.Tuple;
 
 import java.lang.reflect.Type;
 import java.util.Arrays;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/OperatorContainer.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/OperatorContainer.java
index 1d3ddc1..ae7b2f4 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/OperatorContainer.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/OperatorContainer.java
@@ -1,8 +1,8 @@
-package org.apache.incubator.wayang.core.plan.wayangplan;
+package org.apache.wayang.core.plan.wayangplan;
 
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
-import org.apache.incubator.wayang.core.util.WayangCollections;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.wayang.core.util.WayangCollections;
 import org.slf4j.LoggerFactory;
 
 import java.util.Collection;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/OperatorContainers.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/OperatorContainers.java
index c29ad3d..b61aff8 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/OperatorContainers.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/OperatorContainers.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.plan.wayangplan;
+package org.apache.wayang.core.plan.wayangplan;
 
 import org.apache.commons.lang3.Validate;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/Operators.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/Operators.java
index f77f5ff..9952d5d 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/Operators.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/Operators.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.plan.wayangplan;
+package org.apache.wayang.core.plan.wayangplan;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/OutputSlot.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/OutputSlot.java
index e824f0d..1619423 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/OutputSlot.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/OutputSlot.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.core.plan.wayangplan;
+package org.apache.wayang.core.plan.wayangplan;
 
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.core.types.DataSetType;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/PlanMetrics.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/PlanMetrics.java
index 6938bf4..b32e5e1 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/PlanMetrics.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/PlanMetrics.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.plan.wayangplan;
+package org.apache.wayang.core.plan.wayangplan;
 
 import de.hpi.isg.profiledb.store.model.Measurement;
 import de.hpi.isg.profiledb.store.model.Type;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/PlanTraversal.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/PlanTraversal.java
index 7e77e4b..0c618f1 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/PlanTraversal.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/PlanTraversal.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.plan.wayangplan;
+package org.apache.wayang.core.plan.wayangplan;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/Slot.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/Slot.java
index f4f39e7..3d45915 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/Slot.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/Slot.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.core.plan.wayangplan;
+package org.apache.wayang.core.plan.wayangplan;
 
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.wayang.core.types.DataSetType;
 
 import java.util.Collection;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/SlotMapping.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/SlotMapping.java
index 13f41d2..fc337ef 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/SlotMapping.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/SlotMapping.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.core.plan.wayangplan;
+package org.apache.wayang.core.plan.wayangplan;
 
-import org.apache.incubator.wayang.core.util.WayangCollections;
+import org.apache.wayang.core.util.WayangCollections;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/Subplan.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/Subplan.java
index ce73590..bbfc235 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/Subplan.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/Subplan.java
@@ -1,10 +1,10 @@
-package org.apache.incubator.wayang.core.plan.wayangplan;
+package org.apache.wayang.core.plan.wayangplan;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityPusher;
-import org.apache.incubator.wayang.core.optimizer.cardinality.SubplanCardinalityPusher;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityPusher;
+import org.apache.wayang.core.optimizer.cardinality.SubplanCardinalityPusher;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/TopDownPlanVisitor.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/TopDownPlanVisitor.java
index 72b19f5..e24a4b1 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/TopDownPlanVisitor.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/TopDownPlanVisitor.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.plan.wayangplan;
+package org.apache.wayang.core.plan.wayangplan;
 
 import java.util.Optional;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/UnarySink.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/UnarySink.java
index bf0f2cb..54e8669 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/UnarySink.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/UnarySink.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.core.plan.wayangplan;
+package org.apache.wayang.core.plan.wayangplan;
 
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.core.types.DataSetType;
 
 /**
  * Abstract base-class for sinks with a single input.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/UnarySource.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/UnarySource.java
index eb9f10b..0e9cccb 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/UnarySource.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/UnarySource.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.core.plan.wayangplan;
+package org.apache.wayang.core.plan.wayangplan;
 
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.core.types.DataSetType;
 
 /**
  * Abstract base class for sources with a single output.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/UnaryToUnaryOperator.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/UnaryToUnaryOperator.java
index e48d292..5d56c29 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/UnaryToUnaryOperator.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/UnaryToUnaryOperator.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.core.plan.wayangplan;
+package org.apache.wayang.core.plan.wayangplan;
 
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.core.types.DataSetType;
 
 /**
  * This operator has a single input and a single output.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/WayangPlan.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/WayangPlan.java
index 546f24e..a1f36c6 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/WayangPlan.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/WayangPlan.java
@@ -1,10 +1,10 @@
-package org.apache.incubator.wayang.core.plan.wayangplan;
+package org.apache.wayang.core.plan.wayangplan;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.core.api.exception.WayangException;
-import org.apache.incubator.wayang.core.mapping.PlanTransformation;
-import org.apache.incubator.wayang.core.optimizer.SanityChecker;
-import org.apache.incubator.wayang.core.util.WayangCollections;
+import org.apache.wayang.core.api.exception.WayangException;
+import org.apache.wayang.core.mapping.PlanTransformation;
+import org.apache.wayang.core.optimizer.SanityChecker;
+import org.apache.wayang.core.util.WayangCollections;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/traversal/AbstractTopologicalTraversal.java b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/traversal/AbstractTopologicalTraversal.java
index 574bd70..b0e6ca1 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/traversal/AbstractTopologicalTraversal.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plan/wayangplan/traversal/AbstractTopologicalTraversal.java
@@ -1,10 +1,10 @@
-package org.apache.incubator.wayang.core.plan.wayangplan.traversal;
+package org.apache.wayang.core.plan.wayangplan.traversal;
 
-import org.apache.incubator.wayang.core.api.exception.WayangException;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.wayang.core.api.exception.WayangException;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.plan.wayangplan.WayangPlan;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/platform/AbstractChannelInstance.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/AbstractChannelInstance.java
index 63380eb..f6ac148 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/platform/AbstractChannelInstance.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/platform/AbstractChannelInstance.java
@@ -1,9 +1,9 @@
-package org.apache.incubator.wayang.core.platform;
+package org.apache.wayang.core.platform;
 
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionTask;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
-import org.apache.incubator.wayang.core.platform.lineage.ChannelLineageNode;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.plan.executionplan.ExecutionTask;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.platform.lineage.ChannelLineageNode;
 import org.slf4j.LoggerFactory;
 
 import java.util.OptionalLong;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/platform/AtomicExecution.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/AtomicExecution.java
index 8d7507f..9e1633b 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/platform/AtomicExecution.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/platform/AtomicExecution.java
@@ -1,16 +1,16 @@
-package org.apache.incubator.wayang.core.platform;
+package org.apache.wayang.core.platform;
 
 import org.apache.commons.lang3.SerializationException;
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.costs.ConstantLoadProfileEstimator;
-import org.apache.incubator.wayang.core.optimizer.costs.EstimationContext;
-import org.apache.incubator.wayang.core.optimizer.costs.LoadProfile;
-import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileEstimator;
-import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileEstimators;
-import org.apache.incubator.wayang.core.util.JsonSerializables;
-import org.apache.incubator.wayang.core.util.JsonSerializer;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.costs.ConstantLoadProfileEstimator;
+import org.apache.wayang.core.optimizer.costs.EstimationContext;
+import org.apache.wayang.core.optimizer.costs.LoadProfile;
+import org.apache.wayang.core.optimizer.costs.LoadProfileEstimator;
+import org.apache.wayang.core.optimizer.costs.LoadProfileEstimators;
+import org.apache.wayang.core.util.JsonSerializables;
+import org.apache.wayang.core.util.JsonSerializer;
 
 /**
  * An atomic execution describes the smallest work unit considered by Wayang's cost model.
@@ -42,7 +42,7 @@ public class AtomicExecution {
     }
 
     /**
-     * This {@link JsonSerializer} stores the given instances via their {@link org.apache.incubator.wayang.core.api.Configuration}
+     * This {@link JsonSerializer} stores the given instances via their {@link org.apache.wayang.core.api.Configuration}
      * key, if any, or else by the {@link LoadProfile} that they estimate.
      */
     public static class KeyOrLoadSerializer implements JsonSerializer<AtomicExecution> {
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/platform/AtomicExecutionGroup.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/AtomicExecutionGroup.java
index 7541504..8940f14 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/platform/AtomicExecutionGroup.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/platform/AtomicExecutionGroup.java
@@ -1,14 +1,14 @@
-package org.apache.incubator.wayang.core.platform;
+package org.apache.wayang.core.platform;
 
 import org.json.JSONObject;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.costs.EstimationContext;
-import org.apache.incubator.wayang.core.optimizer.costs.LoadProfile;
-import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileToTimeConverter;
-import org.apache.incubator.wayang.core.optimizer.costs.SimpleEstimationContext;
-import org.apache.incubator.wayang.core.optimizer.costs.TimeEstimate;
-import org.apache.incubator.wayang.core.util.JsonSerializables;
-import org.apache.incubator.wayang.core.util.JsonSerializer;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.costs.EstimationContext;
+import org.apache.wayang.core.optimizer.costs.LoadProfile;
+import org.apache.wayang.core.optimizer.costs.LoadProfileToTimeConverter;
+import org.apache.wayang.core.optimizer.costs.SimpleEstimationContext;
+import org.apache.wayang.core.optimizer.costs.TimeEstimate;
+import org.apache.wayang.core.util.JsonSerializables;
+import org.apache.wayang.core.util.JsonSerializer;
 
 import java.util.Collection;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/platform/Breakpoint.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/Breakpoint.java
index f5962b4..549f240 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/platform/Breakpoint.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/platform/Breakpoint.java
@@ -1,8 +1,8 @@
-package org.apache.incubator.wayang.core.platform;
+package org.apache.wayang.core.platform;
 
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionPlan;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionStage;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.plan.executionplan.ExecutionPlan;
+import org.apache.wayang.core.plan.executionplan.ExecutionStage;
 
 /**
  * Describes when to interrupt the execution of an {@link ExecutionPlan}.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/platform/CardinalityBreakpoint.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/CardinalityBreakpoint.java
index f2ae6d5..0668e26 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/platform/CardinalityBreakpoint.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/platform/CardinalityBreakpoint.java
@@ -1,14 +1,14 @@
-package org.apache.incubator.wayang.core.platform;
+package org.apache.wayang.core.platform;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
-import org.apache.incubator.wayang.core.plan.executionplan.Channel;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionStage;
-import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.Slot;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.wayang.core.plan.executionplan.Channel;
+import org.apache.wayang.core.plan.executionplan.ExecutionStage;
+import org.apache.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.plan.wayangplan.Slot;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/platform/ChannelDescriptor.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/ChannelDescriptor.java
index fcd7a25..d93219a 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/platform/ChannelDescriptor.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/platform/ChannelDescriptor.java
@@ -1,9 +1,9 @@
-package org.apache.incubator.wayang.core.platform;
+package org.apache.wayang.core.platform;
 
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.plan.executionplan.Channel;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionStage;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.plan.executionplan.Channel;
+import org.apache.wayang.core.plan.executionplan.ExecutionStage;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
 
 import java.lang.reflect.Constructor;
 import java.util.Objects;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/platform/ChannelInstance.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/ChannelInstance.java
index 48e1ba7..ae311b7 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/platform/ChannelInstance.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/platform/ChannelInstance.java
@@ -1,9 +1,9 @@
-package org.apache.incubator.wayang.core.platform;
+package org.apache.wayang.core.platform;
 
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.plan.executionplan.Channel;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
-import org.apache.incubator.wayang.core.platform.lineage.ChannelLineageNode;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.plan.executionplan.Channel;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.platform.lineage.ChannelLineageNode;
 
 import java.util.OptionalLong;
 
@@ -40,7 +40,7 @@ public interface ChannelInstance extends ExecutionResource {
 
     /**
      * Provides a {@link ChannelLineageNode} that keeps around (at least) all non-executed predecessor
-     * {@link ChannelInstance}s and {@link org.apache.incubator.wayang.core.optimizer.OptimizationContext.OperatorContext}s.
+     * {@link ChannelInstance}s and {@link org.apache.wayang.core.optimizer.OptimizationContext.OperatorContext}s.
      *
      * @return the {@link ChannelLineageNode}
      */
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/platform/CompositeExecutionResource.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/CompositeExecutionResource.java
index ce9a841..1b8181e 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/platform/CompositeExecutionResource.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/platform/CompositeExecutionResource.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.platform;
+package org.apache.wayang.core.platform;
 
 /**
  * {@link ExecutionResource} that itself contains {@link ExecutionResource}s.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/platform/ConjunctiveBreakpoint.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/ConjunctiveBreakpoint.java
index 6d6ea8b..87b0cd1 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/platform/ConjunctiveBreakpoint.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/platform/ConjunctiveBreakpoint.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.core.platform;
+package org.apache.wayang.core.platform;
 
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionStage;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.plan.executionplan.ExecutionStage;
 
 import java.util.Arrays;
 import java.util.LinkedList;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/platform/CrossPlatformExecutor.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/CrossPlatformExecutor.java
index 95aeae6..ac14a15 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/platform/CrossPlatformExecutor.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/platform/CrossPlatformExecutor.java
@@ -1,20 +1,20 @@
-package org.apache.incubator.wayang.core.platform;
-
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.api.Job;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.plan.executionplan.Channel;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionPlan;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionStage;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionStageLoop;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionTask;
-import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.LoopHeadOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.LoopSubplan;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.profiling.InstrumentationStrategy;
-import org.apache.incubator.wayang.core.util.AbstractReferenceCountable;
-import org.apache.incubator.wayang.core.util.Formats;
+package org.apache.wayang.core.platform;
+
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.Job;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.plan.executionplan.Channel;
+import org.apache.wayang.core.plan.executionplan.ExecutionPlan;
+import org.apache.wayang.core.plan.executionplan.ExecutionStage;
+import org.apache.wayang.core.plan.executionplan.ExecutionStageLoop;
+import org.apache.wayang.core.plan.executionplan.ExecutionTask;
+import org.apache.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.wayang.core.plan.wayangplan.LoopHeadOperator;
+import org.apache.wayang.core.plan.wayangplan.LoopSubplan;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.profiling.InstrumentationStrategy;
+import org.apache.wayang.core.util.AbstractReferenceCountable;
+import org.apache.wayang.core.util.Formats;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/platform/ExecutionResource.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/ExecutionResource.java
index c785b3b..4f258dd 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/platform/ExecutionResource.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/platform/ExecutionResource.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.core.platform;
+package org.apache.wayang.core.platform;
 
-import org.apache.incubator.wayang.core.api.exception.WayangException;
-import org.apache.incubator.wayang.core.util.ReferenceCountable;
+import org.apache.wayang.core.api.exception.WayangException;
+import org.apache.wayang.core.util.ReferenceCountable;
 
 /**
  * Represents a resource allocated for execution that needs to be released manually.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/platform/ExecutionResourceTemplate.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/ExecutionResourceTemplate.java
index 09d3faf..440023c 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/platform/ExecutionResourceTemplate.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/platform/ExecutionResourceTemplate.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.core.platform;
+package org.apache.wayang.core.platform;
 
-import org.apache.incubator.wayang.core.api.exception.WayangException;
-import org.apache.incubator.wayang.core.util.AbstractReferenceCountable;
+import org.apache.wayang.core.api.exception.WayangException;
+import org.apache.wayang.core.util.AbstractReferenceCountable;
 
 /**
  * Implements various functionalities of an {@link ExecutionResource}.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/platform/ExecutionState.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/ExecutionState.java
index ab8ff65..7aeb77d 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/platform/ExecutionState.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/platform/ExecutionState.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.core.platform;
+package org.apache.wayang.core.platform;
 
-import org.apache.incubator.wayang.core.optimizer.enumeration.ExecutionTaskFlow;
-import org.apache.incubator.wayang.core.plan.executionplan.Channel;
+import org.apache.wayang.core.optimizer.enumeration.ExecutionTaskFlow;
+import org.apache.wayang.core.plan.executionplan.Channel;
 
 import java.util.Collection;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/platform/Executor.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/Executor.java
index 50fa291..ce8b4f9 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/platform/Executor.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/platform/Executor.java
@@ -1,9 +1,9 @@
-package org.apache.incubator.wayang.core.platform;
+package org.apache.wayang.core.platform;
 
-import org.apache.incubator.wayang.core.api.Job;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionStage;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.api.Job;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.plan.executionplan.ExecutionStage;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
 
 /**
  * An executor executes {@link ExecutionOperator}s.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/platform/ExecutorTemplate.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/ExecutorTemplate.java
index d088167..f5bffbc 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/platform/ExecutorTemplate.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/platform/ExecutorTemplate.java
@@ -1,12 +1,12 @@
-package org.apache.incubator.wayang.core.platform;
-
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
-import org.apache.incubator.wayang.core.plan.executionplan.Channel;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionStageLoop;
-import org.apache.incubator.wayang.core.platform.lineage.ExecutionLineageNode;
-import org.apache.incubator.wayang.core.util.AbstractReferenceCountable;
+package org.apache.wayang.core.platform;
+
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.wayang.core.plan.executionplan.Channel;
+import org.apache.wayang.core.plan.executionplan.ExecutionStageLoop;
+import org.apache.wayang.core.platform.lineage.ExecutionLineageNode;
+import org.apache.wayang.core.util.AbstractReferenceCountable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/platform/FixBreakpoint.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/FixBreakpoint.java
index db2feda..f090372 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/platform/FixBreakpoint.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/platform/FixBreakpoint.java
@@ -1,8 +1,8 @@
-package org.apache.incubator.wayang.core.platform;
+package org.apache.wayang.core.platform;
 
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionPlan;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionStage;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.plan.executionplan.ExecutionPlan;
+import org.apache.wayang.core.plan.executionplan.ExecutionStage;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/platform/Junction.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/Junction.java
index 98dc5fe..4001854 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/platform/Junction.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/platform/Junction.java
@@ -1,14 +1,14 @@
-package org.apache.incubator.wayang.core.platform;
-
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
-import org.apache.incubator.wayang.core.optimizer.costs.TimeEstimate;
-import org.apache.incubator.wayang.core.plan.executionplan.Channel;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionTask;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.util.WayangCollections;
+package org.apache.wayang.core.platform;
+
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.wayang.core.optimizer.costs.TimeEstimate;
+import org.apache.wayang.core.plan.executionplan.Channel;
+import org.apache.wayang.core.plan.executionplan.ExecutionTask;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.util.WayangCollections;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/platform/NoIterationBreakpoint.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/NoIterationBreakpoint.java
index 866d9e8..cfcee18 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/platform/NoIterationBreakpoint.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/platform/NoIterationBreakpoint.java
@@ -1,8 +1,8 @@
-package org.apache.incubator.wayang.core.platform;
+package org.apache.wayang.core.platform;
 
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionStage;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionStageLoop;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.plan.executionplan.ExecutionStage;
+import org.apache.wayang.core.plan.executionplan.ExecutionStageLoop;
 
 /**
  * This {@link Breakpoint} implementation always requests a break unless inside of {@link ExecutionStageLoop}s.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/platform/PartialExecution.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/PartialExecution.java
index bbcf3ce..d4b3a67 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/platform/PartialExecution.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/platform/PartialExecution.java
@@ -1,16 +1,16 @@
-package org.apache.incubator.wayang.core.platform;
+package org.apache.wayang.core.platform;
 
 import org.json.JSONObject;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.ProbabilisticDoubleInterval;
-import org.apache.incubator.wayang.core.optimizer.costs.EstimationContext;
-import org.apache.incubator.wayang.core.optimizer.costs.TimeEstimate;
-import org.apache.incubator.wayang.core.optimizer.costs.TimeToCostConverter;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
-import org.apache.incubator.wayang.core.platform.lineage.ExecutionLineageNode;
-import org.apache.incubator.wayang.core.util.JsonSerializables;
-import org.apache.incubator.wayang.core.util.JsonSerializer;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.optimizer.ProbabilisticDoubleInterval;
+import org.apache.wayang.core.optimizer.costs.EstimationContext;
+import org.apache.wayang.core.optimizer.costs.TimeEstimate;
+import org.apache.wayang.core.optimizer.costs.TimeToCostConverter;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.platform.lineage.ExecutionLineageNode;
+import org.apache.wayang.core.util.JsonSerializables;
+import org.apache.wayang.core.util.JsonSerializer;
 
 import java.util.Collection;
 import java.util.LinkedList;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/platform/Platform.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/Platform.java
index ea8bd95..4624da9 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/platform/Platform.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/platform/Platform.java
@@ -1,18 +1,18 @@
-package org.apache.incubator.wayang.core.platform;
+package org.apache.wayang.core.platform;
 
 import org.json.JSONObject;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.api.Job;
-import org.apache.incubator.wayang.core.api.exception.WayangException;
-import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileToTimeConverter;
-import org.apache.incubator.wayang.core.optimizer.costs.TimeToCostConverter;
-import org.apache.incubator.wayang.core.plan.executionplan.Channel;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionTask;
-import org.apache.incubator.wayang.core.plan.executionplan.PlatformExecution;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
-import org.apache.incubator.wayang.core.util.JsonSerializables;
-import org.apache.incubator.wayang.core.util.JsonSerializer;
-import org.apache.incubator.wayang.core.util.ReflectionUtils;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.Job;
+import org.apache.wayang.core.api.exception.WayangException;
+import org.apache.wayang.core.optimizer.costs.LoadProfileToTimeConverter;
+import org.apache.wayang.core.optimizer.costs.TimeToCostConverter;
+import org.apache.wayang.core.plan.executionplan.Channel;
+import org.apache.wayang.core.plan.executionplan.ExecutionTask;
+import org.apache.wayang.core.plan.executionplan.PlatformExecution;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.util.JsonSerializables;
+import org.apache.wayang.core.util.JsonSerializer;
+import org.apache.wayang.core.util.ReflectionUtils;
 
 /**
  * A platform describes an execution engine that executes {@link ExecutionOperator}s.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/platform/PushExecutorTemplate.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/PushExecutorTemplate.java
index 005598e..e66b798 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/platform/PushExecutorTemplate.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/platform/PushExecutorTemplate.java
@@ -1,16 +1,16 @@
-package org.apache.incubator.wayang.core.platform;
-
-import org.apache.incubator.wayang.core.api.Job;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.plan.executionplan.Channel;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionStage;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionTask;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.LoopHeadOperator;
-import org.apache.incubator.wayang.core.util.OneTimeExecutable;
-import org.apache.incubator.wayang.core.util.WayangCollections;
-import org.apache.incubator.wayang.core.util.Tuple;
+package org.apache.wayang.core.platform;
+
+import org.apache.wayang.core.api.Job;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.plan.executionplan.Channel;
+import org.apache.wayang.core.plan.executionplan.ExecutionStage;
+import org.apache.wayang.core.plan.executionplan.ExecutionTask;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.wayang.core.plan.wayangplan.LoopHeadOperator;
+import org.apache.wayang.core.util.OneTimeExecutable;
+import org.apache.wayang.core.util.WayangCollections;
+import org.apache.wayang.core.util.Tuple;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/platform/lineage/ChannelLineageNode.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/lineage/ChannelLineageNode.java
index 9067f1f..cb0c19b 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/platform/lineage/ChannelLineageNode.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/platform/lineage/ChannelLineageNode.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.core.platform.lineage;
+package org.apache.wayang.core.platform.lineage;
 
-import org.apache.incubator.wayang.core.platform.ChannelInstance;
+import org.apache.wayang.core.platform.ChannelInstance;
 
 /**
  * Encapsulates a {@link ChannelInstance} in the lazy execution lineage.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/platform/lineage/ExecutionLineageNode.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/lineage/ExecutionLineageNode.java
index 2d6f9cd..902c43f 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/platform/lineage/ExecutionLineageNode.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/platform/lineage/ExecutionLineageNode.java
@@ -1,9 +1,9 @@
-package org.apache.incubator.wayang.core.platform.lineage;
+package org.apache.wayang.core.platform.lineage;
 
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileEstimator;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
-import org.apache.incubator.wayang.core.platform.AtomicExecution;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.optimizer.costs.LoadProfileEstimator;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.platform.AtomicExecution;
 
 import java.util.Collection;
 import java.util.LinkedList;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/platform/lineage/LazyExecutionLineageNode.java b/wayang-core/src/main/java/org/apache/wayang/core/platform/lineage/LazyExecutionLineageNode.java
index a64bb8a..4947af1 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/platform/lineage/LazyExecutionLineageNode.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/platform/lineage/LazyExecutionLineageNode.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.core.platform.lineage;
+package org.apache.wayang.core.platform.lineage;
 
-import org.apache.incubator.wayang.core.platform.ChannelInstance;
-import org.apache.incubator.wayang.core.util.Tuple;
+import org.apache.wayang.core.platform.ChannelInstance;
+import org.apache.wayang.core.util.Tuple;
 import org.slf4j.LoggerFactory;
 
 import java.util.Collection;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plugin/DynamicPlugin.java b/wayang-core/src/main/java/org/apache/wayang/core/plugin/DynamicPlugin.java
index 8c953eb..63fe202 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plugin/DynamicPlugin.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plugin/DynamicPlugin.java
@@ -1,14 +1,14 @@
-package org.apache.incubator.wayang.core.plugin;
+package org.apache.wayang.core.plugin;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.api.exception.WayangException;
-import org.apache.incubator.wayang.core.mapping.Mapping;
-import org.apache.incubator.wayang.core.optimizer.channels.ChannelConversion;
-import org.apache.incubator.wayang.core.platform.Platform;
-import org.apache.incubator.wayang.core.util.ReflectionUtils;
-import org.apache.incubator.wayang.core.util.fs.FileSystem;
-import org.apache.incubator.wayang.core.util.fs.FileSystems;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.exception.WayangException;
+import org.apache.wayang.core.mapping.Mapping;
+import org.apache.wayang.core.optimizer.channels.ChannelConversion;
+import org.apache.wayang.core.platform.Platform;
+import org.apache.wayang.core.util.ReflectionUtils;
+import org.apache.wayang.core.util.fs.FileSystem;
+import org.apache.wayang.core.util.fs.FileSystems;
 import org.yaml.snakeyaml.Yaml;
 
 import java.io.IOException;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/plugin/Plugin.java b/wayang-core/src/main/java/org/apache/wayang/core/plugin/Plugin.java
index dfe88d4..e4da914 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/plugin/Plugin.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/plugin/Plugin.java
@@ -1,10 +1,10 @@
-package org.apache.incubator.wayang.core.plugin;
+package org.apache.wayang.core.plugin;
 
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.api.WayangContext;
-import org.apache.incubator.wayang.core.mapping.Mapping;
-import org.apache.incubator.wayang.core.optimizer.channels.ChannelConversion;
-import org.apache.incubator.wayang.core.platform.Platform;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.WayangContext;
+import org.apache.wayang.core.mapping.Mapping;
+import org.apache.wayang.core.optimizer.channels.ChannelConversion;
+import org.apache.wayang.core.platform.Platform;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/profiling/CardinalityRepository.java b/wayang-core/src/main/java/org/apache/wayang/core/profiling/CardinalityRepository.java
index 87795bd..c6e0e62 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/profiling/CardinalityRepository.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/profiling/CardinalityRepository.java
@@ -1,18 +1,18 @@
-package org.apache.incubator.wayang.core.profiling;
+package org.apache.wayang.core.profiling;
 
 import org.apache.commons.io.IOUtils;
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.api.exception.WayangException;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
-import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.Slot;
-import org.apache.incubator.wayang.core.platform.CrossPlatformExecutor;
-import org.apache.incubator.wayang.core.platform.ExecutionState;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.exception.WayangException;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.plan.wayangplan.Slot;
+import org.apache.wayang.core.platform.CrossPlatformExecutor;
+import org.apache.wayang.core.platform.ExecutionState;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/profiling/CostMeasurement.java b/wayang-core/src/main/java/org/apache/wayang/core/profiling/CostMeasurement.java
index 07cbe90..21c9836 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/profiling/CostMeasurement.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/profiling/CostMeasurement.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.profiling;
+package org.apache.wayang.core.profiling;
 
 import de.hpi.isg.profiledb.store.model.Measurement;
 import de.hpi.isg.profiledb.store.model.Type;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/profiling/ExecutionLog.java b/wayang-core/src/main/java/org/apache/wayang/core/profiling/ExecutionLog.java
index a92496b..23ceefa 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/profiling/ExecutionLog.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/profiling/ExecutionLog.java
@@ -1,13 +1,13 @@
-package org.apache.incubator.wayang.core.profiling;
+package org.apache.wayang.core.profiling;
 
 import org.apache.commons.io.IOUtils;
 import org.json.JSONObject;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.api.exception.WayangException;
-import org.apache.incubator.wayang.core.platform.CrossPlatformExecutor;
-import org.apache.incubator.wayang.core.platform.PartialExecution;
-import org.apache.incubator.wayang.core.util.JsonSerializables;
-import org.apache.incubator.wayang.core.util.JsonSerializer;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.exception.WayangException;
+import org.apache.wayang.core.platform.CrossPlatformExecutor;
+import org.apache.wayang.core.platform.PartialExecution;
+import org.apache.wayang.core.util.JsonSerializables;
+import org.apache.wayang.core.util.JsonSerializer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/profiling/ExecutionPlanMeasurement.java b/wayang-core/src/main/java/org/apache/wayang/core/profiling/ExecutionPlanMeasurement.java
index 91e413f..a167dc1 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/profiling/ExecutionPlanMeasurement.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/profiling/ExecutionPlanMeasurement.java
@@ -1,11 +1,11 @@
-package org.apache.incubator.wayang.core.profiling;
+package org.apache.wayang.core.profiling;
 
 import de.hpi.isg.profiledb.store.model.Measurement;
 import de.hpi.isg.profiledb.store.model.Type;
-import org.apache.incubator.wayang.core.plan.executionplan.Channel;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionPlan;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionTask;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.plan.executionplan.Channel;
+import org.apache.wayang.core.plan.executionplan.ExecutionPlan;
+import org.apache.wayang.core.plan.executionplan.ExecutionTask;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -208,7 +208,7 @@ public class ExecutionPlanMeasurement extends Measurement {
         private String name;
 
         /**
-         * The name of the {@link org.apache.incubator.wayang.core.platform.Platform} of the {@link ExecutionOperator}.
+         * The name of the {@link org.apache.wayang.core.platform.Platform} of the {@link ExecutionOperator}.
          */
         private String platform;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/profiling/FullInstrumentationStrategy.java b/wayang-core/src/main/java/org/apache/wayang/core/profiling/FullInstrumentationStrategy.java
index 6cafea8..f316fa1 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/profiling/FullInstrumentationStrategy.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/profiling/FullInstrumentationStrategy.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.core.profiling;
+package org.apache.wayang.core.profiling;
 
-import org.apache.incubator.wayang.core.plan.executionplan.Channel;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionStage;
+import org.apache.wayang.core.plan.executionplan.Channel;
+import org.apache.wayang.core.plan.executionplan.ExecutionStage;
 
 import java.util.Arrays;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/profiling/InstrumentationStrategy.java b/wayang-core/src/main/java/org/apache/wayang/core/profiling/InstrumentationStrategy.java
index 0d76930..d3ae331 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/profiling/InstrumentationStrategy.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/profiling/InstrumentationStrategy.java
@@ -1,8 +1,8 @@
-package org.apache.incubator.wayang.core.profiling;
+package org.apache.wayang.core.profiling;
 
-import org.apache.incubator.wayang.core.plan.executionplan.Channel;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionPlan;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionStage;
+import org.apache.wayang.core.plan.executionplan.Channel;
+import org.apache.wayang.core.plan.executionplan.ExecutionPlan;
+import org.apache.wayang.core.plan.executionplan.ExecutionStage;
 
 /**
  * Determines, which {@link Channel}s in an {@link ExecutionPlan} should be instrumented.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/profiling/NoInstrumentationStrategy.java b/wayang-core/src/main/java/org/apache/wayang/core/profiling/NoInstrumentationStrategy.java
index e8bf96d..c3f7ac8 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/profiling/NoInstrumentationStrategy.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/profiling/NoInstrumentationStrategy.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.core.profiling;
+package org.apache.wayang.core.profiling;
 
-import org.apache.incubator.wayang.core.plan.executionplan.Channel;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionStage;
+import org.apache.wayang.core.plan.executionplan.Channel;
+import org.apache.wayang.core.plan.executionplan.ExecutionStage;
 
 /**
  * Instruments only outbound {@link Channel}s.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/profiling/OutboundInstrumentationStrategy.java b/wayang-core/src/main/java/org/apache/wayang/core/profiling/OutboundInstrumentationStrategy.java
index b9e13fb..4677882 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/profiling/OutboundInstrumentationStrategy.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/profiling/OutboundInstrumentationStrategy.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.core.profiling;
+package org.apache.wayang.core.profiling;
 
-import org.apache.incubator.wayang.core.plan.executionplan.Channel;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionStage;
+import org.apache.wayang.core.plan.executionplan.Channel;
+import org.apache.wayang.core.plan.executionplan.ExecutionStage;
 
 /**
  * Instruments only outbound {@link Channel}s.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/profiling/PartialExecutionMeasurement.java b/wayang-core/src/main/java/org/apache/wayang/core/profiling/PartialExecutionMeasurement.java
index 71b21d7..b0ed1e1 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/profiling/PartialExecutionMeasurement.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/profiling/PartialExecutionMeasurement.java
@@ -1,10 +1,10 @@
-package org.apache.incubator.wayang.core.profiling;
+package org.apache.wayang.core.profiling;
 
 import de.hpi.isg.profiledb.store.model.Measurement;
 import de.hpi.isg.profiledb.store.model.Type;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.costs.TimeEstimate;
-import org.apache.incubator.wayang.core.platform.PartialExecution;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.costs.TimeEstimate;
+import org.apache.wayang.core.platform.PartialExecution;
 
 /**
  * This {@link Measurement} adapts a {@link PartialExecutionMeasurement}.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/profiling/ProfileDBs.java b/wayang-core/src/main/java/org/apache/wayang/core/profiling/ProfileDBs.java
index 11df3ca..59426ec 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/profiling/ProfileDBs.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/profiling/ProfileDBs.java
@@ -1,9 +1,9 @@
-package org.apache.incubator.wayang.core.profiling;
+package org.apache.wayang.core.profiling;
 
 import de.hpi.isg.profiledb.ProfileDB;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.plan.wayangplan.OperatorBase;
-import org.apache.incubator.wayang.core.plan.wayangplan.PlanMetrics;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.plan.wayangplan.OperatorBase;
+import org.apache.wayang.core.plan.wayangplan.PlanMetrics;
 
 /**
  * Utilities to work with {@link de.hpi.isg.profiledb.ProfileDB}s.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/types/BasicDataUnitType.java b/wayang-core/src/main/java/org/apache/wayang/core/types/BasicDataUnitType.java
index 629ea50..00ec5e5 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/types/BasicDataUnitType.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/types/BasicDataUnitType.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.types;
+package org.apache.wayang.core.types;
 
 import java.util.Objects;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/types/DataSetType.java b/wayang-core/src/main/java/org/apache/wayang/core/types/DataSetType.java
index 381a6fc..3132330 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/types/DataSetType.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/types/DataSetType.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.core.types;
+package org.apache.wayang.core.types;
 
-import org.apache.incubator.wayang.core.util.ReflectionUtils;
+import org.apache.wayang.core.util.ReflectionUtils;
 
 import java.util.Objects;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/types/DataUnitGroupType.java b/wayang-core/src/main/java/org/apache/wayang/core/types/DataUnitGroupType.java
index 340dad8..8739ab8 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/types/DataUnitGroupType.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/types/DataUnitGroupType.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.core.types;
+package org.apache.wayang.core.types;
 
-import org.apache.incubator.wayang.core.util.ReflectionUtils;
+import org.apache.wayang.core.util.ReflectionUtils;
 
 import java.util.Objects;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/types/DataUnitType.java b/wayang-core/src/main/java/org/apache/wayang/core/types/DataUnitType.java
index 2b5c0c4..ebc360a 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/types/DataUnitType.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/types/DataUnitType.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.types;
+package org.apache.wayang.core.types;
 
 /**
  * The type of data types designate the kind of data that are being passed between operators.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/AbstractReferenceCountable.java b/wayang-core/src/main/java/org/apache/wayang/core/util/AbstractReferenceCountable.java
index 2a564c8..f45d4f4 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/AbstractReferenceCountable.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/AbstractReferenceCountable.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.util;
+package org.apache.wayang.core.util;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/Action.java b/wayang-core/src/main/java/org/apache/wayang/core/util/Action.java
index c17f558..d4942e4 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/Action.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/Action.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.util;
+package org.apache.wayang.core.util;
 
 import org.slf4j.LoggerFactory;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/Actions.java b/wayang-core/src/main/java/org/apache/wayang/core/util/Actions.java
index 5f5485f..ead17b0 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/Actions.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/Actions.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.util;
+package org.apache.wayang.core.util;
 
 /**
  * Utilities to perform actions.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/Bitmask.java b/wayang-core/src/main/java/org/apache/wayang/core/util/Bitmask.java
index 939df8b..52e3105 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/Bitmask.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/Bitmask.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.util;
+package org.apache.wayang.core.util;
 
 import java.util.NoSuchElementException;
 import java.util.PrimitiveIterator;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/Canonicalizer.java b/wayang-core/src/main/java/org/apache/wayang/core/util/Canonicalizer.java
index b9bc14e..fdfa431 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/Canonicalizer.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/Canonicalizer.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.util;
+package org.apache.wayang.core.util;
 
 import java.util.Collection;
 import java.util.HashMap;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/ConsumerIteratorAdapter.java b/wayang-core/src/main/java/org/apache/wayang/core/util/ConsumerIteratorAdapter.java
index 3108146..ec8f62d 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/ConsumerIteratorAdapter.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/ConsumerIteratorAdapter.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.util;
+package org.apache.wayang.core.util;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/Copyable.java b/wayang-core/src/main/java/org/apache/wayang/core/util/Copyable.java
index 06d89f1..0064a39 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/Copyable.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/Copyable.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.util;
+package org.apache.wayang.core.util;
 
 /**
  * Implementing objects must be able to provide copies of themselves.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/Counter.java b/wayang-core/src/main/java/org/apache/wayang/core/util/Counter.java
index 8cf2ccb..fec6161 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/Counter.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/Counter.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.util;
+package org.apache.wayang.core.util;
 
 import java.util.HashMap;
 import java.util.Iterator;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/CrossProductIterable.java b/wayang-core/src/main/java/org/apache/wayang/core/util/CrossProductIterable.java
index fda9ae0..cde789f 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/CrossProductIterable.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/CrossProductIterable.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.util;
+package org.apache.wayang.core.util;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/Formats.java b/wayang-core/src/main/java/org/apache/wayang/core/util/Formats.java
index 000dc8d..2821640 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/Formats.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/Formats.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.util;
+package org.apache.wayang.core.util;
 
 /**
  * Formats different general purpose objects.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/Iterators.java b/wayang-core/src/main/java/org/apache/wayang/core/util/Iterators.java
index 73f1919..06d4726 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/Iterators.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/Iterators.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.util;
+package org.apache.wayang.core.util;
 
 import java.util.Iterator;
 import java.util.function.Predicate;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/JsonSerializable.java b/wayang-core/src/main/java/org/apache/wayang/core/util/JsonSerializable.java
index a627c89..aab2010 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/JsonSerializable.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/JsonSerializable.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.core.util;
+package org.apache.wayang.core.util;
 
 import org.json.JSONObject;
-import org.apache.incubator.wayang.core.api.exception.WayangException;
+import org.apache.wayang.core.api.exception.WayangException;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/JsonSerializables.java b/wayang-core/src/main/java/org/apache/wayang/core/util/JsonSerializables.java
index cb31dec..fa2f139 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/JsonSerializables.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/JsonSerializables.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.util;
+package org.apache.wayang.core.util;
 
 import org.apache.commons.lang3.SerializationException;
 import org.json.JSONArray;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/JsonSerializer.java b/wayang-core/src/main/java/org/apache/wayang/core/util/JsonSerializer.java
index 6d6c9ac..c0ddbbd 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/JsonSerializer.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/JsonSerializer.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.util;
+package org.apache.wayang.core.util;
 
 import org.apache.commons.lang3.SerializationException;
 import org.json.JSONObject;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/JuelUtils.java b/wayang-core/src/main/java/org/apache/wayang/core/util/JuelUtils.java
index f48fc06..443559d 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/JuelUtils.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/JuelUtils.java
@@ -1,10 +1,10 @@
-package org.apache.incubator.wayang.core.util;
+package org.apache.wayang.core.util;
 
 import de.odysseus.el.ExpressionFactoryImpl;
 import de.odysseus.el.TreeValueExpression;
 import de.odysseus.el.util.SimpleContext;
-import org.apache.incubator.wayang.core.api.exception.WayangException;
-import org.apache.incubator.wayang.core.optimizer.OptimizationUtils;
+import org.apache.wayang.core.api.exception.WayangException;
+import org.apache.wayang.core.optimizer.OptimizationUtils;
 import org.slf4j.LoggerFactory;
 
 import javax.el.ValueExpression;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/LimitedInputStream.java b/wayang-core/src/main/java/org/apache/wayang/core/util/LimitedInputStream.java
index d8bf4ab..48189f6 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/LimitedInputStream.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/LimitedInputStream.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.util;
+package org.apache.wayang.core.util;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/Logging.java b/wayang-core/src/main/java/org/apache/wayang/core/util/Logging.java
index 77cb064..adff2f9 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/Logging.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/Logging.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.util;
+package org.apache.wayang.core.util;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/LruCache.java b/wayang-core/src/main/java/org/apache/wayang/core/util/LruCache.java
index b7a0469..d6d0789 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/LruCache.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/LruCache.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.util;
+package org.apache.wayang.core.util;
 
 import org.apache.commons.lang3.Validate;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/MultiMap.java b/wayang-core/src/main/java/org/apache/wayang/core/util/MultiMap.java
index 6b2c9ef..8c757fc 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/MultiMap.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/MultiMap.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.util;
+package org.apache.wayang.core.util;
 
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/OneTimeExecutable.java b/wayang-core/src/main/java/org/apache/wayang/core/util/OneTimeExecutable.java
index 68da300..4cf8980 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/OneTimeExecutable.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/OneTimeExecutable.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.util;
+package org.apache.wayang.core.util;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/Optional.java b/wayang-core/src/main/java/org/apache/wayang/core/util/Optional.java
index 4461e69..b2d38e8 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/Optional.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/Optional.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.util;
+package org.apache.wayang.core.util;
 
 import java.util.stream.Stream;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/ReferenceCountable.java b/wayang-core/src/main/java/org/apache/wayang/core/util/ReferenceCountable.java
index b4a5759..b50ef90 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/ReferenceCountable.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/ReferenceCountable.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.util;
+package org.apache.wayang.core.util;
 
 /**
  * This interface provides a reference-counting scheme, e.g., to manage allocated external resources. The initial
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/ReflectionUtils.java b/wayang-core/src/main/java/org/apache/wayang/core/util/ReflectionUtils.java
index 2664972..99fd519 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/ReflectionUtils.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/ReflectionUtils.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.core.util;
+package org.apache.wayang.core.util;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.core.api.exception.WayangException;
+import org.apache.wayang.core.api.exception.WayangException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/Tuple.java b/wayang-core/src/main/java/org/apache/wayang/core/util/Tuple.java
index bceacea..f0321f5 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/Tuple.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/Tuple.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.util;
+package org.apache.wayang.core.util;
 
 import java.util.Objects;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/WayangArrays.java b/wayang-core/src/main/java/org/apache/wayang/core/util/WayangArrays.java
index 670700c..30ef6fc 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/WayangArrays.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/WayangArrays.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.util;
+package org.apache.wayang.core.util;
 
 import java.util.Arrays;
 import java.util.BitSet;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/WayangCollections.java b/wayang-core/src/main/java/org/apache/wayang/core/util/WayangCollections.java
index 5720c66..964476f 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/WayangCollections.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/WayangCollections.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.util;
+package org.apache.wayang.core.util;
 
 import org.apache.commons.lang3.Validate;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/fs/FileSystem.java b/wayang-core/src/main/java/org/apache/wayang/core/util/fs/FileSystem.java
index dd40ddc..ddcd042 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/fs/FileSystem.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/fs/FileSystem.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.util.fs;
+package org.apache.wayang.core.util.fs;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/fs/FileSystems.java b/wayang-core/src/main/java/org/apache/wayang/core/util/fs/FileSystems.java
index 72a983e..2f5ca3c 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/fs/FileSystems.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/fs/FileSystems.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.core.util.fs;
+package org.apache.wayang.core.util.fs;
 
-import org.apache.incubator.wayang.core.api.exception.WayangException;
-import org.apache.incubator.wayang.core.util.LruCache;
+import org.apache.wayang.core.api.exception.WayangException;
+import org.apache.wayang.core.util.LruCache;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/fs/FileUtils.java b/wayang-core/src/main/java/org/apache/wayang/core/util/fs/FileUtils.java
index e8ab3a8..0112f52 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/fs/FileUtils.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/fs/FileUtils.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.core.util.fs;
+package org.apache.wayang.core.util.fs;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.incubator.wayang.core.api.exception.WayangException;
+import org.apache.wayang.core.api.exception.WayangException;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/fs/HadoopFileSystem.java b/wayang-core/src/main/java/org/apache/wayang/core/util/fs/HadoopFileSystem.java
index 6fac339..32349c0 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/fs/HadoopFileSystem.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/fs/HadoopFileSystem.java
@@ -1,10 +1,10 @@
-package org.apache.incubator.wayang.core.util.fs;
+package org.apache.wayang.core.util.fs;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FsUrlStreamHandlerFactory;
 import org.apache.hadoop.fs.Path;
-import org.apache.incubator.wayang.core.api.exception.WayangException;
+import org.apache.wayang.core.api.exception.WayangException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/fs/LocalFileSystem.java b/wayang-core/src/main/java/org/apache/wayang/core/util/fs/LocalFileSystem.java
index ef0c9c8..7945ec3 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/fs/LocalFileSystem.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/fs/LocalFileSystem.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.core.util.fs;
+package org.apache.wayang.core.util.fs;
 
-import org.apache.incubator.wayang.core.api.exception.WayangException;
+import org.apache.wayang.core.api.exception.WayangException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/Context.java b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/Context.java
index 3de8be2..c196d10 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/Context.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/Context.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.core.util.mathex;
+package org.apache.wayang.core.util.mathex;
 
-import org.apache.incubator.wayang.core.util.mathex.exceptions.EvaluationException;
+import org.apache.wayang.core.util.mathex.exceptions.EvaluationException;
 
 import java.util.function.ToDoubleFunction;
 
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/DefaultContext.java b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/DefaultContext.java
index f0ea4e9..f59ec2b 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/DefaultContext.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/DefaultContext.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.core.util.mathex;
+package org.apache.wayang.core.util.mathex;
 
-import org.apache.incubator.wayang.core.util.mathex.exceptions.EvaluationException;
+import org.apache.wayang.core.util.mathex.exceptions.EvaluationException;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/Expression.java b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/Expression.java
index 5b1573a..3c62be2 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/Expression.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/Expression.java
@@ -1,8 +1,8 @@
-package org.apache.incubator.wayang.core.util.mathex;
+package org.apache.wayang.core.util.mathex;
 
 
-import org.apache.incubator.wayang.core.util.mathex.exceptions.EvaluationException;
-import org.apache.incubator.wayang.core.util.mathex.model.Constant;
+import org.apache.wayang.core.util.mathex.exceptions.EvaluationException;
+import org.apache.wayang.core.util.mathex.model.Constant;
 
 /**
  * A mathematical expression that can be evaluated.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/ExpressionBuilder.java b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/ExpressionBuilder.java
index 1b32310..0f5ed9c 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/ExpressionBuilder.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/ExpressionBuilder.java
@@ -1,19 +1,19 @@
-package org.apache.incubator.wayang.core.util.mathex;
+package org.apache.wayang.core.util.mathex;
 
 import org.antlr.v4.runtime.ANTLRInputStream;
 import org.antlr.v4.runtime.BaseErrorListener;
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.antlr.v4.runtime.RecognitionException;
 import org.antlr.v4.runtime.Recognizer;
-import org.apache.incubator.wayang.core.mathex.MathExBaseVisitor;
-import org.apache.incubator.wayang.core.mathex.MathExLexer;
-import org.apache.incubator.wayang.core.mathex.MathExParser;
-import org.apache.incubator.wayang.core.util.mathex.exceptions.ParseException;
-import org.apache.incubator.wayang.core.util.mathex.model.BinaryOperation;
-import org.apache.incubator.wayang.core.util.mathex.model.Constant;
-import org.apache.incubator.wayang.core.util.mathex.model.NamedFunction;
-import org.apache.incubator.wayang.core.util.mathex.model.UnaryOperation;
-import org.apache.incubator.wayang.core.util.mathex.model.Variable;
+import org.apache.wayang.core.mathex.MathExBaseVisitor;
+import org.apache.wayang.core.mathex.MathExLexer;
+import org.apache.wayang.core.mathex.MathExParser;
+import org.apache.wayang.core.util.mathex.exceptions.ParseException;
+import org.apache.wayang.core.util.mathex.model.BinaryOperation;
+import org.apache.wayang.core.util.mathex.model.Constant;
+import org.apache.wayang.core.util.mathex.model.NamedFunction;
+import org.apache.wayang.core.util.mathex.model.UnaryOperation;
+import org.apache.wayang.core.util.mathex.model.Variable;
 
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/exceptions/EvaluationException.java b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/exceptions/EvaluationException.java
index d7c821f..d7a928f 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/exceptions/EvaluationException.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/exceptions/EvaluationException.java
@@ -1,8 +1,8 @@
-package org.apache.incubator.wayang.core.util.mathex.exceptions;
+package org.apache.wayang.core.util.mathex.exceptions;
 
 
-import org.apache.incubator.wayang.core.util.mathex.Context;
-import org.apache.incubator.wayang.core.util.mathex.Expression;
+import org.apache.wayang.core.util.mathex.Context;
+import org.apache.wayang.core.util.mathex.Expression;
 
 /**
  * This exception signals a failed {@link Expression} evaluation.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/exceptions/MathExException.java b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/exceptions/MathExException.java
index 7af2138..8f28826 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/exceptions/MathExException.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/exceptions/MathExException.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.core.util.mathex.exceptions;
+package org.apache.wayang.core.util.mathex.exceptions;
 
-import org.apache.incubator.wayang.core.util.mathex.Context;
-import org.apache.incubator.wayang.core.util.mathex.Expression;
+import org.apache.wayang.core.util.mathex.Context;
+import org.apache.wayang.core.util.mathex.Expression;
 
 /**
  * This exception signals a failed {@link Expression} evaluation.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/exceptions/ParseException.java b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/exceptions/ParseException.java
index c9b11da..bf31ad3 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/exceptions/ParseException.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/exceptions/ParseException.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.core.util.mathex.exceptions;
+package org.apache.wayang.core.util.mathex.exceptions;
 
-import org.apache.incubator.wayang.core.util.mathex.Context;
-import org.apache.incubator.wayang.core.util.mathex.Expression;
+import org.apache.wayang.core.util.mathex.Context;
+import org.apache.wayang.core.util.mathex.Expression;
 
 /**
  * This exception signals a failed {@link Expression} evaluation.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/model/BinaryOperation.java b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/model/BinaryOperation.java
index c0aeb03..a93935d 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/model/BinaryOperation.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/model/BinaryOperation.java
@@ -1,9 +1,9 @@
-package org.apache.incubator.wayang.core.util.mathex.model;
+package org.apache.wayang.core.util.mathex.model;
 
 
-import org.apache.incubator.wayang.core.util.mathex.Context;
-import org.apache.incubator.wayang.core.util.mathex.Expression;
-import org.apache.incubator.wayang.core.util.mathex.exceptions.EvaluationException;
+import org.apache.wayang.core.util.mathex.Context;
+import org.apache.wayang.core.util.mathex.Expression;
+import org.apache.wayang.core.util.mathex.exceptions.EvaluationException;
 
 /**
  * An operation {@link Expression}.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/model/CompiledFunction.java b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/model/CompiledFunction.java
index 406d097..9ab835b 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/model/CompiledFunction.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/model/CompiledFunction.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.core.util.mathex.model;
+package org.apache.wayang.core.util.mathex.model;
 
-import org.apache.incubator.wayang.core.util.mathex.Context;
-import org.apache.incubator.wayang.core.util.mathex.Expression;
+import org.apache.wayang.core.util.mathex.Context;
+import org.apache.wayang.core.util.mathex.Expression;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/model/Constant.java b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/model/Constant.java
index af35662..5f317f1 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/model/Constant.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/model/Constant.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.core.util.mathex.model;
+package org.apache.wayang.core.util.mathex.model;
 
-import org.apache.incubator.wayang.core.util.mathex.Context;
-import org.apache.incubator.wayang.core.util.mathex.Expression;
+import org.apache.wayang.core.util.mathex.Context;
+import org.apache.wayang.core.util.mathex.Expression;
 
 /**
  * A constant {@link Expression}.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/model/NamedFunction.java b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/model/NamedFunction.java
index 87e38a5..f623f9b 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/model/NamedFunction.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/model/NamedFunction.java
@@ -1,8 +1,8 @@
-package org.apache.incubator.wayang.core.util.mathex.model;
+package org.apache.wayang.core.util.mathex.model;
 
-import org.apache.incubator.wayang.core.util.mathex.Context;
-import org.apache.incubator.wayang.core.util.mathex.Expression;
-import org.apache.incubator.wayang.core.util.mathex.exceptions.EvaluationException;
+import org.apache.wayang.core.util.mathex.Context;
+import org.apache.wayang.core.util.mathex.Expression;
+import org.apache.wayang.core.util.mathex.exceptions.EvaluationException;
 
 import java.util.List;
 import java.util.function.ToDoubleFunction;
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/model/UnaryOperation.java b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/model/UnaryOperation.java
index a76bc53..5d70028 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/model/UnaryOperation.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/model/UnaryOperation.java
@@ -1,8 +1,8 @@
-package org.apache.incubator.wayang.core.util.mathex.model;
+package org.apache.wayang.core.util.mathex.model;
 
-import org.apache.incubator.wayang.core.util.mathex.Context;
-import org.apache.incubator.wayang.core.util.mathex.Expression;
-import org.apache.incubator.wayang.core.util.mathex.exceptions.EvaluationException;
+import org.apache.wayang.core.util.mathex.Context;
+import org.apache.wayang.core.util.mathex.Expression;
+import org.apache.wayang.core.util.mathex.exceptions.EvaluationException;
 
 /**
  * An operation {@link Expression}.
diff --git a/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/model/Variable.java b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/model/Variable.java
index 7c85b16..5bc62d5 100644
--- a/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/model/Variable.java
+++ b/wayang-core/src/main/java/org/apache/wayang/core/util/mathex/model/Variable.java
@@ -1,8 +1,8 @@
-package org.apache.incubator.wayang.core.util.mathex.model;
+package org.apache.wayang.core.util.mathex.model;
 
 
-import org.apache.incubator.wayang.core.util.mathex.Context;
-import org.apache.incubator.wayang.core.util.mathex.Expression;
+import org.apache.wayang.core.util.mathex.Context;
+import org.apache.wayang.core.util.mathex.Expression;
 
 /**
  * A variable {@link Expression}
diff --git a/wayang-core/src/main/resources/wayang-core-defaults.properties b/wayang-core/src/main/resources/wayang-core-defaults.properties
index a6ec552..21749d0 100644
--- a/wayang-core/src/main/resources/wayang-core-defaults.properties
+++ b/wayang-core/src/main/resources/wayang-core-defaults.properties
@@ -1,9 +1,9 @@
 # Configure plan enumeration pruning.
-wayang.core.optimizer.pruning.strategies = org.apache.incubator.wayang.core.optimizer.enumeration.LatentOperatorPruningStrategy
-# wayang.core.optimizer.pruning.strategies = org.apache.incubator.wayang.core.optimizer.enumeration.TopKPruningStrategy
+wayang.core.optimizer.pruning.strategies = org.apache.wayang.core.optimizer.enumeration.LatentOperatorPruningStrategy
+# wayang.core.optimizer.pruning.strategies = org.apache.wayang.core.optimizer.enumeration.TopKPruningStrategy
 # wayang.core.optimizer.pruning.topk = 5
-# wayang.core.optimizer.channels.selection = org.apache.incubator.wayang.core.optimizer.channels.ChannelConversionGraph$CostbasedTreeSelectionStrategy
-# wayang.core.optimizer.instrumentation = org.apache.incubator.wayang.core.profiling.OutboundInstrumentationStrategy
+# wayang.core.optimizer.channels.selection = org.apache.wayang.core.optimizer.channels.ChannelConversionGraph$CostbasedTreeSelectionStrategy
+# wayang.core.optimizer.instrumentation = org.apache.wayang.core.profiling.OutboundInstrumentationStrategy
 wayang.core.optimizer.enumeration.concatenationprio = plans2
 wayang.core.optimizer.enumeration.invertconcatenations = false
 wayang.core.optimizer.enumeration.branchesfirst = false
@@ -21,7 +21,7 @@ wayang.core.optimizer.cardinality.spreadsmoothing = 10000
 wayang.core.optimizer.cardinality.minconfidence = 0.5
 
 # Settings for aggressive re-optimization.
-#wayang.core.optimizer.instrumentation = org.apache.incubator.wayang.core.profiling.FullInstrumentationStrategy
+#wayang.core.optimizer.instrumentation = org.apache.wayang.core.profiling.FullInstrumentationStrategy
 #wayang.core.optimizer.reoptimize = true
 #wayang.core.optimizer.reoptimize.proactive = true
 #wayang.core.optimizer.cardinality.maxspread = 1
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/SlotTest.java b/wayang-core/src/test/java/org/apache/wayang/core/SlotTest.java
index c381196..b99a4f2 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/SlotTest.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/SlotTest.java
@@ -1,12 +1,12 @@
-package org.apache.incubator.wayang.core;
+package org.apache.wayang.core;
 
 import org.junit.Test;
-import org.apache.incubator.wayang.core.plan.wayangplan.Slot;
-import org.apache.incubator.wayang.core.plan.wayangplan.test.TestSink;
-import org.apache.incubator.wayang.core.plan.wayangplan.test.TestSource;
-import org.apache.incubator.wayang.core.test.TestDataUnit;
-import org.apache.incubator.wayang.core.test.TestDataUnit2;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.core.plan.wayangplan.Slot;
+import org.apache.wayang.core.plan.wayangplan.test.TestSink;
+import org.apache.wayang.core.plan.wayangplan.test.TestSource;
+import org.apache.wayang.core.test.TestDataUnit;
+import org.apache.wayang.core.test.TestDataUnit2;
+import org.apache.wayang.core.types.DataSetType;
 
 /**
  * Test suite for {@link Slot}s.
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/mapping/OperatorPatternTest.java b/wayang-core/src/test/java/org/apache/wayang/core/mapping/OperatorPatternTest.java
index 14b140f..61fa6c2 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/mapping/OperatorPatternTest.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/mapping/OperatorPatternTest.java
@@ -1,8 +1,8 @@
-package org.apache.incubator.wayang.core.mapping;
+package org.apache.wayang.core.mapping;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.apache.incubator.wayang.core.test.DummyExecutionOperator;
+import org.apache.wayang.core.test.DummyExecutionOperator;
 
 /**
  * Tests for {@link OperatorPattern}.
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/mapping/PlanTransformationTest.java b/wayang-core/src/test/java/org/apache/wayang/core/mapping/PlanTransformationTest.java
index 0d165c1..c2ce303 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/mapping/PlanTransformationTest.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/mapping/PlanTransformationTest.java
@@ -1,21 +1,21 @@
-package org.apache.incubator.wayang.core.mapping;
+package org.apache.wayang.core.mapping;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.apache.incubator.wayang.core.mapping.test.TestSinkToTestSink2Factory;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.plan.wayangplan.OperatorAlternative;
-import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
-import org.apache.incubator.wayang.core.plan.wayangplan.UnarySink;
-import org.apache.incubator.wayang.core.plan.wayangplan.UnarySource;
-import org.apache.incubator.wayang.core.plan.wayangplan.test.TestSink;
-import org.apache.incubator.wayang.core.plan.wayangplan.test.TestSink2;
-import org.apache.incubator.wayang.core.plan.wayangplan.test.TestSource;
-import org.apache.incubator.wayang.core.test.TestDataUnit;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.core.mapping.test.TestSinkToTestSink2Factory;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.plan.wayangplan.OperatorAlternative;
+import org.apache.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.wayang.core.plan.wayangplan.UnarySink;
+import org.apache.wayang.core.plan.wayangplan.UnarySource;
+import org.apache.wayang.core.plan.wayangplan.test.TestSink;
+import org.apache.wayang.core.plan.wayangplan.test.TestSink2;
+import org.apache.wayang.core.plan.wayangplan.test.TestSource;
+import org.apache.wayang.core.test.TestDataUnit;
+import org.apache.wayang.core.types.DataSetType;
 
 /**
- * Test suite for the {@link org.apache.incubator.wayang.core.mapping.PlanTransformation} class.
+ * Test suite for the {@link org.apache.wayang.core.mapping.PlanTransformation} class.
  */
 public class PlanTransformationTest {
 
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/mapping/SubplanPatternTest.java b/wayang-core/src/test/java/org/apache/wayang/core/mapping/SubplanPatternTest.java
index 2aa756b..d4bf5d4 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/mapping/SubplanPatternTest.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/mapping/SubplanPatternTest.java
@@ -1,15 +1,15 @@
-package org.apache.incubator.wayang.core.mapping;
+package org.apache.wayang.core.mapping;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.plan.wayangplan.WayangPlan;
-import org.apache.incubator.wayang.core.plan.wayangplan.UnarySink;
-import org.apache.incubator.wayang.core.plan.wayangplan.UnarySource;
-import org.apache.incubator.wayang.core.plan.wayangplan.test.TestSink;
-import org.apache.incubator.wayang.core.plan.wayangplan.test.TestSource;
-import org.apache.incubator.wayang.core.test.TestDataUnit;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.plan.wayangplan.WayangPlan;
+import org.apache.wayang.core.plan.wayangplan.UnarySink;
+import org.apache.wayang.core.plan.wayangplan.UnarySource;
+import org.apache.wayang.core.plan.wayangplan.test.TestSink;
+import org.apache.wayang.core.plan.wayangplan.test.TestSource;
+import org.apache.wayang.core.test.TestDataUnit;
+import org.apache.wayang.core.types.DataSetType;
 
 import java.util.List;
 
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/mapping/test/TestSinkMapping.java b/wayang-core/src/test/java/org/apache/wayang/core/mapping/test/TestSinkMapping.java
index f32abd5..422ef7d 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/mapping/test/TestSinkMapping.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/mapping/test/TestSinkMapping.java
@@ -1,14 +1,14 @@
-package org.apache.incubator.wayang.core.mapping.test;
-
-import org.apache.incubator.wayang.core.mapping.Mapping;
-import org.apache.incubator.wayang.core.mapping.OperatorPattern;
-import org.apache.incubator.wayang.core.mapping.PlanTransformation;
-import org.apache.incubator.wayang.core.mapping.ReplacementSubplanFactory;
-import org.apache.incubator.wayang.core.mapping.SubplanPattern;
-import org.apache.incubator.wayang.core.plan.wayangplan.test.TestSink;
-import org.apache.incubator.wayang.core.plan.wayangplan.test.TestSink2;
-import org.apache.incubator.wayang.core.test.DummyPlatform;
-import org.apache.incubator.wayang.core.types.DataSetType;
+package org.apache.wayang.core.mapping.test;
+
+import org.apache.wayang.core.mapping.Mapping;
+import org.apache.wayang.core.mapping.OperatorPattern;
+import org.apache.wayang.core.mapping.PlanTransformation;
+import org.apache.wayang.core.mapping.ReplacementSubplanFactory;
+import org.apache.wayang.core.mapping.SubplanPattern;
+import org.apache.wayang.core.plan.wayangplan.test.TestSink;
+import org.apache.wayang.core.plan.wayangplan.test.TestSink2;
+import org.apache.wayang.core.test.DummyPlatform;
+import org.apache.wayang.core.types.DataSetType;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/mapping/test/TestSinkToTestSink2Factory.java b/wayang-core/src/test/java/org/apache/wayang/core/mapping/test/TestSinkToTestSink2Factory.java
index 8e0c402..36f13c4 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/mapping/test/TestSinkToTestSink2Factory.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/mapping/test/TestSinkToTestSink2Factory.java
@@ -1,11 +1,11 @@
-package org.apache.incubator.wayang.core.mapping.test;
+package org.apache.wayang.core.mapping.test;
 
-import org.apache.incubator.wayang.core.mapping.OperatorMatch;
-import org.apache.incubator.wayang.core.mapping.ReplacementSubplanFactory;
-import org.apache.incubator.wayang.core.mapping.SubplanMatch;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.plan.wayangplan.test.TestSink;
-import org.apache.incubator.wayang.core.plan.wayangplan.test.TestSink2;
+import org.apache.wayang.core.mapping.OperatorMatch;
+import org.apache.wayang.core.mapping.ReplacementSubplanFactory;
+import org.apache.wayang.core.mapping.SubplanMatch;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.plan.wayangplan.test.TestSink;
+import org.apache.wayang.core.plan.wayangplan.test.TestSink2;
 
 /**
  * This factory replaces a {@link TestSink} by a
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/optimizer/cardinality/AggregatingCardinalityEstimatorTest.java b/wayang-core/src/test/java/org/apache/wayang/core/optimizer/cardinality/AggregatingCardinalityEstimatorTest.java
index 49dcd45..2952bc9 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/optimizer/cardinality/AggregatingCardinalityEstimatorTest.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/optimizer/cardinality/AggregatingCardinalityEstimatorTest.java
@@ -1,9 +1,9 @@
-package org.apache.incubator.wayang.core.optimizer.cardinality;
+package org.apache.wayang.core.optimizer.cardinality;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.OptimizationContext;
 
 import java.util.Arrays;
 
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/optimizer/cardinality/DefaultCardinalityEstimatorTest.java b/wayang-core/src/test/java/org/apache/wayang/core/optimizer/cardinality/DefaultCardinalityEstimatorTest.java
index 8665397..125906c 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/optimizer/cardinality/DefaultCardinalityEstimatorTest.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/optimizer/cardinality/DefaultCardinalityEstimatorTest.java
@@ -1,9 +1,9 @@
-package org.apache.incubator.wayang.core.optimizer.cardinality;
+package org.apache.wayang.core.optimizer.cardinality;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.OptimizationContext;
 
 import java.util.function.ToLongFunction;
 
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/optimizer/cardinality/LoopSubplanCardinalityPusherTest.java b/wayang-core/src/test/java/org/apache/wayang/core/optimizer/cardinality/LoopSubplanCardinalityPusherTest.java
index 73c33a5..d9f8e8c 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/optimizer/cardinality/LoopSubplanCardinalityPusherTest.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/optimizer/cardinality/LoopSubplanCardinalityPusherTest.java
@@ -1,25 +1,25 @@
-package org.apache.incubator.wayang.core.optimizer.cardinality;
+package org.apache.wayang.core.optimizer.cardinality;
 
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.api.Job;
-import org.apache.incubator.wayang.core.api.configuration.FunctionalKeyValueProvider;
-import org.apache.incubator.wayang.core.api.configuration.KeyValueProvider;
-import org.apache.incubator.wayang.core.optimizer.DefaultOptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.plan.wayangplan.ElementaryOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.LoopIsolator;
-import org.apache.incubator.wayang.core.plan.wayangplan.LoopSubplan;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.test.TestFilterOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.test.TestJoin;
-import org.apache.incubator.wayang.core.plan.wayangplan.test.TestLoopHead;
-import org.apache.incubator.wayang.core.plan.wayangplan.test.TestSource;
-import org.apache.incubator.wayang.core.test.MockFactory;
-import org.apache.incubator.wayang.core.util.WayangCollections;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.Job;
+import org.apache.wayang.core.api.configuration.FunctionalKeyValueProvider;
+import org.apache.wayang.core.api.configuration.KeyValueProvider;
+import org.apache.wayang.core.optimizer.DefaultOptimizationContext;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.plan.wayangplan.ElementaryOperator;
+import org.apache.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.wayang.core.plan.wayangplan.LoopIsolator;
+import org.apache.wayang.core.plan.wayangplan.LoopSubplan;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.plan.wayangplan.test.TestFilterOperator;
+import org.apache.wayang.core.plan.wayangplan.test.TestJoin;
+import org.apache.wayang.core.plan.wayangplan.test.TestLoopHead;
+import org.apache.wayang.core.plan.wayangplan.test.TestSource;
+import org.apache.wayang.core.test.MockFactory;
+import org.apache.wayang.core.util.WayangCollections;
 
 /**
  * Test suite for {@link LoopSubplanCardinalityPusher}.
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/optimizer/cardinality/SubplanCardinalityPusherTest.java b/wayang-core/src/test/java/org/apache/wayang/core/optimizer/cardinality/SubplanCardinalityPusherTest.java
index f4fdaf7..4851318 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/optimizer/cardinality/SubplanCardinalityPusherTest.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/optimizer/cardinality/SubplanCardinalityPusherTest.java
@@ -1,22 +1,22 @@
-package org.apache.incubator.wayang.core.optimizer.cardinality;
+package org.apache.wayang.core.optimizer.cardinality;
 
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.api.Job;
-import org.apache.incubator.wayang.core.api.configuration.FunctionalKeyValueProvider;
-import org.apache.incubator.wayang.core.api.configuration.KeyValueProvider;
-import org.apache.incubator.wayang.core.optimizer.DefaultOptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.plan.wayangplan.ElementaryOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.Subplan;
-import org.apache.incubator.wayang.core.plan.wayangplan.test.TestJoin;
-import org.apache.incubator.wayang.core.plan.wayangplan.test.TestMapOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.test.TestSource;
-import org.apache.incubator.wayang.core.test.MockFactory;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.Job;
+import org.apache.wayang.core.api.configuration.FunctionalKeyValueProvider;
+import org.apache.wayang.core.api.configuration.KeyValueProvider;
+import org.apache.wayang.core.optimizer.DefaultOptimizationContext;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.plan.wayangplan.ElementaryOperator;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.plan.wayangplan.Subplan;
+import org.apache.wayang.core.plan.wayangplan.test.TestJoin;
+import org.apache.wayang.core.plan.wayangplan.test.TestMapOperator;
+import org.apache.wayang.core.plan.wayangplan.test.TestSource;
+import org.apache.wayang.core.test.MockFactory;
+import org.apache.wayang.core.types.DataSetType;
 
 /**
  * Test suite for {@link SubplanCardinalityPusher}.
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/optimizer/channels/ChannelConversionGraphTest.java b/wayang-core/src/test/java/org/apache/wayang/core/optimizer/channels/ChannelConversionGraphTest.java
index d7bad08..e35775f 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/optimizer/channels/ChannelConversionGraphTest.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/optimizer/channels/ChannelConversionGraphTest.java
@@ -1,25 +1,25 @@
-package org.apache.incubator.wayang.core.optimizer.channels;
+package org.apache.wayang.core.optimizer.channels;
 
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.api.Job;
-import org.apache.incubator.wayang.core.optimizer.DefaultOptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.OptimizationUtils;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
-import org.apache.incubator.wayang.core.plan.executionplan.Channel;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionTask;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
-import org.apache.incubator.wayang.core.platform.ChannelDescriptor;
-import org.apache.incubator.wayang.core.platform.Junction;
-import org.apache.incubator.wayang.core.test.DummyExecutionOperator;
-import org.apache.incubator.wayang.core.test.DummyExternalReusableChannel;
-import org.apache.incubator.wayang.core.test.DummyNonReusableChannel;
-import org.apache.incubator.wayang.core.test.DummyReusableChannel;
-import org.apache.incubator.wayang.core.test.MockFactory;
-import org.apache.incubator.wayang.core.util.WayangCollections;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.Job;
+import org.apache.wayang.core.optimizer.DefaultOptimizationContext;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.optimizer.OptimizationUtils;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.wayang.core.plan.executionplan.Channel;
+import org.apache.wayang.core.plan.executionplan.ExecutionTask;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.platform.ChannelDescriptor;
+import org.apache.wayang.core.platform.Junction;
+import org.apache.wayang.core.test.DummyExecutionOperator;
+import org.apache.wayang.core.test.DummyExternalReusableChannel;
+import org.apache.wayang.core.test.DummyNonReusableChannel;
+import org.apache.wayang.core.test.DummyReusableChannel;
+import org.apache.wayang.core.test.MockFactory;
+import org.apache.wayang.core.util.WayangCollections;
 
 import java.util.Arrays;
 import java.util.function.Supplier;
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/optimizer/costs/NestableLoadProfileEstimatorTest.java b/wayang-core/src/test/java/org/apache/wayang/core/optimizer/costs/NestableLoadProfileEstimatorTest.java
index 352e04e..f42da6f 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/optimizer/costs/NestableLoadProfileEstimatorTest.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/optimizer/costs/NestableLoadProfileEstimatorTest.java
@@ -1,16 +1,16 @@
-package org.apache.incubator.wayang.core.optimizer.costs;
+package org.apache.wayang.core.optimizer.costs;
 
 import gnu.trove.map.TObjectDoubleMap;
 import gnu.trove.map.hash.TObjectDoubleHashMap;
 import org.junit.Assert;
 import org.junit.Test;
-import org.apache.incubator.wayang.core.optimizer.OptimizationUtils;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
-import org.apache.incubator.wayang.core.platform.ChannelDescriptor;
-import org.apache.incubator.wayang.core.platform.Platform;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.core.optimizer.OptimizationUtils;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
+import org.apache.wayang.core.platform.ChannelDescriptor;
+import org.apache.wayang.core.platform.Platform;
+import org.apache.wayang.core.types.DataSetType;
 
 import java.util.List;
 
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/optimizer/enumeration/StageAssignmentTraversalTest.java b/wayang-core/src/test/java/org/apache/wayang/core/optimizer/enumeration/StageAssignmentTraversalTest.java
index b83fa93..6972506 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/optimizer/enumeration/StageAssignmentTraversalTest.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/optimizer/enumeration/StageAssignmentTraversalTest.java
@@ -1,15 +1,15 @@
-package org.apache.incubator.wayang.core.optimizer.enumeration;
+package org.apache.wayang.core.optimizer.enumeration;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.apache.incubator.wayang.core.plan.executionplan.Channel;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionPlan;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionStage;
-import org.apache.incubator.wayang.core.plan.executionplan.ExecutionTask;
-import org.apache.incubator.wayang.core.plan.executionplan.test.TestChannel;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
-import org.apache.incubator.wayang.core.platform.Platform;
-import org.apache.incubator.wayang.core.test.MockFactory;
+import org.apache.wayang.core.plan.executionplan.Channel;
+import org.apache.wayang.core.plan.executionplan.ExecutionPlan;
+import org.apache.wayang.core.plan.executionplan.ExecutionStage;
+import org.apache.wayang.core.plan.executionplan.ExecutionTask;
+import org.apache.wayang.core.plan.executionplan.test.TestChannel;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.platform.Platform;
+import org.apache.wayang.core.test.MockFactory;
 
 import java.util.Collections;
 
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/plan/executionplan/test/TestChannel.java b/wayang-core/src/test/java/org/apache/wayang/core/plan/executionplan/test/TestChannel.java
index f19f692..1e8bec7 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/plan/executionplan/test/TestChannel.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/plan/executionplan/test/TestChannel.java
@@ -1,10 +1,10 @@
-package org.apache.incubator.wayang.core.plan.executionplan.test;
+package org.apache.wayang.core.plan.executionplan.test;
 
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.plan.executionplan.Channel;
-import org.apache.incubator.wayang.core.platform.ChannelDescriptor;
-import org.apache.incubator.wayang.core.platform.ChannelInstance;
-import org.apache.incubator.wayang.core.platform.Executor;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.plan.executionplan.Channel;
+import org.apache.wayang.core.platform.ChannelDescriptor;
+import org.apache.wayang.core.platform.ChannelInstance;
+import org.apache.wayang.core.platform.Executor;
 
 /**
  * {@link Channel} implementation that can be used for test purposes.
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/LoopIsolatorTest.java b/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/LoopIsolatorTest.java
index 999a88e..78b4923 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/LoopIsolatorTest.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/LoopIsolatorTest.java
@@ -1,11 +1,11 @@
-package org.apache.incubator.wayang.core.plan.wayangplan;
+package org.apache.wayang.core.plan.wayangplan;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.apache.incubator.wayang.core.plan.wayangplan.test.TestLoopHead;
-import org.apache.incubator.wayang.core.plan.wayangplan.test.TestMapOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.test.TestSink;
-import org.apache.incubator.wayang.core.plan.wayangplan.test.TestSource;
+import org.apache.wayang.core.plan.wayangplan.test.TestLoopHead;
+import org.apache.wayang.core.plan.wayangplan.test.TestMapOperator;
+import org.apache.wayang.core.plan.wayangplan.test.TestSink;
+import org.apache.wayang.core.plan.wayangplan.test.TestSource;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/OperatorTest.java b/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/OperatorTest.java
index 054dcfb..400fb06 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/OperatorTest.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/OperatorTest.java
@@ -1,9 +1,9 @@
-package org.apache.incubator.wayang.core.plan.wayangplan;
+package org.apache.wayang.core.plan.wayangplan;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.apache.incubator.wayang.core.util.ReflectionUtils;
-import org.apache.incubator.wayang.core.util.WayangCollections;
+import org.apache.wayang.core.util.ReflectionUtils;
+import org.apache.wayang.core.util.WayangCollections;
 
 import java.util.Collection;
 
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/SlotMappingTest.java b/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/SlotMappingTest.java
index 4a25bc6..7b708bf 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/SlotMappingTest.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/SlotMappingTest.java
@@ -1,10 +1,10 @@
-package org.apache.incubator.wayang.core.plan.wayangplan;
+package org.apache.wayang.core.plan.wayangplan;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.apache.incubator.wayang.core.plan.wayangplan.test.TestSink;
-import org.apache.incubator.wayang.core.plan.wayangplan.test.TestSource;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.core.plan.wayangplan.test.TestSink;
+import org.apache.wayang.core.plan.wayangplan.test.TestSource;
+import org.apache.wayang.core.types.DataSetType;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestCustomMapOperator.java b/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestCustomMapOperator.java
index 1d11cb9..ba47384 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestCustomMapOperator.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestCustomMapOperator.java
@@ -1,8 +1,8 @@
-package org.apache.incubator.wayang.core.plan.wayangplan.test;
+package org.apache.wayang.core.plan.wayangplan.test;
 
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
-import org.apache.incubator.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
+import org.apache.wayang.core.types.DataSetType;
 
 /**
  * Test operator that exposes map-like behavior. Does not provide a {@link CardinalityEstimator}.
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestFilterOperator.java b/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestFilterOperator.java
index 8c8dcdf..7713f5c 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestFilterOperator.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestFilterOperator.java
@@ -1,11 +1,11 @@
-package org.apache.incubator.wayang.core.plan.wayangplan.test;
-
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
-import org.apache.incubator.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
-import org.apache.incubator.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
-import org.apache.incubator.wayang.core.types.DataSetType;
-import org.apache.incubator.wayang.core.types.DataUnitType;
+package org.apache.wayang.core.plan.wayangplan.test;
+
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
+import org.apache.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
+import org.apache.wayang.core.types.DataSetType;
+import org.apache.wayang.core.types.DataUnitType;
 
 import java.util.Optional;
 
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestJoin.java b/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestJoin.java
index 933db80..fde6894 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestJoin.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestJoin.java
@@ -1,16 +1,16 @@
-package org.apache.incubator.wayang.core.plan.wayangplan.test;
-
-
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
-import org.apache.incubator.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
-import org.apache.incubator.wayang.core.plan.wayangplan.BinaryToUnaryOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.ElementaryOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.TopDownPlanVisitor;
-import org.apache.incubator.wayang.core.types.DataSetType;
-import org.apache.incubator.wayang.core.types.DataUnitType;
+package org.apache.wayang.core.plan.wayangplan.test;
+
+
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
+import org.apache.wayang.core.plan.wayangplan.BinaryToUnaryOperator;
+import org.apache.wayang.core.plan.wayangplan.ElementaryOperator;
+import org.apache.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.plan.wayangplan.TopDownPlanVisitor;
+import org.apache.wayang.core.types.DataSetType;
+import org.apache.wayang.core.types.DataUnitType;
 
 import java.util.Optional;
 
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestLoopHead.java b/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestLoopHead.java
index 9ef8f80..569e03e 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestLoopHead.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestLoopHead.java
@@ -1,15 +1,15 @@
-package org.apache.incubator.wayang.core.plan.wayangplan.test;
+package org.apache.wayang.core.plan.wayangplan.test;
 
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
-import org.apache.incubator.wayang.core.optimizer.cardinality.SwitchForwardCardinalityEstimator;
-import org.apache.incubator.wayang.core.plan.wayangplan.ElementaryOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.LoopHeadOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.OperatorBase;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.types.DataSetType;
-import org.apache.incubator.wayang.core.types.DataUnitType;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.wayang.core.optimizer.cardinality.SwitchForwardCardinalityEstimator;
+import org.apache.wayang.core.plan.wayangplan.ElementaryOperator;
+import org.apache.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.wayang.core.plan.wayangplan.LoopHeadOperator;
+import org.apache.wayang.core.plan.wayangplan.OperatorBase;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.types.DataSetType;
+import org.apache.wayang.core.types.DataUnitType;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestMapOperator.java b/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestMapOperator.java
index 8654b51..c2eb4d5 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestMapOperator.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestMapOperator.java
@@ -1,12 +1,12 @@
-package org.apache.incubator.wayang.core.plan.wayangplan.test;
+package org.apache.wayang.core.plan.wayangplan.test;
 
 import org.apache.commons.lang3.Validate;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
-import org.apache.incubator.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
-import org.apache.incubator.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
-import org.apache.incubator.wayang.core.types.DataSetType;
-import org.apache.incubator.wayang.core.types.DataUnitType;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.wayang.core.optimizer.cardinality.DefaultCardinalityEstimator;
+import org.apache.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
+import org.apache.wayang.core.types.DataSetType;
+import org.apache.wayang.core.types.DataUnitType;
 
 import java.util.Optional;
 
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestSink.java b/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestSink.java
index 949088b..c4b410c 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestSink.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestSink.java
@@ -1,10 +1,10 @@
-package org.apache.incubator.wayang.core.plan.wayangplan.test;
+package org.apache.wayang.core.plan.wayangplan.test;
 
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
-import org.apache.incubator.wayang.core.plan.wayangplan.UnarySink;
-import org.apache.incubator.wayang.core.types.DataSetType;
-import org.apache.incubator.wayang.core.types.DataUnitType;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.wayang.core.plan.wayangplan.UnarySink;
+import org.apache.wayang.core.types.DataSetType;
+import org.apache.wayang.core.types.DataUnitType;
 
 import java.util.Optional;
 
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestSink2.java b/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestSink2.java
index 43c10ef..d0357e4 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestSink2.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestSink2.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.core.plan.wayangplan.test;
+package org.apache.wayang.core.plan.wayangplan.test;
 
-import org.apache.incubator.wayang.core.plan.wayangplan.UnarySink;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.core.plan.wayangplan.UnarySink;
+import org.apache.wayang.core.types.DataSetType;
 
 /**
  * Another dummy sink for testing purposes.
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestSource.java b/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestSource.java
index ee326da..fb0dc62 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestSource.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/plan/wayangplan/test/TestSource.java
@@ -1,11 +1,11 @@
-package org.apache.incubator.wayang.core.plan.wayangplan.test;
-
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimator;
-import org.apache.incubator.wayang.core.optimizer.cardinality.FixedSizeCardinalityEstimator;
-import org.apache.incubator.wayang.core.plan.wayangplan.UnarySource;
-import org.apache.incubator.wayang.core.types.DataSetType;
-import org.apache.incubator.wayang.core.types.DataUnitType;
+package org.apache.wayang.core.plan.wayangplan.test;
+
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimator;
+import org.apache.wayang.core.optimizer.cardinality.FixedSizeCardinalityEstimator;
+import org.apache.wayang.core.plan.wayangplan.UnarySource;
+import org.apache.wayang.core.types.DataSetType;
+import org.apache.wayang.core.types.DataUnitType;
 
 import java.util.Optional;
 
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/platform/PartialExecutionTest.java b/wayang-core/src/test/java/org/apache/wayang/core/platform/PartialExecutionTest.java
index f16fd69..5eecf51 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/platform/PartialExecutionTest.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/platform/PartialExecutionTest.java
@@ -1,20 +1,20 @@
-package org.apache.incubator.wayang.core.platform;
+package org.apache.wayang.core.platform;
 
 import org.json.JSONObject;
 import org.junit.Assert;
 import org.junit.Test;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.api.configuration.KeyValueProvider;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.cardinality.CardinalityEstimate;
-import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileEstimator;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
-import org.apache.incubator.wayang.core.platform.lineage.ExecutionLineageNode;
-import org.apache.incubator.wayang.core.test.DummyExecutionOperator;
-import org.apache.incubator.wayang.core.test.DummyPlatform;
-import org.apache.incubator.wayang.core.test.SerializableDummyExecutionOperator;
-import org.apache.incubator.wayang.core.util.JsonSerializables;
-import org.apache.incubator.wayang.core.util.WayangCollections;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.configuration.KeyValueProvider;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.optimizer.cardinality.CardinalityEstimate;
+import org.apache.wayang.core.optimizer.costs.LoadProfileEstimator;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.platform.lineage.ExecutionLineageNode;
+import org.apache.wayang.core.test.DummyExecutionOperator;
+import org.apache.wayang.core.test.DummyPlatform;
+import org.apache.wayang.core.test.SerializableDummyExecutionOperator;
+import org.apache.wayang.core.util.JsonSerializables;
+import org.apache.wayang.core.util.WayangCollections;
 
 import java.util.Arrays;
 
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/plugin/DynamicPluginTest.java b/wayang-core/src/test/java/org/apache/wayang/core/plugin/DynamicPluginTest.java
index 37fae05..95fe9fa 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/plugin/DynamicPluginTest.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/plugin/DynamicPluginTest.java
@@ -1,17 +1,17 @@
-package org.apache.incubator.wayang.core.plugin;
+package org.apache.wayang.core.plugin;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.mapping.Mapping;
-import org.apache.incubator.wayang.core.mapping.test.TestSinkMapping;
-import org.apache.incubator.wayang.core.optimizer.channels.ChannelConversion;
-import org.apache.incubator.wayang.core.optimizer.channels.DefaultChannelConversion;
-import org.apache.incubator.wayang.core.platform.ChannelDescriptor;
-import org.apache.incubator.wayang.core.platform.Platform;
-import org.apache.incubator.wayang.core.test.DummyPlatform;
-import org.apache.incubator.wayang.core.util.ReflectionUtils;
-import org.apache.incubator.wayang.core.util.WayangCollections;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.mapping.Mapping;
+import org.apache.wayang.core.mapping.test.TestSinkMapping;
+import org.apache.wayang.core.optimizer.channels.ChannelConversion;
+import org.apache.wayang.core.optimizer.channels.DefaultChannelConversion;
+import org.apache.wayang.core.platform.ChannelDescriptor;
+import org.apache.wayang.core.platform.Platform;
+import org.apache.wayang.core.test.DummyPlatform;
+import org.apache.wayang.core.util.ReflectionUtils;
+import org.apache.wayang.core.util.WayangCollections;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -55,9 +55,9 @@ public class DynamicPluginTest {
 
         Configuration configuration = new Configuration();
         plugin.setProperties(configuration);
-        Assert.assertEquals(51.3d, configuration.getDoubleProperty("org.apache.incubator.wayang.test.float"), 0.000001);
-        Assert.assertEquals("abcdef", configuration.getStringProperty("org.apache.incubator.wayang.test.string"));
-        Assert.assertEquals(1234567890123456789L, configuration.getLongProperty("org.apache.incubator.wayang.test.long"));
+        Assert.assertEquals(51.3d, configuration.getDoubleProperty("org.apache.wayang.test.float"), 0.000001);
+        Assert.assertEquals("abcdef", configuration.getStringProperty("org.apache.wayang.test.string"));
+        Assert.assertEquals(1234567890123456789L, configuration.getLongProperty("org.apache.wayang.test.long"));
     }
 
     @Test
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/test/DummyExecutionOperator.java b/wayang-core/src/test/java/org/apache/wayang/core/test/DummyExecutionOperator.java
index 3aad123..8feb034 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/test/DummyExecutionOperator.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/test/DummyExecutionOperator.java
@@ -1,12 +1,12 @@
-package org.apache.incubator.wayang.core.test;
-
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.OperatorBase;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.platform.ChannelDescriptor;
-import org.apache.incubator.wayang.core.platform.Platform;
-import org.apache.incubator.wayang.core.types.DataSetType;
+package org.apache.wayang.core.test;
+
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.wayang.core.plan.wayangplan.OperatorBase;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.platform.ChannelDescriptor;
+import org.apache.wayang.core.platform.Platform;
+import org.apache.wayang.core.types.DataSetType;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/test/DummyExternalReusableChannel.java b/wayang-core/src/test/java/org/apache/wayang/core/test/DummyExternalReusableChannel.java
index b519fcd..e91ac5d 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/test/DummyExternalReusableChannel.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/test/DummyExternalReusableChannel.java
@@ -1,11 +1,11 @@
-package org.apache.incubator.wayang.core.test;
+package org.apache.wayang.core.test;
 
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.plan.executionplan.Channel;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.platform.ChannelDescriptor;
-import org.apache.incubator.wayang.core.platform.ChannelInstance;
-import org.apache.incubator.wayang.core.platform.Executor;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.plan.executionplan.Channel;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.platform.ChannelDescriptor;
+import org.apache.wayang.core.platform.ChannelInstance;
+import org.apache.wayang.core.platform.Executor;
 
 /**
  * Dummy {@link Channel}.
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/test/DummyNonReusableChannel.java b/wayang-core/src/test/java/org/apache/wayang/core/test/DummyNonReusableChannel.java
index 6d0dc68..a4c1f78 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/test/DummyNonReusableChannel.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/test/DummyNonReusableChannel.java
@@ -1,11 +1,11 @@
-package org.apache.incubator.wayang.core.test;
+package org.apache.wayang.core.test;
 
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.plan.executionplan.Channel;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.platform.ChannelDescriptor;
-import org.apache.incubator.wayang.core.platform.ChannelInstance;
-import org.apache.incubator.wayang.core.platform.Executor;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.plan.executionplan.Channel;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.platform.ChannelDescriptor;
+import org.apache.wayang.core.platform.ChannelInstance;
+import org.apache.wayang.core.platform.Executor;
 
 /**
  * Dummy {@link Channel}.
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/test/DummyPlatform.java b/wayang-core/src/test/java/org/apache/wayang/core/test/DummyPlatform.java
index a3d8aee..9df82eb 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/test/DummyPlatform.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/test/DummyPlatform.java
@@ -1,12 +1,12 @@
-package org.apache.incubator.wayang.core.test;
-
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.optimizer.costs.LoadProfile;
-import org.apache.incubator.wayang.core.optimizer.costs.LoadProfileToTimeConverter;
-import org.apache.incubator.wayang.core.optimizer.costs.TimeEstimate;
-import org.apache.incubator.wayang.core.optimizer.costs.TimeToCostConverter;
-import org.apache.incubator.wayang.core.platform.Executor;
-import org.apache.incubator.wayang.core.platform.Platform;
+package org.apache.wayang.core.test;
+
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.optimizer.costs.LoadProfile;
+import org.apache.wayang.core.optimizer.costs.LoadProfileToTimeConverter;
+import org.apache.wayang.core.optimizer.costs.TimeEstimate;
+import org.apache.wayang.core.optimizer.costs.TimeToCostConverter;
+import org.apache.wayang.core.platform.Executor;
+import org.apache.wayang.core.platform.Platform;
 
 /**
  * {@link Platform} implementation for test purposes.
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/test/DummyReusableChannel.java b/wayang-core/src/test/java/org/apache/wayang/core/test/DummyReusableChannel.java
index 4cd0101..6bfcd01 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/test/DummyReusableChannel.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/test/DummyReusableChannel.java
@@ -1,11 +1,11 @@
-package org.apache.incubator.wayang.core.test;
+package org.apache.wayang.core.test;
 
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.plan.executionplan.Channel;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.platform.ChannelDescriptor;
-import org.apache.incubator.wayang.core.platform.ChannelInstance;
-import org.apache.incubator.wayang.core.platform.Executor;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.plan.executionplan.Channel;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.platform.ChannelDescriptor;
+import org.apache.wayang.core.platform.ChannelInstance;
+import org.apache.wayang.core.platform.Executor;
 
 /**
  * Dummy {@link Channel}.
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/test/MockFactory.java b/wayang-core/src/test/java/org/apache/wayang/core/test/MockFactory.java
index 9dd8cab..aea6d34 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/test/MockFactory.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/test/MockFactory.java
@@ -1,16 +1,16 @@
-package org.apache.incubator.wayang.core.test;
+package org.apache.wayang.core.test;
 
 import org.mockito.Answers;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.api.Job;
-import org.apache.incubator.wayang.core.optimizer.DefaultOptimizationContext;
-import org.apache.incubator.wayang.core.plan.wayangplan.CompositeOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
-import org.apache.incubator.wayang.core.plan.wayangplan.InputSlot;
-import org.apache.incubator.wayang.core.plan.wayangplan.OperatorContainer;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.platform.Platform;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.Job;
+import org.apache.wayang.core.optimizer.DefaultOptimizationContext;
+import org.apache.wayang.core.plan.wayangplan.CompositeOperator;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.plan.wayangplan.InputSlot;
+import org.apache.wayang.core.plan.wayangplan.OperatorContainer;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.platform.Platform;
+import org.apache.wayang.core.types.DataSetType;
 
 import java.util.Collections;
 
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/test/SerializableDummyExecutionOperator.java b/wayang-core/src/test/java/org/apache/wayang/core/test/SerializableDummyExecutionOperator.java
index 87b3539..1e24127 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/test/SerializableDummyExecutionOperator.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/test/SerializableDummyExecutionOperator.java
@@ -1,8 +1,8 @@
-package org.apache.incubator.wayang.core.test;
+package org.apache.wayang.core.test;
 
 import org.json.JSONObject;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
-import org.apache.incubator.wayang.core.util.JsonSerializable;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.util.JsonSerializable;
 
 /**
  * Dummy {@link ExecutionOperator} for test purposes.
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/test/TestDataUnit.java b/wayang-core/src/test/java/org/apache/wayang/core/test/TestDataUnit.java
index 393ba0f..d3c706f 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/test/TestDataUnit.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/test/TestDataUnit.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.test;
+package org.apache.wayang.core.test;
 
 /**
  * A data unit type for test purposes.
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/test/TestDataUnit2.java b/wayang-core/src/test/java/org/apache/wayang/core/test/TestDataUnit2.java
index 933035a..4ceba99 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/test/TestDataUnit2.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/test/TestDataUnit2.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.test;
+package org.apache.wayang.core.test;
 
 /**
  * Another data unit type for test purposes.
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/util/BitmaskTest.java b/wayang-core/src/test/java/org/apache/wayang/core/util/BitmaskTest.java
index e513086..86fa38a 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/util/BitmaskTest.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/util/BitmaskTest.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.util;
+package org.apache.wayang.core.util;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/util/ConsumerIteratorAdapterTest.java b/wayang-core/src/test/java/org/apache/wayang/core/util/ConsumerIteratorAdapterTest.java
index 360afde..9f9ddd3 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/util/ConsumerIteratorAdapterTest.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/util/ConsumerIteratorAdapterTest.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.util;
+package org.apache.wayang.core.util;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/util/CrossProductIterableTest.java b/wayang-core/src/test/java/org/apache/wayang/core/util/CrossProductIterableTest.java
index c77bf2e..1cf74dc 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/util/CrossProductIterableTest.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/util/CrossProductIterableTest.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.util;
+package org.apache.wayang.core.util;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/util/LimitedInputStreamTest.java b/wayang-core/src/test/java/org/apache/wayang/core/util/LimitedInputStreamTest.java
index ac0e79b..4f5e1ef 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/util/LimitedInputStreamTest.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/util/LimitedInputStreamTest.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.util;
+package org.apache.wayang.core.util;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/util/ReflectionUtilsTest.java b/wayang-core/src/test/java/org/apache/wayang/core/util/ReflectionUtilsTest.java
index ae30b56..3590c5e 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/util/ReflectionUtilsTest.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/util/ReflectionUtilsTest.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.util;
+package org.apache.wayang.core.util;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -28,13 +28,13 @@ public class ReflectionUtilsTest {
 
     @Test
     public void testEvaluateWithStaticVariable() {
-        final Object val = ReflectionUtils.evaluate("org.apache.incubator.wayang.core.util.ReflectionUtilsTest.TEST_INT");
+        final Object val = ReflectionUtils.evaluate("org.apache.wayang.core.util.ReflectionUtilsTest.TEST_INT");
         Assert.assertEquals(42, val);
     }
 
     @Test
     public void testEvaluateWithStaticMethod() {
-        final Object val = ReflectionUtils.evaluate("org.apache.incubator.wayang.core.util.ReflectionUtilsTest.testInt()");
+        final Object val = ReflectionUtils.evaluate("org.apache.wayang.core.util.ReflectionUtilsTest.testInt()");
         Assert.assertEquals(23, val);
     }
 
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/util/WayangCollectionsTest.java b/wayang-core/src/test/java/org/apache/wayang/core/util/WayangCollectionsTest.java
index bec27fc..9ec01cc 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/util/WayangCollectionsTest.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/util/WayangCollectionsTest.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.core.util;
+package org.apache.wayang.core.util;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/util/mathex/ExpressionBuilderTest.java b/wayang-core/src/test/java/org/apache/wayang/core/util/mathex/ExpressionBuilderTest.java
index c33e1ff..60a68e5 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/util/mathex/ExpressionBuilderTest.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/util/mathex/ExpressionBuilderTest.java
@@ -1,9 +1,9 @@
-package org.apache.incubator.wayang.core.util.mathex;
+package org.apache.wayang.core.util.mathex;
 
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.apache.incubator.wayang.core.util.mathex.exceptions.ParseException;
+import org.apache.wayang.core.util.mathex.exceptions.ParseException;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/wayang-core/src/test/java/org/apache/wayang/core/util/mathex/ExpressionTest.java b/wayang-core/src/test/java/org/apache/wayang/core/util/mathex/ExpressionTest.java
index 9e1e0ac..b165c5a 100644
--- a/wayang-core/src/test/java/org/apache/wayang/core/util/mathex/ExpressionTest.java
+++ b/wayang-core/src/test/java/org/apache/wayang/core/util/mathex/ExpressionTest.java
@@ -1,11 +1,11 @@
-package org.apache.incubator.wayang.core.util.mathex;
+package org.apache.wayang.core.util.mathex;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.apache.incubator.wayang.core.util.mathex.exceptions.EvaluationException;
-import org.apache.incubator.wayang.core.util.mathex.model.CompiledFunction;
-import org.apache.incubator.wayang.core.util.mathex.model.Constant;
-import org.apache.incubator.wayang.core.util.mathex.model.NamedFunction;
+import org.apache.wayang.core.util.mathex.exceptions.EvaluationException;
+import org.apache.wayang.core.util.mathex.model.CompiledFunction;
+import org.apache.wayang.core.util.mathex.model.Constant;
+import org.apache.wayang.core.util.mathex.model.NamedFunction;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/wayang-core/src/test/resources/partial-plugin.yaml b/wayang-core/src/test/resources/partial-plugin.yaml
index 0a84bd5..2a16c8f 100644
--- a/wayang-core/src/test/resources/partial-plugin.yaml
+++ b/wayang-core/src/test/resources/partial-plugin.yaml
@@ -1,7 +1,7 @@
 platforms:
   include:
-  - org.apache.incubator.wayang.core.test.DummyPlatform.getInstance()
+  - org.apache.wayang.core.test.DummyPlatform.getInstance()
 
 mappings:
   exclude:
-  - new org.apache.incubator.wayang.core.mapping.test.TestSinkMapping()
+  - new org.apache.wayang.core.mapping.test.TestSinkMapping()
diff --git a/wayang-core/src/test/resources/test-plugin.yaml b/wayang-core/src/test/resources/test-plugin.yaml
index eae1293..9b86cdb 100644
--- a/wayang-core/src/test/resources/test-plugin.yaml
+++ b/wayang-core/src/test/resources/test-plugin.yaml
@@ -1,20 +1,20 @@
 platforms:
   include:
-    - org.apache.incubator.wayang.core.test.DummyPlatform.getInstance()
+    - org.apache.wayang.core.test.DummyPlatform.getInstance()
   exclude:
 
 mappings:
   include:
-    - new org.apache.incubator.wayang.core.mapping.test.TestSinkMapping()
+    - new org.apache.wayang.core.mapping.test.TestSinkMapping()
   exclude:
 
 conversions:
   include:
   exclude:
-    - org.apache.incubator.wayang.core.plugin.DynamicPluginTest.CHANNEL_CONVERSIONS
+    - org.apache.wayang.core.plugin.DynamicPluginTest.CHANNEL_CONVERSIONS
 
 properties:
-  org.apache.incubator.wayang.test.float: 51.3
-  org.apache.incubator.wayang.test.string: abcdef
-  org.apache.incubator.wayang.test.long: 1234567890123456789
+  org.apache.wayang.test.float: 51.3
+  org.apache.wayang.test.string: abcdef
+  org.apache.wayang.test.long: 1234567890123456789
 
diff --git a/wayang-distro/pom.xml b/wayang-distro/pom.xml
index d44dd10..3edf85d 100644
--- a/wayang-distro/pom.xml
+++ b/wayang-distro/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>wayang</artifactId>
-        <groupId>org.apache.incubator.wayang</groupId>
+        <groupId>org.apache.wayang</groupId>
         <version>0.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -35,57 +35,57 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.incubator.wayang</groupId>
+            <groupId>org.apache.wayang</groupId>
             <artifactId>wayang-core</artifactId>
             <version>0.5.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.incubator.wayang</groupId>
+            <groupId>org.apache.wayang</groupId>
             <artifactId>wayang-basic</artifactId>
             <version>0.5.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.incubator.wayang</groupId>
+            <groupId>org.apache.wayang</groupId>
             <artifactId>wayang-java</artifactId>
             <version>0.5.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.incubator.wayang</groupId>
+            <groupId>org.apache.wayang</groupId>
             <artifactId>wayang-spark_2.11</artifactId>
             <version>0.5.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.incubator.wayang</groupId>
+            <groupId>org.apache.wayang</groupId>
             <artifactId>wayang-graphchi_2.11</artifactId>
             <version>0.5.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.incubator.wayang</groupId>
+            <groupId>org.apache.wayang</groupId>
             <artifactId>wayang-profiler_2.11</artifactId>
             <version>0.5.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.incubator.wayang</groupId>
+            <groupId>org.apache.wayang</groupId>
             <artifactId>wayang-jdbc-template</artifactId>
             <version>0.5.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.incubator.wayang</groupId>
+            <groupId>org.apache.wayang</groupId>
             <artifactId>wayang-sqlite3</artifactId>
             <version>0.5.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.incubator.wayang</groupId>
+            <groupId>org.apache.wayang</groupId>
             <artifactId>wayang-postgres</artifactId>
             <version>0.5.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.incubator.wayang</groupId>
+            <groupId>org.apache.wayang</groupId>
             <artifactId>wayang-api_2.11</artifactId>
             <version>0.5.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.incubator.wayang</groupId>
+            <groupId>org.apache.wayang</groupId>
             <artifactId>wayang-flink</artifactId>
             <version>0.5.0-SNAPSHOT</version>
         </dependency>
diff --git a/wayang-extensions/pom.xml b/wayang-extensions/pom.xml
index ef5299d..a8697ae 100644
--- a/wayang-extensions/pom.xml
+++ b/wayang-extensions/pom.xml
@@ -2,7 +2,7 @@
 <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>wayang</artifactId>
-        <groupId>org.apache.incubator.wayang</groupId>
+        <groupId>org.apache.wayang</groupId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/wayang-extensions/wayang-iejoin/pom.xml b/wayang-extensions/wayang-iejoin/pom.xml
index d3b7676..5291ce4 100644
--- a/wayang-extensions/wayang-iejoin/pom.xml
+++ b/wayang-extensions/wayang-iejoin/pom.xml
@@ -2,7 +2,7 @@
 <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>wayang-extensions</artifactId>
-        <groupId>org.apache.incubator.wayang</groupId>
+        <groupId>org.apache.wayang</groupId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -12,22 +12,22 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.incubator.wayang</groupId>
+            <groupId>org.apache.wayang</groupId>
             <artifactId>wayang-core</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.incubator.wayang</groupId>
+            <groupId>org.apache.wayang</groupId>
             <artifactId>wayang-basic</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.incubator.wayang</groupId>
+            <groupId>org.apache.wayang</groupId>
             <artifactId>wayang-java</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.incubator.wayang</groupId>
+            <groupId>org.apache.wayang</groupId>
             <artifactId>wayang-spark_2.11</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/IEJoin.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/IEJoin.java
index 815402b..0f9dd87 100644
--- a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/IEJoin.java
+++ b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/IEJoin.java
@@ -1,17 +1,17 @@
-package org.apache.incubator.wayang.iejoin;
-
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.mapping.Mapping;
-import org.apache.incubator.wayang.core.optimizer.channels.ChannelConversion;
-import org.apache.incubator.wayang.core.platform.Platform;
-import org.apache.incubator.wayang.core.plugin.Plugin;
-import org.apache.incubator.wayang.iejoin.mapping.Mappings;
-import org.apache.incubator.wayang.iejoin.operators.IEJoinOperator;
-import org.apache.incubator.wayang.iejoin.operators.IESelfJoinOperator;
-import org.apache.incubator.wayang.java.Java;
-import org.apache.incubator.wayang.java.platform.JavaPlatform;
-import org.apache.incubator.wayang.spark.Spark;
-import org.apache.incubator.wayang.spark.platform.SparkPlatform;
+package org.apache.wayang.iejoin;
+
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.mapping.Mapping;
+import org.apache.wayang.core.optimizer.channels.ChannelConversion;
+import org.apache.wayang.core.platform.Platform;
+import org.apache.wayang.core.plugin.Plugin;
+import org.apache.wayang.iejoin.mapping.Mappings;
+import org.apache.wayang.iejoin.operators.IEJoinOperator;
+import org.apache.wayang.iejoin.operators.IESelfJoinOperator;
+import org.apache.wayang.java.Java;
+import org.apache.wayang.java.platform.JavaPlatform;
+import org.apache.wayang.spark.Spark;
+import org.apache.wayang.spark.platform.SparkPlatform;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/data/Data.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/data/Data.java
index 20ae163..1698645 100755
--- a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/data/Data.java
+++ b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/data/Data.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.iejoin.data;
+package org.apache.wayang.iejoin.data;
 
 import java.io.Serializable;
 
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/mapping/Mappings.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/mapping/Mappings.java
index 271e6df..deba94b 100644
--- a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/mapping/Mappings.java
+++ b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/mapping/Mappings.java
@@ -1,11 +1,11 @@
-package org.apache.incubator.wayang.iejoin.mapping;
+package org.apache.wayang.iejoin.mapping;
 
-import org.apache.incubator.wayang.core.mapping.Mapping;
-import org.apache.incubator.wayang.iejoin.mapping.spark.IEJoinMapping;
-import org.apache.incubator.wayang.iejoin.mapping.spark.IESelfJoinMapping;
-import org.apache.incubator.wayang.iejoin.operators.IEJoinOperator;
-import org.apache.incubator.wayang.java.platform.JavaPlatform;
-import org.apache.incubator.wayang.spark.platform.SparkPlatform;
+import org.apache.wayang.core.mapping.Mapping;
+import org.apache.wayang.iejoin.mapping.spark.IEJoinMapping;
+import org.apache.wayang.iejoin.mapping.spark.IESelfJoinMapping;
+import org.apache.wayang.iejoin.operators.IEJoinOperator;
+import org.apache.wayang.java.platform.JavaPlatform;
+import org.apache.wayang.spark.platform.SparkPlatform;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -19,7 +19,7 @@ public class Mappings {
      * {@link Mapping}s towards the {@link JavaPlatform}.
      */
     public static Collection<Mapping> javaMappings = Arrays.asList(
-            new org.apache.incubator.wayang.iejoin.mapping.java.IEJoinMapping(), new org.apache.incubator.wayang.iejoin.mapping.java.IESelfJoinMapping()
+            new org.apache.wayang.iejoin.mapping.java.IEJoinMapping(), new org.apache.wayang.iejoin.mapping.java.IESelfJoinMapping()
     );
 
     /**
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/mapping/java/IEJoinMapping.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/mapping/java/IEJoinMapping.java
index fa67d46..c0753b3 100644
--- a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/mapping/java/IEJoinMapping.java
+++ b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/mapping/java/IEJoinMapping.java
@@ -1,15 +1,15 @@
-package org.apache.incubator.wayang.iejoin.mapping.java;
+package org.apache.wayang.iejoin.mapping.java;
 
-import org.apache.incubator.wayang.core.mapping.Mapping;
-import org.apache.incubator.wayang.core.mapping.OperatorPattern;
-import org.apache.incubator.wayang.core.mapping.PlanTransformation;
-import org.apache.incubator.wayang.core.mapping.ReplacementSubplanFactory;
-import org.apache.incubator.wayang.core.mapping.SubplanPattern;
-import org.apache.incubator.wayang.core.types.DataSetType;
-import org.apache.incubator.wayang.iejoin.operators.IEJoinMasterOperator;
-import org.apache.incubator.wayang.iejoin.operators.IEJoinOperator;
-import org.apache.incubator.wayang.iejoin.operators.JavaIEJoinOperator;
-import org.apache.incubator.wayang.java.platform.JavaPlatform;
+import org.apache.wayang.core.mapping.Mapping;
+import org.apache.wayang.core.mapping.OperatorPattern;
+import org.apache.wayang.core.mapping.PlanTransformation;
+import org.apache.wayang.core.mapping.ReplacementSubplanFactory;
+import org.apache.wayang.core.mapping.SubplanPattern;
+import org.apache.wayang.core.types.DataSetType;
+import org.apache.wayang.iejoin.operators.IEJoinMasterOperator;
+import org.apache.wayang.iejoin.operators.IEJoinOperator;
+import org.apache.wayang.iejoin.operators.JavaIEJoinOperator;
+import org.apache.wayang.java.platform.JavaPlatform;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/mapping/java/IESelfJoinMapping.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/mapping/java/IESelfJoinMapping.java
index 781fd3a..58bb8b9 100644
--- a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/mapping/java/IESelfJoinMapping.java
+++ b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/mapping/java/IESelfJoinMapping.java
@@ -1,15 +1,15 @@
-package org.apache.incubator.wayang.iejoin.mapping.java;
+package org.apache.wayang.iejoin.mapping.java;
 
-import org.apache.incubator.wayang.core.mapping.Mapping;
-import org.apache.incubator.wayang.core.mapping.OperatorPattern;
-import org.apache.incubator.wayang.core.mapping.PlanTransformation;
-import org.apache.incubator.wayang.core.mapping.ReplacementSubplanFactory;
-import org.apache.incubator.wayang.core.mapping.SubplanPattern;
-import org.apache.incubator.wayang.core.types.DataSetType;
-import org.apache.incubator.wayang.iejoin.operators.IEJoinMasterOperator;
-import org.apache.incubator.wayang.iejoin.operators.IESelfJoinOperator;
-import org.apache.incubator.wayang.iejoin.operators.JavaIESelfJoinOperator;
-import org.apache.incubator.wayang.java.platform.JavaPlatform;
+import org.apache.wayang.core.mapping.Mapping;
+import org.apache.wayang.core.mapping.OperatorPattern;
+import org.apache.wayang.core.mapping.PlanTransformation;
+import org.apache.wayang.core.mapping.ReplacementSubplanFactory;
+import org.apache.wayang.core.mapping.SubplanPattern;
+import org.apache.wayang.core.types.DataSetType;
+import org.apache.wayang.iejoin.operators.IEJoinMasterOperator;
+import org.apache.wayang.iejoin.operators.IESelfJoinOperator;
+import org.apache.wayang.iejoin.operators.JavaIESelfJoinOperator;
+import org.apache.wayang.java.platform.JavaPlatform;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/mapping/spark/IEJoinMapping.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/mapping/spark/IEJoinMapping.java
index a2856d1..c506cc7 100755
--- a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/mapping/spark/IEJoinMapping.java
+++ b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/mapping/spark/IEJoinMapping.java
@@ -1,18 +1,18 @@
-package org.apache.incubator.wayang.iejoin.mapping.spark;
+package org.apache.wayang.iejoin.mapping.spark;
 
-import org.apache.incubator.wayang.basic.data.Record;
-import org.apache.incubator.wayang.core.mapping.Mapping;
-import org.apache.incubator.wayang.core.mapping.OperatorPattern;
-import org.apache.incubator.wayang.core.mapping.PlanTransformation;
-import org.apache.incubator.wayang.core.mapping.ReplacementSubplanFactory;
-import org.apache.incubator.wayang.core.mapping.SubplanMatch;
-import org.apache.incubator.wayang.core.mapping.SubplanPattern;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.types.DataSetType;
-import org.apache.incubator.wayang.iejoin.operators.IEJoinMasterOperator;
-import org.apache.incubator.wayang.iejoin.operators.IEJoinOperator;
-import org.apache.incubator.wayang.iejoin.operators.SparkIEJoinOperator;
-import org.apache.incubator.wayang.spark.platform.SparkPlatform;
+import org.apache.wayang.basic.data.Record;
+import org.apache.wayang.core.mapping.Mapping;
+import org.apache.wayang.core.mapping.OperatorPattern;
+import org.apache.wayang.core.mapping.PlanTransformation;
+import org.apache.wayang.core.mapping.ReplacementSubplanFactory;
+import org.apache.wayang.core.mapping.SubplanMatch;
+import org.apache.wayang.core.mapping.SubplanPattern;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.types.DataSetType;
+import org.apache.wayang.iejoin.operators.IEJoinMasterOperator;
+import org.apache.wayang.iejoin.operators.IEJoinOperator;
+import org.apache.wayang.iejoin.operators.SparkIEJoinOperator;
+import org.apache.wayang.spark.platform.SparkPlatform;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/mapping/spark/IESelfJoinMapping.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/mapping/spark/IESelfJoinMapping.java
index d3c1664..2c23996 100755
--- a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/mapping/spark/IESelfJoinMapping.java
+++ b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/mapping/spark/IESelfJoinMapping.java
@@ -1,18 +1,18 @@
-package org.apache.incubator.wayang.iejoin.mapping.spark;
+package org.apache.wayang.iejoin.mapping.spark;
 
-import org.apache.incubator.wayang.basic.data.Record;
-import org.apache.incubator.wayang.core.mapping.Mapping;
-import org.apache.incubator.wayang.core.mapping.OperatorPattern;
-import org.apache.incubator.wayang.core.mapping.PlanTransformation;
-import org.apache.incubator.wayang.core.mapping.ReplacementSubplanFactory;
-import org.apache.incubator.wayang.core.mapping.SubplanMatch;
-import org.apache.incubator.wayang.core.mapping.SubplanPattern;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.types.DataSetType;
-import org.apache.incubator.wayang.iejoin.operators.IEJoinMasterOperator;
-import org.apache.incubator.wayang.iejoin.operators.IESelfJoinOperator;
-import org.apache.incubator.wayang.iejoin.operators.SparkIESelfJoinOperator;
-import org.apache.incubator.wayang.spark.platform.SparkPlatform;
+import org.apache.wayang.basic.data.Record;
+import org.apache.wayang.core.mapping.Mapping;
+import org.apache.wayang.core.mapping.OperatorPattern;
+import org.apache.wayang.core.mapping.PlanTransformation;
+import org.apache.wayang.core.mapping.ReplacementSubplanFactory;
+import org.apache.wayang.core.mapping.SubplanMatch;
+import org.apache.wayang.core.mapping.SubplanPattern;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.types.DataSetType;
+import org.apache.wayang.iejoin.operators.IEJoinMasterOperator;
+import org.apache.wayang.iejoin.operators.IESelfJoinOperator;
+import org.apache.wayang.iejoin.operators.SparkIESelfJoinOperator;
+import org.apache.wayang.spark.platform.SparkPlatform;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/IEJoinMasterOperator.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/IEJoinMasterOperator.java
index 38de7d3..99a41ef 100755
--- a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/IEJoinMasterOperator.java
+++ b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/IEJoinMasterOperator.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.iejoin.operators;
+package org.apache.wayang.iejoin.operators;
 
-import org.apache.incubator.wayang.basic.data.Tuple5;
+import org.apache.wayang.basic.data.Tuple5;
 
 /**
  * This operator decides the correct sorting orders for IEJoin
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/IEJoinOperator.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/IEJoinOperator.java
index 55ae10b..cdd4aed 100755
--- a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/IEJoinOperator.java
+++ b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/IEJoinOperator.java
@@ -1,10 +1,10 @@
-package org.apache.incubator.wayang.iejoin.operators;
+package org.apache.wayang.iejoin.operators;
 
-import org.apache.incubator.wayang.basic.data.Tuple2;
-import org.apache.incubator.wayang.basic.data.Tuple5;
-import org.apache.incubator.wayang.core.function.TransformationDescriptor;
-import org.apache.incubator.wayang.core.plan.wayangplan.BinaryToUnaryOperator;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.basic.data.Tuple2;
+import org.apache.wayang.basic.data.Tuple5;
+import org.apache.wayang.core.function.TransformationDescriptor;
+import org.apache.wayang.core.plan.wayangplan.BinaryToUnaryOperator;
+import org.apache.wayang.core.types.DataSetType;
 
 /**
  * This operator applies inequality join on elements of input datasets.
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/IESelfJoinOperator.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/IESelfJoinOperator.java
index 0373e06..34159bc 100755
--- a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/IESelfJoinOperator.java
+++ b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/IESelfJoinOperator.java
@@ -1,10 +1,10 @@
-package org.apache.incubator.wayang.iejoin.operators;
+package org.apache.wayang.iejoin.operators;
 
-import org.apache.incubator.wayang.basic.data.Tuple2;
-import org.apache.incubator.wayang.basic.data.Tuple5;
-import org.apache.incubator.wayang.core.function.TransformationDescriptor;
-import org.apache.incubator.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
-import org.apache.incubator.wayang.core.types.DataSetType;
+import org.apache.wayang.basic.data.Tuple2;
+import org.apache.wayang.basic.data.Tuple5;
+import org.apache.wayang.core.function.TransformationDescriptor;
+import org.apache.wayang.core.plan.wayangplan.UnaryToUnaryOperator;
+import org.apache.wayang.core.types.DataSetType;
 
 /**
  * This operator applies inequality self join on elements of input datasets.
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/JavaIEJoinOperator.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/JavaIEJoinOperator.java
index bd8c4f4..070bdc7 100755
--- a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/JavaIEJoinOperator.java
+++ b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/JavaIEJoinOperator.java
@@ -1,22 +1,22 @@
-package org.apache.incubator.wayang.iejoin.operators;
-
-import org.apache.incubator.wayang.core.function.TransformationDescriptor;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
-import org.apache.incubator.wayang.core.platform.ChannelDescriptor;
-import org.apache.incubator.wayang.core.platform.ChannelInstance;
-import org.apache.incubator.wayang.core.platform.lineage.ExecutionLineageNode;
-import org.apache.incubator.wayang.core.types.DataSetType;
-import org.apache.incubator.wayang.core.util.Tuple;
-import org.apache.incubator.wayang.iejoin.data.Data;
-import org.apache.incubator.wayang.iejoin.operators.java_helpers.BitSetJoin;
-import org.apache.incubator.wayang.iejoin.operators.java_helpers.DataComparator;
-import org.apache.incubator.wayang.iejoin.operators.java_helpers.extractData;
-import org.apache.incubator.wayang.java.channels.CollectionChannel;
-import org.apache.incubator.wayang.java.channels.JavaChannelInstance;
-import org.apache.incubator.wayang.java.channels.StreamChannel;
-import org.apache.incubator.wayang.java.execution.JavaExecutor;
-import org.apache.incubator.wayang.java.operators.JavaExecutionOperator;
+package org.apache.wayang.iejoin.operators;
+
+import org.apache.wayang.core.function.TransformationDescriptor;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.platform.ChannelDescriptor;
+import org.apache.wayang.core.platform.ChannelInstance;
+import org.apache.wayang.core.platform.lineage.ExecutionLineageNode;
+import org.apache.wayang.core.types.DataSetType;
+import org.apache.wayang.core.util.Tuple;
+import org.apache.wayang.iejoin.data.Data;
+import org.apache.wayang.iejoin.operators.java_helpers.BitSetJoin;
+import org.apache.wayang.iejoin.operators.java_helpers.DataComparator;
+import org.apache.wayang.iejoin.operators.java_helpers.extractData;
+import org.apache.wayang.java.channels.CollectionChannel;
+import org.apache.wayang.java.channels.JavaChannelInstance;
+import org.apache.wayang.java.channels.StreamChannel;
+import org.apache.wayang.java.execution.JavaExecutor;
+import org.apache.wayang.java.operators.JavaExecutionOperator;
 import scala.Tuple2;
 
 import java.util.ArrayList;
@@ -107,9 +107,9 @@ public class JavaIEJoinOperator<Type0 extends Comparable<Type0>, Type1 extends C
         ArrayList<Tuple2<Input, Input>> result = new BitSetJoin<Type0, Type1, Input>(list1ASC, list2ASC,
                 list1ASCSec, list2ASCSec, equalReverse, false, cond0).call(list0, list1);
 
-        ArrayList<org.apache.incubator.wayang.basic.data.Tuple2<Input, Input>> result2 = new ArrayList<>();
+        ArrayList<org.apache.wayang.basic.data.Tuple2<Input, Input>> result2 = new ArrayList<>();
         for (Tuple2<Input, Input> t : result) {
-            result2.add(new org.apache.incubator.wayang.basic.data.Tuple2<>(t._1(), t._2()));
+            result2.add(new org.apache.wayang.basic.data.Tuple2<>(t._1(), t._2()));
         }
 
         outputChannel.accept(result2);
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/JavaIESelfJoinOperator.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/JavaIESelfJoinOperator.java
index fbb1899..ba80055 100755
--- a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/JavaIESelfJoinOperator.java
+++ b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/JavaIESelfJoinOperator.java
@@ -1,22 +1,22 @@
-package org.apache.incubator.wayang.iejoin.operators;
-
-import org.apache.incubator.wayang.core.function.TransformationDescriptor;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
-import org.apache.incubator.wayang.core.platform.ChannelDescriptor;
-import org.apache.incubator.wayang.core.platform.ChannelInstance;
-import org.apache.incubator.wayang.core.platform.lineage.ExecutionLineageNode;
-import org.apache.incubator.wayang.core.types.DataSetType;
-import org.apache.incubator.wayang.core.util.Tuple;
-import org.apache.incubator.wayang.iejoin.data.Data;
-import org.apache.incubator.wayang.iejoin.operators.java_helpers.BitSetJoin;
-import org.apache.incubator.wayang.iejoin.operators.java_helpers.DataComparator;
-import org.apache.incubator.wayang.iejoin.operators.java_helpers.extractData;
-import org.apache.incubator.wayang.java.channels.CollectionChannel;
-import org.apache.incubator.wayang.java.channels.JavaChannelInstance;
-import org.apache.incubator.wayang.java.channels.StreamChannel;
-import org.apache.incubator.wayang.java.execution.JavaExecutor;
-import org.apache.incubator.wayang.java.operators.JavaExecutionOperator;
+package org.apache.wayang.iejoin.operators;
+
+import org.apache.wayang.core.function.TransformationDescriptor;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.platform.ChannelDescriptor;
+import org.apache.wayang.core.platform.ChannelInstance;
+import org.apache.wayang.core.platform.lineage.ExecutionLineageNode;
+import org.apache.wayang.core.types.DataSetType;
+import org.apache.wayang.core.util.Tuple;
+import org.apache.wayang.iejoin.data.Data;
+import org.apache.wayang.iejoin.operators.java_helpers.BitSetJoin;
+import org.apache.wayang.iejoin.operators.java_helpers.DataComparator;
+import org.apache.wayang.iejoin.operators.java_helpers.extractData;
+import org.apache.wayang.java.channels.CollectionChannel;
+import org.apache.wayang.java.channels.JavaChannelInstance;
+import org.apache.wayang.java.channels.StreamChannel;
+import org.apache.wayang.java.execution.JavaExecutor;
+import org.apache.wayang.java.operators.JavaExecutionOperator;
 import scala.Tuple2;
 
 import java.util.ArrayList;
@@ -85,12 +85,12 @@ public class JavaIESelfJoinOperator<Type0 extends Comparable<Type0>, Type1 exten
         ArrayList<Tuple2<Input, Input>> result = new BitSetJoin<Type0, Type1, Input>(list1ASC, list2ASC,
                 list1ASCSec, list2ASCSec, equalReverse, true, cond0).call(list0, list0);
 
-        ArrayList<org.apache.incubator.wayang.basic.data.Tuple2<Input, Input>> result2 = new ArrayList<>();
+        ArrayList<org.apache.wayang.basic.data.Tuple2<Input, Input>> result2 = new ArrayList<>();
         for (Tuple2<Input, Input> t : result) {
-            result2.add(new org.apache.incubator.wayang.basic.data.Tuple2<Input, Input>(t._1(), t._2()));
+            result2.add(new org.apache.wayang.basic.data.Tuple2<Input, Input>(t._1(), t._2()));
         }
 
-        outputChannel.<org.apache.incubator.wayang.basic.data.Tuple2<Input, Input>>accept(result2.stream());
+        outputChannel.<org.apache.wayang.basic.data.Tuple2<Input, Input>>accept(result2.stream());
 
         return ExecutionOperator.modelEagerExecution(inputs, outputs, operatorContext);
     }
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/SparkIEJoinOperator.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/SparkIEJoinOperator.java
index 6101462..402e1c9 100755
--- a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/SparkIEJoinOperator.java
+++ b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/SparkIEJoinOperator.java
@@ -1,27 +1,27 @@
-package org.apache.incubator.wayang.iejoin.operators;
+package org.apache.wayang.iejoin.operators;
 
 import org.apache.spark.api.java.JavaPairRDD;
 import org.apache.spark.api.java.JavaRDD;
 import org.apache.spark.api.java.function.Function;
-import org.apache.incubator.wayang.core.function.TransformationDescriptor;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
-import org.apache.incubator.wayang.core.platform.ChannelDescriptor;
-import org.apache.incubator.wayang.core.platform.ChannelInstance;
-import org.apache.incubator.wayang.core.platform.lineage.ExecutionLineageNode;
-import org.apache.incubator.wayang.core.types.DataSetType;
-import org.apache.incubator.wayang.core.util.Copyable;
-import org.apache.incubator.wayang.core.util.Tuple;
-import org.apache.incubator.wayang.iejoin.data.Data;
-import org.apache.incubator.wayang.iejoin.operators.spark_helpers.BitSetJoin;
-import org.apache.incubator.wayang.iejoin.operators.spark_helpers.List2AttributesObjectSkinny;
-import org.apache.incubator.wayang.iejoin.operators.spark_helpers.addUniqueID;
-import org.apache.incubator.wayang.iejoin.operators.spark_helpers.build2ListObject;
-import org.apache.incubator.wayang.iejoin.operators.spark_helpers.extractData;
-import org.apache.incubator.wayang.iejoin.operators.spark_helpers.filterUnwantedBlocks;
-import org.apache.incubator.wayang.spark.channels.RddChannel;
-import org.apache.incubator.wayang.spark.execution.SparkExecutor;
-import org.apache.incubator.wayang.spark.operators.SparkExecutionOperator;
+import org.apache.wayang.core.function.TransformationDescriptor;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.platform.ChannelDescriptor;
+import org.apache.wayang.core.platform.ChannelInstance;
+import org.apache.wayang.core.platform.lineage.ExecutionLineageNode;
+import org.apache.wayang.core.types.DataSetType;
+import org.apache.wayang.core.util.Copyable;
+import org.apache.wayang.core.util.Tuple;
+import org.apache.wayang.iejoin.data.Data;
+import org.apache.wayang.iejoin.operators.spark_helpers.BitSetJoin;
+import org.apache.wayang.iejoin.operators.spark_helpers.List2AttributesObjectSkinny;
+import org.apache.wayang.iejoin.operators.spark_helpers.addUniqueID;
+import org.apache.wayang.iejoin.operators.spark_helpers.build2ListObject;
+import org.apache.wayang.iejoin.operators.spark_helpers.extractData;
+import org.apache.wayang.iejoin.operators.spark_helpers.filterUnwantedBlocks;
+import org.apache.wayang.spark.channels.RddChannel;
+import org.apache.wayang.spark.execution.SparkExecutor;
+import org.apache.wayang.spark.operators.SparkExecutionOperator;
 import scala.Tuple2;
 import scala.Tuple5;
 
@@ -73,7 +73,7 @@ public class SparkIEJoinOperator<Type0 extends Comparable<Type0>, Type1 extends
         JavaPairRDD<List2AttributesObjectSkinny<Type0, Type1>, List2AttributesObjectSkinny<Type0, Type1>> listOfListObject = null;
         JavaPairRDD<Long, Tuple2<Long, Input>> r1RowIDS = null;
         JavaPairRDD<Long, Tuple2<Long, Input>> r2RowIDS = null;
-        JavaRDD<org.apache.incubator.wayang.basic.data.Tuple2<Input, Input>> outRDD = null;
+        JavaRDD<org.apache.wayang.basic.data.Tuple2<Input, Input>> outRDD = null;
 
         //get this from the user (SOMEHOW)
         //ArrayList<String> attSymbols = new ArrayList<String>();
@@ -189,7 +189,7 @@ public class SparkIEJoinOperator<Type0 extends Comparable<Type0>, Type1 extends
         JavaPairRDD<Long, Input> tmpOut2 = tmpOut1.join(r1RowIDS).mapToPair(
                 in -> new Tuple2<Long, Input>(in._2()._1(), in._2()._2()._2()));
 
-        outRDD = tmpOut2.join(r2RowIDS).map(in -> new org.apache.incubator.wayang.basic.data.Tuple2<Input, Input>(in._2()._1(), in._2()._2()._2()));
+        outRDD = tmpOut2.join(r2RowIDS).map(in -> new org.apache.wayang.basic.data.Tuple2<Input, Input>(in._2()._1(), in._2()._2()._2()));
 
         output.accept(outRDD, sparkExecutor);
 
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/SparkIESelfJoinOperator.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/SparkIESelfJoinOperator.java
index 9978746..1c596a1 100755
--- a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/SparkIESelfJoinOperator.java
+++ b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/SparkIESelfJoinOperator.java
@@ -1,27 +1,27 @@
-package org.apache.incubator.wayang.iejoin.operators;
+package org.apache.wayang.iejoin.operators;
 
 import org.apache.spark.api.java.JavaPairRDD;
 import org.apache.spark.api.java.JavaRDD;
 import org.apache.spark.api.java.function.Function;
-import org.apache.incubator.wayang.core.function.TransformationDescriptor;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.plan.wayangplan.ExecutionOperator;
-import org.apache.incubator.wayang.core.platform.ChannelDescriptor;
-import org.apache.incubator.wayang.core.platform.ChannelInstance;
-import org.apache.incubator.wayang.core.platform.lineage.ExecutionLineageNode;
-import org.apache.incubator.wayang.core.types.DataSetType;
-import org.apache.incubator.wayang.core.util.Copyable;
-import org.apache.incubator.wayang.core.util.Tuple;
-import org.apache.incubator.wayang.iejoin.data.Data;
-import org.apache.incubator.wayang.iejoin.operators.spark_helpers.BitSetJoin;
-import org.apache.incubator.wayang.iejoin.operators.spark_helpers.List2AttributesObjectSkinny;
-import org.apache.incubator.wayang.iejoin.operators.spark_helpers.addUniqueID;
-import org.apache.incubator.wayang.iejoin.operators.spark_helpers.build2ListObject;
-import org.apache.incubator.wayang.iejoin.operators.spark_helpers.extractData;
-import org.apache.incubator.wayang.iejoin.operators.spark_helpers.filterUnwantedBlocks;
-import org.apache.incubator.wayang.spark.channels.RddChannel;
-import org.apache.incubator.wayang.spark.execution.SparkExecutor;
-import org.apache.incubator.wayang.spark.operators.SparkExecutionOperator;
+import org.apache.wayang.core.function.TransformationDescriptor;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.plan.wayangplan.ExecutionOperator;
+import org.apache.wayang.core.platform.ChannelDescriptor;
+import org.apache.wayang.core.platform.ChannelInstance;
+import org.apache.wayang.core.platform.lineage.ExecutionLineageNode;
+import org.apache.wayang.core.types.DataSetType;
+import org.apache.wayang.core.util.Copyable;
+import org.apache.wayang.core.util.Tuple;
+import org.apache.wayang.iejoin.data.Data;
+import org.apache.wayang.iejoin.operators.spark_helpers.BitSetJoin;
+import org.apache.wayang.iejoin.operators.spark_helpers.List2AttributesObjectSkinny;
+import org.apache.wayang.iejoin.operators.spark_helpers.addUniqueID;
+import org.apache.wayang.iejoin.operators.spark_helpers.build2ListObject;
+import org.apache.wayang.iejoin.operators.spark_helpers.extractData;
+import org.apache.wayang.iejoin.operators.spark_helpers.filterUnwantedBlocks;
+import org.apache.wayang.spark.channels.RddChannel;
+import org.apache.wayang.spark.execution.SparkExecutor;
+import org.apache.wayang.spark.operators.SparkExecutionOperator;
 import scala.Tuple2;
 import scala.Tuple5;
 
@@ -65,7 +65,7 @@ public class SparkIESelfJoinOperator<Type0 extends Comparable<Type0>, Type1 exte
         JavaPairRDD<List2AttributesObjectSkinny<Type0, Type1>, List2AttributesObjectSkinny<Type0, Type1>> listOfListObject = null;
         JavaPairRDD<Long, Tuple2<Long, Input>> r1RowIDS = null;
         JavaPairRDD<Long, Tuple2<Long, Input>> r2RowIDS = null;
-        JavaRDD<org.apache.incubator.wayang.basic.data.Tuple2<Input, Input>> outRDD = null;
+        JavaRDD<org.apache.wayang.basic.data.Tuple2<Input, Input>> outRDD = null;
 
         //get this from the user (SOMEHOW)
         /*ArrayList<String> attSymbols = new ArrayList<String>();
@@ -144,7 +144,7 @@ public class SparkIESelfJoinOperator<Type0 extends Comparable<Type0>, Type1 exte
         JavaPairRDD<Long, Input> tmpOut2 = tmpOut1.join(r1RowIDS).mapToPair(
                 in -> new Tuple2<Long, Input>(in._2()._1(), in._2()._2()._2()));
 
-        outRDD = tmpOut2.join(r2RowIDS).map(in -> new org.apache.incubator.wayang.basic.data.Tuple2<Input, Input>(in._2()._1(), in._2()._2()._2()));
+        outRDD = tmpOut2.join(r2RowIDS).map(in -> new org.apache.wayang.basic.data.Tuple2<Input, Input>(in._2()._1(), in._2()._2()._2()));
 
         output.accept(outRDD, sparkExecutor);
 
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/java_helpers/BitSetJoin.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/java_helpers/BitSetJoin.java
index b9bf67c..d85ed6b 100755
--- a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/java_helpers/BitSetJoin.java
+++ b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/java_helpers/BitSetJoin.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.iejoin.operators.java_helpers;
+package org.apache.wayang.iejoin.operators.java_helpers;
 
-import org.apache.incubator.wayang.iejoin.data.Data;
-import org.apache.incubator.wayang.iejoin.operators.IEJoinMasterOperator;
+import org.apache.wayang.iejoin.data.Data;
+import org.apache.wayang.iejoin.operators.IEJoinMasterOperator;
 import scala.Tuple2;
 
 import java.util.ArrayList;
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/java_helpers/DataComparator.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/java_helpers/DataComparator.java
index 29d9945..db0f1cb 100644
--- a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/java_helpers/DataComparator.java
+++ b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/java_helpers/DataComparator.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.iejoin.operators.java_helpers;
+package org.apache.wayang.iejoin.operators.java_helpers;
 
-import org.apache.incubator.wayang.iejoin.data.Data;
+import org.apache.wayang.iejoin.data.Data;
 import scala.Tuple2;
 
 import java.io.Serializable;
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/java_helpers/extractData.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/java_helpers/extractData.java
index ff21600..672b162 100755
--- a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/java_helpers/extractData.java
+++ b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/java_helpers/extractData.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.iejoin.operators.java_helpers;
+package org.apache.wayang.iejoin.operators.java_helpers;
 
 
-import org.apache.incubator.wayang.iejoin.data.Data;
+import org.apache.wayang.iejoin.data.Data;
 
 import java.util.function.Function;
 
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/java_helpers/myMergeSort.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/java_helpers/myMergeSort.java
index 97c0fc0..6c1ffac 100755
--- a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/java_helpers/myMergeSort.java
+++ b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/java_helpers/myMergeSort.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.iejoin.operators.java_helpers;
+package org.apache.wayang.iejoin.operators.java_helpers;
 
-import org.apache.incubator.wayang.iejoin.data.Data;
+import org.apache.wayang.iejoin.data.Data;
 import scala.Tuple2;
 
 import java.util.ArrayList;
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/java_helpers/revDataComparator.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/java_helpers/revDataComparator.java
index 0755668..633d556 100755
--- a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/java_helpers/revDataComparator.java
+++ b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/java_helpers/revDataComparator.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.iejoin.operators.java_helpers;
+package org.apache.wayang.iejoin.operators.java_helpers;
 
-import org.apache.incubator.wayang.iejoin.data.Data;
+import org.apache.wayang.iejoin.data.Data;
 import scala.Tuple2;
 
 import java.io.Serializable;
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/BitSetJoin.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/BitSetJoin.java
index 24db932..9a774ce 100755
--- a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/BitSetJoin.java
+++ b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/BitSetJoin.java
@@ -1,8 +1,8 @@
-package org.apache.incubator.wayang.iejoin.operators.spark_helpers;
+package org.apache.wayang.iejoin.operators.spark_helpers;
 
 import org.apache.spark.api.java.function.PairFlatMapFunction;
-import org.apache.incubator.wayang.iejoin.data.Data;
-import org.apache.incubator.wayang.iejoin.operators.IEJoinMasterOperator;
+import org.apache.wayang.iejoin.data.Data;
+import org.apache.wayang.iejoin.operators.IEJoinMasterOperator;
 import scala.Tuple2;
 
 import java.util.ArrayList;
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/List2AttributesObjectSkinny.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/List2AttributesObjectSkinny.java
index 3190051..3dbdf6b 100755
--- a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/List2AttributesObjectSkinny.java
+++ b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/List2AttributesObjectSkinny.java
@@ -1,6 +1,6 @@
-package org.apache.incubator.wayang.iejoin.operators.spark_helpers;
+package org.apache.wayang.iejoin.operators.spark_helpers;
 
-import org.apache.incubator.wayang.iejoin.data.Data;
+import org.apache.wayang.iejoin.data.Data;
 import scala.Tuple2;
 
 import java.io.Serializable;
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/addUniqueID.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/addUniqueID.java
index 3b6da9f..ab5afd8 100755
--- a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/addUniqueID.java
+++ b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/addUniqueID.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.iejoin.operators.spark_helpers;
+package org.apache.wayang.iejoin.operators.spark_helpers;
 
 import org.apache.spark.api.java.function.Function2;
-import org.apache.incubator.wayang.core.util.Copyable;
+import org.apache.wayang.core.util.Copyable;
 import scala.Tuple2;
 
 import java.util.ArrayList;
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/build2ListObject.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/build2ListObject.java
index 2de66e0..33fa653 100755
--- a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/build2ListObject.java
+++ b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/build2ListObject.java
@@ -1,8 +1,8 @@
-package org.apache.incubator.wayang.iejoin.operators.spark_helpers;
+package org.apache.wayang.iejoin.operators.spark_helpers;
 
 import org.apache.spark.api.java.function.Function2;
-import org.apache.incubator.wayang.core.util.Copyable;
-import org.apache.incubator.wayang.iejoin.data.Data;
+import org.apache.wayang.core.util.Copyable;
+import org.apache.wayang.iejoin.data.Data;
 import scala.Tuple2;
 
 import java.util.ArrayList;
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/extractData.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/extractData.java
index 277847c..623c662 100755
--- a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/extractData.java
+++ b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/extractData.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.iejoin.operators.spark_helpers;
+package org.apache.wayang.iejoin.operators.spark_helpers;
 
 import org.apache.spark.api.java.function.Function;
-import org.apache.incubator.wayang.iejoin.data.Data;
+import org.apache.wayang.iejoin.data.Data;
 import scala.Tuple2;
 
 /**
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/filterUnwantedBlocks.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/filterUnwantedBlocks.java
index 5145411..09f56bb 100755
--- a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/filterUnwantedBlocks.java
+++ b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/filterUnwantedBlocks.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.iejoin.operators.spark_helpers;
+package org.apache.wayang.iejoin.operators.spark_helpers;
 
 import org.apache.spark.api.java.function.Function;
-import org.apache.incubator.wayang.iejoin.operators.IEJoinMasterOperator;
+import org.apache.wayang.iejoin.operators.IEJoinMasterOperator;
 import scala.Tuple2;
 import scala.Tuple5;
 
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/myMergeSort.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/myMergeSort.java
index 0b189da..6c2add4 100755
--- a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/myMergeSort.java
+++ b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/myMergeSort.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.iejoin.operators.spark_helpers;
+package org.apache.wayang.iejoin.operators.spark_helpers;
 
 
-import org.apache.incubator.wayang.iejoin.data.Data;
+import org.apache.wayang.iejoin.data.Data;
 
 import java.util.Comparator;
 
diff --git a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/revDataComparator.java b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/revDataComparator.java
index 4f3b24f..4dc7db8 100755
--- a/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/revDataComparator.java
+++ b/wayang-extensions/wayang-iejoin/src/main/java/org/apache/wayang/iejoin/operators/spark_helpers/revDataComparator.java
@@ -1,7 +1,7 @@
-package org.apache.incubator.wayang.iejoin.operators.spark_helpers;
+package org.apache.wayang.iejoin.operators.spark_helpers;
 
 
-import org.apache.incubator.wayang.iejoin.data.Data;
+import org.apache.wayang.iejoin.data.Data;
 
 import java.io.Serializable;
 import java.util.Comparator;
diff --git a/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/JavaExecutionOperatorTestBase.java b/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/JavaExecutionOperatorTestBase.java
index 9645231..25bcb70 100644
--- a/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/JavaExecutionOperatorTestBase.java
+++ b/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/JavaExecutionOperatorTestBase.java
@@ -1,18 +1,18 @@
-package org.apache.incubator.wayang.iejoin.operators;
+package org.apache.wayang.iejoin.operators;
 
 import org.junit.BeforeClass;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.api.Job;
-import org.apache.incubator.wayang.core.optimizer.DefaultOptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.platform.ChannelInstance;
-import org.apache.incubator.wayang.iejoin.test.ChannelFactory;
-import org.apache.incubator.wayang.java.channels.CollectionChannel;
-import org.apache.incubator.wayang.java.channels.StreamChannel;
-import org.apache.incubator.wayang.java.execution.JavaExecutor;
-import org.apache.incubator.wayang.java.operators.JavaExecutionOperator;
-import org.apache.incubator.wayang.java.platform.JavaPlatform;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.Job;
+import org.apache.wayang.core.optimizer.DefaultOptimizationContext;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.platform.ChannelInstance;
+import org.apache.wayang.iejoin.test.ChannelFactory;
+import org.apache.wayang.java.channels.CollectionChannel;
+import org.apache.wayang.java.channels.StreamChannel;
+import org.apache.wayang.java.execution.JavaExecutor;
+import org.apache.wayang.java.operators.JavaExecutionOperator;
+import org.apache.wayang.java.platform.JavaPlatform;
 
 import java.util.Collection;
 import java.util.stream.Stream;
diff --git a/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/JavaIEJoinOperatorTest.java b/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/JavaIEJoinOperatorTest.java
index 3f35782..735defe 100755
--- a/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/JavaIEJoinOperatorTest.java
+++ b/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/JavaIEJoinOperatorTest.java
@@ -1,13 +1,13 @@
-package org.apache.incubator.wayang.iejoin.operators;
+package org.apache.wayang.iejoin.operators;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.apache.incubator.wayang.basic.data.Record;
-import org.apache.incubator.wayang.basic.data.Tuple2;
-import org.apache.incubator.wayang.core.function.TransformationDescriptor;
-import org.apache.incubator.wayang.core.types.DataSetType;
-import org.apache.incubator.wayang.core.types.DataUnitType;
-import org.apache.incubator.wayang.java.channels.JavaChannelInstance;
+import org.apache.wayang.basic.data.Record;
+import org.apache.wayang.basic.data.Tuple2;
+import org.apache.wayang.core.function.TransformationDescriptor;
+import org.apache.wayang.core.types.DataSetType;
+import org.apache.wayang.core.types.DataUnitType;
+import org.apache.wayang.java.channels.JavaChannelInstance;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/SparkIEJoinOperatorTest.java b/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/SparkIEJoinOperatorTest.java
index eed6c82..4e1db78 100755
--- a/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/SparkIEJoinOperatorTest.java
+++ b/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/SparkIEJoinOperatorTest.java
@@ -1,14 +1,14 @@
-package org.apache.incubator.wayang.iejoin.operators;
+package org.apache.wayang.iejoin.operators;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.apache.incubator.wayang.basic.data.Record;
-import org.apache.incubator.wayang.basic.data.Tuple2;
-import org.apache.incubator.wayang.core.function.TransformationDescriptor;
-import org.apache.incubator.wayang.core.platform.ChannelInstance;
-import org.apache.incubator.wayang.core.types.DataSetType;
-import org.apache.incubator.wayang.core.types.DataUnitType;
-import org.apache.incubator.wayang.spark.channels.RddChannel;
+import org.apache.wayang.basic.data.Record;
+import org.apache.wayang.basic.data.Tuple2;
+import org.apache.wayang.core.function.TransformationDescriptor;
+import org.apache.wayang.core.platform.ChannelInstance;
+import org.apache.wayang.core.types.DataSetType;
+import org.apache.wayang.core.types.DataUnitType;
+import org.apache.wayang.spark.channels.RddChannel;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/SparkIEJoinOperatorTest2.java b/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/SparkIEJoinOperatorTest2.java
index c3cc9b7..599a733 100755
--- a/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/SparkIEJoinOperatorTest2.java
+++ b/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/SparkIEJoinOperatorTest2.java
@@ -1,14 +1,14 @@
-package org.apache.incubator.wayang.iejoin.operators;
+package org.apache.wayang.iejoin.operators;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.apache.incubator.wayang.basic.data.Record;
-import org.apache.incubator.wayang.basic.data.Tuple2;
-import org.apache.incubator.wayang.core.function.TransformationDescriptor;
-import org.apache.incubator.wayang.core.platform.ChannelInstance;
-import org.apache.incubator.wayang.core.types.DataSetType;
-import org.apache.incubator.wayang.core.types.DataUnitType;
-import org.apache.incubator.wayang.spark.channels.RddChannel;
+import org.apache.wayang.basic.data.Record;
+import org.apache.wayang.basic.data.Tuple2;
+import org.apache.wayang.core.function.TransformationDescriptor;
+import org.apache.wayang.core.platform.ChannelInstance;
+import org.apache.wayang.core.types.DataSetType;
+import org.apache.wayang.core.types.DataUnitType;
+import org.apache.wayang.spark.channels.RddChannel;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/SparkIEJoinOperatorTest3.java b/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/SparkIEJoinOperatorTest3.java
index 74379cf..84fde4f 100755
--- a/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/SparkIEJoinOperatorTest3.java
+++ b/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/SparkIEJoinOperatorTest3.java
@@ -1,14 +1,14 @@
-package org.apache.incubator.wayang.iejoin.operators;
+package org.apache.wayang.iejoin.operators;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.apache.incubator.wayang.basic.data.Record;
-import org.apache.incubator.wayang.basic.data.Tuple2;
-import org.apache.incubator.wayang.core.function.TransformationDescriptor;
-import org.apache.incubator.wayang.core.platform.ChannelInstance;
-import org.apache.incubator.wayang.core.types.DataSetType;
-import org.apache.incubator.wayang.core.types.DataUnitType;
-import org.apache.incubator.wayang.spark.channels.RddChannel;
+import org.apache.wayang.basic.data.Record;
+import org.apache.wayang.basic.data.Tuple2;
+import org.apache.wayang.core.function.TransformationDescriptor;
+import org.apache.wayang.core.platform.ChannelInstance;
+import org.apache.wayang.core.types.DataSetType;
+import org.apache.wayang.core.types.DataUnitType;
+import org.apache.wayang.spark.channels.RddChannel;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/SparkIEJoinOperatorTest4.java b/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/SparkIEJoinOperatorTest4.java
index 89f7f62..10114c3 100755
--- a/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/SparkIEJoinOperatorTest4.java
+++ b/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/SparkIEJoinOperatorTest4.java
@@ -1,14 +1,14 @@
-package org.apache.incubator.wayang.iejoin.operators;
+package org.apache.wayang.iejoin.operators;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.apache.incubator.wayang.basic.data.Record;
-import org.apache.incubator.wayang.basic.data.Tuple2;
-import org.apache.incubator.wayang.core.function.TransformationDescriptor;
-import org.apache.incubator.wayang.core.platform.ChannelInstance;
-import org.apache.incubator.wayang.core.types.DataSetType;
-import org.apache.incubator.wayang.core.types.DataUnitType;
-import org.apache.incubator.wayang.spark.channels.RddChannel;
+import org.apache.wayang.basic.data.Record;
+import org.apache.wayang.basic.data.Tuple2;
+import org.apache.wayang.core.function.TransformationDescriptor;
+import org.apache.wayang.core.platform.ChannelInstance;
+import org.apache.wayang.core.types.DataSetType;
+import org.apache.wayang.core.types.DataUnitType;
+import org.apache.wayang.spark.channels.RddChannel;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/SparkIESelfJoinOperatorTest.java b/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/SparkIESelfJoinOperatorTest.java
index deae6d6..b5bc04f 100755
--- a/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/SparkIESelfJoinOperatorTest.java
+++ b/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/SparkIESelfJoinOperatorTest.java
@@ -1,14 +1,14 @@
-package org.apache.incubator.wayang.iejoin.operators;
+package org.apache.wayang.iejoin.operators;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.apache.incubator.wayang.basic.data.Record;
-import org.apache.incubator.wayang.basic.data.Tuple2;
-import org.apache.incubator.wayang.core.function.TransformationDescriptor;
-import org.apache.incubator.wayang.core.platform.ChannelInstance;
-import org.apache.incubator.wayang.core.types.DataSetType;
-import org.apache.incubator.wayang.core.types.DataUnitType;
-import org.apache.incubator.wayang.spark.channels.RddChannel;
+import org.apache.wayang.basic.data.Record;
+import org.apache.wayang.basic.data.Tuple2;
+import org.apache.wayang.core.function.TransformationDescriptor;
+import org.apache.wayang.core.platform.ChannelInstance;
+import org.apache.wayang.core.types.DataSetType;
+import org.apache.wayang.core.types.DataUnitType;
+import org.apache.wayang.spark.channels.RddChannel;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/SparkOperatorTestBase.java b/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/SparkOperatorTestBase.java
index d82a69b..9f81e6e 100644
--- a/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/SparkOperatorTestBase.java
+++ b/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/operators/SparkOperatorTestBase.java
@@ -1,20 +1,20 @@
-package org.apache.incubator.wayang.iejoin.operators;
+package org.apache.wayang.iejoin.operators;
 
 import org.apache.spark.api.java.JavaSparkContext;
 import org.junit.Before;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.api.Job;
-import org.apache.incubator.wayang.core.optimizer.DefaultOptimizationContext;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.plan.wayangplan.Operator;
-import org.apache.incubator.wayang.core.platform.ChannelInstance;
-import org.apache.incubator.wayang.core.platform.CrossPlatformExecutor;
-import org.apache.incubator.wayang.iejoin.test.ChannelFactory;
-import org.apache.incubator.wayang.java.channels.CollectionChannel;
-import org.apache.incubator.wayang.spark.channels.RddChannel;
-import org.apache.incubator.wayang.spark.execution.SparkExecutor;
-import org.apache.incubator.wayang.spark.operators.SparkExecutionOperator;
-import org.apache.incubator.wayang.spark.platform.SparkPlatform;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.api.Job;
+import org.apache.wayang.core.optimizer.DefaultOptimizationContext;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.plan.wayangplan.Operator;
+import org.apache.wayang.core.platform.ChannelInstance;
+import org.apache.wayang.core.platform.CrossPlatformExecutor;
+import org.apache.wayang.iejoin.test.ChannelFactory;
+import org.apache.wayang.java.channels.CollectionChannel;
+import org.apache.wayang.spark.channels.RddChannel;
+import org.apache.wayang.spark.execution.SparkExecutor;
+import org.apache.wayang.spark.operators.SparkExecutionOperator;
+import org.apache.wayang.spark.platform.SparkPlatform;
 
 import java.util.Collection;
 
diff --git a/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/test/ChannelFactory.java b/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/test/ChannelFactory.java
index ec70d7c..884446e 100644
--- a/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/test/ChannelFactory.java
+++ b/wayang-extensions/wayang-iejoin/src/test/java/org/apache/wayang/iejoin/test/ChannelFactory.java
@@ -1,15 +1,15 @@
-package org.apache.incubator.wayang.iejoin.test;
+package org.apache.wayang.iejoin.test;
 
 import org.junit.Before;
-import org.apache.incubator.wayang.core.api.Configuration;
-import org.apache.incubator.wayang.core.plan.executionplan.Channel;
-import org.apache.incubator.wayang.core.platform.ChannelDescriptor;
-import org.apache.incubator.wayang.core.util.WayangCollections;
-import org.apache.incubator.wayang.java.channels.CollectionChannel;
-import org.apache.incubator.wayang.java.channels.StreamChannel;
-import org.apache.incubator.wayang.java.execution.JavaExecutor;
-import org.apache.incubator.wayang.spark.channels.RddChannel;
-import org.apache.incubator.wayang.spark.execution.SparkExecutor;
+import org.apache.wayang.core.api.Configuration;
+import org.apache.wayang.core.plan.executionplan.Channel;
+import org.apache.wayang.core.platform.ChannelDescriptor;
+import org.apache.wayang.core.util.WayangCollections;
+import org.apache.wayang.java.channels.CollectionChannel;
+import org.apache.wayang.java.channels.StreamChannel;
+import org.apache.wayang.java.execution.JavaExecutor;
+import org.apache.wayang.spark.channels.RddChannel;
+import org.apache.wayang.spark.execution.SparkExecutor;
 
 import java.util.Collection;
 import java.util.stream.Stream;
diff --git a/wayang-platforms/pom.xml b/wayang-platforms/pom.xml
index a8feff0..3c1ba3d 100644
--- a/wayang-platforms/pom.xml
+++ b/wayang-platforms/pom.xml
@@ -2,7 +2,7 @@
 <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>wayang</artifactId>
-        <groupId>org.apache.incubator.wayang</groupId>
+        <groupId>org.apache.wayang</groupId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/wayang-platforms/wayang-flink/pom.xml b/wayang-platforms/wayang-flink/pom.xml
index aadab4d..b234e0f 100644
--- a/wayang-platforms/wayang-flink/pom.xml
+++ b/wayang-platforms/wayang-flink/pom.xml
@@ -2,7 +2,7 @@
 <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>wayang-platforms</artifactId>
-        <groupId>org.apache.incubator.wayang</groupId>
+        <groupId>org.apache.wayang</groupId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -16,17 +16,17 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.incubator.wayang</groupId>
+            <groupId>org.apache.wayang</groupId>
             <artifactId>wayang-core</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.incubator.wayang</groupId>
+            <groupId>org.apache.wayang</groupId>
             <artifactId>wayang-basic</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.incubator.wayang</groupId>
+            <groupId>org.apache.wayang</groupId>
             <artifactId>wayang-java</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/Flink.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/Flink.java
index 74ee76c..f1393c7 100644
--- a/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/Flink.java
+++ b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/Flink.java
@@ -1,10 +1,10 @@
-package org.apache.incubator.wayang.flink;
+package org.apache.wayang.flink;
 
 
-import org.apache.incubator.wayang.flink.platform.FlinkPlatform;
-import org.apache.incubator.wayang.flink.plugin.FlinkBasicPlugin;
-import org.apache.incubator.wayang.flink.plugin.FlinkConversionPlugin;
-import org.apache.incubator.wayang.flink.plugin.FlinkGraphPlugin;
+import org.apache.wayang.flink.platform.FlinkPlatform;
+import org.apache.wayang.flink.plugin.FlinkBasicPlugin;
+import org.apache.wayang.flink.plugin.FlinkConversionPlugin;
+import org.apache.wayang.flink.plugin.FlinkGraphPlugin;
 
 /**
  * Register for relevant components of this module.
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/channels/ChannelConversions.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/channels/ChannelConversions.java
index 8e93a9b..4697948 100644
--- a/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/channels/ChannelConversions.java
+++ b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/channels/ChannelConversions.java
@@ -1,17 +1,17 @@
-package org.apache.incubator.wayang.flink.channels;
-
-import org.apache.incubator.wayang.basic.channels.FileChannel;
-import org.apache.incubator.wayang.basic.data.Tuple2;
-import org.apache.incubator.wayang.core.optimizer.channels.ChannelConversion;
-import org.apache.incubator.wayang.core.optimizer.channels.DefaultChannelConversion;
-import org.apache.incubator.wayang.core.types.DataSetType;
-import org.apache.incubator.wayang.flink.operators.FlinkCollectionSink;
-import org.apache.incubator.wayang.flink.operators.FlinkCollectionSource;
-import org.apache.incubator.wayang.flink.operators.FlinkObjectFileSink;
-import org.apache.incubator.wayang.flink.operators.FlinkObjectFileSource;
-import org.apache.incubator.wayang.flink.operators.FlinkTsvFileSink;
-import org.apache.incubator.wayang.flink.platform.FlinkPlatform;
-import org.apache.incubator.wayang.java.channels.CollectionChannel;
+package org.apache.wayang.flink.channels;
+
+import org.apache.wayang.basic.channels.FileChannel;
+import org.apache.wayang.basic.data.Tuple2;
+import org.apache.wayang.core.optimizer.channels.ChannelConversion;
+import org.apache.wayang.core.optimizer.channels.DefaultChannelConversion;
+import org.apache.wayang.core.types.DataSetType;
+import org.apache.wayang.flink.operators.FlinkCollectionSink;
+import org.apache.wayang.flink.operators.FlinkCollectionSource;
+import org.apache.wayang.flink.operators.FlinkObjectFileSink;
+import org.apache.wayang.flink.operators.FlinkObjectFileSource;
+import org.apache.wayang.flink.operators.FlinkTsvFileSink;
+import org.apache.wayang.flink.platform.FlinkPlatform;
+import org.apache.wayang.java.channels.CollectionChannel;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/channels/DataSetChannel.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/channels/DataSetChannel.java
index 2093917..c75266a 100644
--- a/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/channels/DataSetChannel.java
+++ b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/channels/DataSetChannel.java
@@ -1,14 +1,14 @@
-package org.apache.incubator.wayang.flink.channels;
+package org.apache.wayang.flink.channels;
 
 import org.apache.flink.api.java.DataSet;
-import org.apache.incubator.wayang.core.optimizer.OptimizationContext;
-import org.apache.incubator.wayang.core.plan.executionplan.Channel;
-import org.apache.incubator.wayang.core.plan.wayangplan.OutputSlot;
-import org.apache.incubator.wayang.core.platform.AbstractChannelInstance;
-import org.apache.incubator.wayang.core.platform.ChannelDescriptor;
-import org.apache.incubator.wayang.core.platform.ChannelInstance;
-import org.apache.incubator.wayang.core.platform.Executor;
-import org.apache.incubator.wayang.flink.execution.FlinkExecutor;
+import org.apache.wayang.core.optimizer.OptimizationContext;
+import org.apache.wayang.core.plan.executionplan.Channel;
+import org.apache.wayang.core.plan.wayangplan.OutputSlot;
+import org.apache.wayang.core.platform.AbstractChannelInstance;
+import org.apache.wayang.core.platform.ChannelDescriptor;
+import org.apache.wayang.core.platform.ChannelInstance;
+import org.apache.wayang.core.platform.Executor;
+import org.apache.wayang.flink.execution.FlinkExecutor;
 
 import java.util.OptionalLong;
 
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/compiler/FlinkCoGroupFunction.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/compiler/FlinkCoGroupFunction.java
index 7523bda..bb85bcc 100644
--- a/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/compiler/FlinkCoGroupFunction.java
+++ b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/compiler/FlinkCoGroupFunction.java
@@ -1,8 +1,8 @@
-package org.apache.incubator.wayang.flink.compiler;
+package org.apache.wayang.flink.compiler;
 
 import org.apache.flink.api.common.functions.CoGroupFunction;
 import org.apache.flink.util.Collector;
-import org.apache.incubator.wayang.basic.data.Tuple2;
+import org.apache.wayang.basic.data.Tuple2;
 
 /**
  * Wrapper of {@Link CoGroupFunction} of Flink for use in Wayang
diff --git a/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/compiler/FunctionCompiler.java b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/compiler/FunctionCompiler.java
index 580b18b..ff35613 100644
--- a/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/compiler/FunctionCompiler.java
+++ b/wayang-platforms/wayang-flink/src/main/java/org/apache/wayang/flink/compiler/FunctionCompiler.java
@@ -1,4 +1,4 @@
-package org.apache.incubator.wayang.flink.compiler;
+package org.apache.wayang.flink.compiler;
 
 import org.apache.flink.api.common.functions.CoGroupFunction;
 import org.apache.flink.api.common.functions.FilterFunction;
@@ -14,14 +14,14 @@ import org.apache.flink.api.java.functions.KeySelector;
... 12183 lines suppressed ...