[FLINK-36063][runtime] Migrate StreamGraph and its related classes from flink-streaming-java to flink-runtime.
This closes #25219.
diff --git a/flink-docs/src/main/java/org/apache/flink/docs/util/ConfigurationOptionLocator.java b/flink-docs/src/main/java/org/apache/flink/docs/util/ConfigurationOptionLocator.java
index 01c3aee..e2341cf 100644
--- a/flink-docs/src/main/java/org/apache/flink/docs/util/ConfigurationOptionLocator.java
+++ b/flink-docs/src/main/java/org/apache/flink/docs/util/ConfigurationOptionLocator.java
@@ -55,7 +55,7 @@
new OptionsClassLocation(
"flink-runtime", "org.apache.flink.runtime.highavailability"),
new OptionsClassLocation(
- "flink-streaming-java", "org.apache.flink.streaming.api.environment"),
+ "flink-runtime", "org.apache.flink.streaming.api.environment"),
new OptionsClassLocation("flink-yarn", "org.apache.flink.yarn.configuration"),
new OptionsClassLocation(
"flink-metrics/flink-metrics-prometheus",
diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml
index 4ea1698..204b3cc 100644
--- a/flink-runtime/pom.xml
+++ b/flink-runtime/pom.xml
@@ -194,6 +194,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-datagen</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
</dependency>
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/CheckpointingMode.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/CheckpointingMode.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/CheckpointingMode.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/CheckpointingMode.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/SimpleTimerService.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/SimpleTimerService.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/SimpleTimerService.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/SimpleTimerService.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/TimeCharacteristic.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/TimeCharacteristic.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/TimeCharacteristic.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/TimeCharacteristic.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/TimeDomain.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/TimeDomain.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/TimeDomain.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/TimeDomain.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/TimerService.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/TimerService.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/TimerService.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/TimerService.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/checkpoint/CheckpointedFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/checkpoint/CheckpointedFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/checkpoint/CheckpointedFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/checkpoint/CheckpointedFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/checkpoint/ExternallyInducedSource.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/checkpoint/ExternallyInducedSource.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/checkpoint/ExternallyInducedSource.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/checkpoint/ExternallyInducedSource.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/checkpoint/ListCheckpointed.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/checkpoint/ListCheckpointed.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/checkpoint/ListCheckpointed.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/checkpoint/ListCheckpointed.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/checkpoint/WithMasterCheckpointHook.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/checkpoint/WithMasterCheckpointHook.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/checkpoint/WithMasterCheckpointHook.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/checkpoint/WithMasterCheckpointHook.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/connector/sink2/CommittableMessage.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/connector/sink2/CommittableMessage.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/connector/sink2/CommittableMessage.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/connector/sink2/CommittableMessage.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/connector/sink2/CommittableMessageSerializer.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/connector/sink2/CommittableMessageSerializer.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/connector/sink2/CommittableMessageSerializer.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/connector/sink2/CommittableMessageSerializer.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/connector/sink2/CommittableMessageTypeInfo.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/connector/sink2/CommittableMessageTypeInfo.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/connector/sink2/CommittableMessageTypeInfo.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/connector/sink2/CommittableMessageTypeInfo.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/connector/sink2/CommittableSummary.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/connector/sink2/CommittableSummary.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/connector/sink2/CommittableSummary.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/connector/sink2/CommittableSummary.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/connector/sink2/CommittableWithLineage.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/connector/sink2/CommittableWithLineage.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/connector/sink2/CommittableWithLineage.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/connector/sink2/CommittableWithLineage.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/connector/sink2/GlobalCommittableWrapper.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/connector/sink2/GlobalCommittableWrapper.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/connector/sink2/GlobalCommittableWrapper.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/connector/sink2/GlobalCommittableWrapper.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/connector/sink2/GlobalCommitterOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/connector/sink2/GlobalCommitterOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/connector/sink2/GlobalCommitterOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/connector/sink2/GlobalCommitterOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/connector/sink2/GlobalCommitterSerializer.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/connector/sink2/GlobalCommitterSerializer.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/connector/sink2/GlobalCommitterSerializer.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/connector/sink2/GlobalCommitterSerializer.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/connector/sink2/StandardSinkTopologies.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/connector/sink2/StandardSinkTopologies.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/connector/sink2/StandardSinkTopologies.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/connector/sink2/StandardSinkTopologies.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/connector/sink2/SupportsPostCommitTopology.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/connector/sink2/SupportsPostCommitTopology.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/connector/sink2/SupportsPostCommitTopology.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/connector/sink2/SupportsPostCommitTopology.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/connector/sink2/SupportsPreCommitTopology.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/connector/sink2/SupportsPreCommitTopology.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/connector/sink2/SupportsPreCommitTopology.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/connector/sink2/SupportsPreCommitTopology.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/connector/sink2/SupportsPreWriteTopology.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/connector/sink2/SupportsPreWriteTopology.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/connector/sink2/SupportsPreWriteTopology.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/connector/sink2/SupportsPreWriteTopology.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/AllWindowedStream.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/AllWindowedStream.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/AllWindowedStream.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/AllWindowedStream.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/BroadcastConnectedStream.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/BroadcastConnectedStream.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/BroadcastConnectedStream.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/BroadcastConnectedStream.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/BroadcastStream.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/BroadcastStream.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/BroadcastStream.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/BroadcastStream.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/CachedDataStream.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/CachedDataStream.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/CachedDataStream.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/CachedDataStream.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/CoGroupedStreams.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/CoGroupedStreams.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/CoGroupedStreams.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/CoGroupedStreams.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/ConnectedStreams.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/ConnectedStreams.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/ConnectedStreams.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/ConnectedStreams.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/CustomSinkOperatorUidHashes.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/CustomSinkOperatorUidHashes.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/CustomSinkOperatorUidHashes.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/CustomSinkOperatorUidHashes.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/DataStream.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/DataStream.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/DataStream.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/DataStream.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/DataStreamSink.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/DataStreamSink.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/DataStreamSink.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/DataStreamSink.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/DataStreamSource.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/DataStreamSource.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/DataStreamSource.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/DataStreamSource.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/IterativeStream.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/IterativeStream.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/IterativeStream.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/IterativeStream.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/JoinedStreams.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/JoinedStreams.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/JoinedStreams.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/JoinedStreams.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/KeyedPartitionWindowedStream.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/KeyedPartitionWindowedStream.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/KeyedPartitionWindowedStream.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/KeyedPartitionWindowedStream.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/KeyedStream.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/KeyedStream.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/KeyedStream.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/KeyedStream.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/NonKeyedPartitionWindowedStream.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/NonKeyedPartitionWindowedStream.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/NonKeyedPartitionWindowedStream.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/NonKeyedPartitionWindowedStream.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/PartitionWindowedStream.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/PartitionWindowedStream.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/PartitionWindowedStream.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/PartitionWindowedStream.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/QueryableStateStream.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/QueryableStateStream.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/QueryableStateStream.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/QueryableStateStream.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/SideOutputDataStream.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/SideOutputDataStream.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/SideOutputDataStream.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/SideOutputDataStream.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/SingleOutputStreamOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/SingleOutputStreamOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/SingleOutputStreamOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/SingleOutputStreamOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/StreamProjection.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/StreamProjection.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/StreamProjection.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/StreamProjection.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/UnsupportedTimeCharacteristicException.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/UnsupportedTimeCharacteristicException.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/UnsupportedTimeCharacteristicException.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/UnsupportedTimeCharacteristicException.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/WindowedStream.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/WindowedStream.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/WindowedStream.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/WindowedStream.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/CheckpointConfig.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/environment/CheckpointConfig.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/CheckpointConfig.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/environment/CheckpointConfig.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/ExecutionCheckpointingOptions.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/environment/ExecutionCheckpointingOptions.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/ExecutionCheckpointingOptions.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/environment/ExecutionCheckpointingOptions.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/LocalStreamEnvironment.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/environment/LocalStreamEnvironment.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/LocalStreamEnvironment.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/environment/LocalStreamEnvironment.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/RemoteStreamEnvironment.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/environment/RemoteStreamEnvironment.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/RemoteStreamEnvironment.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/environment/RemoteStreamEnvironment.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironmentFactory.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironmentFactory.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironmentFactory.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironmentFactory.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamPipelineOptions.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/environment/StreamPipelineOptions.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamPipelineOptions.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/environment/StreamPipelineOptions.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/AssignerWithPeriodicWatermarks.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/AssignerWithPeriodicWatermarks.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/AssignerWithPeriodicWatermarks.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/AssignerWithPeriodicWatermarks.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/AssignerWithPunctuatedWatermarks.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/AssignerWithPunctuatedWatermarks.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/AssignerWithPunctuatedWatermarks.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/AssignerWithPunctuatedWatermarks.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/KeyedProcessFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/KeyedProcessFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/KeyedProcessFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/KeyedProcessFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/ProcessFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/ProcessFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/ProcessFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/ProcessFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/TimestampAssigner.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/TimestampAssigner.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/TimestampAssigner.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/TimestampAssigner.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/aggregation/AggregationFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/aggregation/AggregationFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/aggregation/AggregationFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/aggregation/AggregationFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/aggregation/ComparableAggregator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/aggregation/ComparableAggregator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/aggregation/ComparableAggregator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/aggregation/ComparableAggregator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/aggregation/Comparator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/aggregation/Comparator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/aggregation/Comparator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/aggregation/Comparator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/aggregation/SumAggregator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/aggregation/SumAggregator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/aggregation/SumAggregator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/aggregation/SumAggregator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/aggregation/SumFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/aggregation/SumFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/aggregation/SumFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/aggregation/SumFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/co/BaseBroadcastProcessFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/co/BaseBroadcastProcessFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/co/BaseBroadcastProcessFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/co/BaseBroadcastProcessFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/co/BroadcastProcessFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/co/BroadcastProcessFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/co/BroadcastProcessFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/co/BroadcastProcessFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/co/CoFlatMapFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/co/CoFlatMapFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/co/CoFlatMapFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/co/CoFlatMapFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/co/CoMapFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/co/CoMapFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/co/CoMapFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/co/CoMapFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/co/CoProcessFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/co/CoProcessFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/co/CoProcessFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/co/CoProcessFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/co/KeyedBroadcastProcessFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/co/KeyedBroadcastProcessFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/co/KeyedBroadcastProcessFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/co/KeyedBroadcastProcessFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/co/KeyedCoProcessFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/co/KeyedCoProcessFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/co/KeyedCoProcessFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/co/KeyedCoProcessFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/co/ProcessJoinFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/co/ProcessJoinFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/co/ProcessJoinFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/co/ProcessJoinFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/query/AbstractQueryableStateOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/query/AbstractQueryableStateOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/query/AbstractQueryableStateOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/query/AbstractQueryableStateOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/query/QueryableAppendingStateOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/query/QueryableAppendingStateOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/query/QueryableAppendingStateOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/query/QueryableAppendingStateOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/query/QueryableValueStateOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/query/QueryableValueStateOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/query/QueryableValueStateOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/query/QueryableValueStateOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/OutputFormatSinkFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/sink/OutputFormatSinkFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/OutputFormatSinkFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/sink/OutputFormatSinkFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/PrintSinkFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/sink/PrintSinkFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/PrintSinkFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/sink/PrintSinkFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/RichSinkFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/sink/RichSinkFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/RichSinkFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/sink/RichSinkFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/SinkFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/sink/SinkFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/SinkFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/sink/SinkFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/SocketClientSink.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/sink/SocketClientSink.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/SocketClientSink.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/sink/SocketClientSink.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/ContinuousFileMonitoringFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/ContinuousFileMonitoringFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/ContinuousFileMonitoringFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/ContinuousFileMonitoringFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/ContinuousFileReaderOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/ContinuousFileReaderOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/ContinuousFileReaderOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/ContinuousFileReaderOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/ContinuousFileReaderOperatorFactory.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/ContinuousFileReaderOperatorFactory.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/ContinuousFileReaderOperatorFactory.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/ContinuousFileReaderOperatorFactory.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/FileMonitoringFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/FileMonitoringFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/FileMonitoringFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/FileMonitoringFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/FileProcessingMode.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/FileProcessingMode.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/FileProcessingMode.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/FileProcessingMode.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/FileReadFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/FileReadFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/FileReadFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/FileReadFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/FromElementsFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/FromElementsFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/FromElementsFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/FromElementsFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/FromIteratorFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/FromIteratorFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/FromIteratorFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/FromIteratorFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/FromSplittableIteratorFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/FromSplittableIteratorFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/FromSplittableIteratorFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/FromSplittableIteratorFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/InputFormatSourceFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/InputFormatSourceFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/InputFormatSourceFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/InputFormatSourceFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/ParallelSourceFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/ParallelSourceFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/ParallelSourceFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/ParallelSourceFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/RichParallelSourceFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/RichParallelSourceFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/RichParallelSourceFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/RichParallelSourceFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/RichSourceFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/RichSourceFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/RichSourceFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/RichSourceFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/SocketTextStreamFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/SocketTextStreamFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/SocketTextStreamFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/SocketTextStreamFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/SourceFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/SourceFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/SourceFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/SourceFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/StatefulSequenceSource.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/StatefulSequenceSource.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/StatefulSequenceSource.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/StatefulSequenceSource.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/TimestampedFileInputSplit.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/TimestampedFileInputSplit.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/TimestampedFileInputSplit.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/TimestampedFileInputSplit.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/TimestampedInputSplit.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/TimestampedInputSplit.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/TimestampedInputSplit.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/TimestampedInputSplit.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/windowing/AggregateApplyAllWindowFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/windowing/AggregateApplyAllWindowFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/windowing/AggregateApplyAllWindowFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/windowing/AggregateApplyAllWindowFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/windowing/AggregateApplyWindowFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/windowing/AggregateApplyWindowFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/windowing/AggregateApplyWindowFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/windowing/AggregateApplyWindowFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/windowing/AllWindowFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/windowing/AllWindowFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/windowing/AllWindowFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/windowing/AllWindowFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/windowing/InternalProcessApplyAllWindowContext.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/windowing/InternalProcessApplyAllWindowContext.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/windowing/InternalProcessApplyAllWindowContext.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/windowing/InternalProcessApplyAllWindowContext.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/windowing/InternalProcessApplyWindowContext.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/windowing/InternalProcessApplyWindowContext.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/windowing/InternalProcessApplyWindowContext.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/windowing/InternalProcessApplyWindowContext.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/windowing/PassThroughAllWindowFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/windowing/PassThroughAllWindowFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/windowing/PassThroughAllWindowFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/windowing/PassThroughAllWindowFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/windowing/PassThroughWindowFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/windowing/PassThroughWindowFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/windowing/PassThroughWindowFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/windowing/PassThroughWindowFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/windowing/ProcessAllWindowFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/windowing/ProcessAllWindowFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/windowing/ProcessAllWindowFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/windowing/ProcessAllWindowFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/windowing/ProcessWindowFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/windowing/ProcessWindowFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/windowing/ProcessWindowFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/windowing/ProcessWindowFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/windowing/ReduceApplyAllWindowFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/windowing/ReduceApplyAllWindowFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/windowing/ReduceApplyAllWindowFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/windowing/ReduceApplyAllWindowFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/windowing/ReduceApplyProcessAllWindowFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/windowing/ReduceApplyProcessAllWindowFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/windowing/ReduceApplyProcessAllWindowFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/windowing/ReduceApplyProcessAllWindowFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/windowing/ReduceApplyProcessWindowFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/windowing/ReduceApplyProcessWindowFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/windowing/ReduceApplyProcessWindowFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/windowing/ReduceApplyProcessWindowFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/windowing/ReduceApplyWindowFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/windowing/ReduceApplyWindowFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/windowing/ReduceApplyWindowFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/windowing/ReduceApplyWindowFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/windowing/WindowFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/windowing/WindowFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/windowing/WindowFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/windowing/WindowFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/FunctionMasterCheckpointHookFactory.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/FunctionMasterCheckpointHookFactory.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/FunctionMasterCheckpointHookFactory.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/FunctionMasterCheckpointHookFactory.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/GlobalStreamExchangeMode.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/GlobalStreamExchangeMode.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/GlobalStreamExchangeMode.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/GlobalStreamExchangeMode.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/JSONGenerator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/JSONGenerator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/JSONGenerator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/JSONGenerator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/NonChainedOutput.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/NonChainedOutput.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/NonChainedOutput.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/NonChainedOutput.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/SimpleTransformationTranslator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/SimpleTransformationTranslator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/SimpleTransformationTranslator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/SimpleTransformationTranslator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/StreamConfig.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/StreamConfig.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/StreamConfig.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/StreamConfig.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/StreamEdge.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/StreamEdge.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/StreamEdge.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/StreamEdge.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/StreamGraph.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/StreamGraph.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/StreamGraph.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/StreamGraph.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/StreamGraphGenerator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/StreamGraphGenerator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/StreamGraphGenerator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/StreamGraphGenerator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/StreamGraphHasher.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/StreamGraphHasher.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/StreamGraphHasher.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/StreamGraphHasher.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/StreamGraphHasherV2.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/StreamGraphHasherV2.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/StreamGraphHasherV2.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/StreamGraphHasherV2.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/StreamGraphUserHashHasher.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/StreamGraphUserHashHasher.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/StreamGraphUserHashHasher.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/StreamGraphUserHashHasher.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/StreamNode.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/StreamNode.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/StreamNode.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/StreamNode.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/StreamingJobGraphGenerator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/StreamingJobGraphGenerator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/StreamingJobGraphGenerator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/StreamingJobGraphGenerator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/TransformationTranslator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/TransformationTranslator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/TransformationTranslator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/TransformationTranslator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/lineage/DefaultLineageDataset.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/lineage/DefaultLineageDataset.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/lineage/DefaultLineageDataset.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/lineage/DefaultLineageDataset.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/lineage/DefaultLineageEdge.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/lineage/DefaultLineageEdge.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/lineage/DefaultLineageEdge.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/lineage/DefaultLineageEdge.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/lineage/DefaultLineageGraph.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/lineage/DefaultLineageGraph.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/lineage/DefaultLineageGraph.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/lineage/DefaultLineageGraph.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/lineage/LineageDataset.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/lineage/LineageDataset.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/lineage/LineageDataset.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/lineage/LineageDataset.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/lineage/LineageDatasetFacet.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/lineage/LineageDatasetFacet.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/lineage/LineageDatasetFacet.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/lineage/LineageDatasetFacet.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/lineage/LineageEdge.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/lineage/LineageEdge.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/lineage/LineageEdge.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/lineage/LineageEdge.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/lineage/LineageGraph.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/lineage/LineageGraph.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/lineage/LineageGraph.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/lineage/LineageGraph.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/lineage/LineageGraphUtils.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/lineage/LineageGraphUtils.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/lineage/LineageGraphUtils.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/lineage/LineageGraphUtils.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/lineage/LineageVertex.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/lineage/LineageVertex.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/lineage/LineageVertex.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/lineage/LineageVertex.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/lineage/LineageVertexProvider.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/lineage/LineageVertexProvider.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/lineage/LineageVertexProvider.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/lineage/LineageVertexProvider.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/lineage/SourceLineageVertex.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/lineage/SourceLineageVertex.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/lineage/SourceLineageVertex.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/lineage/SourceLineageVertex.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/AbstractStreamOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/AbstractStreamOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/AbstractStreamOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/AbstractStreamOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/AbstractStreamOperatorFactory.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/AbstractStreamOperatorFactory.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/AbstractStreamOperatorFactory.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/AbstractStreamOperatorFactory.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/AbstractStreamOperatorV2.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/AbstractStreamOperatorV2.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/AbstractStreamOperatorV2.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/AbstractStreamOperatorV2.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/AbstractUdfStreamOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/AbstractUdfStreamOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/AbstractUdfStreamOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/AbstractUdfStreamOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/BackendRestorerProcedure.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/BackendRestorerProcedure.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/BackendRestorerProcedure.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/BackendRestorerProcedure.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/BatchGroupedReduceOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/BatchGroupedReduceOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/BatchGroupedReduceOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/BatchGroupedReduceOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/BoundedMultiInput.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/BoundedMultiInput.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/BoundedMultiInput.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/BoundedMultiInput.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/BoundedOneInput.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/BoundedOneInput.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/BoundedOneInput.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/BoundedOneInput.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/ChainingStrategy.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/ChainingStrategy.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/ChainingStrategy.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/ChainingStrategy.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/CoordinatedOperatorFactory.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/CoordinatedOperatorFactory.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/CoordinatedOperatorFactory.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/CoordinatedOperatorFactory.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/CountingOutput.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/CountingOutput.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/CountingOutput.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/CountingOutput.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/Input.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/Input.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/Input.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/Input.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/InputFormatOperatorFactory.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InputFormatOperatorFactory.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/InputFormatOperatorFactory.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InputFormatOperatorFactory.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/InputSelectable.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InputSelectable.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/InputSelectable.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InputSelectable.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/InputSelection.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InputSelection.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/InputSelection.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InputSelection.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/InternalTimeServiceManager.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimeServiceManager.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/InternalTimeServiceManager.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimeServiceManager.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/InternalTimeServiceManagerImpl.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimeServiceManagerImpl.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/InternalTimeServiceManagerImpl.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimeServiceManagerImpl.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/InternalTimer.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimer.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/InternalTimer.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimer.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/InternalTimerService.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimerService.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/InternalTimerService.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimerService.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/InternalTimerServiceAsyncImpl.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimerServiceAsyncImpl.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/InternalTimerServiceAsyncImpl.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimerServiceAsyncImpl.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/InternalTimerServiceImpl.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimerServiceImpl.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/InternalTimerServiceImpl.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimerServiceImpl.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/InternalTimerServiceSerializationProxy.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimerServiceSerializationProxy.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/InternalTimerServiceSerializationProxy.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimerServiceSerializationProxy.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/InternalTimersSnapshot.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimersSnapshot.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/InternalTimersSnapshot.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimersSnapshot.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/InternalTimersSnapshotReaderWriters.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimersSnapshotReaderWriters.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/InternalTimersSnapshotReaderWriters.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimersSnapshotReaderWriters.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/KeyContext.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/KeyContext.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/KeyContext.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/KeyContext.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/KeyContextHandler.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/KeyContextHandler.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/KeyContextHandler.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/KeyContextHandler.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/KeyedProcessOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/KeyedProcessOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/KeyedProcessOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/KeyedProcessOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/LatencyMarkerEmitter.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/LatencyMarkerEmitter.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/LatencyMarkerEmitter.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/LatencyMarkerEmitter.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/LegacyKeyedProcessOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/LegacyKeyedProcessOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/LegacyKeyedProcessOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/LegacyKeyedProcessOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/MailboxWatermarkProcessor.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/MailboxWatermarkProcessor.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/MailboxWatermarkProcessor.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/MailboxWatermarkProcessor.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/MapPartitionIterator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/MapPartitionIterator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/MapPartitionIterator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/MapPartitionIterator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/MapPartitionOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/MapPartitionOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/MapPartitionOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/MapPartitionOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/MultipleInputStreamOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/MultipleInputStreamOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/MultipleInputStreamOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/MultipleInputStreamOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/OneInputStreamOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/OneInputStreamOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/OneInputStreamOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/OneInputStreamOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/OneInputStreamOperatorFactory.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/OneInputStreamOperatorFactory.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/OneInputStreamOperatorFactory.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/OneInputStreamOperatorFactory.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/OperatorAttributes.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/OperatorAttributes.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/OperatorAttributes.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/OperatorAttributes.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/OperatorAttributesBuilder.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/OperatorAttributesBuilder.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/OperatorAttributesBuilder.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/OperatorAttributesBuilder.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/OperatorSnapshotFinalizer.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/OperatorSnapshotFinalizer.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/OperatorSnapshotFinalizer.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/OperatorSnapshotFinalizer.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/OperatorSnapshotFutures.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/OperatorSnapshotFutures.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/OperatorSnapshotFutures.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/OperatorSnapshotFutures.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/Output.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/Output.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/Output.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/Output.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/OutputFormatOperatorFactory.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/OutputFormatOperatorFactory.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/OutputFormatOperatorFactory.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/OutputFormatOperatorFactory.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/PartitionAggregateOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/PartitionAggregateOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/PartitionAggregateOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/PartitionAggregateOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/PartitionReduceOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/PartitionReduceOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/PartitionReduceOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/PartitionReduceOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/ProcessOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/ProcessOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/ProcessOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/ProcessOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/SetupableStreamOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/SetupableStreamOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/SetupableStreamOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/SetupableStreamOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/SimpleInputFormatOperatorFactory.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/SimpleInputFormatOperatorFactory.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/SimpleInputFormatOperatorFactory.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/SimpleInputFormatOperatorFactory.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/SimpleOperatorFactory.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/SimpleOperatorFactory.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/SimpleOperatorFactory.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/SimpleOperatorFactory.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/SimpleOutputFormatOperatorFactory.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/SimpleOutputFormatOperatorFactory.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/SimpleOutputFormatOperatorFactory.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/SimpleOutputFormatOperatorFactory.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/SimpleUdfStreamOperatorFactory.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/SimpleUdfStreamOperatorFactory.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/SimpleUdfStreamOperatorFactory.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/SimpleUdfStreamOperatorFactory.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/SourceOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/SourceOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/SourceOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/SourceOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/SourceOperatorFactory.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/SourceOperatorFactory.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/SourceOperatorFactory.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/SourceOperatorFactory.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamFilter.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamFilter.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamFilter.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamFilter.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamFlatMap.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamFlatMap.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamFlatMap.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamFlatMap.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamGroupedReduceOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamGroupedReduceOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamGroupedReduceOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamGroupedReduceOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamMap.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamMap.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamMap.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamMap.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamOperatorFactory.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamOperatorFactory.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamOperatorFactory.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamOperatorFactory.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamOperatorFactoryUtil.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamOperatorFactoryUtil.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamOperatorFactoryUtil.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamOperatorFactoryUtil.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamOperatorParameters.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamOperatorParameters.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamOperatorParameters.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamOperatorParameters.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamOperatorStateContext.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamOperatorStateContext.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamOperatorStateContext.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamOperatorStateContext.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamOperatorStateHandler.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamOperatorStateHandler.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamOperatorStateHandler.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamOperatorStateHandler.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamProject.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamProject.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamProject.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamProject.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamSink.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamSink.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamSink.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamSink.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamSource.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamSource.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamSource.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamSource.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamSourceContexts.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamSourceContexts.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamSourceContexts.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamSourceContexts.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamTaskStateInitializer.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamTaskStateInitializer.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamTaskStateInitializer.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamTaskStateInitializer.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamTaskStateInitializerImpl.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamTaskStateInitializerImpl.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamTaskStateInitializerImpl.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamTaskStateInitializerImpl.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamingRuntimeContext.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamingRuntimeContext.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/StreamingRuntimeContext.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamingRuntimeContext.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/TimerHeapInternalTimer.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/TimerHeapInternalTimer.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/TimerHeapInternalTimer.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/TimerHeapInternalTimer.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/TimerSerializer.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/TimerSerializer.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/TimerSerializer.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/TimerSerializer.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/TimerSerializerSnapshot.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/TimerSerializerSnapshot.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/TimerSerializerSnapshot.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/TimerSerializerSnapshot.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/TimestampedCollector.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/TimestampedCollector.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/TimestampedCollector.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/TimestampedCollector.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/Triggerable.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/Triggerable.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/Triggerable.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/Triggerable.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/TwoInputStreamOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/TwoInputStreamOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/TwoInputStreamOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/TwoInputStreamOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/TwoInputStreamOperatorFactory.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/TwoInputStreamOperatorFactory.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/TwoInputStreamOperatorFactory.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/TwoInputStreamOperatorFactory.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/UdfStreamOperatorFactory.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/UdfStreamOperatorFactory.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/UdfStreamOperatorFactory.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/UdfStreamOperatorFactory.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/UserFunctionProvider.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/UserFunctionProvider.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/UserFunctionProvider.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/UserFunctionProvider.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/YieldingOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/YieldingOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/YieldingOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/YieldingOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/YieldingOperatorFactory.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/YieldingOperatorFactory.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/YieldingOperatorFactory.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/YieldingOperatorFactory.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/co/BatchCoBroadcastWithKeyedOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/co/BatchCoBroadcastWithKeyedOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/co/BatchCoBroadcastWithKeyedOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/co/BatchCoBroadcastWithKeyedOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/co/BatchCoBroadcastWithNonKeyedOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/co/BatchCoBroadcastWithNonKeyedOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/co/BatchCoBroadcastWithNonKeyedOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/co/BatchCoBroadcastWithNonKeyedOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/co/CoBroadcastWithKeyedOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/co/CoBroadcastWithKeyedOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/co/CoBroadcastWithKeyedOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/co/CoBroadcastWithKeyedOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/co/CoBroadcastWithNonKeyedOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/co/CoBroadcastWithNonKeyedOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/co/CoBroadcastWithNonKeyedOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/co/CoBroadcastWithNonKeyedOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/co/CoProcessOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/co/CoProcessOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/co/CoProcessOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/co/CoProcessOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/co/CoStreamFlatMap.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/co/CoStreamFlatMap.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/co/CoStreamFlatMap.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/co/CoStreamFlatMap.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/co/CoStreamMap.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/co/CoStreamMap.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/co/CoStreamMap.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/co/CoStreamMap.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/co/IntervalJoinOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/co/IntervalJoinOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/co/IntervalJoinOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/co/IntervalJoinOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/co/KeyedCoProcessOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/co/KeyedCoProcessOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/co/KeyedCoProcessOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/co/KeyedCoProcessOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/co/LegacyKeyedCoProcessOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/co/LegacyKeyedCoProcessOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/co/LegacyKeyedCoProcessOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/co/LegacyKeyedCoProcessOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/collect/AbstractCollectResultBuffer.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/AbstractCollectResultBuffer.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/collect/AbstractCollectResultBuffer.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/AbstractCollectResultBuffer.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/collect/CheckpointedCollectResultBuffer.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CheckpointedCollectResultBuffer.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/collect/CheckpointedCollectResultBuffer.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CheckpointedCollectResultBuffer.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/collect/ClientAndIterator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/ClientAndIterator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/collect/ClientAndIterator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/ClientAndIterator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectCoordinationRequest.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectCoordinationRequest.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectCoordinationRequest.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectCoordinationRequest.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectCoordinationResponse.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectCoordinationResponse.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectCoordinationResponse.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectCoordinationResponse.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectResultFetcher.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectResultFetcher.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectResultFetcher.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectResultFetcher.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectResultIterator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectResultIterator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectResultIterator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectResultIterator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectSinkAddressEvent.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectSinkAddressEvent.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectSinkAddressEvent.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectSinkAddressEvent.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectSinkFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectSinkFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectSinkFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectSinkFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectSinkOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectSinkOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectSinkOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectSinkOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectSinkOperatorCoordinator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectSinkOperatorCoordinator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectSinkOperatorCoordinator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectSinkOperatorCoordinator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectSinkOperatorFactory.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectSinkOperatorFactory.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectSinkOperatorFactory.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectSinkOperatorFactory.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectStreamSink.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectStreamSink.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectStreamSink.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectStreamSink.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/collect/SocketConnection.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/SocketConnection.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/collect/SocketConnection.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/SocketConnection.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/collect/UncheckpointedCollectResultBuffer.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/UncheckpointedCollectResultBuffer.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/collect/UncheckpointedCollectResultBuffer.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/UncheckpointedCollectResultBuffer.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sort/BytesKeyNormalizationUtil.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sort/BytesKeyNormalizationUtil.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sort/BytesKeyNormalizationUtil.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sort/BytesKeyNormalizationUtil.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sort/FixedLengthByteKeyComparator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sort/FixedLengthByteKeyComparator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sort/FixedLengthByteKeyComparator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sort/FixedLengthByteKeyComparator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sort/KeyAndValueSerializer.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sort/KeyAndValueSerializer.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sort/KeyAndValueSerializer.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sort/KeyAndValueSerializer.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sort/MultiInputSortingDataInput.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sort/MultiInputSortingDataInput.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sort/MultiInputSortingDataInput.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sort/MultiInputSortingDataInput.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sort/ObservableStreamTaskInput.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sort/ObservableStreamTaskInput.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sort/ObservableStreamTaskInput.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sort/ObservableStreamTaskInput.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sort/SortingDataInput.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sort/SortingDataInput.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sort/SortingDataInput.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sort/SortingDataInput.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sort/VariableLengthByteKeyComparator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sort/VariableLengthByteKeyComparator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sort/VariableLengthByteKeyComparator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sort/VariableLengthByteKeyComparator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/AbstractBatchExecutionKeyState.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/AbstractBatchExecutionKeyState.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/AbstractBatchExecutionKeyState.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/AbstractBatchExecutionKeyState.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionCheckpointStorage.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionCheckpointStorage.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionCheckpointStorage.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionCheckpointStorage.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionInternalPriorityQueueSet.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionInternalPriorityQueueSet.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionInternalPriorityQueueSet.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionInternalPriorityQueueSet.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionInternalTimeService.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionInternalTimeService.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionInternalTimeService.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionInternalTimeService.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionInternalTimeServiceManager.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionInternalTimeServiceManager.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionInternalTimeServiceManager.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionInternalTimeServiceManager.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyAggregatingState.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyAggregatingState.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyAggregatingState.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyAggregatingState.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyListState.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyListState.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyListState.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyListState.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyMapState.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyMapState.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyMapState.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyMapState.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyReducingState.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyReducingState.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyReducingState.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyReducingState.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyValueState.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyValueState.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyValueState.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyValueState.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyedStateBackend.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyedStateBackend.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyedStateBackend.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyedStateBackend.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionStateBackend.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionStateBackend.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionStateBackend.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionStateBackend.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/MergingAbstractBatchExecutionKeyState.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/MergingAbstractBatchExecutionKeyState.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/MergingAbstractBatchExecutionKeyState.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/MergingAbstractBatchExecutionKeyState.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/NonCheckpointingStorageAccess.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/NonCheckpointingStorageAccess.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/NonCheckpointingStorageAccess.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/NonCheckpointingStorageAccess.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/FixedLengthByteKeyAndValueComparator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/FixedLengthByteKeyAndValueComparator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/FixedLengthByteKeyAndValueComparator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/FixedLengthByteKeyAndValueComparator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/KeyAndValueSerializer.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/KeyAndValueSerializer.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/KeyAndValueSerializer.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/KeyAndValueSerializer.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/KeyedSortPartitionOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/KeyedSortPartitionOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/KeyedSortPartitionOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/KeyedSortPartitionOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/SortPartitionOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/SortPartitionOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/SortPartitionOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/SortPartitionOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/VariableLengthByteKeyAndValueComparator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/VariableLengthByteKeyAndValueComparator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/VariableLengthByteKeyAndValueComparator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/VariableLengthByteKeyAndValueComparator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/source/NoOpTimestampsAndWatermarks.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/source/NoOpTimestampsAndWatermarks.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/source/NoOpTimestampsAndWatermarks.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/source/NoOpTimestampsAndWatermarks.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/source/ProgressiveTimestampsAndWatermarks.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/source/ProgressiveTimestampsAndWatermarks.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/source/ProgressiveTimestampsAndWatermarks.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/source/ProgressiveTimestampsAndWatermarks.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/source/SourceOutputWithWatermarks.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/source/SourceOutputWithWatermarks.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/source/SourceOutputWithWatermarks.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/source/SourceOutputWithWatermarks.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/source/TimestampsAndWatermarks.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/source/TimestampsAndWatermarks.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/source/TimestampsAndWatermarks.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/source/TimestampsAndWatermarks.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/source/TimestampsAndWatermarksContext.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/source/TimestampsAndWatermarksContext.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/source/TimestampsAndWatermarksContext.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/source/TimestampsAndWatermarksContext.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/source/WatermarkToDataOutput.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/source/WatermarkToDataOutput.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/source/WatermarkToDataOutput.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/source/WatermarkToDataOutput.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/util/PausableRelativeClock.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/util/PausableRelativeClock.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/util/PausableRelativeClock.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/util/PausableRelativeClock.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/util/SimpleVersionedListState.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/util/SimpleVersionedListState.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/util/SimpleVersionedListState.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/util/SimpleVersionedListState.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/AbstractBroadcastStateTransformation.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/AbstractBroadcastStateTransformation.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/AbstractBroadcastStateTransformation.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/AbstractBroadcastStateTransformation.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/AbstractMultipleInputTransformation.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/AbstractMultipleInputTransformation.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/AbstractMultipleInputTransformation.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/AbstractMultipleInputTransformation.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/BroadcastStateTransformation.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/BroadcastStateTransformation.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/BroadcastStateTransformation.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/BroadcastStateTransformation.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/CacheTransformation.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/CacheTransformation.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/CacheTransformation.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/CacheTransformation.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/CoFeedbackTransformation.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/CoFeedbackTransformation.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/CoFeedbackTransformation.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/CoFeedbackTransformation.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/FeedbackTransformation.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/FeedbackTransformation.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/FeedbackTransformation.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/FeedbackTransformation.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/KeyedBroadcastStateTransformation.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/KeyedBroadcastStateTransformation.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/KeyedBroadcastStateTransformation.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/KeyedBroadcastStateTransformation.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/KeyedMultipleInputTransformation.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/KeyedMultipleInputTransformation.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/KeyedMultipleInputTransformation.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/KeyedMultipleInputTransformation.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/LegacySinkTransformation.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/LegacySinkTransformation.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/LegacySinkTransformation.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/LegacySinkTransformation.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/LegacySourceTransformation.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/LegacySourceTransformation.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/LegacySourceTransformation.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/LegacySourceTransformation.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/MultipleInputTransformation.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/MultipleInputTransformation.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/MultipleInputTransformation.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/MultipleInputTransformation.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/OneInputTransformation.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/OneInputTransformation.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/OneInputTransformation.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/OneInputTransformation.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/PartitionTransformation.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/PartitionTransformation.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/PartitionTransformation.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/PartitionTransformation.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/PhysicalTransformation.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/PhysicalTransformation.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/PhysicalTransformation.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/PhysicalTransformation.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/ReduceTransformation.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/ReduceTransformation.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/ReduceTransformation.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/ReduceTransformation.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/SideOutputTransformation.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/SideOutputTransformation.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/SideOutputTransformation.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/SideOutputTransformation.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/SinkTransformation.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/SinkTransformation.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/SinkTransformation.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/SinkTransformation.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/SinkV1Adapter.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/SinkV1Adapter.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/SinkV1Adapter.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/SinkV1Adapter.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/SourceTransformation.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/SourceTransformation.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/SourceTransformation.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/SourceTransformation.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/SourceTransformationWrapper.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/SourceTransformationWrapper.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/SourceTransformationWrapper.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/SourceTransformationWrapper.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/StreamExchangeMode.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/StreamExchangeMode.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/StreamExchangeMode.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/StreamExchangeMode.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/TimestampsAndWatermarksTransformation.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/TimestampsAndWatermarksTransformation.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/TimestampsAndWatermarksTransformation.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/TimestampsAndWatermarksTransformation.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/TransformationWithLineage.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/TransformationWithLineage.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/TransformationWithLineage.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/TransformationWithLineage.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/TwoInputTransformation.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/TwoInputTransformation.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/TwoInputTransformation.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/TwoInputTransformation.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/UnionTransformation.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/UnionTransformation.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/UnionTransformation.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/UnionTransformation.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/WithBoundedness.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/WithBoundedness.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/transformations/WithBoundedness.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/WithBoundedness.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/watermark/InternalWatermark.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/watermark/InternalWatermark.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/watermark/InternalWatermark.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/watermark/InternalWatermark.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/watermark/Watermark.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/watermark/Watermark.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/watermark/Watermark.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/watermark/Watermark.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/GlobalWindows.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/GlobalWindows.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/GlobalWindows.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/GlobalWindows.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/MergingWindowAssigner.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/MergingWindowAssigner.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/MergingWindowAssigner.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/MergingWindowAssigner.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/SlidingEventTimeWindows.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/SlidingEventTimeWindows.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/SlidingEventTimeWindows.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/SlidingEventTimeWindows.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/SlidingProcessingTimeWindows.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/SlidingProcessingTimeWindows.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/SlidingProcessingTimeWindows.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/SlidingProcessingTimeWindows.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/TumblingEventTimeWindows.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/TumblingEventTimeWindows.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/TumblingEventTimeWindows.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/TumblingEventTimeWindows.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/TumblingProcessingTimeWindows.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/TumblingProcessingTimeWindows.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/TumblingProcessingTimeWindows.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/TumblingProcessingTimeWindows.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/WindowAssigner.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/WindowAssigner.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/WindowAssigner.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/WindowAssigner.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/WindowStagger.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/WindowStagger.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/WindowStagger.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/WindowStagger.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/evictors/CountEvictor.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/evictors/CountEvictor.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/evictors/CountEvictor.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/evictors/CountEvictor.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/evictors/Evictor.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/evictors/Evictor.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/evictors/Evictor.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/evictors/Evictor.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/time/Time.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/time/Time.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/time/Time.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/time/Time.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/CountTrigger.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/triggers/CountTrigger.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/CountTrigger.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/triggers/CountTrigger.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/EventTimeTrigger.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/triggers/EventTimeTrigger.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/EventTimeTrigger.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/triggers/EventTimeTrigger.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/ProcessingTimeTrigger.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/triggers/ProcessingTimeTrigger.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/ProcessingTimeTrigger.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/triggers/ProcessingTimeTrigger.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/PurgingTrigger.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/triggers/PurgingTrigger.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/PurgingTrigger.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/triggers/PurgingTrigger.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/Trigger.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/triggers/Trigger.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/Trigger.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/triggers/Trigger.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/TriggerResult.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/triggers/TriggerResult.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/TriggerResult.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/triggers/TriggerResult.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/windows/GlobalWindow.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/windows/GlobalWindow.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/windows/GlobalWindow.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/windows/GlobalWindow.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/windows/TimeWindow.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/windows/TimeWindow.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/windows/TimeWindow.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/windows/TimeWindow.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/windows/Window.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/windows/Window.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/windows/Window.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/windows/Window.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/AbstractStreamTaskNetworkInput.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/AbstractStreamTaskNetworkInput.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/AbstractStreamTaskNetworkInput.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/AbstractStreamTaskNetworkInput.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/BlockingQueueBroker.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/BlockingQueueBroker.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/BlockingQueueBroker.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/BlockingQueueBroker.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/DataInputStatus.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/DataInputStatus.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/DataInputStatus.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/DataInputStatus.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/FinishedDataOutput.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/FinishedDataOutput.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/FinishedDataOutput.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/FinishedDataOutput.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/InputGateUtil.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/InputGateUtil.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/InputGateUtil.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/InputGateUtil.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/MultipleFuturesAvailabilityHelper.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/MultipleFuturesAvailabilityHelper.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/MultipleFuturesAvailabilityHelper.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/MultipleFuturesAvailabilityHelper.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/MultipleInputSelectionHandler.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/MultipleInputSelectionHandler.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/MultipleInputSelectionHandler.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/MultipleInputSelectionHandler.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/PushingAsyncDataInput.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/PushingAsyncDataInput.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/PushingAsyncDataInput.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/PushingAsyncDataInput.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/RecordAttributesCombiner.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/RecordAttributesCombiner.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/RecordAttributesCombiner.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/RecordAttributesCombiner.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/RecordProcessorUtils.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/RecordProcessorUtils.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/RecordProcessorUtils.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/RecordProcessorUtils.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/RecordWriterOutput.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/RecordWriterOutput.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/RecordWriterOutput.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/RecordWriterOutput.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/RecoverableStreamTaskInput.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/RecoverableStreamTaskInput.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/RecoverableStreamTaskInput.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/RecoverableStreamTaskInput.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/StreamInputProcessor.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/StreamInputProcessor.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/StreamInputProcessor.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/StreamInputProcessor.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/StreamMultipleInputProcessor.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/StreamMultipleInputProcessor.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/StreamMultipleInputProcessor.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/StreamMultipleInputProcessor.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/StreamMultipleInputProcessorFactory.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/StreamMultipleInputProcessorFactory.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/StreamMultipleInputProcessorFactory.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/StreamMultipleInputProcessorFactory.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/StreamOneInputProcessor.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/StreamOneInputProcessor.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/StreamOneInputProcessor.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/StreamOneInputProcessor.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/StreamTaskExternallyInducedSourceInput.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/StreamTaskExternallyInducedSourceInput.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/StreamTaskExternallyInducedSourceInput.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/StreamTaskExternallyInducedSourceInput.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/StreamTaskInput.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/StreamTaskInput.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/StreamTaskInput.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/StreamTaskInput.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/StreamTaskNetworkInput.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/StreamTaskNetworkInput.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/StreamTaskNetworkInput.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/StreamTaskNetworkInput.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/StreamTaskNetworkInputFactory.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/StreamTaskNetworkInputFactory.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/StreamTaskNetworkInputFactory.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/StreamTaskNetworkInputFactory.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/StreamTaskSourceInput.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/StreamTaskSourceInput.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/StreamTaskSourceInput.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/StreamTaskSourceInput.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/StreamTwoInputProcessorFactory.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/StreamTwoInputProcessorFactory.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/StreamTwoInputProcessorFactory.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/StreamTwoInputProcessorFactory.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/AbstractAlignedBarrierHandlerState.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/AbstractAlignedBarrierHandlerState.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/AbstractAlignedBarrierHandlerState.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/AbstractAlignedBarrierHandlerState.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/AbstractAlternatingAlignedBarrierHandlerState.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/AbstractAlternatingAlignedBarrierHandlerState.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/AbstractAlternatingAlignedBarrierHandlerState.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/AbstractAlternatingAlignedBarrierHandlerState.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/AlternatingCollectingBarriers.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/AlternatingCollectingBarriers.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/AlternatingCollectingBarriers.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/AlternatingCollectingBarriers.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/AlternatingCollectingBarriersUnaligned.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/AlternatingCollectingBarriersUnaligned.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/AlternatingCollectingBarriersUnaligned.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/AlternatingCollectingBarriersUnaligned.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/AlternatingWaitingForFirstBarrier.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/AlternatingWaitingForFirstBarrier.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/AlternatingWaitingForFirstBarrier.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/AlternatingWaitingForFirstBarrier.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/AlternatingWaitingForFirstBarrierUnaligned.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/AlternatingWaitingForFirstBarrierUnaligned.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/AlternatingWaitingForFirstBarrierUnaligned.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/AlternatingWaitingForFirstBarrierUnaligned.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/BarrierAlignmentUtil.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/BarrierAlignmentUtil.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/BarrierAlignmentUtil.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/BarrierAlignmentUtil.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/BarrierHandlerState.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/BarrierHandlerState.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/BarrierHandlerState.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/BarrierHandlerState.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/ChannelState.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/ChannelState.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/ChannelState.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/ChannelState.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/CheckpointBarrierHandler.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/CheckpointBarrierHandler.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/CheckpointBarrierHandler.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/CheckpointBarrierHandler.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/CheckpointBarrierTracker.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/CheckpointBarrierTracker.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/CheckpointBarrierTracker.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/CheckpointBarrierTracker.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/CheckpointedInputGate.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/CheckpointedInputGate.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/CheckpointedInputGate.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/CheckpointedInputGate.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/CollectingBarriers.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/CollectingBarriers.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/CollectingBarriers.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/CollectingBarriers.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/InputProcessorUtil.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/InputProcessorUtil.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/InputProcessorUtil.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/InputProcessorUtil.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/SingleCheckpointBarrierHandler.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/SingleCheckpointBarrierHandler.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/SingleCheckpointBarrierHandler.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/SingleCheckpointBarrierHandler.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/UpstreamRecoveryTracker.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/UpstreamRecoveryTracker.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/UpstreamRecoveryTracker.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/UpstreamRecoveryTracker.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/WaitingForFirstBarrier.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/WaitingForFirstBarrier.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/WaitingForFirstBarrier.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/WaitingForFirstBarrier.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/recovery/DemultiplexingRecordDeserializer.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/recovery/DemultiplexingRecordDeserializer.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/recovery/DemultiplexingRecordDeserializer.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/recovery/DemultiplexingRecordDeserializer.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/recovery/RecordFilter.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/recovery/RecordFilter.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/recovery/RecordFilter.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/recovery/RecordFilter.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/recovery/RescalingStreamTaskNetworkInput.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/recovery/RescalingStreamTaskNetworkInput.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/recovery/RescalingStreamTaskNetworkInput.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/recovery/RescalingStreamTaskNetworkInput.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/metrics/MinWatermarkGauge.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/metrics/MinWatermarkGauge.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/metrics/MinWatermarkGauge.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/metrics/MinWatermarkGauge.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/metrics/WatermarkGauge.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/metrics/WatermarkGauge.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/metrics/WatermarkGauge.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/metrics/WatermarkGauge.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/TimestampsAndWatermarksOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/TimestampsAndWatermarksOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/TimestampsAndWatermarksOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/TimestampsAndWatermarksOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/asyncprocessing/AsyncStateProcessing.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/asyncprocessing/AsyncStateProcessing.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/asyncprocessing/AsyncStateProcessing.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/asyncprocessing/AsyncStateProcessing.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/asyncprocessing/AsyncStateProcessingOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/asyncprocessing/AsyncStateProcessingOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/asyncprocessing/AsyncStateProcessingOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/asyncprocessing/AsyncStateProcessingOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/asyncprocessing/ElementOrder.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/asyncprocessing/ElementOrder.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/asyncprocessing/ElementOrder.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/asyncprocessing/ElementOrder.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/CommitterOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/CommitterOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/CommitterOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/CommitterOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/CommitterOperatorFactory.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/CommitterOperatorFactory.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/CommitterOperatorFactory.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/CommitterOperatorFactory.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/InitContextBase.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/InitContextBase.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/InitContextBase.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/InitContextBase.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/InitContextInitializationContextAdapter.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/InitContextInitializationContextAdapter.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/InitContextInitializationContextAdapter.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/InitContextInitializationContextAdapter.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/SinkV1WriterCommittableSerializer.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/SinkV1WriterCommittableSerializer.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/SinkV1WriterCommittableSerializer.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/SinkV1WriterCommittableSerializer.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/SinkWriterOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/SinkWriterOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/SinkWriterOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/SinkWriterOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/SinkWriterOperatorFactory.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/SinkWriterOperatorFactory.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/SinkWriterOperatorFactory.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/SinkWriterOperatorFactory.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/SinkWriterStateHandler.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/SinkWriterStateHandler.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/SinkWriterStateHandler.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/SinkWriterStateHandler.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/StatefulSinkWriterStateHandler.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/StatefulSinkWriterStateHandler.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/StatefulSinkWriterStateHandler.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/StatefulSinkWriterStateHandler.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/StatelessSinkWriterStateHandler.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/StatelessSinkWriterStateHandler.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/StatelessSinkWriterStateHandler.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/StatelessSinkWriterStateHandler.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/CheckpointCommittableManager.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/CheckpointCommittableManager.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/CheckpointCommittableManager.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/CheckpointCommittableManager.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/CheckpointCommittableManagerImpl.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/CheckpointCommittableManagerImpl.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/CheckpointCommittableManagerImpl.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/CheckpointCommittableManagerImpl.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/CommitRequestImpl.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/CommitRequestImpl.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/CommitRequestImpl.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/CommitRequestImpl.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/CommitRequestState.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/CommitRequestState.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/CommitRequestState.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/CommitRequestState.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/CommittableCollector.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/CommittableCollector.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/CommittableCollector.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/CommittableCollector.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/CommittableCollectorSerializer.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/CommittableCollectorSerializer.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/CommittableCollectorSerializer.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/CommittableCollectorSerializer.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/CommittableManager.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/CommittableManager.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/CommittableManager.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/CommittableManager.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/SinkV1CommittableDeserializer.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/SinkV1CommittableDeserializer.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/SinkV1CommittableDeserializer.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/SinkV1CommittableDeserializer.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/SubtaskCommittableManager.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/SubtaskCommittableManager.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/SubtaskCommittableManager.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/SubtaskCommittableManager.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/util/AssignerWithPeriodicWatermarksAdapter.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/util/AssignerWithPeriodicWatermarksAdapter.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/util/AssignerWithPeriodicWatermarksAdapter.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/util/AssignerWithPeriodicWatermarksAdapter.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/util/AssignerWithPunctuatedWatermarksAdapter.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/util/AssignerWithPunctuatedWatermarksAdapter.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/util/AssignerWithPunctuatedWatermarksAdapter.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/util/AssignerWithPunctuatedWatermarksAdapter.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/MergingWindowSet.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/MergingWindowSet.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/MergingWindowSet.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/MergingWindowSet.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/TimestampedValue.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/TimestampedValue.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/TimestampedValue.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/TimestampedValue.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperatorBuilder.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperatorBuilder.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperatorBuilder.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperatorBuilder.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalAggregateProcessAllWindowFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalAggregateProcessAllWindowFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalAggregateProcessAllWindowFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalAggregateProcessAllWindowFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalAggregateProcessWindowFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalAggregateProcessWindowFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalAggregateProcessWindowFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalAggregateProcessWindowFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalIterableAllWindowFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalIterableAllWindowFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalIterableAllWindowFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalIterableAllWindowFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalIterableProcessAllWindowFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalIterableProcessAllWindowFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalIterableProcessAllWindowFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalIterableProcessAllWindowFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalIterableProcessWindowFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalIterableProcessWindowFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalIterableProcessWindowFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalIterableProcessWindowFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalIterableWindowFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalIterableWindowFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalIterableWindowFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalIterableWindowFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalProcessAllWindowContext.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalProcessAllWindowContext.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalProcessAllWindowContext.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalProcessAllWindowContext.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalProcessWindowContext.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalProcessWindowContext.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalProcessWindowContext.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalProcessWindowContext.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalSingleValueAllWindowFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalSingleValueAllWindowFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalSingleValueAllWindowFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalSingleValueAllWindowFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalSingleValueProcessAllWindowFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalSingleValueProcessAllWindowFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalSingleValueProcessAllWindowFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalSingleValueProcessAllWindowFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalSingleValueProcessWindowFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalSingleValueProcessWindowFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalSingleValueProcessWindowFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalSingleValueProcessWindowFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalSingleValueWindowFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalSingleValueWindowFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalSingleValueWindowFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalSingleValueWindowFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalWindowFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalWindowFunction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalWindowFunction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/functions/InternalWindowFunction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/partitioner/BroadcastPartitioner.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/partitioner/BroadcastPartitioner.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/partitioner/BroadcastPartitioner.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/partitioner/BroadcastPartitioner.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/partitioner/ConfigurableStreamPartitioner.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/partitioner/ConfigurableStreamPartitioner.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/partitioner/ConfigurableStreamPartitioner.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/partitioner/ConfigurableStreamPartitioner.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/partitioner/CustomPartitionerWrapper.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/partitioner/CustomPartitionerWrapper.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/partitioner/CustomPartitionerWrapper.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/partitioner/CustomPartitionerWrapper.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/partitioner/ForwardForConsecutiveHashPartitioner.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/partitioner/ForwardForConsecutiveHashPartitioner.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/partitioner/ForwardForConsecutiveHashPartitioner.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/partitioner/ForwardForConsecutiveHashPartitioner.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/partitioner/ForwardForUnspecifiedPartitioner.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/partitioner/ForwardForUnspecifiedPartitioner.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/partitioner/ForwardForUnspecifiedPartitioner.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/partitioner/ForwardForUnspecifiedPartitioner.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/partitioner/ForwardPartitioner.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/partitioner/ForwardPartitioner.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/partitioner/ForwardPartitioner.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/partitioner/ForwardPartitioner.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/partitioner/GlobalPartitioner.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/partitioner/GlobalPartitioner.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/partitioner/GlobalPartitioner.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/partitioner/GlobalPartitioner.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/partitioner/KeyGroupStreamPartitioner.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/partitioner/KeyGroupStreamPartitioner.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/partitioner/KeyGroupStreamPartitioner.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/partitioner/KeyGroupStreamPartitioner.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/partitioner/RebalancePartitioner.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/partitioner/RebalancePartitioner.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/partitioner/RebalancePartitioner.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/partitioner/RebalancePartitioner.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/partitioner/RescalePartitioner.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/partitioner/RescalePartitioner.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/partitioner/RescalePartitioner.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/partitioner/RescalePartitioner.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/partitioner/ShufflePartitioner.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/partitioner/ShufflePartitioner.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/partitioner/ShufflePartitioner.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/partitioner/ShufflePartitioner.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/partitioner/StreamPartitioner.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/partitioner/StreamPartitioner.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/partitioner/StreamPartitioner.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/partitioner/StreamPartitioner.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/streamrecord/LatencyMarker.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/streamrecord/LatencyMarker.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/streamrecord/LatencyMarker.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/streamrecord/LatencyMarker.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/streamrecord/RecordAttributes.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/streamrecord/RecordAttributes.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/streamrecord/RecordAttributes.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/streamrecord/RecordAttributes.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/streamrecord/RecordAttributesBuilder.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/streamrecord/RecordAttributesBuilder.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/streamrecord/RecordAttributesBuilder.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/streamrecord/RecordAttributesBuilder.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/streamrecord/StreamElement.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/streamrecord/StreamElement.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/streamrecord/StreamElement.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/streamrecord/StreamElement.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/streamrecord/StreamElementSerializer.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/streamrecord/StreamElementSerializer.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/streamrecord/StreamElementSerializer.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/streamrecord/StreamElementSerializer.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/streamrecord/StreamRecord.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/streamrecord/StreamRecord.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/streamrecord/StreamRecord.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/streamrecord/StreamRecord.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/AbstractTwoInputStreamTask.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/AbstractTwoInputStreamTask.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/AbstractTwoInputStreamTask.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/AbstractTwoInputStreamTask.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/AsyncCheckpointRunnable.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/AsyncCheckpointRunnable.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/AsyncCheckpointRunnable.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/AsyncCheckpointRunnable.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/BroadcastingOutputCollector.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/BroadcastingOutputCollector.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/BroadcastingOutputCollector.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/BroadcastingOutputCollector.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/ChainingOutput.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/ChainingOutput.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/ChainingOutput.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/ChainingOutput.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/ContainingTaskDetails.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/ContainingTaskDetails.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/ContainingTaskDetails.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/ContainingTaskDetails.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/CopyingBroadcastingOutputCollector.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/CopyingBroadcastingOutputCollector.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/CopyingBroadcastingOutputCollector.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/CopyingBroadcastingOutputCollector.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/CopyingChainingOutput.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/CopyingChainingOutput.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/CopyingChainingOutput.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/CopyingChainingOutput.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/ExceptionInChainedOperatorException.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/ExceptionInChainedOperatorException.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/ExceptionInChainedOperatorException.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/ExceptionInChainedOperatorException.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/FinishedOnRestoreInput.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/FinishedOnRestoreInput.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/FinishedOnRestoreInput.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/FinishedOnRestoreInput.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/FinishedOnRestoreMainOperatorOutput.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/FinishedOnRestoreMainOperatorOutput.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/FinishedOnRestoreMainOperatorOutput.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/FinishedOnRestoreMainOperatorOutput.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/FinishedOperatorChain.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/FinishedOperatorChain.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/FinishedOperatorChain.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/FinishedOperatorChain.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/MultipleInputStreamTask.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/MultipleInputStreamTask.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/MultipleInputStreamTask.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/MultipleInputStreamTask.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/OneInputStreamTask.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/OneInputStreamTask.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/OneInputStreamTask.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/OneInputStreamTask.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/OperatorChain.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/OperatorChain.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/OperatorChain.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/OperatorChain.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/OperatorEventDispatcherImpl.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/OperatorEventDispatcherImpl.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/OperatorEventDispatcherImpl.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/OperatorEventDispatcherImpl.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/OutputWithChainingCheck.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/OutputWithChainingCheck.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/OutputWithChainingCheck.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/OutputWithChainingCheck.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/ProcessingTimeService.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/ProcessingTimeService.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/ProcessingTimeService.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/ProcessingTimeService.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/ProcessingTimeServiceAware.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/ProcessingTimeServiceAware.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/ProcessingTimeServiceAware.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/ProcessingTimeServiceAware.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/ProcessingTimeServiceFactory.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/ProcessingTimeServiceFactory.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/ProcessingTimeServiceFactory.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/ProcessingTimeServiceFactory.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/ProcessingTimeServiceImpl.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/ProcessingTimeServiceImpl.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/ProcessingTimeServiceImpl.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/ProcessingTimeServiceImpl.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/ProcessingTimeServiceUtil.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/ProcessingTimeServiceUtil.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/ProcessingTimeServiceUtil.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/ProcessingTimeServiceUtil.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/RegularOperatorChain.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/RegularOperatorChain.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/RegularOperatorChain.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/RegularOperatorChain.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/SourceOperatorStreamTask.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/SourceOperatorStreamTask.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/SourceOperatorStreamTask.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/SourceOperatorStreamTask.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/SourceStreamTask.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/SourceStreamTask.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/SourceStreamTask.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/SourceStreamTask.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamIterationHead.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamIterationHead.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamIterationHead.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamIterationHead.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamIterationTail.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamIterationTail.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamIterationTail.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamIterationTail.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamOperatorWrapper.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamOperatorWrapper.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamOperatorWrapper.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamOperatorWrapper.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamTask.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamTask.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamTask.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamTask.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamTaskActionExecutor.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamTaskActionExecutor.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamTaskActionExecutor.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamTaskActionExecutor.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamTaskCancellationContext.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamTaskCancellationContext.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamTaskCancellationContext.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamTaskCancellationContext.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamTaskException.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamTaskException.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamTaskException.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamTaskException.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamTaskFinishedOnRestoreSourceInput.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamTaskFinishedOnRestoreSourceInput.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamTaskFinishedOnRestoreSourceInput.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamTaskFinishedOnRestoreSourceInput.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/SubtaskCheckpointCoordinator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/SubtaskCheckpointCoordinator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/SubtaskCheckpointCoordinator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/SubtaskCheckpointCoordinator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/SubtaskCheckpointCoordinatorImpl.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/SubtaskCheckpointCoordinatorImpl.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/SubtaskCheckpointCoordinatorImpl.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/SubtaskCheckpointCoordinatorImpl.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/SystemProcessingTimeService.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/SystemProcessingTimeService.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/SystemProcessingTimeService.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/SystemProcessingTimeService.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/TimerException.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/TimerException.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/TimerException.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/TimerException.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/TimerService.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/TimerService.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/TimerService.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/TimerService.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/TwoInputStreamTask.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/TwoInputStreamTask.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/TwoInputStreamTask.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/TwoInputStreamTask.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/WatermarkGaugeExposingOutput.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/WatermarkGaugeExposingOutput.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/WatermarkGaugeExposingOutput.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/WatermarkGaugeExposingOutput.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/GaugePeriodTimer.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/GaugePeriodTimer.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/GaugePeriodTimer.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/GaugePeriodTimer.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/Mail.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/Mail.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/Mail.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/Mail.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/MailboxDefaultAction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/MailboxDefaultAction.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/MailboxDefaultAction.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/MailboxDefaultAction.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/MailboxExecutorFactory.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/MailboxExecutorFactory.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/MailboxExecutorFactory.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/MailboxExecutorFactory.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/MailboxExecutorImpl.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/MailboxExecutorImpl.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/MailboxExecutorImpl.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/MailboxExecutorImpl.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/MailboxMetricsController.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/MailboxMetricsController.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/MailboxMetricsController.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/MailboxMetricsController.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/MailboxProcessor.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/MailboxProcessor.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/MailboxProcessor.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/MailboxProcessor.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/PeriodTimer.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/PeriodTimer.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/PeriodTimer.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/PeriodTimer.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/TaskMailbox.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/TaskMailbox.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/TaskMailbox.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/TaskMailbox.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/TaskMailboxImpl.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/TaskMailboxImpl.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/TaskMailboxImpl.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/mailbox/TaskMailboxImpl.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/translators/AbstractOneInputTransformationTranslator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/AbstractOneInputTransformationTranslator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/translators/AbstractOneInputTransformationTranslator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/AbstractOneInputTransformationTranslator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/translators/AbstractTwoInputTransformationTranslator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/AbstractTwoInputTransformationTranslator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/translators/AbstractTwoInputTransformationTranslator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/AbstractTwoInputTransformationTranslator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/translators/BatchExecutionUtils.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/BatchExecutionUtils.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/translators/BatchExecutionUtils.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/BatchExecutionUtils.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/translators/BroadcastStateTransformationTranslator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/BroadcastStateTransformationTranslator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/translators/BroadcastStateTransformationTranslator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/BroadcastStateTransformationTranslator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/translators/CacheTransformationTranslator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/CacheTransformationTranslator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/translators/CacheTransformationTranslator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/CacheTransformationTranslator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/translators/KeyedBroadcastStateTransformationTranslator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/KeyedBroadcastStateTransformationTranslator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/translators/KeyedBroadcastStateTransformationTranslator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/KeyedBroadcastStateTransformationTranslator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/translators/LegacySinkTransformationTranslator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/LegacySinkTransformationTranslator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/translators/LegacySinkTransformationTranslator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/LegacySinkTransformationTranslator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/translators/LegacySourceTransformationTranslator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/LegacySourceTransformationTranslator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/translators/LegacySourceTransformationTranslator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/LegacySourceTransformationTranslator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/translators/MultiInputTransformationTranslator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/MultiInputTransformationTranslator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/translators/MultiInputTransformationTranslator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/MultiInputTransformationTranslator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/translators/OneInputTransformationTranslator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/OneInputTransformationTranslator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/translators/OneInputTransformationTranslator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/OneInputTransformationTranslator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/translators/PartitionTransformationTranslator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/PartitionTransformationTranslator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/translators/PartitionTransformationTranslator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/PartitionTransformationTranslator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/translators/ReduceTransformationTranslator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/ReduceTransformationTranslator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/translators/ReduceTransformationTranslator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/ReduceTransformationTranslator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/translators/SideOutputTransformationTranslator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/SideOutputTransformationTranslator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/translators/SideOutputTransformationTranslator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/SideOutputTransformationTranslator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/translators/SinkTransformationTranslator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/SinkTransformationTranslator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/translators/SinkTransformationTranslator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/SinkTransformationTranslator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/translators/SourceTransformationTranslator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/SourceTransformationTranslator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/translators/SourceTransformationTranslator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/SourceTransformationTranslator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/translators/TimestampsAndWatermarksTransformationTranslator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/TimestampsAndWatermarksTransformationTranslator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/translators/TimestampsAndWatermarksTransformationTranslator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/TimestampsAndWatermarksTransformationTranslator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/translators/TwoInputTransformationTranslator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/TwoInputTransformationTranslator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/translators/TwoInputTransformationTranslator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/TwoInputTransformationTranslator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/translators/UnionTransformationTranslator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/UnionTransformationTranslator.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/translators/UnionTransformationTranslator.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/UnionTransformationTranslator.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/watermarkstatus/HeapPriorityQueue.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/watermarkstatus/HeapPriorityQueue.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/watermarkstatus/HeapPriorityQueue.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/watermarkstatus/HeapPriorityQueue.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/watermarkstatus/StatusWatermarkValve.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/watermarkstatus/StatusWatermarkValve.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/watermarkstatus/StatusWatermarkValve.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/watermarkstatus/StatusWatermarkValve.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/watermarkstatus/WatermarkStatus.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/watermarkstatus/WatermarkStatus.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/watermarkstatus/WatermarkStatus.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/runtime/watermarkstatus/WatermarkStatus.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/util/LatencyStats.java b/flink-runtime/src/main/java/org/apache/flink/streaming/util/LatencyStats.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/util/LatencyStats.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/util/LatencyStats.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/util/functions/StreamingFunctionUtils.java b/flink-runtime/src/main/java/org/apache/flink/streaming/util/functions/StreamingFunctionUtils.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/util/functions/StreamingFunctionUtils.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/util/functions/StreamingFunctionUtils.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/util/graph/StreamGraphUtils.java b/flink-runtime/src/main/java/org/apache/flink/streaming/util/graph/StreamGraphUtils.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/util/graph/StreamGraphUtils.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/util/graph/StreamGraphUtils.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/util/keys/KeySelectorUtil.java b/flink-runtime/src/main/java/org/apache/flink/streaming/util/keys/KeySelectorUtil.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/util/keys/KeySelectorUtil.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/util/keys/KeySelectorUtil.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/util/typeutils/FieldAccessor.java b/flink-runtime/src/main/java/org/apache/flink/streaming/util/typeutils/FieldAccessor.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/util/typeutils/FieldAccessor.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/util/typeutils/FieldAccessor.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/util/typeutils/FieldAccessorFactory.java b/flink-runtime/src/main/java/org/apache/flink/streaming/util/typeutils/FieldAccessorFactory.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/util/typeutils/FieldAccessorFactory.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/util/typeutils/FieldAccessorFactory.java
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/util/typeutils/ScalaProductFieldAccessorFactory.java b/flink-runtime/src/main/java/org/apache/flink/streaming/util/typeutils/ScalaProductFieldAccessorFactory.java
similarity index 100%
rename from flink-streaming-java/src/main/java/org/apache/flink/streaming/util/typeutils/ScalaProductFieldAccessorFactory.java
rename to flink-runtime/src/main/java/org/apache/flink/streaming/util/typeutils/ScalaProductFieldAccessorFactory.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/AggregationFunctionTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/AggregationFunctionTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/AggregationFunctionTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/AggregationFunctionTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/RestartStrategyTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/RestartStrategyTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/RestartStrategyTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/RestartStrategyTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/SourceFunctionTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/SourceFunctionTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/SourceFunctionTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/SourceFunctionTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/TypeFillTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/TypeFillTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/TypeFillTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/TypeFillTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/checkpoint/ListCheckpointedTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/checkpoint/ListCheckpointedTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/checkpoint/ListCheckpointedTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/checkpoint/ListCheckpointedTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/connector/sink2/CommittableMessageSerializerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/connector/sink2/CommittableMessageSerializerTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/connector/sink2/CommittableMessageSerializerTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/connector/sink2/CommittableMessageSerializerTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/connector/sink2/CommittableMessageTypeInfoTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/connector/sink2/CommittableMessageTypeInfoTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/connector/sink2/CommittableMessageTypeInfoTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/connector/sink2/CommittableMessageTypeInfoTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/connector/sink2/CommittableSummaryAssert.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/connector/sink2/CommittableSummaryAssert.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/connector/sink2/CommittableSummaryAssert.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/connector/sink2/CommittableSummaryAssert.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/connector/sink2/CommittableWithLinageAssert.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/connector/sink2/CommittableWithLinageAssert.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/connector/sink2/CommittableWithLinageAssert.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/connector/sink2/CommittableWithLinageAssert.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/connector/sink2/GlobalCommitterOperatorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/connector/sink2/GlobalCommitterOperatorTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/connector/sink2/GlobalCommitterOperatorTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/connector/sink2/GlobalCommitterOperatorTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/connector/sink2/GlobalCommitterSerializerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/connector/sink2/GlobalCommitterSerializerTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/connector/sink2/GlobalCommitterSerializerTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/connector/sink2/GlobalCommitterSerializerTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/connector/sink2/IntegerSerializer.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/connector/sink2/IntegerSerializer.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/connector/sink2/IntegerSerializer.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/connector/sink2/IntegerSerializer.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/connector/sink2/SinkV2Assertions.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/connector/sink2/SinkV2Assertions.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/connector/sink2/SinkV2Assertions.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/connector/sink2/SinkV2Assertions.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/datastream/CoGroupedStreamsTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/datastream/CoGroupedStreamsTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/datastream/CoGroupedStreamsTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/datastream/CoGroupedStreamsTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/datastream/DataStreamSourceTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/datastream/DataStreamSourceTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/datastream/DataStreamSourceTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/datastream/DataStreamSourceTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/datastream/JoinedStreamsTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/datastream/JoinedStreamsTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/datastream/JoinedStreamsTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/datastream/JoinedStreamsTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/datastream/UnionSerializerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/datastream/UnionSerializerTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/datastream/UnionSerializerTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/datastream/UnionSerializerTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/datastream/UnionSerializerUpgradeTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/datastream/UnionSerializerUpgradeTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/datastream/UnionSerializerUpgradeTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/datastream/UnionSerializerUpgradeTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/environment/CheckpointConfigFromConfigurationTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/environment/CheckpointConfigFromConfigurationTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/environment/CheckpointConfigFromConfigurationTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/environment/CheckpointConfigFromConfigurationTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironmentConfigurationTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironmentConfigurationTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironmentConfigurationTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironmentConfigurationTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/functions/FromElementsFunctionTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/functions/FromElementsFunctionTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/functions/FromElementsFunctionTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/functions/FromElementsFunctionTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/functions/ListSourceContext.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/functions/ListSourceContext.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/functions/ListSourceContext.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/functions/ListSourceContext.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/functions/StatefulSequenceSourceTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/functions/StatefulSequenceSourceTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/functions/StatefulSequenceSourceTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/functions/StatefulSequenceSourceTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/functions/sink/OutputFormatSinkFunctionTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/functions/sink/OutputFormatSinkFunctionTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/functions/sink/OutputFormatSinkFunctionTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/functions/sink/OutputFormatSinkFunctionTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/functions/sink/filesystem/BucketStatePathResolver.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/functions/sink/filesystem/BucketStatePathResolver.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/functions/sink/filesystem/BucketStatePathResolver.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/functions/sink/filesystem/BucketStatePathResolver.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/functions/sink/filesystem/utils/NoOpCommitter.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/functions/sink/filesystem/utils/NoOpCommitter.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/functions/sink/filesystem/utils/NoOpCommitter.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/functions/sink/filesystem/utils/NoOpCommitter.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/functions/sink/filesystem/utils/NoOpRecoverable.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/functions/sink/filesystem/utils/NoOpRecoverable.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/functions/sink/filesystem/utils/NoOpRecoverable.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/functions/sink/filesystem/utils/NoOpRecoverable.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/functions/sink/filesystem/utils/NoOpRecoverableFsDataOutputStream.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/functions/sink/filesystem/utils/NoOpRecoverableFsDataOutputStream.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/functions/sink/filesystem/utils/NoOpRecoverableFsDataOutputStream.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/functions/sink/filesystem/utils/NoOpRecoverableFsDataOutputStream.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/functions/sink/filesystem/utils/NoOpRecoverableWriter.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/functions/sink/filesystem/utils/NoOpRecoverableWriter.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/functions/sink/filesystem/utils/NoOpRecoverableWriter.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/functions/sink/filesystem/utils/NoOpRecoverableWriter.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/functions/source/ContinuousFileReaderOperatorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/functions/source/ContinuousFileReaderOperatorTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/functions/source/ContinuousFileReaderOperatorTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/functions/source/ContinuousFileReaderOperatorTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/functions/source/FileMonitoringFunctionTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/functions/source/FileMonitoringFunctionTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/functions/source/FileMonitoringFunctionTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/functions/source/FileMonitoringFunctionTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/functions/source/InputFormatSourceFunctionTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/functions/source/InputFormatSourceFunctionTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/functions/source/InputFormatSourceFunctionTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/functions/source/InputFormatSourceFunctionTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/functions/source/SocketTextStreamFunctionTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/functions/source/SocketTextStreamFunctionTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/functions/source/SocketTextStreamFunctionTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/functions/source/SocketTextStreamFunctionTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/graph/SinkTransformationTranslatorITCaseBase.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/graph/SinkTransformationTranslatorITCaseBase.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/graph/SinkTransformationTranslatorITCaseBase.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/graph/SinkTransformationTranslatorITCaseBase.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/graph/SlotAllocationTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/graph/SlotAllocationTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/graph/SlotAllocationTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/graph/SlotAllocationTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/graph/StreamingJobGraphGeneratorWithGlobalStreamExchangeModeTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/graph/StreamingJobGraphGeneratorWithGlobalStreamExchangeModeTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/graph/StreamingJobGraphGeneratorWithGlobalStreamExchangeModeTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/graph/StreamingJobGraphGeneratorWithGlobalStreamExchangeModeTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/lineage/DefaultLineageGraphTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/lineage/DefaultLineageGraphTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/lineage/DefaultLineageGraphTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/lineage/DefaultLineageGraphTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/AbstractStreamOperatorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/AbstractStreamOperatorTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/AbstractStreamOperatorTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/AbstractStreamOperatorTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/BackendRestorerProcedureTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/BackendRestorerProcedureTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/BackendRestorerProcedureTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/BackendRestorerProcedureTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/BatchGroupedReduceOperatorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/BatchGroupedReduceOperatorTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/BatchGroupedReduceOperatorTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/BatchGroupedReduceOperatorTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/InputSelectionTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/InputSelectionTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/InputSelectionTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/InputSelectionTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/InternalTimeServiceManagerImplTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/InternalTimeServiceManagerImplTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/InternalTimeServiceManagerImplTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/InternalTimeServiceManagerImplTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/InternalTimerServiceAsyncImplTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/InternalTimerServiceAsyncImplTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/InternalTimerServiceAsyncImplTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/InternalTimerServiceAsyncImplTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/InternalTimerServiceImplTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/InternalTimerServiceImplTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/InternalTimerServiceImplTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/InternalTimerServiceImplTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/KeyGroupPartitionerForTimersTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/KeyGroupPartitionerForTimersTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/KeyGroupPartitionerForTimersTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/KeyGroupPartitionerForTimersTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/KeyedProcessOperatorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/KeyedProcessOperatorTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/KeyedProcessOperatorTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/KeyedProcessOperatorTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/LegacyKeyedProcessOperatorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/LegacyKeyedProcessOperatorTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/LegacyKeyedProcessOperatorTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/LegacyKeyedProcessOperatorTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/MailboxWatermarkProcessorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/MailboxWatermarkProcessorTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/MailboxWatermarkProcessorTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/MailboxWatermarkProcessorTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/MapPartitionIteratorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/MapPartitionIteratorTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/MapPartitionIteratorTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/MapPartitionIteratorTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/MapPartitionOperatorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/MapPartitionOperatorTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/MapPartitionOperatorTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/MapPartitionOperatorTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/OperatorAttributesTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/OperatorAttributesTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/OperatorAttributesTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/OperatorAttributesTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/OperatorSnapshotFinalizerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/OperatorSnapshotFinalizerTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/OperatorSnapshotFinalizerTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/OperatorSnapshotFinalizerTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/OperatorSnapshotFuturesTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/OperatorSnapshotFuturesTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/OperatorSnapshotFuturesTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/OperatorSnapshotFuturesTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/PartitionAggregateOperatorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/PartitionAggregateOperatorTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/PartitionAggregateOperatorTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/PartitionAggregateOperatorTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/PartitionReduceOperatorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/PartitionReduceOperatorTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/PartitionReduceOperatorTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/PartitionReduceOperatorTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/ProcessOperatorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/ProcessOperatorTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/ProcessOperatorTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/ProcessOperatorTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/SourceOperatorAlignmentTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/SourceOperatorAlignmentTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/SourceOperatorAlignmentTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/SourceOperatorAlignmentTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/SourceOperatorIdleTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/SourceOperatorIdleTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/SourceOperatorIdleTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/SourceOperatorIdleTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/SourceOperatorSplitWatermarkAlignmentTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/SourceOperatorSplitWatermarkAlignmentTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/SourceOperatorSplitWatermarkAlignmentTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/SourceOperatorSplitWatermarkAlignmentTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/SourceOperatorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/SourceOperatorTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/SourceOperatorTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/SourceOperatorTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/SourceOperatorTestContext.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/SourceOperatorTestContext.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/SourceOperatorTestContext.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/SourceOperatorTestContext.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/SourceOperatorWatermarksTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/SourceOperatorWatermarksTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/SourceOperatorWatermarksTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/SourceOperatorWatermarksTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/StateDescriptorPassingTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StateDescriptorPassingTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/StateDescriptorPassingTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StateDescriptorPassingTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/StateInitializationContextImplTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StateInitializationContextImplTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/StateInitializationContextImplTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StateInitializationContextImplTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/StateSnapshotContextSynchronousImplTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StateSnapshotContextSynchronousImplTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/StateSnapshotContextSynchronousImplTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StateSnapshotContextSynchronousImplTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/StreamFilterTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StreamFilterTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/StreamFilterTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StreamFilterTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/StreamFlatMapTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StreamFlatMapTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/StreamFlatMapTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StreamFlatMapTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/StreamGroupedReduceOperatorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StreamGroupedReduceOperatorTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/StreamGroupedReduceOperatorTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StreamGroupedReduceOperatorTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/StreamMapTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StreamMapTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/StreamMapTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StreamMapTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/StreamOperatorStateHandlerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StreamOperatorStateHandlerTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/StreamOperatorStateHandlerTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StreamOperatorStateHandlerTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/StreamProjectTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StreamProjectTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/StreamProjectTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StreamProjectTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/StreamSinkOperatorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StreamSinkOperatorTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/StreamSinkOperatorTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StreamSinkOperatorTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/StreamSourceContextIdleDetectionTests.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StreamSourceContextIdleDetectionTests.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/StreamSourceContextIdleDetectionTests.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StreamSourceContextIdleDetectionTests.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/StreamTaskStateInitializerImplTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StreamTaskStateInitializerImplTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/StreamTaskStateInitializerImplTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StreamTaskStateInitializerImplTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/StreamingRuntimeContextTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StreamingRuntimeContextTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/StreamingRuntimeContextTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StreamingRuntimeContextTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/TestInternalTimerService.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/TestInternalTimerService.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/TestInternalTimerService.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/TestInternalTimerService.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/TimerSerializerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/TimerSerializerTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/TimerSerializerTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/TimerSerializerTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/TimerSerializerUpgradeTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/TimerSerializerUpgradeTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/TimerSerializerUpgradeTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/TimerSerializerUpgradeTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/WrappingFunctionSnapshotRestoreTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/WrappingFunctionSnapshotRestoreTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/WrappingFunctionSnapshotRestoreTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/WrappingFunctionSnapshotRestoreTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/co/BufferEntryMatchers.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/co/BufferEntryMatchers.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/co/BufferEntryMatchers.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/co/BufferEntryMatchers.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/co/BufferEntrySerializerUpgradeTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/co/BufferEntrySerializerUpgradeTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/co/BufferEntrySerializerUpgradeTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/co/BufferEntrySerializerUpgradeTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/co/CoBroadcastWithKeyedOperatorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/co/CoBroadcastWithKeyedOperatorTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/co/CoBroadcastWithKeyedOperatorTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/co/CoBroadcastWithKeyedOperatorTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/co/CoBroadcastWithNonKeyedOperatorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/co/CoBroadcastWithNonKeyedOperatorTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/co/CoBroadcastWithNonKeyedOperatorTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/co/CoBroadcastWithNonKeyedOperatorTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/co/CoProcessOperatorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/co/CoProcessOperatorTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/co/CoProcessOperatorTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/co/CoProcessOperatorTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/co/IntervalJoinOperatorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/co/IntervalJoinOperatorTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/co/IntervalJoinOperatorTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/co/IntervalJoinOperatorTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/co/KeyedCoProcessOperatorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/co/KeyedCoProcessOperatorTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/co/KeyedCoProcessOperatorTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/co/KeyedCoProcessOperatorTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/co/LegacyKeyedCoProcessOperatorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/co/LegacyKeyedCoProcessOperatorTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/co/LegacyKeyedCoProcessOperatorTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/co/LegacyKeyedCoProcessOperatorTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/collect/CollectResultBufferTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/CollectResultBufferTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/collect/CollectResultBufferTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/CollectResultBufferTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/collect/CollectResultIteratorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/CollectResultIteratorTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/collect/CollectResultIteratorTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/CollectResultIteratorTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/collect/CollectSinkOperatorCoordinatorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/CollectSinkOperatorCoordinatorTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/collect/CollectSinkOperatorCoordinatorTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/CollectSinkOperatorCoordinatorTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/AbstractTestCoordinationRequestHandler.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/AbstractTestCoordinationRequestHandler.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/AbstractTestCoordinationRequestHandler.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/AbstractTestCoordinationRequestHandler.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/CollectTestUtils.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/CollectTestUtils.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/CollectTestUtils.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/CollectTestUtils.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/MockFunctionSnapshotContext.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/MockFunctionSnapshotContext.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/MockFunctionSnapshotContext.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/MockFunctionSnapshotContext.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/MockOperatorEventGateway.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/MockOperatorEventGateway.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/MockOperatorEventGateway.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/MockOperatorEventGateway.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/TestCheckpointedCoordinationRequestHandler.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/TestCheckpointedCoordinationRequestHandler.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/TestCheckpointedCoordinationRequestHandler.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/TestCheckpointedCoordinationRequestHandler.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/TestJobClient.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/TestJobClient.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/TestJobClient.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/TestJobClient.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/TestUncheckpointedCoordinationRequestHandler.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/TestUncheckpointedCoordinationRequestHandler.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/TestUncheckpointedCoordinationRequestHandler.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/TestUncheckpointedCoordinationRequestHandler.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sort/CollectingDataOutput.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/CollectingDataOutput.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sort/CollectingDataOutput.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/CollectingDataOutput.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sort/CollectionDataInput.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/CollectionDataInput.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sort/CollectionDataInput.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/CollectionDataInput.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sort/FixedLengthByteKeyComparatorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/FixedLengthByteKeyComparatorTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sort/FixedLengthByteKeyComparatorTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/FixedLengthByteKeyComparatorTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sort/FixedLengthKeyAndValueSerializerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/FixedLengthKeyAndValueSerializerTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sort/FixedLengthKeyAndValueSerializerTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/FixedLengthKeyAndValueSerializerTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sort/LargeSortingDataInputITCase.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/LargeSortingDataInputITCase.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sort/LargeSortingDataInputITCase.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/LargeSortingDataInputITCase.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sort/MultiInputSortingDataInputsTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/MultiInputSortingDataInputsTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sort/MultiInputSortingDataInputsTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/MultiInputSortingDataInputsTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sort/SerializerComparatorTestData.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/SerializerComparatorTestData.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sort/SerializerComparatorTestData.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/SerializerComparatorTestData.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sort/SortingDataInputTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/SortingDataInputTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sort/SortingDataInputTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/SortingDataInputTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sort/VariableLengthByteKeyComparatorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/VariableLengthByteKeyComparatorTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sort/VariableLengthByteKeyComparatorTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/VariableLengthByteKeyComparatorTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sort/VariableLengthKeyAndValueSerializerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/VariableLengthKeyAndValueSerializerTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sort/VariableLengthKeyAndValueSerializerTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/VariableLengthKeyAndValueSerializerTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionInternalPriorityQueueSetTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionInternalPriorityQueueSetTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionInternalPriorityQueueSetTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionInternalPriorityQueueSetTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionInternalTimeServiceTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionInternalTimeServiceTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionInternalTimeServiceTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionInternalTimeServiceTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionStateBackendTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionStateBackendTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionStateBackendTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionStateBackendTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionStateBackendVerificationTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionStateBackendVerificationTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionStateBackendVerificationTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionStateBackendVerificationTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sortpartition/FixedLengthByteKeyAndValueComparatorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sortpartition/FixedLengthByteKeyAndValueComparatorTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sortpartition/FixedLengthByteKeyAndValueComparatorTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sortpartition/FixedLengthByteKeyAndValueComparatorTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sortpartition/KeyAndValueSerializerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sortpartition/KeyAndValueSerializerTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sortpartition/KeyAndValueSerializerTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sortpartition/KeyAndValueSerializerTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sortpartition/KeyedSortPartitionOperatorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sortpartition/KeyedSortPartitionOperatorTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sortpartition/KeyedSortPartitionOperatorTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sortpartition/KeyedSortPartitionOperatorTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sortpartition/SerializerComparatorTestData.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sortpartition/SerializerComparatorTestData.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sortpartition/SerializerComparatorTestData.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sortpartition/SerializerComparatorTestData.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sortpartition/SortPartitionOperatorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sortpartition/SortPartitionOperatorTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sortpartition/SortPartitionOperatorTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sortpartition/SortPartitionOperatorTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sortpartition/VariableLengthByteKeyAndValueComparatorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sortpartition/VariableLengthByteKeyAndValueComparatorTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/sortpartition/VariableLengthByteKeyAndValueComparatorTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sortpartition/VariableLengthByteKeyAndValueComparatorTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/source/CollectingDataOutput.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/source/CollectingDataOutput.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/source/CollectingDataOutput.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/source/CollectingDataOutput.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/source/OnEventTestWatermarkGenerator.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/source/OnEventTestWatermarkGenerator.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/source/OnEventTestWatermarkGenerator.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/source/OnEventTestWatermarkGenerator.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/source/OnPeriodicTestWatermarkGenerator.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/source/OnPeriodicTestWatermarkGenerator.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/source/OnPeriodicTestWatermarkGenerator.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/source/OnPeriodicTestWatermarkGenerator.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/source/SourceOperatorEventTimeTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/source/SourceOperatorEventTimeTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/source/SourceOperatorEventTimeTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/source/SourceOperatorEventTimeTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/source/SourceOutputWithWatermarksTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/source/SourceOutputWithWatermarksTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/source/SourceOutputWithWatermarksTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/source/SourceOutputWithWatermarksTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/source/TestingSourceOperator.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/source/TestingSourceOperator.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/source/TestingSourceOperator.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/source/TestingSourceOperator.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/source/WatermarkToDataOutputTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/source/WatermarkToDataOutputTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/source/WatermarkToDataOutputTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/source/WatermarkToDataOutputTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/util/PausableRelativeClockTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/util/PausableRelativeClockTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/util/PausableRelativeClockTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/util/PausableRelativeClockTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/transformations/GetTransitivePredecessorsTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/transformations/GetTransitivePredecessorsTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/transformations/GetTransitivePredecessorsTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/transformations/GetTransitivePredecessorsTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/transformations/SinkV1AdapterTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/transformations/SinkV1AdapterTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/api/transformations/SinkV1AdapterTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/api/transformations/SinkV1AdapterTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/environment/TestingJobClient.java b/flink-runtime/src/test/java/org/apache/flink/streaming/environment/TestingJobClient.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/environment/TestingJobClient.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/environment/TestingJobClient.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/graph/StreamConfigTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/graph/StreamConfigTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/graph/StreamConfigTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/graph/StreamConfigTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/graph/TranslationTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/graph/TranslationTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/graph/TranslationTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/graph/TranslationTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/MockIndexedInputGate.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/MockIndexedInputGate.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/MockIndexedInputGate.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/MockIndexedInputGate.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/MockInputGate.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/MockInputGate.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/MockInputGate.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/MockInputGate.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/MultipleInputSelectionHandlerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/MultipleInputSelectionHandlerTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/MultipleInputSelectionHandlerTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/MultipleInputSelectionHandlerTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/RecordAttributesCombinerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/RecordAttributesCombinerTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/RecordAttributesCombinerTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/RecordAttributesCombinerTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/RecordWriterOutputTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/RecordWriterOutputTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/RecordWriterOutputTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/RecordWriterOutputTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/TestEvent.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/TestEvent.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/TestEvent.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/TestEvent.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/DataSkewStreamNetworkThroughputBenchmark.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/DataSkewStreamNetworkThroughputBenchmark.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/DataSkewStreamNetworkThroughputBenchmark.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/DataSkewStreamNetworkThroughputBenchmark.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/DataSkewStreamNetworkThroughputBenchmarkTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/DataSkewStreamNetworkThroughputBenchmarkTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/DataSkewStreamNetworkThroughputBenchmarkTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/DataSkewStreamNetworkThroughputBenchmarkTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/LongRecordWriterThread.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/LongRecordWriterThread.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/LongRecordWriterThread.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/LongRecordWriterThread.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/ReceiverThread.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/ReceiverThread.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/ReceiverThread.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/ReceiverThread.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/SerializingLongReceiver.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/SerializingLongReceiver.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/SerializingLongReceiver.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/SerializingLongReceiver.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/SingleInputGateBenchmarkFactory.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/SingleInputGateBenchmarkFactory.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/SingleInputGateBenchmarkFactory.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/SingleInputGateBenchmarkFactory.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/StreamNetworkBenchmarkEnvironment.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/StreamNetworkBenchmarkEnvironment.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/StreamNetworkBenchmarkEnvironment.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/StreamNetworkBenchmarkEnvironment.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/StreamNetworkBroadcastThroughputBenchmark.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/StreamNetworkBroadcastThroughputBenchmark.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/StreamNetworkBroadcastThroughputBenchmark.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/StreamNetworkBroadcastThroughputBenchmark.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/StreamNetworkBroadcastThroughputBenchmarkTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/StreamNetworkBroadcastThroughputBenchmarkTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/StreamNetworkBroadcastThroughputBenchmarkTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/StreamNetworkBroadcastThroughputBenchmarkTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/StreamNetworkPointToPointBenchmark.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/StreamNetworkPointToPointBenchmark.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/StreamNetworkPointToPointBenchmark.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/StreamNetworkPointToPointBenchmark.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/StreamNetworkPointToPointBenchmarkTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/StreamNetworkPointToPointBenchmarkTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/StreamNetworkPointToPointBenchmarkTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/StreamNetworkPointToPointBenchmarkTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/StreamNetworkThroughputBenchmark.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/StreamNetworkThroughputBenchmark.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/StreamNetworkThroughputBenchmark.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/StreamNetworkThroughputBenchmark.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/StreamNetworkThroughputBenchmarkTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/StreamNetworkThroughputBenchmarkTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/StreamNetworkThroughputBenchmarkTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/benchmark/StreamNetworkThroughputBenchmarkTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/AlignedCheckpointsMassiveRandomTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/AlignedCheckpointsMassiveRandomTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/AlignedCheckpointsMassiveRandomTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/AlignedCheckpointsMassiveRandomTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/AlignedCheckpointsTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/AlignedCheckpointsTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/AlignedCheckpointsTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/AlignedCheckpointsTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/AlternatingCheckpointsTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/AlternatingCheckpointsTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/AlternatingCheckpointsTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/AlternatingCheckpointsTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/BarrierAlignmentUtilTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/BarrierAlignmentUtilTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/BarrierAlignmentUtilTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/BarrierAlignmentUtilTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/CheckpointBarrierTrackerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/CheckpointBarrierTrackerTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/CheckpointBarrierTrackerTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/CheckpointBarrierTrackerTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/CheckpointSequenceValidator.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/CheckpointSequenceValidator.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/CheckpointSequenceValidator.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/CheckpointSequenceValidator.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/CheckpointedInputGateTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/CheckpointedInputGateTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/CheckpointedInputGateTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/CheckpointedInputGateTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/InputProcessorUtilTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/InputProcessorUtilTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/InputProcessorUtilTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/InputProcessorUtilTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/TestBarrierHandlerFactory.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/TestBarrierHandlerFactory.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/TestBarrierHandlerFactory.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/TestBarrierHandlerFactory.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/UnalignedCheckpointsCancellationTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/UnalignedCheckpointsCancellationTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/UnalignedCheckpointsCancellationTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/UnalignedCheckpointsCancellationTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/UnalignedCheckpointsTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/UnalignedCheckpointsTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/UnalignedCheckpointsTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/UnalignedCheckpointsTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/ValidatingCheckpointHandler.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/ValidatingCheckpointHandler.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/ValidatingCheckpointHandler.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/checkpointing/ValidatingCheckpointHandler.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/recovery/DemultiplexingRecordDeserializerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/recovery/DemultiplexingRecordDeserializerTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/io/recovery/DemultiplexingRecordDeserializerTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/recovery/DemultiplexingRecordDeserializerTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/metrics/MinWatermarkGaugeTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/metrics/MinWatermarkGaugeTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/metrics/MinWatermarkGaugeTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/metrics/MinWatermarkGaugeTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/metrics/WatermarkGaugeTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/metrics/WatermarkGaugeTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/metrics/WatermarkGaugeTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/metrics/WatermarkGaugeTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/ContinuousFileProcessingRescalingTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/ContinuousFileProcessingRescalingTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/ContinuousFileProcessingRescalingTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/ContinuousFileProcessingRescalingTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/SourceOperatorLatencyMetricsTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/SourceOperatorLatencyMetricsTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/SourceOperatorLatencyMetricsTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/SourceOperatorLatencyMetricsTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/StreamOperatorChainingTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/StreamOperatorChainingTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/StreamOperatorChainingTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/StreamOperatorChainingTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/StreamSourceOperatorLatencyMetricsTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/StreamSourceOperatorLatencyMetricsTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/StreamSourceOperatorLatencyMetricsTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/StreamSourceOperatorLatencyMetricsTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/TimestampsAndWatermarksOperatorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/TimestampsAndWatermarksOperatorTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/TimestampsAndWatermarksOperatorTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/TimestampsAndWatermarksOperatorTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/sink/committables/CheckpointCommittableManagerImplTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/sink/committables/CheckpointCommittableManagerImplTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/sink/committables/CheckpointCommittableManagerImplTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/sink/committables/CheckpointCommittableManagerImplTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/sink/committables/CommittableCollectorSerializerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/sink/committables/CommittableCollectorSerializerTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/sink/committables/CommittableCollectorSerializerTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/sink/committables/CommittableCollectorSerializerTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/sink/committables/CommittableCollectorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/sink/committables/CommittableCollectorTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/sink/committables/CommittableCollectorTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/sink/committables/CommittableCollectorTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/sink/committables/SubtaskCommittableManagerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/sink/committables/SubtaskCommittableManagerTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/sink/committables/SubtaskCommittableManagerTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/sink/committables/SubtaskCommittableManagerTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/CountTriggerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/CountTriggerTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/CountTriggerTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/CountTriggerTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/EventTimeTriggerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/EventTimeTriggerTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/EventTimeTriggerTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/EventTimeTriggerTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperatorContractTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperatorContractTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperatorContractTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperatorContractTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/GlobalWindowsTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/GlobalWindowsTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/GlobalWindowsTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/GlobalWindowsTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/NonPojoType.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/NonPojoType.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/NonPojoType.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/NonPojoType.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/ProcessingTimeTriggerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/ProcessingTimeTriggerTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/ProcessingTimeTriggerTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/ProcessingTimeTriggerTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/PurgingTriggerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/PurgingTriggerTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/PurgingTriggerTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/PurgingTriggerTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/RegularWindowOperatorContractTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/RegularWindowOperatorContractTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/RegularWindowOperatorContractTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/RegularWindowOperatorContractTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/SimpleTriggerTestHarness.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/SimpleTriggerTestHarness.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/SimpleTriggerTestHarness.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/SimpleTriggerTestHarness.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/SlidingEventTimeWindowsTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/SlidingEventTimeWindowsTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/SlidingEventTimeWindowsTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/SlidingEventTimeWindowsTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/SlidingProcessingTimeWindowsTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/SlidingProcessingTimeWindowsTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/SlidingProcessingTimeWindowsTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/SlidingProcessingTimeWindowsTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/TimeWindowSerializerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/TimeWindowSerializerTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/TimeWindowSerializerTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/TimeWindowSerializerTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/TimeWindowTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/TimeWindowTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/TimeWindowTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/TimeWindowTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/TimeWindowTranslationTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/TimeWindowTranslationTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/TimeWindowTranslationTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/TimeWindowTranslationTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/TriggerTestHarness.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/TriggerTestHarness.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/TriggerTestHarness.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/TriggerTestHarness.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/TumblingEventTimeWindowsTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/TumblingEventTimeWindowsTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/TumblingEventTimeWindowsTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/TumblingEventTimeWindowsTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/TumblingProcessingTimeWindowsTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/TumblingProcessingTimeWindowsTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/TumblingProcessingTimeWindowsTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/TumblingProcessingTimeWindowsTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperatorContractTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperatorContractTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperatorContractTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperatorContractTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/WindowSerializerUpgradeTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/WindowSerializerUpgradeTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/WindowSerializerUpgradeTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/WindowSerializerUpgradeTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/WindowStaggerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/WindowStaggerTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/WindowStaggerTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/WindowStaggerTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/WindowedValue.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/WindowedValue.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/WindowedValue.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/WindowedValue.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/partitioner/BroadcastPartitionerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/partitioner/BroadcastPartitionerTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/partitioner/BroadcastPartitionerTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/partitioner/BroadcastPartitionerTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/partitioner/ForwardPartitionerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/partitioner/ForwardPartitionerTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/partitioner/ForwardPartitionerTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/partitioner/ForwardPartitionerTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/partitioner/GlobalPartitionerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/partitioner/GlobalPartitionerTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/partitioner/GlobalPartitionerTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/partitioner/GlobalPartitionerTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/partitioner/KeyGroupStreamPartitionerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/partitioner/KeyGroupStreamPartitionerTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/partitioner/KeyGroupStreamPartitionerTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/partitioner/KeyGroupStreamPartitionerTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/partitioner/RebalancePartitionerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/partitioner/RebalancePartitionerTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/partitioner/RebalancePartitionerTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/partitioner/RebalancePartitionerTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/partitioner/RescalePartitionerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/partitioner/RescalePartitionerTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/partitioner/RescalePartitionerTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/partitioner/RescalePartitionerTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/partitioner/ShufflePartitionerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/partitioner/ShufflePartitionerTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/partitioner/ShufflePartitionerTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/partitioner/ShufflePartitionerTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/partitioner/StreamPartitionerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/partitioner/StreamPartitionerTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/partitioner/StreamPartitionerTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/partitioner/StreamPartitionerTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/streamrecord/StreamElementSerializerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/streamrecord/StreamElementSerializerTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/streamrecord/StreamElementSerializerTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/streamrecord/StreamElementSerializerTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/streamrecord/StreamElementSerializerUpgradeTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/streamrecord/StreamElementSerializerUpgradeTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/streamrecord/StreamElementSerializerUpgradeTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/streamrecord/StreamElementSerializerUpgradeTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/streamrecord/StreamRecordTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/streamrecord/StreamRecordTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/streamrecord/StreamRecordTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/streamrecord/StreamRecordTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/AsyncCheckpointRunnableTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/AsyncCheckpointRunnableTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/AsyncCheckpointRunnableTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/AsyncCheckpointRunnableTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/InterruptSensitiveRestoreTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/InterruptSensitiveRestoreTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/InterruptSensitiveRestoreTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/InterruptSensitiveRestoreTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/LifeCycleMonitor.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/LifeCycleMonitor.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/LifeCycleMonitor.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/LifeCycleMonitor.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/MockSubtaskCheckpointCoordinatorBuilder.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/MockSubtaskCheckpointCoordinatorBuilder.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/MockSubtaskCheckpointCoordinatorBuilder.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/MockSubtaskCheckpointCoordinatorBuilder.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/OperatorChainTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/OperatorChainTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/OperatorChainTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/OperatorChainTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/ProcessingTimeServiceImplTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/ProcessingTimeServiceImplTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/ProcessingTimeServiceImplTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/ProcessingTimeServiceImplTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamConfigChainer.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamConfigChainer.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamConfigChainer.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamConfigChainer.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamMockEnvironment.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamMockEnvironment.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamMockEnvironment.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamMockEnvironment.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamOperatorWrapperTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamOperatorWrapperTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamOperatorWrapperTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamOperatorWrapperTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskExecutionDecorationTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskExecutionDecorationTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskExecutionDecorationTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskExecutionDecorationTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskTerminationTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskTerminationTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskTerminationTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskTerminationTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/SynchronousCheckpointITCase.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/SynchronousCheckpointITCase.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/SynchronousCheckpointITCase.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/SynchronousCheckpointITCase.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/SystemProcessingTimeServiceTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/SystemProcessingTimeServiceTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/SystemProcessingTimeServiceTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/SystemProcessingTimeServiceTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/TaskCheckpointingBehaviourTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/TaskCheckpointingBehaviourTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/TaskCheckpointingBehaviourTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/TaskCheckpointingBehaviourTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/TestBoundedOneInputStreamOperator.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/TestBoundedOneInputStreamOperator.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/TestBoundedOneInputStreamOperator.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/TestBoundedOneInputStreamOperator.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/TestBoundedTwoInputOperator.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/TestBoundedTwoInputOperator.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/TestBoundedTwoInputOperator.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/TestBoundedTwoInputOperator.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/TestFinishedOnRestoreStreamOperator.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/TestFinishedOnRestoreStreamOperator.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/TestFinishedOnRestoreStreamOperator.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/TestFinishedOnRestoreStreamOperator.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/TestProcessingTimeService.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/TestProcessingTimeService.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/TestProcessingTimeService.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/TestProcessingTimeService.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/TestSpyWrapperStateBackend.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/TestSpyWrapperStateBackend.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/TestSpyWrapperStateBackend.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/TestSpyWrapperStateBackend.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/TestStateBackend.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/TestStateBackend.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/TestStateBackend.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/TestStateBackend.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/TestSubtaskCheckpointCoordinator.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/TestSubtaskCheckpointCoordinator.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/TestSubtaskCheckpointCoordinator.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/TestSubtaskCheckpointCoordinator.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/mailbox/MailboxExecutorImplTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/mailbox/MailboxExecutorImplTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/mailbox/MailboxExecutorImplTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/mailbox/MailboxExecutorImplTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/mailbox/SteppingMailboxProcessor.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/mailbox/SteppingMailboxProcessor.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/mailbox/SteppingMailboxProcessor.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/mailbox/SteppingMailboxProcessor.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/mailbox/TaskMailboxImplTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/mailbox/TaskMailboxImplTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/mailbox/TaskMailboxImplTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/mailbox/TaskMailboxImplTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/mailbox/TaskMailboxProcessorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/mailbox/TaskMailboxProcessorTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/mailbox/TaskMailboxProcessorTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/mailbox/TaskMailboxProcessorTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/watermarkstatus/HeapPriorityQueueTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/watermarkstatus/HeapPriorityQueueTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/watermarkstatus/HeapPriorityQueueTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/watermarkstatus/HeapPriorityQueueTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/watermarkstatus/StatusWatermarkValveTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/watermarkstatus/StatusWatermarkValveTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/watermarkstatus/StatusWatermarkValveTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/watermarkstatus/StatusWatermarkValveTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/watermarkstatus/WatermarkStatusTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/watermarkstatus/WatermarkStatusTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/watermarkstatus/WatermarkStatusTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/runtime/watermarkstatus/WatermarkStatusTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/AbstractBroadcastStreamOperatorTestHarness.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/AbstractBroadcastStreamOperatorTestHarness.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/AbstractBroadcastStreamOperatorTestHarness.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/AbstractBroadcastStreamOperatorTestHarness.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/AbstractStreamOperatorTestHarness.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/AbstractStreamOperatorTestHarness.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/AbstractStreamOperatorTestHarness.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/AbstractStreamOperatorTestHarness.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/AbstractStreamOperatorTestHarnessTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/AbstractStreamOperatorTestHarnessTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/AbstractStreamOperatorTestHarnessTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/AbstractStreamOperatorTestHarnessTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/BlockingSourceContext.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/BlockingSourceContext.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/BlockingSourceContext.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/BlockingSourceContext.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/BroadcastOperatorTestHarness.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/BroadcastOperatorTestHarness.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/BroadcastOperatorTestHarness.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/BroadcastOperatorTestHarness.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/CollectingSourceContext.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/CollectingSourceContext.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/CollectingSourceContext.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/CollectingSourceContext.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/CollectorOutput.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/CollectorOutput.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/CollectorOutput.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/CollectorOutput.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/ContentDump.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/ContentDump.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/ContentDump.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/ContentDump.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/KeyedBroadcastOperatorTestHarness.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/KeyedBroadcastOperatorTestHarness.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/KeyedBroadcastOperatorTestHarness.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/KeyedBroadcastOperatorTestHarness.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/KeyedMultiInputStreamOperatorTestHarness.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/KeyedMultiInputStreamOperatorTestHarness.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/KeyedMultiInputStreamOperatorTestHarness.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/KeyedMultiInputStreamOperatorTestHarness.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/KeyedOneInputStreamOperatorTestHarness.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/KeyedOneInputStreamOperatorTestHarness.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/KeyedOneInputStreamOperatorTestHarness.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/KeyedOneInputStreamOperatorTestHarness.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/KeyedTwoInputStreamOperatorTestHarness.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/KeyedTwoInputStreamOperatorTestHarness.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/KeyedTwoInputStreamOperatorTestHarness.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/KeyedTwoInputStreamOperatorTestHarness.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/LatencyStatsTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/LatencyStatsTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/LatencyStatsTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/LatencyStatsTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/MockContext.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/MockContext.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/MockContext.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/MockContext.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/MockDeserializationSchema.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/MockDeserializationSchema.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/MockDeserializationSchema.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/MockDeserializationSchema.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/MockOutput.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/MockOutput.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/MockOutput.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/MockOutput.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/MockSerializationSchema.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/MockSerializationSchema.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/MockSerializationSchema.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/MockSerializationSchema.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/MockStreamConfig.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/MockStreamConfig.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/MockStreamConfig.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/MockStreamConfig.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/MockStreamTask.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/MockStreamTask.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/MockStreamTask.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/MockStreamTask.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/MockStreamTaskBuilder.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/MockStreamTaskBuilder.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/MockStreamTaskBuilder.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/MockStreamTaskBuilder.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/MockStreamingRuntimeContext.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/MockStreamingRuntimeContext.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/MockStreamingRuntimeContext.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/MockStreamingRuntimeContext.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/MultiInputStreamOperatorTestHarness.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/MultiInputStreamOperatorTestHarness.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/MultiInputStreamOperatorTestHarness.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/MultiInputStreamOperatorTestHarness.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/NoOpIntMap.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/NoOpIntMap.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/NoOpIntMap.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/NoOpIntMap.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/OneInputStreamOperatorTestHarness.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/OneInputStreamOperatorTestHarness.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/OneInputStreamOperatorTestHarness.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/OneInputStreamOperatorTestHarness.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/OperatorSnapshotUtil.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/OperatorSnapshotUtil.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/OperatorSnapshotUtil.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/OperatorSnapshotUtil.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/ProcessFunctionTestHarnesses.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/ProcessFunctionTestHarnesses.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/ProcessFunctionTestHarnesses.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/ProcessFunctionTestHarnesses.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/ProcessFunctionTestHarnessesTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/ProcessFunctionTestHarnessesTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/ProcessFunctionTestHarnessesTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/ProcessFunctionTestHarnessesTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/SourceFunctionUtil.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/SourceFunctionUtil.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/SourceFunctionUtil.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/SourceFunctionUtil.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/SourceOperatorTestHarness.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/SourceOperatorTestHarness.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/SourceOperatorTestHarness.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/SourceOperatorTestHarness.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/StreamRecordMatchers.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/StreamRecordMatchers.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/StreamRecordMatchers.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/StreamRecordMatchers.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/StreamTaskUtil.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/StreamTaskUtil.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/StreamTaskUtil.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/StreamTaskUtil.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/TestAnyModeReadingStreamOperator.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/TestAnyModeReadingStreamOperator.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/TestAnyModeReadingStreamOperator.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/TestAnyModeReadingStreamOperator.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/TestCheckpointedInputGateBuilder.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/TestCheckpointedInputGateBuilder.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/TestCheckpointedInputGateBuilder.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/TestCheckpointedInputGateBuilder.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/TestHarnessUtil.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/TestHarnessUtil.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/TestHarnessUtil.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/TestHarnessUtil.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/TestSequentialReadingStreamOperator.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/TestSequentialReadingStreamOperator.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/TestSequentialReadingStreamOperator.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/TestSequentialReadingStreamOperator.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/TwoInputStreamOperatorTestHarness.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/TwoInputStreamOperatorTestHarness.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/TwoInputStreamOperatorTestHarness.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/TwoInputStreamOperatorTestHarness.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/WatermarkMatchers.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/WatermarkMatchers.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/WatermarkMatchers.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/WatermarkMatchers.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/keys/ArrayKeySelectorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/keys/ArrayKeySelectorTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/keys/ArrayKeySelectorTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/keys/ArrayKeySelectorTest.java
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/util/typeutils/FieldAccessorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/typeutils/FieldAccessorTest.java
similarity index 100%
rename from flink-streaming-java/src/test/java/org/apache/flink/streaming/util/typeutils/FieldAccessorTest.java
rename to flink-runtime/src/test/java/org/apache/flink/streaming/util/typeutils/FieldAccessorTest.java
diff --git a/flink-streaming-java/src/test/resources/buffer-entry-serializer-1.11/serializer-snapshot b/flink-runtime/src/test/resources/buffer-entry-serializer-1.11/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/buffer-entry-serializer-1.11/serializer-snapshot
rename to flink-runtime/src/test/resources/buffer-entry-serializer-1.11/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/buffer-entry-serializer-1.11/test-data b/flink-runtime/src/test/resources/buffer-entry-serializer-1.11/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/buffer-entry-serializer-1.11/test-data
rename to flink-runtime/src/test/resources/buffer-entry-serializer-1.11/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/buffer-entry-serializer-1.12/serializer-snapshot b/flink-runtime/src/test/resources/buffer-entry-serializer-1.12/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/buffer-entry-serializer-1.12/serializer-snapshot
rename to flink-runtime/src/test/resources/buffer-entry-serializer-1.12/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/buffer-entry-serializer-1.12/test-data b/flink-runtime/src/test/resources/buffer-entry-serializer-1.12/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/buffer-entry-serializer-1.12/test-data
rename to flink-runtime/src/test/resources/buffer-entry-serializer-1.12/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/buffer-entry-serializer-1.13/serializer-snapshot b/flink-runtime/src/test/resources/buffer-entry-serializer-1.13/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/buffer-entry-serializer-1.13/serializer-snapshot
rename to flink-runtime/src/test/resources/buffer-entry-serializer-1.13/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/buffer-entry-serializer-1.13/test-data b/flink-runtime/src/test/resources/buffer-entry-serializer-1.13/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/buffer-entry-serializer-1.13/test-data
rename to flink-runtime/src/test/resources/buffer-entry-serializer-1.13/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/buffer-entry-serializer-1.14/serializer-snapshot b/flink-runtime/src/test/resources/buffer-entry-serializer-1.14/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/buffer-entry-serializer-1.14/serializer-snapshot
rename to flink-runtime/src/test/resources/buffer-entry-serializer-1.14/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/buffer-entry-serializer-1.14/test-data b/flink-runtime/src/test/resources/buffer-entry-serializer-1.14/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/buffer-entry-serializer-1.14/test-data
rename to flink-runtime/src/test/resources/buffer-entry-serializer-1.14/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/buffer-entry-serializer-1.15/serializer-snapshot b/flink-runtime/src/test/resources/buffer-entry-serializer-1.15/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/buffer-entry-serializer-1.15/serializer-snapshot
rename to flink-runtime/src/test/resources/buffer-entry-serializer-1.15/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/buffer-entry-serializer-1.15/test-data b/flink-runtime/src/test/resources/buffer-entry-serializer-1.15/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/buffer-entry-serializer-1.15/test-data
rename to flink-runtime/src/test/resources/buffer-entry-serializer-1.15/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/buffer-entry-serializer-1.16/serializer-snapshot b/flink-runtime/src/test/resources/buffer-entry-serializer-1.16/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/buffer-entry-serializer-1.16/serializer-snapshot
rename to flink-runtime/src/test/resources/buffer-entry-serializer-1.16/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/buffer-entry-serializer-1.16/test-data b/flink-runtime/src/test/resources/buffer-entry-serializer-1.16/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/buffer-entry-serializer-1.16/test-data
rename to flink-runtime/src/test/resources/buffer-entry-serializer-1.16/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/buffer-entry-serializer-1.17/serializer-snapshot b/flink-runtime/src/test/resources/buffer-entry-serializer-1.17/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/buffer-entry-serializer-1.17/serializer-snapshot
rename to flink-runtime/src/test/resources/buffer-entry-serializer-1.17/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/buffer-entry-serializer-1.17/test-data b/flink-runtime/src/test/resources/buffer-entry-serializer-1.17/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/buffer-entry-serializer-1.17/test-data
rename to flink-runtime/src/test/resources/buffer-entry-serializer-1.17/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/buffer-entry-serializer-1.18/serializer-snapshot b/flink-runtime/src/test/resources/buffer-entry-serializer-1.18/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/buffer-entry-serializer-1.18/serializer-snapshot
rename to flink-runtime/src/test/resources/buffer-entry-serializer-1.18/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/buffer-entry-serializer-1.18/test-data b/flink-runtime/src/test/resources/buffer-entry-serializer-1.18/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/buffer-entry-serializer-1.18/test-data
rename to flink-runtime/src/test/resources/buffer-entry-serializer-1.18/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/buffer-entry-serializer-1.19/serializer-snapshot b/flink-runtime/src/test/resources/buffer-entry-serializer-1.19/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/buffer-entry-serializer-1.19/serializer-snapshot
rename to flink-runtime/src/test/resources/buffer-entry-serializer-1.19/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/buffer-entry-serializer-1.19/test-data b/flink-runtime/src/test/resources/buffer-entry-serializer-1.19/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/buffer-entry-serializer-1.19/test-data
rename to flink-runtime/src/test/resources/buffer-entry-serializer-1.19/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/buffer-entry-serializer-1.20/serializer-snapshot b/flink-runtime/src/test/resources/buffer-entry-serializer-1.20/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/buffer-entry-serializer-1.20/serializer-snapshot
rename to flink-runtime/src/test/resources/buffer-entry-serializer-1.20/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/buffer-entry-serializer-1.20/test-data b/flink-runtime/src/test/resources/buffer-entry-serializer-1.20/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/buffer-entry-serializer-1.20/test-data
rename to flink-runtime/src/test/resources/buffer-entry-serializer-1.20/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/global-window-serializer-1.11/serializer-snapshot b/flink-runtime/src/test/resources/global-window-serializer-1.11/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/global-window-serializer-1.11/serializer-snapshot
rename to flink-runtime/src/test/resources/global-window-serializer-1.11/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/global-window-serializer-1.11/test-data b/flink-runtime/src/test/resources/global-window-serializer-1.11/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/global-window-serializer-1.11/test-data
rename to flink-runtime/src/test/resources/global-window-serializer-1.11/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/global-window-serializer-1.12/serializer-snapshot b/flink-runtime/src/test/resources/global-window-serializer-1.12/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/global-window-serializer-1.12/serializer-snapshot
rename to flink-runtime/src/test/resources/global-window-serializer-1.12/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/global-window-serializer-1.12/test-data b/flink-runtime/src/test/resources/global-window-serializer-1.12/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/global-window-serializer-1.12/test-data
rename to flink-runtime/src/test/resources/global-window-serializer-1.12/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/global-window-serializer-1.13/serializer-snapshot b/flink-runtime/src/test/resources/global-window-serializer-1.13/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/global-window-serializer-1.13/serializer-snapshot
rename to flink-runtime/src/test/resources/global-window-serializer-1.13/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/global-window-serializer-1.13/test-data b/flink-runtime/src/test/resources/global-window-serializer-1.13/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/global-window-serializer-1.13/test-data
rename to flink-runtime/src/test/resources/global-window-serializer-1.13/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/global-window-serializer-1.14/serializer-snapshot b/flink-runtime/src/test/resources/global-window-serializer-1.14/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/global-window-serializer-1.14/serializer-snapshot
rename to flink-runtime/src/test/resources/global-window-serializer-1.14/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/global-window-serializer-1.14/test-data b/flink-runtime/src/test/resources/global-window-serializer-1.14/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/global-window-serializer-1.14/test-data
rename to flink-runtime/src/test/resources/global-window-serializer-1.14/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/global-window-serializer-1.15/serializer-snapshot b/flink-runtime/src/test/resources/global-window-serializer-1.15/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/global-window-serializer-1.15/serializer-snapshot
rename to flink-runtime/src/test/resources/global-window-serializer-1.15/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/global-window-serializer-1.15/test-data b/flink-runtime/src/test/resources/global-window-serializer-1.15/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/global-window-serializer-1.15/test-data
rename to flink-runtime/src/test/resources/global-window-serializer-1.15/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/global-window-serializer-1.16/serializer-snapshot b/flink-runtime/src/test/resources/global-window-serializer-1.16/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/global-window-serializer-1.16/serializer-snapshot
rename to flink-runtime/src/test/resources/global-window-serializer-1.16/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/global-window-serializer-1.16/test-data b/flink-runtime/src/test/resources/global-window-serializer-1.16/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/global-window-serializer-1.16/test-data
rename to flink-runtime/src/test/resources/global-window-serializer-1.16/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/global-window-serializer-1.17/serializer-snapshot b/flink-runtime/src/test/resources/global-window-serializer-1.17/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/global-window-serializer-1.17/serializer-snapshot
rename to flink-runtime/src/test/resources/global-window-serializer-1.17/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/global-window-serializer-1.17/test-data b/flink-runtime/src/test/resources/global-window-serializer-1.17/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/global-window-serializer-1.17/test-data
rename to flink-runtime/src/test/resources/global-window-serializer-1.17/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/global-window-serializer-1.18/serializer-snapshot b/flink-runtime/src/test/resources/global-window-serializer-1.18/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/global-window-serializer-1.18/serializer-snapshot
rename to flink-runtime/src/test/resources/global-window-serializer-1.18/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/global-window-serializer-1.18/test-data b/flink-runtime/src/test/resources/global-window-serializer-1.18/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/global-window-serializer-1.18/test-data
rename to flink-runtime/src/test/resources/global-window-serializer-1.18/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/global-window-serializer-1.19/serializer-snapshot b/flink-runtime/src/test/resources/global-window-serializer-1.19/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/global-window-serializer-1.19/serializer-snapshot
rename to flink-runtime/src/test/resources/global-window-serializer-1.19/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/global-window-serializer-1.19/test-data b/flink-runtime/src/test/resources/global-window-serializer-1.19/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/global-window-serializer-1.19/test-data
rename to flink-runtime/src/test/resources/global-window-serializer-1.19/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/global-window-serializer-1.20/serializer-snapshot b/flink-runtime/src/test/resources/global-window-serializer-1.20/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/global-window-serializer-1.20/serializer-snapshot
rename to flink-runtime/src/test/resources/global-window-serializer-1.20/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/global-window-serializer-1.20/test-data b/flink-runtime/src/test/resources/global-window-serializer-1.20/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/global-window-serializer-1.20/test-data
rename to flink-runtime/src/test/resources/global-window-serializer-1.20/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/stream-element-serializer-1.11/serializer-snapshot b/flink-runtime/src/test/resources/stream-element-serializer-1.11/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/stream-element-serializer-1.11/serializer-snapshot
rename to flink-runtime/src/test/resources/stream-element-serializer-1.11/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/stream-element-serializer-1.11/test-data b/flink-runtime/src/test/resources/stream-element-serializer-1.11/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/stream-element-serializer-1.11/test-data
rename to flink-runtime/src/test/resources/stream-element-serializer-1.11/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/stream-element-serializer-1.12/serializer-snapshot b/flink-runtime/src/test/resources/stream-element-serializer-1.12/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/stream-element-serializer-1.12/serializer-snapshot
rename to flink-runtime/src/test/resources/stream-element-serializer-1.12/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/stream-element-serializer-1.12/test-data b/flink-runtime/src/test/resources/stream-element-serializer-1.12/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/stream-element-serializer-1.12/test-data
rename to flink-runtime/src/test/resources/stream-element-serializer-1.12/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/stream-element-serializer-1.13/serializer-snapshot b/flink-runtime/src/test/resources/stream-element-serializer-1.13/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/stream-element-serializer-1.13/serializer-snapshot
rename to flink-runtime/src/test/resources/stream-element-serializer-1.13/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/stream-element-serializer-1.13/test-data b/flink-runtime/src/test/resources/stream-element-serializer-1.13/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/stream-element-serializer-1.13/test-data
rename to flink-runtime/src/test/resources/stream-element-serializer-1.13/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/stream-element-serializer-1.14/serializer-snapshot b/flink-runtime/src/test/resources/stream-element-serializer-1.14/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/stream-element-serializer-1.14/serializer-snapshot
rename to flink-runtime/src/test/resources/stream-element-serializer-1.14/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/stream-element-serializer-1.14/test-data b/flink-runtime/src/test/resources/stream-element-serializer-1.14/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/stream-element-serializer-1.14/test-data
rename to flink-runtime/src/test/resources/stream-element-serializer-1.14/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/stream-element-serializer-1.15/serializer-snapshot b/flink-runtime/src/test/resources/stream-element-serializer-1.15/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/stream-element-serializer-1.15/serializer-snapshot
rename to flink-runtime/src/test/resources/stream-element-serializer-1.15/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/stream-element-serializer-1.15/test-data b/flink-runtime/src/test/resources/stream-element-serializer-1.15/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/stream-element-serializer-1.15/test-data
rename to flink-runtime/src/test/resources/stream-element-serializer-1.15/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/stream-element-serializer-1.16/serializer-snapshot b/flink-runtime/src/test/resources/stream-element-serializer-1.16/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/stream-element-serializer-1.16/serializer-snapshot
rename to flink-runtime/src/test/resources/stream-element-serializer-1.16/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/stream-element-serializer-1.16/test-data b/flink-runtime/src/test/resources/stream-element-serializer-1.16/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/stream-element-serializer-1.16/test-data
rename to flink-runtime/src/test/resources/stream-element-serializer-1.16/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/stream-element-serializer-1.17/serializer-snapshot b/flink-runtime/src/test/resources/stream-element-serializer-1.17/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/stream-element-serializer-1.17/serializer-snapshot
rename to flink-runtime/src/test/resources/stream-element-serializer-1.17/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/stream-element-serializer-1.17/test-data b/flink-runtime/src/test/resources/stream-element-serializer-1.17/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/stream-element-serializer-1.17/test-data
rename to flink-runtime/src/test/resources/stream-element-serializer-1.17/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/stream-element-serializer-1.18/serializer-snapshot b/flink-runtime/src/test/resources/stream-element-serializer-1.18/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/stream-element-serializer-1.18/serializer-snapshot
rename to flink-runtime/src/test/resources/stream-element-serializer-1.18/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/stream-element-serializer-1.18/test-data b/flink-runtime/src/test/resources/stream-element-serializer-1.18/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/stream-element-serializer-1.18/test-data
rename to flink-runtime/src/test/resources/stream-element-serializer-1.18/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/stream-element-serializer-1.19/serializer-snapshot b/flink-runtime/src/test/resources/stream-element-serializer-1.19/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/stream-element-serializer-1.19/serializer-snapshot
rename to flink-runtime/src/test/resources/stream-element-serializer-1.19/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/stream-element-serializer-1.19/test-data b/flink-runtime/src/test/resources/stream-element-serializer-1.19/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/stream-element-serializer-1.19/test-data
rename to flink-runtime/src/test/resources/stream-element-serializer-1.19/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/stream-element-serializer-1.20/serializer-snapshot b/flink-runtime/src/test/resources/stream-element-serializer-1.20/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/stream-element-serializer-1.20/serializer-snapshot
rename to flink-runtime/src/test/resources/stream-element-serializer-1.20/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/stream-element-serializer-1.20/test-data b/flink-runtime/src/test/resources/stream-element-serializer-1.20/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/stream-element-serializer-1.20/test-data
rename to flink-runtime/src/test/resources/stream-element-serializer-1.20/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/time-window-serializer-1.11/serializer-snapshot b/flink-runtime/src/test/resources/time-window-serializer-1.11/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/time-window-serializer-1.11/serializer-snapshot
rename to flink-runtime/src/test/resources/time-window-serializer-1.11/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/time-window-serializer-1.11/test-data b/flink-runtime/src/test/resources/time-window-serializer-1.11/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/time-window-serializer-1.11/test-data
rename to flink-runtime/src/test/resources/time-window-serializer-1.11/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/time-window-serializer-1.12/serializer-snapshot b/flink-runtime/src/test/resources/time-window-serializer-1.12/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/time-window-serializer-1.12/serializer-snapshot
rename to flink-runtime/src/test/resources/time-window-serializer-1.12/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/time-window-serializer-1.12/test-data b/flink-runtime/src/test/resources/time-window-serializer-1.12/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/time-window-serializer-1.12/test-data
rename to flink-runtime/src/test/resources/time-window-serializer-1.12/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/time-window-serializer-1.13/serializer-snapshot b/flink-runtime/src/test/resources/time-window-serializer-1.13/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/time-window-serializer-1.13/serializer-snapshot
rename to flink-runtime/src/test/resources/time-window-serializer-1.13/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/time-window-serializer-1.13/test-data b/flink-runtime/src/test/resources/time-window-serializer-1.13/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/time-window-serializer-1.13/test-data
rename to flink-runtime/src/test/resources/time-window-serializer-1.13/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/time-window-serializer-1.14/serializer-snapshot b/flink-runtime/src/test/resources/time-window-serializer-1.14/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/time-window-serializer-1.14/serializer-snapshot
rename to flink-runtime/src/test/resources/time-window-serializer-1.14/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/time-window-serializer-1.14/test-data b/flink-runtime/src/test/resources/time-window-serializer-1.14/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/time-window-serializer-1.14/test-data
rename to flink-runtime/src/test/resources/time-window-serializer-1.14/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/time-window-serializer-1.15/serializer-snapshot b/flink-runtime/src/test/resources/time-window-serializer-1.15/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/time-window-serializer-1.15/serializer-snapshot
rename to flink-runtime/src/test/resources/time-window-serializer-1.15/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/time-window-serializer-1.15/test-data b/flink-runtime/src/test/resources/time-window-serializer-1.15/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/time-window-serializer-1.15/test-data
rename to flink-runtime/src/test/resources/time-window-serializer-1.15/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/time-window-serializer-1.16/serializer-snapshot b/flink-runtime/src/test/resources/time-window-serializer-1.16/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/time-window-serializer-1.16/serializer-snapshot
rename to flink-runtime/src/test/resources/time-window-serializer-1.16/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/time-window-serializer-1.16/test-data b/flink-runtime/src/test/resources/time-window-serializer-1.16/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/time-window-serializer-1.16/test-data
rename to flink-runtime/src/test/resources/time-window-serializer-1.16/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/time-window-serializer-1.17/serializer-snapshot b/flink-runtime/src/test/resources/time-window-serializer-1.17/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/time-window-serializer-1.17/serializer-snapshot
rename to flink-runtime/src/test/resources/time-window-serializer-1.17/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/time-window-serializer-1.17/test-data b/flink-runtime/src/test/resources/time-window-serializer-1.17/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/time-window-serializer-1.17/test-data
rename to flink-runtime/src/test/resources/time-window-serializer-1.17/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/time-window-serializer-1.18/serializer-snapshot b/flink-runtime/src/test/resources/time-window-serializer-1.18/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/time-window-serializer-1.18/serializer-snapshot
rename to flink-runtime/src/test/resources/time-window-serializer-1.18/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/time-window-serializer-1.18/test-data b/flink-runtime/src/test/resources/time-window-serializer-1.18/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/time-window-serializer-1.18/test-data
rename to flink-runtime/src/test/resources/time-window-serializer-1.18/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/time-window-serializer-1.19/serializer-snapshot b/flink-runtime/src/test/resources/time-window-serializer-1.19/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/time-window-serializer-1.19/serializer-snapshot
rename to flink-runtime/src/test/resources/time-window-serializer-1.19/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/time-window-serializer-1.19/test-data b/flink-runtime/src/test/resources/time-window-serializer-1.19/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/time-window-serializer-1.19/test-data
rename to flink-runtime/src/test/resources/time-window-serializer-1.19/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/time-window-serializer-1.20/serializer-snapshot b/flink-runtime/src/test/resources/time-window-serializer-1.20/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/time-window-serializer-1.20/serializer-snapshot
rename to flink-runtime/src/test/resources/time-window-serializer-1.20/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/time-window-serializer-1.20/test-data b/flink-runtime/src/test/resources/time-window-serializer-1.20/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/time-window-serializer-1.20/test-data
rename to flink-runtime/src/test/resources/time-window-serializer-1.20/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/timer-serializer-1.11/serializer-snapshot b/flink-runtime/src/test/resources/timer-serializer-1.11/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/timer-serializer-1.11/serializer-snapshot
rename to flink-runtime/src/test/resources/timer-serializer-1.11/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/timer-serializer-1.11/test-data b/flink-runtime/src/test/resources/timer-serializer-1.11/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/timer-serializer-1.11/test-data
rename to flink-runtime/src/test/resources/timer-serializer-1.11/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/timer-serializer-1.12/serializer-snapshot b/flink-runtime/src/test/resources/timer-serializer-1.12/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/timer-serializer-1.12/serializer-snapshot
rename to flink-runtime/src/test/resources/timer-serializer-1.12/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/timer-serializer-1.12/test-data b/flink-runtime/src/test/resources/timer-serializer-1.12/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/timer-serializer-1.12/test-data
rename to flink-runtime/src/test/resources/timer-serializer-1.12/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/timer-serializer-1.13/serializer-snapshot b/flink-runtime/src/test/resources/timer-serializer-1.13/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/timer-serializer-1.13/serializer-snapshot
rename to flink-runtime/src/test/resources/timer-serializer-1.13/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/timer-serializer-1.13/test-data b/flink-runtime/src/test/resources/timer-serializer-1.13/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/timer-serializer-1.13/test-data
rename to flink-runtime/src/test/resources/timer-serializer-1.13/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/timer-serializer-1.14/serializer-snapshot b/flink-runtime/src/test/resources/timer-serializer-1.14/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/timer-serializer-1.14/serializer-snapshot
rename to flink-runtime/src/test/resources/timer-serializer-1.14/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/timer-serializer-1.14/test-data b/flink-runtime/src/test/resources/timer-serializer-1.14/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/timer-serializer-1.14/test-data
rename to flink-runtime/src/test/resources/timer-serializer-1.14/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/timer-serializer-1.15/serializer-snapshot b/flink-runtime/src/test/resources/timer-serializer-1.15/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/timer-serializer-1.15/serializer-snapshot
rename to flink-runtime/src/test/resources/timer-serializer-1.15/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/timer-serializer-1.15/test-data b/flink-runtime/src/test/resources/timer-serializer-1.15/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/timer-serializer-1.15/test-data
rename to flink-runtime/src/test/resources/timer-serializer-1.15/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/timer-serializer-1.16/serializer-snapshot b/flink-runtime/src/test/resources/timer-serializer-1.16/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/timer-serializer-1.16/serializer-snapshot
rename to flink-runtime/src/test/resources/timer-serializer-1.16/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/timer-serializer-1.16/test-data b/flink-runtime/src/test/resources/timer-serializer-1.16/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/timer-serializer-1.16/test-data
rename to flink-runtime/src/test/resources/timer-serializer-1.16/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/timer-serializer-1.17/serializer-snapshot b/flink-runtime/src/test/resources/timer-serializer-1.17/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/timer-serializer-1.17/serializer-snapshot
rename to flink-runtime/src/test/resources/timer-serializer-1.17/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/timer-serializer-1.17/test-data b/flink-runtime/src/test/resources/timer-serializer-1.17/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/timer-serializer-1.17/test-data
rename to flink-runtime/src/test/resources/timer-serializer-1.17/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/timer-serializer-1.18/serializer-snapshot b/flink-runtime/src/test/resources/timer-serializer-1.18/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/timer-serializer-1.18/serializer-snapshot
rename to flink-runtime/src/test/resources/timer-serializer-1.18/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/timer-serializer-1.18/test-data b/flink-runtime/src/test/resources/timer-serializer-1.18/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/timer-serializer-1.18/test-data
rename to flink-runtime/src/test/resources/timer-serializer-1.18/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/timer-serializer-1.19/serializer-snapshot b/flink-runtime/src/test/resources/timer-serializer-1.19/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/timer-serializer-1.19/serializer-snapshot
rename to flink-runtime/src/test/resources/timer-serializer-1.19/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/timer-serializer-1.19/test-data b/flink-runtime/src/test/resources/timer-serializer-1.19/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/timer-serializer-1.19/test-data
rename to flink-runtime/src/test/resources/timer-serializer-1.19/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/timer-serializer-1.20/serializer-snapshot b/flink-runtime/src/test/resources/timer-serializer-1.20/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/timer-serializer-1.20/serializer-snapshot
rename to flink-runtime/src/test/resources/timer-serializer-1.20/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/timer-serializer-1.20/test-data b/flink-runtime/src/test/resources/timer-serializer-1.20/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/timer-serializer-1.20/test-data
rename to flink-runtime/src/test/resources/timer-serializer-1.20/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/union-serializer-one-1.11/serializer-snapshot b/flink-runtime/src/test/resources/union-serializer-one-1.11/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-one-1.11/serializer-snapshot
rename to flink-runtime/src/test/resources/union-serializer-one-1.11/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/union-serializer-one-1.11/test-data b/flink-runtime/src/test/resources/union-serializer-one-1.11/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-one-1.11/test-data
rename to flink-runtime/src/test/resources/union-serializer-one-1.11/test-data
diff --git a/flink-streaming-java/src/test/resources/union-serializer-one-1.12/serializer-snapshot b/flink-runtime/src/test/resources/union-serializer-one-1.12/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-one-1.12/serializer-snapshot
rename to flink-runtime/src/test/resources/union-serializer-one-1.12/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/union-serializer-one-1.12/test-data b/flink-runtime/src/test/resources/union-serializer-one-1.12/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-one-1.12/test-data
rename to flink-runtime/src/test/resources/union-serializer-one-1.12/test-data
diff --git a/flink-streaming-java/src/test/resources/union-serializer-one-1.13/serializer-snapshot b/flink-runtime/src/test/resources/union-serializer-one-1.13/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-one-1.13/serializer-snapshot
rename to flink-runtime/src/test/resources/union-serializer-one-1.13/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/union-serializer-one-1.13/test-data b/flink-runtime/src/test/resources/union-serializer-one-1.13/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-one-1.13/test-data
rename to flink-runtime/src/test/resources/union-serializer-one-1.13/test-data
diff --git a/flink-streaming-java/src/test/resources/union-serializer-one-1.14/serializer-snapshot b/flink-runtime/src/test/resources/union-serializer-one-1.14/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-one-1.14/serializer-snapshot
rename to flink-runtime/src/test/resources/union-serializer-one-1.14/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/union-serializer-one-1.14/test-data b/flink-runtime/src/test/resources/union-serializer-one-1.14/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-one-1.14/test-data
rename to flink-runtime/src/test/resources/union-serializer-one-1.14/test-data
diff --git a/flink-streaming-java/src/test/resources/union-serializer-one-1.15/serializer-snapshot b/flink-runtime/src/test/resources/union-serializer-one-1.15/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-one-1.15/serializer-snapshot
rename to flink-runtime/src/test/resources/union-serializer-one-1.15/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/union-serializer-one-1.15/test-data b/flink-runtime/src/test/resources/union-serializer-one-1.15/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-one-1.15/test-data
rename to flink-runtime/src/test/resources/union-serializer-one-1.15/test-data
diff --git a/flink-streaming-java/src/test/resources/union-serializer-one-1.16/serializer-snapshot b/flink-runtime/src/test/resources/union-serializer-one-1.16/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-one-1.16/serializer-snapshot
rename to flink-runtime/src/test/resources/union-serializer-one-1.16/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/union-serializer-one-1.16/test-data b/flink-runtime/src/test/resources/union-serializer-one-1.16/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-one-1.16/test-data
rename to flink-runtime/src/test/resources/union-serializer-one-1.16/test-data
diff --git a/flink-streaming-java/src/test/resources/union-serializer-one-1.17/serializer-snapshot b/flink-runtime/src/test/resources/union-serializer-one-1.17/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-one-1.17/serializer-snapshot
rename to flink-runtime/src/test/resources/union-serializer-one-1.17/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/union-serializer-one-1.17/test-data b/flink-runtime/src/test/resources/union-serializer-one-1.17/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-one-1.17/test-data
rename to flink-runtime/src/test/resources/union-serializer-one-1.17/test-data
diff --git a/flink-streaming-java/src/test/resources/union-serializer-one-1.18/serializer-snapshot b/flink-runtime/src/test/resources/union-serializer-one-1.18/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-one-1.18/serializer-snapshot
rename to flink-runtime/src/test/resources/union-serializer-one-1.18/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/union-serializer-one-1.18/test-data b/flink-runtime/src/test/resources/union-serializer-one-1.18/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-one-1.18/test-data
rename to flink-runtime/src/test/resources/union-serializer-one-1.18/test-data
diff --git a/flink-streaming-java/src/test/resources/union-serializer-one-1.19/serializer-snapshot b/flink-runtime/src/test/resources/union-serializer-one-1.19/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-one-1.19/serializer-snapshot
rename to flink-runtime/src/test/resources/union-serializer-one-1.19/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/union-serializer-one-1.19/test-data b/flink-runtime/src/test/resources/union-serializer-one-1.19/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-one-1.19/test-data
rename to flink-runtime/src/test/resources/union-serializer-one-1.19/test-data
diff --git a/flink-streaming-java/src/test/resources/union-serializer-one-1.20/serializer-snapshot b/flink-runtime/src/test/resources/union-serializer-one-1.20/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-one-1.20/serializer-snapshot
rename to flink-runtime/src/test/resources/union-serializer-one-1.20/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/union-serializer-one-1.20/test-data b/flink-runtime/src/test/resources/union-serializer-one-1.20/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-one-1.20/test-data
rename to flink-runtime/src/test/resources/union-serializer-one-1.20/test-data
diff --git a/flink-streaming-java/src/test/resources/union-serializer-two-1.11/serializer-snapshot b/flink-runtime/src/test/resources/union-serializer-two-1.11/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-two-1.11/serializer-snapshot
rename to flink-runtime/src/test/resources/union-serializer-two-1.11/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/union-serializer-two-1.11/test-data b/flink-runtime/src/test/resources/union-serializer-two-1.11/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-two-1.11/test-data
rename to flink-runtime/src/test/resources/union-serializer-two-1.11/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/union-serializer-two-1.12/serializer-snapshot b/flink-runtime/src/test/resources/union-serializer-two-1.12/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-two-1.12/serializer-snapshot
rename to flink-runtime/src/test/resources/union-serializer-two-1.12/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/union-serializer-two-1.12/test-data b/flink-runtime/src/test/resources/union-serializer-two-1.12/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-two-1.12/test-data
rename to flink-runtime/src/test/resources/union-serializer-two-1.12/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/union-serializer-two-1.13/serializer-snapshot b/flink-runtime/src/test/resources/union-serializer-two-1.13/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-two-1.13/serializer-snapshot
rename to flink-runtime/src/test/resources/union-serializer-two-1.13/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/union-serializer-two-1.13/test-data b/flink-runtime/src/test/resources/union-serializer-two-1.13/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-two-1.13/test-data
rename to flink-runtime/src/test/resources/union-serializer-two-1.13/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/union-serializer-two-1.14/serializer-snapshot b/flink-runtime/src/test/resources/union-serializer-two-1.14/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-two-1.14/serializer-snapshot
rename to flink-runtime/src/test/resources/union-serializer-two-1.14/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/union-serializer-two-1.14/test-data b/flink-runtime/src/test/resources/union-serializer-two-1.14/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-two-1.14/test-data
rename to flink-runtime/src/test/resources/union-serializer-two-1.14/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/union-serializer-two-1.15/serializer-snapshot b/flink-runtime/src/test/resources/union-serializer-two-1.15/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-two-1.15/serializer-snapshot
rename to flink-runtime/src/test/resources/union-serializer-two-1.15/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/union-serializer-two-1.15/test-data b/flink-runtime/src/test/resources/union-serializer-two-1.15/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-two-1.15/test-data
rename to flink-runtime/src/test/resources/union-serializer-two-1.15/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/union-serializer-two-1.16/serializer-snapshot b/flink-runtime/src/test/resources/union-serializer-two-1.16/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-two-1.16/serializer-snapshot
rename to flink-runtime/src/test/resources/union-serializer-two-1.16/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/union-serializer-two-1.16/test-data b/flink-runtime/src/test/resources/union-serializer-two-1.16/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-two-1.16/test-data
rename to flink-runtime/src/test/resources/union-serializer-two-1.16/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/union-serializer-two-1.17/serializer-snapshot b/flink-runtime/src/test/resources/union-serializer-two-1.17/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-two-1.17/serializer-snapshot
rename to flink-runtime/src/test/resources/union-serializer-two-1.17/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/union-serializer-two-1.17/test-data b/flink-runtime/src/test/resources/union-serializer-two-1.17/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-two-1.17/test-data
rename to flink-runtime/src/test/resources/union-serializer-two-1.17/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/union-serializer-two-1.18/serializer-snapshot b/flink-runtime/src/test/resources/union-serializer-two-1.18/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-two-1.18/serializer-snapshot
rename to flink-runtime/src/test/resources/union-serializer-two-1.18/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/union-serializer-two-1.18/test-data b/flink-runtime/src/test/resources/union-serializer-two-1.18/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-two-1.18/test-data
rename to flink-runtime/src/test/resources/union-serializer-two-1.18/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/union-serializer-two-1.19/serializer-snapshot b/flink-runtime/src/test/resources/union-serializer-two-1.19/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-two-1.19/serializer-snapshot
rename to flink-runtime/src/test/resources/union-serializer-two-1.19/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/union-serializer-two-1.19/test-data b/flink-runtime/src/test/resources/union-serializer-two-1.19/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-two-1.19/test-data
rename to flink-runtime/src/test/resources/union-serializer-two-1.19/test-data
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/union-serializer-two-1.20/serializer-snapshot b/flink-runtime/src/test/resources/union-serializer-two-1.20/serializer-snapshot
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-two-1.20/serializer-snapshot
rename to flink-runtime/src/test/resources/union-serializer-two-1.20/serializer-snapshot
Binary files differ
diff --git a/flink-streaming-java/src/test/resources/union-serializer-two-1.20/test-data b/flink-runtime/src/test/resources/union-serializer-two-1.20/test-data
similarity index 100%
rename from flink-streaming-java/src/test/resources/union-serializer-two-1.20/test-data
rename to flink-runtime/src/test/resources/union-serializer-two-1.20/test-data
Binary files differ
diff --git a/flink-streaming-java/pom.xml b/flink-streaming-java/pom.xml
index 209df91..eee49d4 100644
--- a/flink-streaming-java/pom.xml
+++ b/flink-streaming-java/pom.xml
@@ -88,12 +88,6 @@
<version>3.6.1</version>
</dependency>
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-connector-datagen</artifactId>
- <version>${project.version}</version>
- </dependency>
-
<!-- test dependencies -->
<dependency>
diff --git a/pom.xml b/pom.xml
index 27b55df..d4546a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2371,6 +2371,38 @@
<!-- FLINK-35812 move tuple interfaces into flink-core-api, should be removed in 2.0 -->
<exclude>org.apache.flink.api.java.tuple.*</exclude>
<exclude>org.apache.flink.types.NullFieldException</exclude>
+ <!-- The following exclusions are due to classes being relocated from the flink-streaming-java
+ module to the flink-runtime module. -->
+ <exclude>org.apache.flink.streaming.api.functions.windowing.AllWindowFunction</exclude>
+ <exclude>org.apache.flink.streaming.api.datastream.CoGroupedStreams</exclude>
+ <exclude>org.apache.flink.streaming.api.datastream.ConnectedStreams</exclude>
+ <exclude>org.apache.flink.streaming.api.datastream.DataStream</exclude>
+ <exclude>org.apache.flink.streaming.api.datastream.IterativeStream</exclude>
+ <exclude>apache.flink.streaming.api.datastream.JoinedStreams</exclude>
+ <exclude>org.apache.flink.streaming.api.datastream.SingleOutputStreamOperator</exclude>
+ <exclude>org.apache.flink.streaming.api.datastream.WindowedStream</exclude>
+ <exclude>org.apache.flink.streaming.api.environment.StreamExecutionEnvironment</exclude>
+ <exclude>org.apache.flink.streaming.api.datastream.AllWindowedStream</exclude>
+ <exclude>org.apache.flink.streaming.api.datastream.JoinedStreams</exclude>
+ <exclude>org.apache.flink.streaming.api.checkpoint.CheckpointedFunction</exclude>
+ <exclude>org.apache.flink.streaming.api.CheckpointingMode</exclude>
+ <exclude>org.apache.flink.streaming.api.datastream.DataStreamSink</exclude>
+ <exclude>org.apache.flink.streaming.api.datastream.DataStreamSource</exclude>
+ <exclude>org.apache.flink.streaming.api.datastream.KeyedStream</exclude>
+ <exclude>org.apache.flink.streaming.api.datastream.SideOutputDataStream</exclude>
+ <exclude>org.apache.flink.streaming.api.environment.CheckpointConfig</exclude>
+ <exclude>org.apache.flink.streaming.api.environment.LocalStreamEnvironment</exclude>
+ <exclude>org.apache.flink.streaming.api.environment.RemoteStreamEnvironment</exclude>
+ <exclude>org.apache.flink.streaming.api.functions.co.CoFlatMapFunction</exclude>
+ <exclude>org.apache.flink.streaming.api.functions.co.CoMapFunction</exclude>
+ <exclude>org.apache.flink.streaming.api.functions.sink.RichSinkFunction</exclude>
+ <exclude>org.apache.flink.streaming.api.functions.sink.SinkFunction</exclude>
+ <exclude>org.apache.flink.streaming.api.functions.source.SourceFunction</exclude>
+ <exclude>org.apache.flink.streaming.api.functions.windowing.WindowFunction</exclude>
+ <exclude>org.apache.flink.streaming.api.windowing.time.Time</exclude>
+ <exclude>org.apache.flink.streaming.api.functions.source.RichSourceFunction</exclude>
+ <exclude>org.apache.flink.streaming.api.functions.source.RichParallelSourceFunction</exclude>
+ <exclude>org.apache.flink.streaming.api.functions.source.ParallelSourceFunction</exclude>
<!-- MARKER: end exclusions -->
</excludes>
<accessModifier>public</accessModifier>
diff --git a/tools/maven/suppressions-runtime.xml b/tools/maven/suppressions-runtime.xml
index 90a2746..0ae0cc3 100644
--- a/tools/maven/suppressions-runtime.xml
+++ b/tools/maven/suppressions-runtime.xml
@@ -31,9 +31,12 @@
<suppress files="SignalHandler.java" checks="ParameterName"/>
<suppress files="TaskCancelAsyncProducerConsumerITCase.java" checks="StaticVariableName"/>
<suppress files="CheckpointCoordinatorTest.java" checks="FileLength"/>
+ <!-- Updated this suppress files section due to FLINK-36063, which migrated many classes from flink-streaming-java to flink-runtime. This allows runtime access to stream graph. -->
+ <suppress files="WindowOperatorContractTest.java" checks="FileLength"/>
<!-- Legacy mockito usages -->
- <suppress files="BlobCachePutTest.java|CheckpointCoordinatorFailureTest.java|CheckpointCoordinatorMasterHooksTest.java|CheckpointCoordinatorRestoringTest.java|CheckpointCoordinatorTestingUtils.java|CheckpointCoordinatorTest.java|CheckpointMetadataLoadingTest.java|CheckpointSettingsSerializableTest.java|CheckpointStateRestoreTest.java|CheckpointStatsHistoryTest.java|CheckpointStatsSnapshotTest.java|CompletedCheckpointStatsSummaryTest.java|CompletedCheckpointTest.java|FailoverStrategyCheckpointCoordinatorTest.java|MasterHooksTest.java|PendingCheckpointStatsTest.java|PendingCheckpointTest.java|StateObjectCollectionTest.java|TaskStateSnapshotTest.java|FinalizeOnMasterTest.java|HadoopUserUtilsITCase.java|EmbeddedHaServicesTest.java|StandaloneHaServicesTest.java|AsynchronousBufferFileWriterTest.java|AsynchronousFileIOChannelTest.java|AbstractReaderTest.java|CancelPartitionRequestTest.java|ClientTransportErrorHandlingTest.java|CreditBasedPartitionRequestClientHandlerTest.java|PartitionRequestClientFactoryTest.java|ServerTransportErrorHandlingTest.java|NettyShuffleEnvironmentTest.java|InputChannelTest.java|LocalInputChannelTest.java|RemoteInputChannelTest.java|InputChannelTestUtils.java|PipelinedSubpartitionTest.java|BlockingBackChannelTest.java|ZooKeeperJobGraphsStoreITCase.java|ZooKeeperLeaderElectionTest.java|ConnectionUtilsTest.java|DataSinkTaskTest.java|KvStateLocationRegistryTest.java|RetryingRegistrationTest.java|DefaultJobLeaderIdServiceTest.java|FileUploadHandlerITCase.java|AbstractHandlerTest.java|AbstractMetricsHandlerTest.java|JobVertexWatermarksHandlerTest.java|CheckpointStatsCacheTest.java|HadoopModuleTest.java|HadoopDelegationTokenReceiverITCase.java|KerberosLoginProviderITCase.java|CheckpointStateOutputStreamTest.java|FsCheckpointStateOutputStreamTest.java|FsCheckpointStorageAccessTest.java|HeapStateBackendTestBase.java|IncrementalRemoteKeyedStateHandleTest.java|LatencyTrackingStateFactoryTest.java|OperatorStateBackendTest.java|SnapshotResultTest.java|StateBackendLoadingTest.java|StateBackendTestBase.java|StateSnapshotCompressionTest.java|TaskExecutorSubmissionTest.java|TaskManagerServicesBuilder.java|TaskSubmissionTestEnvironment.java|TaskAsyncCallTest.java|TaskManagerLocationTest.java|TaskTest.java|TestTaskBuilder.java|EnvironmentInformationTest.java|LeaderGatewayRetrieverTest.java|ZooKeeperStateHandleStoreTest.java"
+ <!-- Updated this suppress files section due to FLINK-36063, which migrated many classes from flink-streaming-java to flink-runtime. This allows runtime access to stream graph. -->
+ <suppress files="TumblingProcessingTimeWindowsTest.java|SourceFunctionUtil.java|AbstractStreamOperatorTestHarnessTest.java|SynchronousCheckpointITCase.java|TestSpyWrapperStateBackend.java|InterruptSensitiveRestoreTest.java|TaskCheckpointingBehaviourTest.java|StreamTaskTerminationTest.java|StreamMockEnvironment.java|SlidingProcessingTimeWindowsTest.java|TumblingEventTimeWindowsTest.java|RegularWindowOperatorContractTest.java|WindowOperatorContractTest.java|PurgingTriggerTest.java|GlobalWindowsTest.java|SlidingEventTimeWindowsTest.java|StreamSourceOperatorLatencyMetricsTest.java|StreamElementSerializerTest.java|StateInitializationContextImplTest.java|OperatorSnapshotFuturesTest.java|StateSnapshotContextSynchronousImplTest.java|InternalTimerServiceImplTest.java|StreamTaskStateInitializerImplTest.java|BackendRestorerProcedureTest.java|StreamingRuntimeContextTest.java|OutputFormatSinkFunctionTest.java|BlobCachePutTest.java|CheckpointCoordinatorFailureTest.java|CheckpointCoordinatorMasterHooksTest.java|CheckpointCoordinatorRestoringTest.java|CheckpointCoordinatorTestingUtils.java|CheckpointCoordinatorTest.java|CheckpointMetadataLoadingTest.java|CheckpointSettingsSerializableTest.java|CheckpointStateRestoreTest.java|CheckpointStatsHistoryTest.java|CheckpointStatsSnapshotTest.java|CompletedCheckpointStatsSummaryTest.java|CompletedCheckpointTest.java|FailoverStrategyCheckpointCoordinatorTest.java|MasterHooksTest.java|PendingCheckpointStatsTest.java|PendingCheckpointTest.java|StateObjectCollectionTest.java|TaskStateSnapshotTest.java|FinalizeOnMasterTest.java|HadoopUserUtilsITCase.java|EmbeddedHaServicesTest.java|StandaloneHaServicesTest.java|AsynchronousBufferFileWriterTest.java|AsynchronousFileIOChannelTest.java|AbstractReaderTest.java|CancelPartitionRequestTest.java|ClientTransportErrorHandlingTest.java|CreditBasedPartitionRequestClientHandlerTest.java|PartitionRequestClientFactoryTest.java|ServerTransportErrorHandlingTest.java|NettyShuffleEnvironmentTest.java|InputChannelTest.java|LocalInputChannelTest.java|RemoteInputChannelTest.java|InputChannelTestUtils.java|PipelinedSubpartitionTest.java|BlockingBackChannelTest.java|ZooKeeperJobGraphsStoreITCase.java|ZooKeeperLeaderElectionTest.java|ConnectionUtilsTest.java|DataSinkTaskTest.java|KvStateLocationRegistryTest.java|RetryingRegistrationTest.java|DefaultJobLeaderIdServiceTest.java|FileUploadHandlerITCase.java|AbstractHandlerTest.java|AbstractMetricsHandlerTest.java|JobVertexWatermarksHandlerTest.java|CheckpointStatsCacheTest.java|HadoopModuleTest.java|HadoopDelegationTokenReceiverITCase.java|KerberosLoginProviderITCase.java|CheckpointStateOutputStreamTest.java|FsCheckpointStateOutputStreamTest.java|FsCheckpointStorageAccessTest.java|HeapStateBackendTestBase.java|IncrementalRemoteKeyedStateHandleTest.java|LatencyTrackingStateFactoryTest.java|OperatorStateBackendTest.java|SnapshotResultTest.java|StateBackendLoadingTest.java|StateBackendTestBase.java|StateSnapshotCompressionTest.java|TaskExecutorSubmissionTest.java|TaskManagerServicesBuilder.java|TaskSubmissionTestEnvironment.java|TaskAsyncCallTest.java|TaskManagerLocationTest.java|TaskTest.java|TestTaskBuilder.java|EnvironmentInformationTest.java|LeaderGatewayRetrieverTest.java|ZooKeeperStateHandleStoreTest.java"
checks="IllegalImport"/>
<!-- Legacy powermock usages -->
diff --git a/tools/maven/suppressions.xml b/tools/maven/suppressions.xml
index 1483db0..13329e4 100644
--- a/tools/maven/suppressions.xml
+++ b/tools/maven/suppressions.xml
@@ -42,7 +42,8 @@
<suppress files="HyperLogLogPlusPlus.java" checks="FileLength"/>
<!-- Legacy mockito usages -->
- <suppress files="AbstractStreamOperatorTestHarnessTest.java|BackendRestorerProcedureTest.java|BufferDataOverWindowOperatorTest.java|CEPOperatorTest.java|CepRuntimeContextTest.java|CliFrontendListTest.java|CliFrontendPackageProgramTest.java|CliFrontendSavepointTest.java|DemultiplexingRecordDeserializerTest.java|DropwizardMeterWrapperTest.java|DynamicEventTimeSessionWindowsTest.java|DynamicProcessingTimeSessionWindowsTest.java|EmbeddedRocksDBStateBackendTest.java|EventTimeSessionWindowsTest.java|FlinkCalciteCatalogReaderTest.java|FlinkMeterWrapperTest.java|GlobalWindowsTest.java|HadoopDataInputStreamTest.java|HadoopInputFormatTest.java|HadoopOutputFormatTest.java|HadoopUtilsTest.java|HiveTableSourceITCase.java|HybridSourceReaderTest.java|HybridSourceSplitEnumeratorTest.java|InternalTimerServiceImplTest.java|InternalWindowFunctionTest.java|InterruptSensitiveRestoreTest.java|LocalStateForwardingTest.java|MergingWindowSetTest.java|NFAITCase.java|NonBufferOverWindowOperatorTest.java|OperatorSnapshotFuturesTest.java|OutputFormatSinkFunctionTest.java|PatternTest.java|ProcessingTimeSessionWindowsTest.java|PurgingTriggerTest.java|PythonOperatorChainingOptimizerTest.java|PythonTestUtils.java|RawFormatSerDeSchemaTest.java|RegisterApplicationMasterResponseReflectorTest.java|RegularWindowOperatorContractTest.java|RichAsyncFunctionTest.java|RocksDBIncrementalCheckpointUtilsTest.java|RocksDBKeyedStateBackendTestFactory.java|RocksDBStateBackendConfigTest.java|TestS3FileSystemFactory.java|SessionWindowAssignerTest.java|SlidingEventTimeWindowsTest.java|SlidingProcessingTimeWindowsTest.java|SourceFunctionUtil.java|StateInitializationContextImplTest.java|StateSnapshotContextSynchronousImplTest.java|StreamElementSerializerTest.java|StreamingRuntimeContextTest.java|StreamMockEnvironment.java|StreamSourceOperatorLatencyMetricsTest.java|StreamSourceOperatorWatermarksTest.java|StreamTaskCancellationBarrierTest.java|StreamTaskStateInitializerImplTest.java|StreamTaskSystemExitTest.java|StreamTaskTerminationTest.java|StreamTaskTest.java|SynchronousCheckpointITCase.java|TaskCheckpointingBehaviourTest.java|TestPartitionDiscoverer.java|TestSpyWrapperStateBackend.java|TumblingEventTimeWindowsTest.java|TumblingProcessingTimeWindowsTest.java|Whitebox.java|WindowOperatorContractTest.java|WindowOperatorTest.java|WindowReaderTest.java"
+ <!-- Updated this suppress files section due to FLINK-36063, which migrated many classes from flink-streaming-java to flink-runtime. This allows runtime access to stream graph. -->
+ <suppress files="BufferDataOverWindowOperatorTest.java|CEPOperatorTest.java|CepRuntimeContextTest.java|CliFrontendListTest.java|CliFrontendPackageProgramTest.java|CliFrontendSavepointTest.java|DemultiplexingRecordDeserializerTest.java|DropwizardMeterWrapperTest.java|DynamicEventTimeSessionWindowsTest.java|DynamicProcessingTimeSessionWindowsTest.java|EmbeddedRocksDBStateBackendTest.java|EventTimeSessionWindowsTest.java|FlinkCalciteCatalogReaderTest.java|FlinkMeterWrapperTest.java|HadoopDataInputStreamTest.java|HadoopInputFormatTest.java|HadoopOutputFormatTest.java|HadoopUtilsTest.java|HiveTableSourceITCase.java|HybridSourceReaderTest.java|HybridSourceSplitEnumeratorTest.java|InternalWindowFunctionTest.java|LocalStateForwardingTest.java|MergingWindowSetTest.java|NFAITCase.java|NonBufferOverWindowOperatorTest.java|PatternTest.java|ProcessingTimeSessionWindowsTest.java|PythonOperatorChainingOptimizerTest.java|PythonTestUtils.java|RawFormatSerDeSchemaTest.java|RegisterApplicationMasterResponseReflectorTest.java|RichAsyncFunctionTest.java|RocksDBIncrementalCheckpointUtilsTest.java|RocksDBKeyedStateBackendTestFactory.java|RocksDBStateBackendConfigTest.java|TestS3FileSystemFactory.java|SessionWindowAssignerTest.java|StreamSourceOperatorWatermarksTest.java|StreamTaskCancellationBarrierTest.java|StreamTaskSystemExitTest.java|StreamTaskTest.java|TestPartitionDiscoverer.java|Whitebox.java|WindowOperatorContractTest.java|WindowOperatorTest.java|WindowReaderTest.java"
checks="IllegalImport"/>
<suppress files="org[\\/]apache[\\/]flink[\\/]formats[\\/]avro[\\/]generated[\\/].*.java" checks="[a-zA-Z0-9]*"/>
