diff --git a/flink-addons/flink-streaming/stratosphere-streaming-connectors/pom.xml b/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml
similarity index 76%
rename from flink-addons/flink-streaming/stratosphere-streaming-connectors/pom.xml
rename to flink-addons/flink-streaming/flink-streaming-connectors/pom.xml
index cc2a8ff27d4ab92de7c754b45f54925f2dd3b2b1..744a36c273fea0d05ae000e03a9e1f278b87a95d 100644
--- a/flink-addons/flink-streaming/stratosphere-streaming-connectors/pom.xml
+++ b/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml
@@ -5,28 +5,29 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>eu.stratosphere</groupId>
-		<artifactId>stratosphere-streaming</artifactId>
+		<groupId>org.apache.flink</groupId>
+		<artifactId>flink-streaming-parent</artifactId>
 		<version>0.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
-	<artifactId>stratosphere-streaming-connectors</artifactId>
-	<name>stratosphere-streaming-connectors</name>
+	<artifactId>flink-streaming-connectors</artifactId>
+	<name>flink-streaming-connectors</name>
 
 	<packaging>jar</packaging>
 
 	<dependencies>
 
 		<dependency>
-			<groupId>eu.stratosphere</groupId>
-			<artifactId>stratosphere-streaming-core</artifactId>
+			<groupId>org.apache.flink</groupId>
+			<artifactId>flink-streaming-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
+		<!--TODO: this might be unnecessary right now -->
 		<dependency>
-			<groupId>eu.stratosphere</groupId>
-			<artifactId>stratosphere-streaming-examples</artifactId>
+			<groupId>org.apache.flink</groupId>
+			<artifactId>flink-streaming-examples</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/kafka/KafkaProducer.java b/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/kafka/KafkaProducer.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/kafka/KafkaProducer.java
rename to flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/kafka/KafkaProducer.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/kafka/KafkaSink.java b/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/kafka/KafkaSink.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/kafka/KafkaSink.java
rename to flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/kafka/KafkaSink.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/kafka/KafkaSource.java b/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/kafka/KafkaSource.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/kafka/KafkaSource.java
rename to flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/kafka/KafkaSource.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/kafka/KafkaTopology.java b/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/kafka/KafkaTopology.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/kafka/KafkaTopology.java
rename to flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/kafka/KafkaTopology.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/rabbitmq/RMQSink.java b/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/rabbitmq/RMQSink.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/rabbitmq/RMQSink.java
rename to flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/rabbitmq/RMQSink.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/rabbitmq/RMQSource.java b/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/rabbitmq/RMQSource.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/rabbitmq/RMQSource.java
rename to flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/rabbitmq/RMQSource.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/rabbitmq/RMQTest.java b/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/rabbitmq/RMQTest.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/rabbitmq/RMQTest.java
rename to flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/rabbitmq/RMQTest.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/rabbitmq/RMQTopology.java b/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/rabbitmq/RMQTopology.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/rabbitmq/RMQTopology.java
rename to flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/rabbitmq/RMQTopology.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/zeromq/ZeroMQSink.java b/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/zeromq/ZeroMQSink.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/zeromq/ZeroMQSink.java
rename to flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/zeromq/ZeroMQSink.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/zeromq/ZeroMQSource.java b/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/zeromq/ZeroMQSource.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/zeromq/ZeroMQSource.java
rename to flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/zeromq/ZeroMQSource.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/zeromq/ZeroMQTopology.java b/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/zeromq/ZeroMQTopology.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/zeromq/ZeroMQTopology.java
rename to flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/zeromq/ZeroMQTopology.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-connectors/src/test/resources/Performance/PerformanceTracker.py b/flink-addons/flink-streaming/flink-streaming-connectors/src/test/resources/Performance/PerformanceTracker.py
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-connectors/src/test/resources/Performance/PerformanceTracker.py
rename to flink-addons/flink-streaming/flink-streaming-connectors/src/test/resources/Performance/PerformanceTracker.py
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-connectors/src/test/resources/Performance/WordCountTopology.java b/flink-addons/flink-streaming/flink-streaming-connectors/src/test/resources/Performance/WordCountTopology.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-connectors/src/test/resources/Performance/WordCountTopology.java
rename to flink-addons/flink-streaming/flink-streaming-connectors/src/test/resources/Performance/WordCountTopology.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-connectors/src/test/resources/Performance/copy-files.sh b/flink-addons/flink-streaming/flink-streaming-connectors/src/test/resources/Performance/copy-files.sh
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-connectors/src/test/resources/Performance/copy-files.sh
rename to flink-addons/flink-streaming/flink-streaming-connectors/src/test/resources/Performance/copy-files.sh
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-connectors/src/test/resources/Performance/copy-logged-files.sh b/flink-addons/flink-streaming/flink-streaming-connectors/src/test/resources/Performance/copy-logged-files.sh
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-connectors/src/test/resources/Performance/copy-logged-files.sh
rename to flink-addons/flink-streaming/flink-streaming-connectors/src/test/resources/Performance/copy-logged-files.sh
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-connectors/src/test/resources/Performance/remove-files.sh b/flink-addons/flink-streaming/flink-streaming-connectors/src/test/resources/Performance/remove-files.sh
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-connectors/src/test/resources/Performance/remove-files.sh
rename to flink-addons/flink-streaming/flink-streaming-connectors/src/test/resources/Performance/remove-files.sh
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-connectors/src/test/resources/Performance/run-test.sh b/flink-addons/flink-streaming/flink-streaming-connectors/src/test/resources/Performance/run-test.sh
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-connectors/src/test/resources/Performance/run-test.sh
rename to flink-addons/flink-streaming/flink-streaming-connectors/src/test/resources/Performance/run-test.sh
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/pom.xml b/flink-addons/flink-streaming/flink-streaming-core/pom.xml
similarity index 83%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/pom.xml
rename to flink-addons/flink-streaming/flink-streaming-core/pom.xml
index 38775146824b122943906bb3dd7fd2d0e3ba26e2..2bda24c17a82dc6726a0c9c96086dbad7ee59113 100644
--- a/flink-addons/flink-streaming/stratosphere-streaming-core/pom.xml
+++ b/flink-addons/flink-streaming/flink-streaming-core/pom.xml
@@ -5,14 +5,14 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>eu.stratosphere</groupId>
-		<artifactId>stratosphere-streaming</artifactId>
+		<groupId>org.apache.flink</groupId>
+		<artifactId>flink-streaming-parent</artifactId>
 		<version>0.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
-	<artifactId>stratosphere-streaming-core</artifactId>
-	<name>stratosphere-streaming-core</name>
+	<artifactId>flink-streaming-core</artifactId>
+	<name>flink-streaming-core</name>
 
 	<packaging>jar</packaging>
 
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/DataStream.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/DataStream.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/DataStream.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/DataStream.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/IterativeDataStream.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/IterativeDataStream.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/IterativeDataStream.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/IterativeDataStream.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/JobGraphBuilder.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/JobGraphBuilder.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/JobGraphBuilder.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/JobGraphBuilder.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/LocalStreamEnvironment.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/LocalStreamEnvironment.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/LocalStreamEnvironment.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/LocalStreamEnvironment.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/RemoteStreamEnvironment.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/RemoteStreamEnvironment.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/RemoteStreamEnvironment.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/RemoteStreamEnvironment.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/StreamExecutionEnvironment.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/StreamExecutionEnvironment.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/StreamExecutionEnvironment.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/StreamExecutionEnvironment.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/collector/DirectedStreamCollectorManager.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/collector/DirectedStreamCollectorManager.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/collector/DirectedStreamCollectorManager.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/collector/DirectedStreamCollectorManager.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/collector/NotPartitionedCollector.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/collector/NotPartitionedCollector.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/collector/NotPartitionedCollector.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/collector/NotPartitionedCollector.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/collector/OutputSelector.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/collector/OutputSelector.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/collector/OutputSelector.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/collector/OutputSelector.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/collector/PartitionedCollector.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/collector/PartitionedCollector.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/collector/PartitionedCollector.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/collector/PartitionedCollector.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/collector/StreamCollector.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/collector/StreamCollector.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/collector/StreamCollector.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/collector/StreamCollector.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/collector/StreamCollectorManager.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/collector/StreamCollectorManager.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/collector/StreamCollectorManager.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/collector/StreamCollectorManager.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/function/FileSourceFunction.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/function/FileSourceFunction.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/function/FileSourceFunction.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/function/FileSourceFunction.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/function/FileStreamFunction.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/function/FileStreamFunction.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/function/FileStreamFunction.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/function/FileStreamFunction.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/function/FromElementsFunction.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/function/FromElementsFunction.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/function/FromElementsFunction.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/function/FromElementsFunction.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/function/GenSequenceFunction.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/function/GenSequenceFunction.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/function/GenSequenceFunction.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/function/GenSequenceFunction.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/function/PrintSinkFunction.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/function/PrintSinkFunction.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/function/PrintSinkFunction.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/function/PrintSinkFunction.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/function/SinkFunction.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/function/SinkFunction.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/function/SinkFunction.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/function/SinkFunction.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/function/SourceFunction.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/function/SourceFunction.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/function/SourceFunction.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/function/SourceFunction.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/BatchReduceInvokable.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/BatchReduceInvokable.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/BatchReduceInvokable.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/BatchReduceInvokable.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/DefaultSinkInvokable.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/DefaultSinkInvokable.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/DefaultSinkInvokable.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/DefaultSinkInvokable.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/DefaultSourceInvokable.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/DefaultSourceInvokable.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/DefaultSourceInvokable.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/DefaultSourceInvokable.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/DefaultTaskInvokable.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/DefaultTaskInvokable.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/DefaultTaskInvokable.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/DefaultTaskInvokable.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/FilterInvokable.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/FilterInvokable.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/FilterInvokable.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/FilterInvokable.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/FlatMapInvokable.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/FlatMapInvokable.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/FlatMapInvokable.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/FlatMapInvokable.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/MapInvokable.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/MapInvokable.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/MapInvokable.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/MapInvokable.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/SinkInvokable.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/SinkInvokable.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/SinkInvokable.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/SinkInvokable.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/StreamComponentInvokable.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/StreamComponentInvokable.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/StreamComponentInvokable.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/StreamComponentInvokable.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/StreamRecordInvokable.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/StreamRecordInvokable.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/StreamRecordInvokable.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/StreamRecordInvokable.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/UserSinkInvokable.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/UserSinkInvokable.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/UserSinkInvokable.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/UserSinkInvokable.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/UserSourceInvokable.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/UserSourceInvokable.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/UserSourceInvokable.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/UserSourceInvokable.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/UserTaskInvokable.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/UserTaskInvokable.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/UserTaskInvokable.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/UserTaskInvokable.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/AbstractCollector.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/AbstractCollector.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/AbstractCollector.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/AbstractCollector.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/AbstractStreamComponent.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/AbstractStreamComponent.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/AbstractStreamComponent.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/AbstractStreamComponent.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/BlockingQueueBroker.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/BlockingQueueBroker.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/BlockingQueueBroker.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/BlockingQueueBroker.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamComponentException.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamComponentException.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamComponentException.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamComponentException.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamIterationSink.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamIterationSink.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamIterationSink.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamIterationSink.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamIterationSource.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamIterationSource.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamIterationSource.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamIterationSource.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamRecordReader.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamRecordReader.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamRecordReader.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamRecordReader.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamSink.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamSink.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamSink.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamSink.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamSource.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamSource.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamSource.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamSource.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamTask.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamTask.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamTask.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamTask.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamWindowTask.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamWindowTask.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamWindowTask.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamWindowTask.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/UnionStreamRecordReader.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/UnionStreamRecordReader.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/UnionStreamRecordReader.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/UnionStreamRecordReader.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamrecord/ArrayStreamRecord.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamrecord/ArrayStreamRecord.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamrecord/ArrayStreamRecord.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamrecord/ArrayStreamRecord.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamrecord/FieldTypeMismatchException.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamrecord/FieldTypeMismatchException.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamrecord/FieldTypeMismatchException.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamrecord/FieldTypeMismatchException.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamrecord/ListStreamRecord.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamrecord/ListStreamRecord.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamrecord/ListStreamRecord.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamrecord/ListStreamRecord.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamrecord/NoSuchFieldException.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamrecord/NoSuchFieldException.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamrecord/NoSuchFieldException.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamrecord/NoSuchFieldException.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamrecord/NoSuchTupleException.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamrecord/NoSuchTupleException.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamrecord/NoSuchTupleException.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamrecord/NoSuchTupleException.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamrecord/StreamRecord.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamrecord/StreamRecord.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamrecord/StreamRecord.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamrecord/StreamRecord.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamrecord/StreamRecordException.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamrecord/StreamRecordException.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamrecord/StreamRecordException.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamrecord/StreamRecordException.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamrecord/TupleSizeMismatchException.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamrecord/TupleSizeMismatchException.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamrecord/TupleSizeMismatchException.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamrecord/TupleSizeMismatchException.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamrecord/UID.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamrecord/UID.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/api/streamrecord/UID.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamrecord/UID.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/faulttolerance/AckEvent.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/faulttolerance/AckEvent.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/faulttolerance/AckEvent.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/faulttolerance/AckEvent.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/faulttolerance/AckEventListener.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/faulttolerance/AckEventListener.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/faulttolerance/AckEventListener.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/faulttolerance/AckEventListener.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/faulttolerance/AtLeastOnceFaultToleranceBuffer.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/faulttolerance/AtLeastOnceFaultToleranceBuffer.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/faulttolerance/AtLeastOnceFaultToleranceBuffer.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/faulttolerance/AtLeastOnceFaultToleranceBuffer.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/faulttolerance/ExactlyOnceFaultToleranceBuffer.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/faulttolerance/ExactlyOnceFaultToleranceBuffer.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/faulttolerance/ExactlyOnceFaultToleranceBuffer.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/faulttolerance/ExactlyOnceFaultToleranceBuffer.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/faulttolerance/FailEvent.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/faulttolerance/FailEvent.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/faulttolerance/FailEvent.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/faulttolerance/FailEvent.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/faulttolerance/FailEventListener.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/faulttolerance/FailEventListener.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/faulttolerance/FailEventListener.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/faulttolerance/FailEventListener.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/faulttolerance/FaultToleranceBuffer.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/faulttolerance/FaultToleranceBuffer.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/faulttolerance/FaultToleranceBuffer.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/faulttolerance/FaultToleranceBuffer.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/faulttolerance/FaultToleranceType.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/faulttolerance/FaultToleranceType.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/faulttolerance/FaultToleranceType.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/faulttolerance/FaultToleranceType.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/faulttolerance/FaultToleranceUtil.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/faulttolerance/FaultToleranceUtil.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/faulttolerance/FaultToleranceUtil.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/faulttolerance/FaultToleranceUtil.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/index/BTreeIndex.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/index/BTreeIndex.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/index/BTreeIndex.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/index/BTreeIndex.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/index/IndexPair.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/index/IndexPair.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/index/IndexPair.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/index/IndexPair.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/partitioner/BroadcastPartitioner.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/partitioner/BroadcastPartitioner.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/partitioner/BroadcastPartitioner.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/partitioner/BroadcastPartitioner.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/partitioner/DefaultPartitioner.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/partitioner/DefaultPartitioner.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/partitioner/DefaultPartitioner.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/partitioner/DefaultPartitioner.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/partitioner/FieldsPartitioner.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/partitioner/FieldsPartitioner.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/partitioner/FieldsPartitioner.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/partitioner/FieldsPartitioner.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/partitioner/GlobalPartitioner.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/partitioner/GlobalPartitioner.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/partitioner/GlobalPartitioner.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/partitioner/GlobalPartitioner.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/partitioner/ShufflePartitioner.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/partitioner/ShufflePartitioner.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/partitioner/ShufflePartitioner.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/partitioner/ShufflePartitioner.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/state/GraphState.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/state/GraphState.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/state/GraphState.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/state/GraphState.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/state/MutableTableState.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/state/MutableTableState.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/state/MutableTableState.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/state/MutableTableState.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/state/MutableTableStateIterator.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/state/MutableTableStateIterator.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/state/MutableTableStateIterator.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/state/MutableTableStateIterator.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/state/SlidingWindowState.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/state/SlidingWindowState.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/state/SlidingWindowState.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/state/SlidingWindowState.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/state/SlidingWindowStateIterator.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/state/SlidingWindowStateIterator.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/state/SlidingWindowStateIterator.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/state/SlidingWindowStateIterator.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/state/StateManager.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/state/StateManager.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/state/StateManager.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/state/StateManager.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/state/TableState.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/state/TableState.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/state/TableState.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/state/TableState.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/state/TableStateIterator.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/state/TableStateIterator.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/state/TableStateIterator.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/state/TableStateIterator.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/state/manager/StateCheckpointer.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/state/manager/StateCheckpointer.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/state/manager/StateCheckpointer.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/state/manager/StateCheckpointer.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/state/manager/StateRestorer.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/state/manager/StateRestorer.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/state/manager/StateRestorer.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/state/manager/StateRestorer.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/util/ClusterUtil.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/util/ClusterUtil.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/util/ClusterUtil.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/util/ClusterUtil.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/util/LogUtils.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/util/LogUtils.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/util/LogUtils.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/util/LogUtils.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/util/TestDataUtil.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/util/TestDataUtil.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/main/java/org/apache/flink/streaming/util/TestDataUtil.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/util/TestDataUtil.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/api/BatchReduceTest.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/BatchReduceTest.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/api/BatchReduceTest.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/BatchReduceTest.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/api/BatchTest.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/BatchTest.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/api/BatchTest.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/BatchTest.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/api/DirectedOutputTest.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/DirectedOutputTest.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/api/DirectedOutputTest.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/DirectedOutputTest.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/api/FlatMapTest.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/FlatMapTest.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/api/FlatMapTest.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/FlatMapTest.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/api/IterateTest.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/IterateTest.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/api/IterateTest.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/IterateTest.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/api/MapTest.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/MapTest.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/api/MapTest.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/MapTest.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/api/PrintTest.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/PrintTest.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/api/PrintTest.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/PrintTest.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/api/StreamCollectorManagerTest.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/StreamCollectorManagerTest.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/api/StreamCollectorManagerTest.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/StreamCollectorManagerTest.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/api/TypeExtractTest.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/TypeExtractTest.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/api/TypeExtractTest.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/TypeExtractTest.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/api/collector/StreamCollectorTest.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/collector/StreamCollectorTest.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/api/collector/StreamCollectorTest.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/collector/StreamCollectorTest.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/api/streamcomponent/MockRecordWriter.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/streamcomponent/MockRecordWriter.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/api/streamcomponent/MockRecordWriter.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/streamcomponent/MockRecordWriter.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/api/streamcomponent/StreamComponentTest.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/streamcomponent/StreamComponentTest.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/api/streamcomponent/StreamComponentTest.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/streamcomponent/StreamComponentTest.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/api/streamrecord/ArrayStreamRecordTest.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/streamrecord/ArrayStreamRecordTest.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/api/streamrecord/ArrayStreamRecordTest.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/streamrecord/ArrayStreamRecordTest.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/api/streamrecord/ListStreamRecordTest.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/streamrecord/ListStreamRecordTest.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/api/streamrecord/ListStreamRecordTest.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/streamrecord/ListStreamRecordTest.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/api/streamrecord/MyGeneric.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/streamrecord/MyGeneric.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/api/streamrecord/MyGeneric.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/streamrecord/MyGeneric.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/api/streamrecord/MyGeneric2.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/streamrecord/MyGeneric2.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/api/streamrecord/MyGeneric2.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/streamrecord/MyGeneric2.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/api/streamrecord/UUIDTest.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/streamrecord/UUIDTest.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/api/streamrecord/UUIDTest.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/streamrecord/UUIDTest.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/faulttolerance/AtLeastOnceBufferTest.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/faulttolerance/AtLeastOnceBufferTest.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/faulttolerance/AtLeastOnceBufferTest.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/faulttolerance/AtLeastOnceBufferTest.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/faulttolerance/ExactlyOnceBufferTest.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/faulttolerance/ExactlyOnceBufferTest.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/faulttolerance/ExactlyOnceBufferTest.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/faulttolerance/ExactlyOnceBufferTest.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/faulttolerance/FaultToleranceTypeTest.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/faulttolerance/FaultToleranceTypeTest.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/faulttolerance/FaultToleranceTypeTest.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/faulttolerance/FaultToleranceTypeTest.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/faulttolerance/FaultToleranceUtilTest.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/faulttolerance/FaultToleranceUtilTest.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/faulttolerance/FaultToleranceUtilTest.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/faulttolerance/FaultToleranceUtilTest.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/index/BTreeIndexTest.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/index/BTreeIndexTest.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/index/BTreeIndexTest.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/index/BTreeIndexTest.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/partitioner/BroadcastPartitionerTest.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/partitioner/BroadcastPartitionerTest.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/partitioner/BroadcastPartitionerTest.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/partitioner/BroadcastPartitionerTest.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/partitioner/DefaultPartitionerTest.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/partitioner/DefaultPartitionerTest.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/partitioner/DefaultPartitionerTest.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/partitioner/DefaultPartitionerTest.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/partitioner/FieldsPartitionerTest.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/partitioner/FieldsPartitionerTest.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/partitioner/FieldsPartitionerTest.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/partitioner/FieldsPartitionerTest.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/partitioner/GlobalPartitionerTest.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/partitioner/GlobalPartitionerTest.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/partitioner/GlobalPartitionerTest.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/partitioner/GlobalPartitionerTest.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/partitioner/ShufflePartitionerTest.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/partitioner/ShufflePartitionerTest.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/partitioner/ShufflePartitionerTest.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/partitioner/ShufflePartitionerTest.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/state/InternalStateTest.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/state/InternalStateTest.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/state/InternalStateTest.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/state/InternalStateTest.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/util/MockRecordWriterFactory.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/util/MockRecordWriterFactory.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/util/MockRecordWriterFactory.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/util/MockRecordWriterFactory.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/util/TestDataUtilTest.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/util/TestDataUtilTest.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-core/src/test/java/org/apache/flink/streaming/util/TestDataUtilTest.java
rename to flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/util/TestDataUtilTest.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/pom.xml b/flink-addons/flink-streaming/flink-streaming-examples/pom.xml
similarity index 79%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/pom.xml
rename to flink-addons/flink-streaming/flink-streaming-examples/pom.xml
index 81bf4d84f1817eaafae35293ee3cb4b945f97278..a2240211110bcbebd31e3d46ef866a82608cef9e 100644
--- a/flink-addons/flink-streaming/stratosphere-streaming-examples/pom.xml
+++ b/flink-addons/flink-streaming/flink-streaming-examples/pom.xml
@@ -5,22 +5,22 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>eu.stratosphere</groupId>
-		<artifactId>stratosphere-streaming</artifactId>
+		<groupId>org.apache.flink</groupId>
+		<artifactId>flink-streaming-parent</artifactId>
 		<version>0.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
-	<artifactId>stratosphere-streaming-examples</artifactId>
-	<name>stratosphere-streaming-examples</name>
+	<artifactId>flink-streaming-examples</artifactId>
+	<name>flink-streaming-examples</name>
 
 	<packaging>jar</packaging>
 
 	<dependencies>
 
 		<dependency>
-			<groupId>eu.stratosphere</groupId>
-			<artifactId>stratosphere-streaming-core</artifactId>
+			<groupId>org.apache.flink</groupId>
+			<artifactId>flink-streaming-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/basictopology/BasicTopology.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/basictopology/BasicTopology.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/basictopology/BasicTopology.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/basictopology/BasicTopology.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/cellinfo/CellInfoLocal.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/cellinfo/CellInfoLocal.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/cellinfo/CellInfoLocal.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/cellinfo/CellInfoLocal.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/cellinfo/IWorkerEngine.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/cellinfo/IWorkerEngine.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/cellinfo/IWorkerEngine.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/cellinfo/IWorkerEngine.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/cellinfo/Util.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/cellinfo/Util.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/cellinfo/Util.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/cellinfo/Util.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/cellinfo/WorkerEngineBin.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/cellinfo/WorkerEngineBin.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/cellinfo/WorkerEngineBin.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/cellinfo/WorkerEngineBin.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/cellinfo/WorkerEngineExact.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/cellinfo/WorkerEngineExact.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/cellinfo/WorkerEngineExact.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/cellinfo/WorkerEngineExact.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/collaborativefilter/CollaborativeFilteringLocal.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/collaborativefilter/CollaborativeFilteringLocal.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/collaborativefilter/CollaborativeFilteringLocal.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/collaborativefilter/CollaborativeFilteringLocal.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/collaborativefilter/CollaborativeFilteringMap.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/collaborativefilter/CollaborativeFilteringMap.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/collaborativefilter/CollaborativeFilteringMap.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/collaborativefilter/CollaborativeFilteringMap.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/collaborativefilter/CollaborativeFilteringReduce.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/collaborativefilter/CollaborativeFilteringReduce.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/collaborativefilter/CollaborativeFilteringReduce.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/collaborativefilter/CollaborativeFilteringReduce.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/collaborativefilter/CollaborativeFilteringSink.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/collaborativefilter/CollaborativeFilteringSink.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/collaborativefilter/CollaborativeFilteringSink.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/collaborativefilter/CollaborativeFilteringSink.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/collaborativefilter/CollaborativeFilteringSource.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/collaborativefilter/CollaborativeFilteringSource.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/collaborativefilter/CollaborativeFilteringSource.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/collaborativefilter/CollaborativeFilteringSource.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/kmeans/KMeansLocal.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/kmeans/KMeansLocal.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/kmeans/KMeansLocal.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/kmeans/KMeansLocal.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/kmeans/KMeansMap.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/kmeans/KMeansMap.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/kmeans/KMeansMap.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/kmeans/KMeansMap.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/kmeans/KMeansReduce.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/kmeans/KMeansReduce.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/kmeans/KMeansReduce.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/kmeans/KMeansReduce.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/kmeans/KMeansSink.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/kmeans/KMeansSink.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/kmeans/KMeansSink.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/kmeans/KMeansSink.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/kmeans/KMeansSource.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/kmeans/KMeansSource.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/kmeans/KMeansSource.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/kmeans/KMeansSource.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/pagerank/PageRankLocal.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/pagerank/PageRankLocal.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/pagerank/PageRankLocal.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/pagerank/PageRankLocal.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/pagerank/PageRankMap.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/pagerank/PageRankMap.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/pagerank/PageRankMap.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/pagerank/PageRankMap.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/pagerank/PageRankReduce.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/pagerank/PageRankReduce.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/pagerank/PageRankReduce.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/pagerank/PageRankReduce.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/pagerank/PageRankSink.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/pagerank/PageRankSink.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/pagerank/PageRankSink.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/pagerank/PageRankSink.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/pagerank/PageRankSource.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/pagerank/PageRankSource.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/pagerank/PageRankSource.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/pagerank/PageRankSource.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/sssp/SSSPLocal.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/sssp/SSSPLocal.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/sssp/SSSPLocal.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/sssp/SSSPLocal.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/sssp/SSSPMap.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/sssp/SSSPMap.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/sssp/SSSPMap.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/sssp/SSSPMap.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/sssp/SSSPReduce.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/sssp/SSSPReduce.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/sssp/SSSPReduce.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/sssp/SSSPReduce.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/sssp/SSSPSink.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/sssp/SSSPSink.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/sssp/SSSPSink.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/sssp/SSSPSink.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/sssp/SSSPSource.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/sssp/SSSPSource.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/sssp/SSSPSource.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/iterative/sssp/SSSPSource.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/join/JoinLocal.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/join/JoinLocal.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/join/JoinLocal.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/join/JoinLocal.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/join/JoinSink.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/join/JoinSink.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/join/JoinSink.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/join/JoinSink.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/join/JoinSourceOne.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/join/JoinSourceOne.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/join/JoinSourceOne.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/join/JoinSourceOne.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/join/JoinSourceTwo.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/join/JoinSourceTwo.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/join/JoinSourceTwo.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/join/JoinSourceTwo.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/join/JoinTask.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/join/JoinTask.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/join/JoinTask.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/join/JoinTask.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/ml/IncrementalLearningSkeleton.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/ml/IncrementalLearningSkeleton.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/ml/IncrementalLearningSkeleton.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/ml/IncrementalLearningSkeleton.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/ml/IncrementalOLS.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/ml/IncrementalOLS.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/ml/IncrementalOLS.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/ml/IncrementalOLS.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/join/WindowJoinLocal.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/join/WindowJoinLocal.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/join/WindowJoinLocal.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/join/WindowJoinLocal.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/join/WindowJoinSourceOne.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/join/WindowJoinSourceOne.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/join/WindowJoinSourceOne.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/join/WindowJoinSourceOne.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/join/WindowJoinSourceTwo.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/join/WindowJoinSourceTwo.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/join/WindowJoinSourceTwo.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/join/WindowJoinSourceTwo.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/join/WindowJoinTask.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/join/WindowJoinTask.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/join/WindowJoinTask.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/join/WindowJoinTask.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/sum/WindowSumAggregate.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/sum/WindowSumAggregate.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/sum/WindowSumAggregate.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/sum/WindowSumAggregate.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/sum/WindowSumLocal.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/sum/WindowSumLocal.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/sum/WindowSumLocal.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/sum/WindowSumLocal.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/sum/WindowSumMultiple.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/sum/WindowSumMultiple.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/sum/WindowSumMultiple.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/sum/WindowSumMultiple.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/sum/WindowSumSink.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/sum/WindowSumSink.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/sum/WindowSumSink.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/sum/WindowSumSink.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/sum/WindowSumSource.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/sum/WindowSumSource.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/sum/WindowSumSource.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/sum/WindowSumSource.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/wordcount/WindowWordCountCounter.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/wordcount/WindowWordCountCounter.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/wordcount/WindowWordCountCounter.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/wordcount/WindowWordCountCounter.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/wordcount/WindowWordCountLocal.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/wordcount/WindowWordCountLocal.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/wordcount/WindowWordCountLocal.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/wordcount/WindowWordCountLocal.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/wordcount/WindowWordCountSink.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/wordcount/WindowWordCountSink.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/wordcount/WindowWordCountSink.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/wordcount/WindowWordCountSink.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/wordcount/WindowWordCountSplitter.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/wordcount/WindowWordCountSplitter.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/wordcount/WindowWordCountSplitter.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/window/wordcount/WindowWordCountSplitter.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/wordcount/WordCountCounter.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/wordcount/WordCountCounter.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/wordcount/WordCountCounter.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/wordcount/WordCountCounter.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/wordcount/WordCountLocal.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/wordcount/WordCountLocal.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/wordcount/WordCountLocal.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/wordcount/WordCountLocal.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/wordcount/WordCountSplitter.java b/flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/wordcount/WordCountSplitter.java
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/main/java/org/apache/flink/streaming/examples/wordcount/WordCountSplitter.java
rename to flink-addons/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/wordcount/WordCountSplitter.java
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/test/resources/testdata_checksum/ASTopology.data.md5 b/flink-addons/flink-streaming/flink-streaming-examples/src/test/resources/testdata_checksum/ASTopology.data.md5
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/test/resources/testdata_checksum/ASTopology.data.md5
rename to flink-addons/flink-streaming/flink-streaming-examples/src/test/resources/testdata_checksum/ASTopology.data.md5
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/test/resources/testdata_checksum/MovieLens100k.data.md5 b/flink-addons/flink-streaming/flink-streaming-examples/src/test/resources/testdata_checksum/MovieLens100k.data.md5
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/test/resources/testdata_checksum/MovieLens100k.data.md5
rename to flink-addons/flink-streaming/flink-streaming-examples/src/test/resources/testdata_checksum/MovieLens100k.data.md5
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/test/resources/testdata_checksum/hamlet.txt.md5 b/flink-addons/flink-streaming/flink-streaming-examples/src/test/resources/testdata_checksum/hamlet.txt.md5
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/test/resources/testdata_checksum/hamlet.txt.md5
rename to flink-addons/flink-streaming/flink-streaming-examples/src/test/resources/testdata_checksum/hamlet.txt.md5
diff --git a/flink-addons/flink-streaming/stratosphere-streaming-examples/src/test/resources/testdata_checksum/terainput.txt.md5 b/flink-addons/flink-streaming/flink-streaming-examples/src/test/resources/testdata_checksum/terainput.txt.md5
similarity index 100%
rename from flink-addons/flink-streaming/stratosphere-streaming-examples/src/test/resources/testdata_checksum/terainput.txt.md5
rename to flink-addons/flink-streaming/flink-streaming-examples/src/test/resources/testdata_checksum/terainput.txt.md5
diff --git a/flink-addons/flink-streaming/pom.xml b/flink-addons/flink-streaming/pom.xml
index ecce6b7bc8245e783f6ef4dfaabc915d4984b859..344f93f262eb429d19662b0fb13a9571b878f9b0 100644
--- a/flink-addons/flink-streaming/pom.xml
+++ b/flink-addons/flink-streaming/pom.xml
@@ -4,12 +4,13 @@
 
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>eu.stratosphere</groupId>
+	<groupId>org.apache.flink</groupId>
 	<version>0.3-SNAPSHOT</version>
-	<artifactId>stratosphere-streaming</artifactId>
+	<artifactId>flink-streaming-parent</artifactId>
 
-	<name>stratosphere-streaming</name>
+	<name>flink-streaming</name>
 	<packaging>pom</packaging>
+	<!-- TODO update url -->
 	<url>http://github.com/stratosphere/stratosphere-streaming</url>
 	<inceptionYear>2014</inceptionYear>
 
@@ -17,12 +18,13 @@
 		<license>
 			<name>The Apache Software License, Version 2.0</name>
 			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-			<distribution>stratosphere</distribution>
+			<distribution>Apache Flink</distribution>
 		</license>
 	</licenses>
 
 	<scm>
-		<url>https://github.com/stratosphere/stratosphere-streaming</url>
+		<!-- TODO update scm -->
+		<url>http://github.com/stratosphere/stratosphere-streaming</url>
 		<connection>scm:git:git@github.com:stratosphere/stratosphere-streaming.git</connection>
 		<developerConnection>scm:git:git@github.com:stratosphere/stratosphere-streaming.git</developerConnection>
 	</scm>
@@ -31,13 +33,13 @@
 	</developers>
 
 	<modules>
-		<module>stratosphere-streaming-core</module>
-		<module>stratosphere-streaming-examples</module>
-		<module>stratosphere-streaming-connectors</module>
+		<module>flink-streaming-core</module>
+		<module>flink-streaming-examples</module>
+		<module>flink-streaming-connectors</module>
 	</modules>
 
 	<properties>
-		<stratosphere.version>0.6-SNAPSHOT</stratosphere.version>
+		<flink.version>0.6-SNAPSHOT</flink.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 	</properties>
@@ -51,39 +53,39 @@
 	</repositories>
 	<dependencies>
 		<dependency>
-			<groupId>eu.stratosphere</groupId>
-			<artifactId>stratosphere-core</artifactId>
-            		<version>${stratosphere.version}</version>
+			<groupId>org.apache.flink</groupId>
+			<artifactId>flink-core</artifactId>
+            		<version>${flink.version}</version>
 			<type>jar</type>
 		</dependency>
 		<dependency>
-			<groupId>eu.stratosphere</groupId>
-			<artifactId>stratosphere-tests</artifactId>
-			<version>${stratosphere.version}</version>
+			<groupId>org.apache.flink</groupId>
+			<artifactId>flink-tests</artifactId>
+			<version>${flink.version}</version>
 			<type>jar</type>
 		</dependency>
 		<dependency>
-			<groupId>eu.stratosphere</groupId>
-			<artifactId>stratosphere-compiler</artifactId>
-			<version>${stratosphere.version}</version>
+			<groupId>org.apache.flink</groupId>
+			<artifactId>flink-compiler</artifactId>
+			<version>${flink.version}</version>
 			<type>jar</type>
 		</dependency>
 		<dependency>
-			<groupId>eu.stratosphere</groupId>
-			<artifactId>stratosphere-runtime</artifactId>
-			<version>${stratosphere.version}</version>
+			<groupId>org.apache.flink</groupId>
+			<artifactId>flink-runtime</artifactId>
+			<version>${flink.version}</version>
 			<type>jar</type>
 		</dependency>
 		<dependency>
-			<groupId>eu.stratosphere</groupId>
-			<artifactId>stratosphere-clients</artifactId>
-			<version>${stratosphere.version}</version>
+			<groupId>org.apache.flink</groupId>
+			<artifactId>flink-clients</artifactId>
+			<version>${flink.version}</version>
 			<type>jar</type>
 		</dependency>
 		<dependency>
-			<groupId>eu.stratosphere</groupId>
-			<artifactId>stratosphere-java</artifactId>
-			<version>${stratosphere.version}</version>
+			<groupId>org.apache.flink</groupId>
+			<artifactId>flink-java</artifactId>
+			<version>${flink.version}</version>
 			<type>jar</type>
 		</dependency>
 		<dependency>
@@ -240,7 +242,7 @@
 							<!-- Resource files which have values. -->
 							<exclude>**/resources/**</exclude>
 							<!-- Configuration Files. -->
-							<exclude>**/stratosphere-bin/conf/slaves</exclude>
+							<exclude>**/Apache Flink-bin/conf/slaves</exclude>
 							<!-- Administrative files in the main trunk. -->
 							<exclude>README.md</exclude>
 							<exclude>CHANGELOG</exclude>
@@ -262,26 +264,26 @@
 					</descriptorRefs>
 				</configuration>
 			</plugin>
- <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.8</version>
-        <executions>
-          <execution>
-            <id>copy-dependencies</id>
-            <phase>package</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/alternateLocation</outputDirectory>
-              <overWriteReleases>false</overWriteReleases>
-              <overWriteSnapshots>false</overWriteSnapshots>
-              <overWriteIfNewer>true</overWriteIfNewer>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
+ 			<plugin>
+        			<groupId>org.apache.maven.plugins</groupId>
+        			<artifactId>maven-dependency-plugin</artifactId>
+        			<version>2.8</version>
+        			<executions>
+          				<execution>
+            					<id>copy-dependencies</id>
+            					<phase>package</phase>
+            					<goals>
+              						<goal>copy-dependencies</goal>
+            					</goals>
+            					<configuration>
+              						<outputDirectory>${project.build.directory}/alternateLocation</outputDirectory>
+              						<overWriteReleases>false</overWriteReleases>
+              						<overWriteSnapshots>false</overWriteSnapshots>
+             						<overWriteIfNewer>true</overWriteIfNewer>
+            					</configuration>
+          				</execution>
+        			</executions>
+      			</plugin>
 		</plugins>
 	</build>
 </project>