diff --git a/.gitignore b/.gitignore
index 638f71f867112..8e30de7b246ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,7 @@ tmp
 _site
 docs/api
 build-target
-flink-staging/flink-avro/src/test/java/org/apache/flink/api/io/avro/generated/
+flink-batch-connectors/flink-avro/src/test/java/org/apache/flink/api/io/avro/generated/
 flink-runtime-web/web-dashboard/node_modules/
 flink-runtime-web/web-dashboard/bower_components/
 atlassian-ide-plugin.xml
diff --git a/docs/apis/hadoop_compatibility.md b/docs/apis/hadoop_compatibility.md
index d88dc0b74b223..aca1edffc1dec 100644
--- a/docs/apis/hadoop_compatibility.md
+++ b/docs/apis/hadoop_compatibility.md
@@ -46,7 +46,7 @@ The code is located in `org.apache.flink.api.java.hadoop` and
 `org.apache.flink.api.scala.hadoop` in an additional sub-package for the
 `mapred` and `mapreduce` API.
 
-Support for Hadoop Mappers and Reducers is contained in the `flink-staging`
+Support for Hadoop Mappers and Reducers is contained in the `flink-hadoop-compatibility`
 Maven module.
 This code resides in the `org.apache.flink.hadoopcompatibility`
 package.
diff --git a/docs/apis/streaming_guide.md b/docs/apis/streaming_guide.md
index de7d46ec22c1c..ba7a7f89cdb42 100644
--- a/docs/apis/streaming_guide.md
+++ b/docs/apis/streaming_guide.md
@@ -3916,7 +3916,7 @@ After installing Docker an image can be pulled for each connector. Containers ca
 For the easiest setup, create a jar with all the dependencies of the *flink-streaming-connectors* project.
 
 ~~~bash
-cd /PATH/TO/GIT/flink/flink-staging/flink-streaming-connectors
+cd /PATH/TO/GIT/flink/flink-streaming-connectors
 mvn assembly:assembly
 ~~~bash
 
diff --git a/docs/internals/general_arch.md b/docs/internals/general_arch.md
index 4628e0b1dd097..a81ae8508ba5a 100644
--- a/docs/internals/general_arch.md
+++ b/docs/internals/general_arch.md
@@ -97,9 +97,7 @@ In addition to the projects listed in the figure above, Flink currently contains
 - `flink-dist`: The *distribution* project. It defines how to assemble the compiled code, scripts, and other resources
 into the final folder structure that is ready to use.
 
-- `flink-staging`: A series of projects that are in an early version. Currently contains
-among other things projects for YARN support, JDBC data sources and sinks, hadoop compatibility,
-graph specific operators, and HBase connectors.
+- `flink-contrib`: A series of projects that are in an early version.
 
 - `flink-quickstart`: Scripts, maven archetypes, and example programs for the quickstarts and tutorials.
 
diff --git a/docs/internals/stream_checkpointing.md b/docs/internals/stream_checkpointing.md
index 48355a1fd7a3d..dbfd3412c922f 100644
--- a/docs/internals/stream_checkpointing.md
+++ b/docs/internals/stream_checkpointing.md
@@ -141,7 +141,7 @@ It is possible to let an operator continue processing while it stores its state
 After receiving the checkpoint barriers on its inputs, the operator starts the asynchronous snapshot copying of its state. It immediately emits the barrier to its outputs and continues with the regular stream processing. Once the background copy process has completed, it acknowledges the checkpoint to the checkpoint coordinator (the JobManager). The checkpoint is now only complete after all sinks received the barriers and all stateful operators acknowledged their completed backup (which may be later than the barriers reaching the sinks).
 
 User-defined state that is used through the key/value state abstraction can be snapshotted *asynchronously*.
-User functions that implement the interface {% gh_link /flink-staging/flink-streaming/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/checkpoint/Checkpointed.java "Checkpointed" %} will be snapshotted *synchronously*, while functions that implement {% gh_link /flink-staging/flink-streaming/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/checkpoint/CheckpointedAsynchronously.java "CheckpointedAsynchronously" %} will be snapshotted *asynchronously*. Note that for the latter, the user function must guarantee that any future modifications to its state to not affect the state object returned by the `snapshotState()` method.
+User functions that implement the interface {% gh_link /flink-FIXME/flink-streaming/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/checkpoint/Checkpointed.java "Checkpointed" %} will be snapshotted *synchronously*, while functions that implement {% gh_link /flink-FIXME/flink-streaming/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/checkpoint/CheckpointedAsynchronously.java "CheckpointedAsynchronously" %} will be snapshotted *asynchronously*. Note that for the latter, the user function must guarantee that any future modifications to its state to not affect the state object returned by the `snapshotState()` method.
 
 
 
diff --git a/docs/setup/flink_on_tez.md b/docs/setup/flink_on_tez.md
index afbd147e353fc..daa0d7d347da9 100644
--- a/docs/setup/flink_on_tez.md
+++ b/docs/setup/flink_on_tez.md
@@ -23,8 +23,9 @@ under the License.
 <a href="#top"></a>
 
 You can run Flink using Tez as an execution environment. Flink on Tez 
-is currently included in *flink-staging* in alpha. All classes are
-located in the *org.apache.flink.tez* package.
+is currently included in the *flink-contrib* module, which means it is 
+in alpha stability. All classes are located in the *org.apache.flink.tez* 
+package.
 
 * This will be replaced by the TOC
 {:toc}
@@ -101,7 +102,7 @@ public class WordCountExample {
   using `mvn -DskipTests clean package -Pinclude-tez -Dhadoop.version=X.X.X -Dtez.version=X.X.X`.
   Make sure that the Hadoop version matches the version that Tez uses.
   Obtain the jar file contained in the Flink distribution under
-  `flink-staging/flink-tez/target/flink-tez-x.y.z-flink-fat-jar.jar` 
+  `flink-contrib/flink-tez/target/flink-tez-x.y.z-flink-fat-jar.jar` 
   and upload it to some directory in HDFS. E.g., to upload the file
   to the directory `/apps`, execute
   {% highlight bash %}
diff --git a/flink-staging/flink-avro/pom.xml b/flink-batch-connectors/flink-avro/pom.xml
similarity index 99%
rename from flink-staging/flink-avro/pom.xml
rename to flink-batch-connectors/flink-avro/pom.xml
index 9e0e868bdcdfa..e9c6499d43c34 100644
--- a/flink-staging/flink-avro/pom.xml
+++ b/flink-batch-connectors/flink-avro/pom.xml
@@ -25,7 +25,7 @@ under the License.
 	
 	<parent>
 		<groupId>org.apache.flink</groupId>
-		<artifactId>flink-staging</artifactId>
+		<artifactId>flink-batch-connectors</artifactId>
 		<version>1.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
diff --git a/flink-staging/flink-avro/src/main/java/org/apache/flink/api/avro/DataInputDecoder.java b/flink-batch-connectors/flink-avro/src/main/java/org/apache/flink/api/avro/DataInputDecoder.java
similarity index 100%
rename from flink-staging/flink-avro/src/main/java/org/apache/flink/api/avro/DataInputDecoder.java
rename to flink-batch-connectors/flink-avro/src/main/java/org/apache/flink/api/avro/DataInputDecoder.java
diff --git a/flink-staging/flink-avro/src/main/java/org/apache/flink/api/avro/DataOutputEncoder.java b/flink-batch-connectors/flink-avro/src/main/java/org/apache/flink/api/avro/DataOutputEncoder.java
similarity index 100%
rename from flink-staging/flink-avro/src/main/java/org/apache/flink/api/avro/DataOutputEncoder.java
rename to flink-batch-connectors/flink-avro/src/main/java/org/apache/flink/api/avro/DataOutputEncoder.java
diff --git a/flink-staging/flink-avro/src/main/java/org/apache/flink/api/avro/FSDataInputStreamWrapper.java b/flink-batch-connectors/flink-avro/src/main/java/org/apache/flink/api/avro/FSDataInputStreamWrapper.java
similarity index 100%
rename from flink-staging/flink-avro/src/main/java/org/apache/flink/api/avro/FSDataInputStreamWrapper.java
rename to flink-batch-connectors/flink-avro/src/main/java/org/apache/flink/api/avro/FSDataInputStreamWrapper.java
diff --git a/flink-staging/flink-avro/src/main/java/org/apache/flink/api/io/avro/example/AvroTypeExample.java b/flink-batch-connectors/flink-avro/src/main/java/org/apache/flink/api/io/avro/example/AvroTypeExample.java
similarity index 100%
rename from flink-staging/flink-avro/src/main/java/org/apache/flink/api/io/avro/example/AvroTypeExample.java
rename to flink-batch-connectors/flink-avro/src/main/java/org/apache/flink/api/io/avro/example/AvroTypeExample.java
diff --git a/flink-staging/flink-avro/src/main/java/org/apache/flink/api/io/avro/example/User.java b/flink-batch-connectors/flink-avro/src/main/java/org/apache/flink/api/io/avro/example/User.java
similarity index 100%
rename from flink-staging/flink-avro/src/main/java/org/apache/flink/api/io/avro/example/User.java
rename to flink-batch-connectors/flink-avro/src/main/java/org/apache/flink/api/io/avro/example/User.java
diff --git a/flink-staging/flink-avro/src/main/java/org/apache/flink/api/java/io/AvroInputFormat.java b/flink-batch-connectors/flink-avro/src/main/java/org/apache/flink/api/java/io/AvroInputFormat.java
similarity index 100%
rename from flink-staging/flink-avro/src/main/java/org/apache/flink/api/java/io/AvroInputFormat.java
rename to flink-batch-connectors/flink-avro/src/main/java/org/apache/flink/api/java/io/AvroInputFormat.java
diff --git a/flink-staging/flink-avro/src/main/java/org/apache/flink/api/java/io/AvroOutputFormat.java b/flink-batch-connectors/flink-avro/src/main/java/org/apache/flink/api/java/io/AvroOutputFormat.java
similarity index 100%
rename from flink-staging/flink-avro/src/main/java/org/apache/flink/api/java/io/AvroOutputFormat.java
rename to flink-batch-connectors/flink-avro/src/main/java/org/apache/flink/api/java/io/AvroOutputFormat.java
diff --git a/flink-staging/flink-avro/src/test/assembly/test-assembly.xml b/flink-batch-connectors/flink-avro/src/test/assembly/test-assembly.xml
similarity index 100%
rename from flink-staging/flink-avro/src/test/assembly/test-assembly.xml
rename to flink-batch-connectors/flink-avro/src/test/assembly/test-assembly.xml
diff --git a/flink-staging/flink-avro/src/test/java/org/apache/flink/api/avro/AvroExternalJarProgramITCase.java b/flink-batch-connectors/flink-avro/src/test/java/org/apache/flink/api/avro/AvroExternalJarProgramITCase.java
similarity index 100%
rename from flink-staging/flink-avro/src/test/java/org/apache/flink/api/avro/AvroExternalJarProgramITCase.java
rename to flink-batch-connectors/flink-avro/src/test/java/org/apache/flink/api/avro/AvroExternalJarProgramITCase.java
diff --git a/flink-staging/flink-avro/src/test/java/org/apache/flink/api/avro/AvroOutputFormatITCase.java b/flink-batch-connectors/flink-avro/src/test/java/org/apache/flink/api/avro/AvroOutputFormatITCase.java
similarity index 100%
rename from flink-staging/flink-avro/src/test/java/org/apache/flink/api/avro/AvroOutputFormatITCase.java
rename to flink-batch-connectors/flink-avro/src/test/java/org/apache/flink/api/avro/AvroOutputFormatITCase.java
diff --git a/flink-staging/flink-avro/src/test/java/org/apache/flink/api/avro/EncoderDecoderTest.java b/flink-batch-connectors/flink-avro/src/test/java/org/apache/flink/api/avro/EncoderDecoderTest.java
similarity index 100%
rename from flink-staging/flink-avro/src/test/java/org/apache/flink/api/avro/EncoderDecoderTest.java
rename to flink-batch-connectors/flink-avro/src/test/java/org/apache/flink/api/avro/EncoderDecoderTest.java
diff --git a/flink-staging/flink-avro/src/test/java/org/apache/flink/api/avro/testjar/AvroExternalJarProgram.java b/flink-batch-connectors/flink-avro/src/test/java/org/apache/flink/api/avro/testjar/AvroExternalJarProgram.java
similarity index 100%
rename from flink-staging/flink-avro/src/test/java/org/apache/flink/api/avro/testjar/AvroExternalJarProgram.java
rename to flink-batch-connectors/flink-avro/src/test/java/org/apache/flink/api/avro/testjar/AvroExternalJarProgram.java
diff --git a/flink-staging/flink-avro/src/test/java/org/apache/flink/api/io/avro/AvroPojoTest.java b/flink-batch-connectors/flink-avro/src/test/java/org/apache/flink/api/io/avro/AvroPojoTest.java
similarity index 100%
rename from flink-staging/flink-avro/src/test/java/org/apache/flink/api/io/avro/AvroPojoTest.java
rename to flink-batch-connectors/flink-avro/src/test/java/org/apache/flink/api/io/avro/AvroPojoTest.java
diff --git a/flink-staging/flink-avro/src/test/java/org/apache/flink/api/io/avro/AvroRecordInputFormatTest.java b/flink-batch-connectors/flink-avro/src/test/java/org/apache/flink/api/io/avro/AvroRecordInputFormatTest.java
similarity index 100%
rename from flink-staging/flink-avro/src/test/java/org/apache/flink/api/io/avro/AvroRecordInputFormatTest.java
rename to flink-batch-connectors/flink-avro/src/test/java/org/apache/flink/api/io/avro/AvroRecordInputFormatTest.java
diff --git a/flink-staging/flink-avro/src/test/java/org/apache/flink/api/io/avro/AvroSplittableInputFormatTest.java b/flink-batch-connectors/flink-avro/src/test/java/org/apache/flink/api/io/avro/AvroSplittableInputFormatTest.java
similarity index 100%
rename from flink-staging/flink-avro/src/test/java/org/apache/flink/api/io/avro/AvroSplittableInputFormatTest.java
rename to flink-batch-connectors/flink-avro/src/test/java/org/apache/flink/api/io/avro/AvroSplittableInputFormatTest.java
diff --git a/flink-staging/flink-avro/src/test/java/org/apache/flink/api/java/io/AvroInputFormatTypeExtractionTest.java b/flink-batch-connectors/flink-avro/src/test/java/org/apache/flink/api/java/io/AvroInputFormatTypeExtractionTest.java
similarity index 100%
rename from flink-staging/flink-avro/src/test/java/org/apache/flink/api/java/io/AvroInputFormatTypeExtractionTest.java
rename to flink-batch-connectors/flink-avro/src/test/java/org/apache/flink/api/java/io/AvroInputFormatTypeExtractionTest.java
diff --git a/flink-staging/flink-avro/src/test/resources/avro/user.avsc b/flink-batch-connectors/flink-avro/src/test/resources/avro/user.avsc
similarity index 100%
rename from flink-staging/flink-avro/src/test/resources/avro/user.avsc
rename to flink-batch-connectors/flink-avro/src/test/resources/avro/user.avsc
diff --git a/flink-staging/flink-avro/src/test/resources/log4j-test.properties b/flink-batch-connectors/flink-avro/src/test/resources/log4j-test.properties
similarity index 100%
rename from flink-staging/flink-avro/src/test/resources/log4j-test.properties
rename to flink-batch-connectors/flink-avro/src/test/resources/log4j-test.properties
diff --git a/flink-staging/flink-avro/src/test/resources/logback-test.xml b/flink-batch-connectors/flink-avro/src/test/resources/logback-test.xml
similarity index 100%
rename from flink-staging/flink-avro/src/test/resources/logback-test.xml
rename to flink-batch-connectors/flink-avro/src/test/resources/logback-test.xml
diff --git a/flink-staging/flink-avro/src/test/resources/testdata.avro b/flink-batch-connectors/flink-avro/src/test/resources/testdata.avro
similarity index 100%
rename from flink-staging/flink-avro/src/test/resources/testdata.avro
rename to flink-batch-connectors/flink-avro/src/test/resources/testdata.avro
diff --git a/flink-staging/flink-hadoop-compatibility/pom.xml b/flink-batch-connectors/flink-hadoop-compatibility/pom.xml
similarity index 97%
rename from flink-staging/flink-hadoop-compatibility/pom.xml
rename to flink-batch-connectors/flink-hadoop-compatibility/pom.xml
index e27e70275ebcf..d98729a2091f3 100644
--- a/flink-staging/flink-hadoop-compatibility/pom.xml
+++ b/flink-batch-connectors/flink-hadoop-compatibility/pom.xml
@@ -24,7 +24,7 @@ under the License.
 	
 	<parent>
 		<groupId>org.apache.flink</groupId>
-		<artifactId>flink-staging</artifactId>
+		<artifactId>flink-batch-connectors</artifactId>
 		<version>1.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
diff --git a/flink-staging/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/HadoopMapFunction.java b/flink-batch-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/HadoopMapFunction.java
similarity index 100%
rename from flink-staging/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/HadoopMapFunction.java
rename to flink-batch-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/HadoopMapFunction.java
diff --git a/flink-staging/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/HadoopReduceCombineFunction.java b/flink-batch-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/HadoopReduceCombineFunction.java
similarity index 100%
rename from flink-staging/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/HadoopReduceCombineFunction.java
rename to flink-batch-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/HadoopReduceCombineFunction.java
diff --git a/flink-staging/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/HadoopReduceFunction.java b/flink-batch-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/HadoopReduceFunction.java
similarity index 100%
rename from flink-staging/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/HadoopReduceFunction.java
rename to flink-batch-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/HadoopReduceFunction.java
diff --git a/flink-staging/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/example/HadoopMapredCompatWordCount.java b/flink-batch-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/example/HadoopMapredCompatWordCount.java
similarity index 100%
rename from flink-staging/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/example/HadoopMapredCompatWordCount.java
rename to flink-batch-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/example/HadoopMapredCompatWordCount.java
diff --git a/flink-staging/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/wrapper/HadoopOutputCollector.java b/flink-batch-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/wrapper/HadoopOutputCollector.java
similarity index 100%
rename from flink-staging/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/wrapper/HadoopOutputCollector.java
rename to flink-batch-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/wrapper/HadoopOutputCollector.java
diff --git a/flink-staging/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/wrapper/HadoopTupleUnwrappingIterator.java b/flink-batch-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/wrapper/HadoopTupleUnwrappingIterator.java
similarity index 100%
rename from flink-staging/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/wrapper/HadoopTupleUnwrappingIterator.java
rename to flink-batch-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/wrapper/HadoopTupleUnwrappingIterator.java
diff --git a/flink-staging/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapreduce/example/WordCount.java b/flink-batch-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapreduce/example/WordCount.java
similarity index 100%
rename from flink-staging/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapreduce/example/WordCount.java
rename to flink-batch-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapreduce/example/WordCount.java
diff --git a/flink-staging/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/HadoopMapFunctionITCase.java b/flink-batch-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/HadoopMapFunctionITCase.java
similarity index 100%
rename from flink-staging/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/HadoopMapFunctionITCase.java
rename to flink-batch-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/HadoopMapFunctionITCase.java
diff --git a/flink-staging/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/HadoopMapredITCase.java b/flink-batch-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/HadoopMapredITCase.java
similarity index 100%
rename from flink-staging/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/HadoopMapredITCase.java
rename to flink-batch-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/HadoopMapredITCase.java
diff --git a/flink-staging/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/HadoopReduceCombineFunctionITCase.java b/flink-batch-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/HadoopReduceCombineFunctionITCase.java
similarity index 100%
rename from flink-staging/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/HadoopReduceCombineFunctionITCase.java
rename to flink-batch-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/HadoopReduceCombineFunctionITCase.java
diff --git a/flink-staging/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/HadoopReduceFunctionITCase.java b/flink-batch-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/HadoopReduceFunctionITCase.java
similarity index 100%
rename from flink-staging/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/HadoopReduceFunctionITCase.java
rename to flink-batch-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/HadoopReduceFunctionITCase.java
diff --git a/flink-staging/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/HadoopTestData.java b/flink-batch-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/HadoopTestData.java
similarity index 100%
rename from flink-staging/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/HadoopTestData.java
rename to flink-batch-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/HadoopTestData.java
diff --git a/flink-staging/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/wrapper/HadoopTupleUnwrappingIteratorTest.java b/flink-batch-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/wrapper/HadoopTupleUnwrappingIteratorTest.java
similarity index 100%
rename from flink-staging/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/wrapper/HadoopTupleUnwrappingIteratorTest.java
rename to flink-batch-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/wrapper/HadoopTupleUnwrappingIteratorTest.java
diff --git a/flink-staging/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapreduce/HadoopInputOutputITCase.java b/flink-batch-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapreduce/HadoopInputOutputITCase.java
similarity index 100%
rename from flink-staging/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapreduce/HadoopInputOutputITCase.java
rename to flink-batch-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapreduce/HadoopInputOutputITCase.java
diff --git a/flink-staging/flink-hadoop-compatibility/src/test/resources/log4j-test.properties b/flink-batch-connectors/flink-hadoop-compatibility/src/test/resources/log4j-test.properties
similarity index 100%
rename from flink-staging/flink-hadoop-compatibility/src/test/resources/log4j-test.properties
rename to flink-batch-connectors/flink-hadoop-compatibility/src/test/resources/log4j-test.properties
diff --git a/flink-staging/flink-hadoop-compatibility/src/test/resources/logback-test.xml b/flink-batch-connectors/flink-hadoop-compatibility/src/test/resources/logback-test.xml
similarity index 100%
rename from flink-staging/flink-hadoop-compatibility/src/test/resources/logback-test.xml
rename to flink-batch-connectors/flink-hadoop-compatibility/src/test/resources/logback-test.xml
diff --git a/flink-staging/flink-hbase/pom.xml b/flink-batch-connectors/flink-hbase/pom.xml
similarity index 99%
rename from flink-staging/flink-hbase/pom.xml
rename to flink-batch-connectors/flink-hbase/pom.xml
index c2b0881cf7b11..ba4cf852ddf2e 100644
--- a/flink-staging/flink-hbase/pom.xml
+++ b/flink-batch-connectors/flink-hbase/pom.xml
@@ -24,7 +24,7 @@ under the License.
 
 	<parent>
 		<groupId>org.apache.flink</groupId>
-		<artifactId>flink-staging</artifactId>
+		<artifactId>flink-batch-connectors</artifactId>
 		<version>1.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
diff --git a/flink-staging/flink-hbase/src/main/java/org/apache/flink/addons/hbase/TableInputFormat.java b/flink-batch-connectors/flink-hbase/src/main/java/org/apache/flink/addons/hbase/TableInputFormat.java
similarity index 100%
rename from flink-staging/flink-hbase/src/main/java/org/apache/flink/addons/hbase/TableInputFormat.java
rename to flink-batch-connectors/flink-hbase/src/main/java/org/apache/flink/addons/hbase/TableInputFormat.java
diff --git a/flink-staging/flink-hbase/src/main/java/org/apache/flink/addons/hbase/TableInputSplit.java b/flink-batch-connectors/flink-hbase/src/main/java/org/apache/flink/addons/hbase/TableInputSplit.java
similarity index 100%
rename from flink-staging/flink-hbase/src/main/java/org/apache/flink/addons/hbase/TableInputSplit.java
rename to flink-batch-connectors/flink-hbase/src/main/java/org/apache/flink/addons/hbase/TableInputSplit.java
diff --git a/flink-staging/flink-hbase/src/test/java/org/apache/flink/addons/hbase/example/HBaseFlinkTestConstants.java b/flink-batch-connectors/flink-hbase/src/test/java/org/apache/flink/addons/hbase/example/HBaseFlinkTestConstants.java
similarity index 100%
rename from flink-staging/flink-hbase/src/test/java/org/apache/flink/addons/hbase/example/HBaseFlinkTestConstants.java
rename to flink-batch-connectors/flink-hbase/src/test/java/org/apache/flink/addons/hbase/example/HBaseFlinkTestConstants.java
diff --git a/flink-staging/flink-hbase/src/test/java/org/apache/flink/addons/hbase/example/HBaseReadExample.java b/flink-batch-connectors/flink-hbase/src/test/java/org/apache/flink/addons/hbase/example/HBaseReadExample.java
similarity index 100%
rename from flink-staging/flink-hbase/src/test/java/org/apache/flink/addons/hbase/example/HBaseReadExample.java
rename to flink-batch-connectors/flink-hbase/src/test/java/org/apache/flink/addons/hbase/example/HBaseReadExample.java
diff --git a/flink-staging/flink-hbase/src/test/java/org/apache/flink/addons/hbase/example/HBaseWriteExample.java b/flink-batch-connectors/flink-hbase/src/test/java/org/apache/flink/addons/hbase/example/HBaseWriteExample.java
similarity index 100%
rename from flink-staging/flink-hbase/src/test/java/org/apache/flink/addons/hbase/example/HBaseWriteExample.java
rename to flink-batch-connectors/flink-hbase/src/test/java/org/apache/flink/addons/hbase/example/HBaseWriteExample.java
diff --git a/flink-staging/flink-hbase/src/test/java/org/apache/flink/addons/hbase/example/HBaseWriteStreamExample.java b/flink-batch-connectors/flink-hbase/src/test/java/org/apache/flink/addons/hbase/example/HBaseWriteStreamExample.java
similarity index 100%
rename from flink-staging/flink-hbase/src/test/java/org/apache/flink/addons/hbase/example/HBaseWriteStreamExample.java
rename to flink-batch-connectors/flink-hbase/src/test/java/org/apache/flink/addons/hbase/example/HBaseWriteStreamExample.java
diff --git a/flink-staging/flink-hbase/src/test/resources/hbase-site.xml b/flink-batch-connectors/flink-hbase/src/test/resources/hbase-site.xml
similarity index 100%
rename from flink-staging/flink-hbase/src/test/resources/hbase-site.xml
rename to flink-batch-connectors/flink-hbase/src/test/resources/hbase-site.xml
diff --git a/flink-staging/flink-hbase/src/test/resources/log4j.properties b/flink-batch-connectors/flink-hbase/src/test/resources/log4j.properties
similarity index 100%
rename from flink-staging/flink-hbase/src/test/resources/log4j.properties
rename to flink-batch-connectors/flink-hbase/src/test/resources/log4j.properties
diff --git a/flink-staging/flink-hcatalog/pom.xml b/flink-batch-connectors/flink-hcatalog/pom.xml
similarity index 99%
rename from flink-staging/flink-hcatalog/pom.xml
rename to flink-batch-connectors/flink-hcatalog/pom.xml
index 00ce57750179c..a3a1d68e06c03 100644
--- a/flink-staging/flink-hcatalog/pom.xml
+++ b/flink-batch-connectors/flink-hcatalog/pom.xml
@@ -24,7 +24,7 @@ under the License.
 	
 	<parent>
 		<groupId>org.apache.flink</groupId>
-		<artifactId>flink-staging</artifactId>
+		<artifactId>flink-batch-connectors</artifactId>
 		<version>1.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
diff --git a/flink-staging/flink-hcatalog/src/main/java/org/apache/flink/hcatalog/HCatInputFormatBase.java b/flink-batch-connectors/flink-hcatalog/src/main/java/org/apache/flink/hcatalog/HCatInputFormatBase.java
similarity index 100%
rename from flink-staging/flink-hcatalog/src/main/java/org/apache/flink/hcatalog/HCatInputFormatBase.java
rename to flink-batch-connectors/flink-hcatalog/src/main/java/org/apache/flink/hcatalog/HCatInputFormatBase.java
diff --git a/flink-staging/flink-hcatalog/src/main/java/org/apache/flink/hcatalog/java/HCatInputFormat.java b/flink-batch-connectors/flink-hcatalog/src/main/java/org/apache/flink/hcatalog/java/HCatInputFormat.java
similarity index 100%
rename from flink-staging/flink-hcatalog/src/main/java/org/apache/flink/hcatalog/java/HCatInputFormat.java
rename to flink-batch-connectors/flink-hcatalog/src/main/java/org/apache/flink/hcatalog/java/HCatInputFormat.java
diff --git a/flink-staging/flink-hcatalog/src/main/scala/org/apache/flink/hcatalog/scala/HCatInputFormat.scala b/flink-batch-connectors/flink-hcatalog/src/main/scala/org/apache/flink/hcatalog/scala/HCatInputFormat.scala
similarity index 100%
rename from flink-staging/flink-hcatalog/src/main/scala/org/apache/flink/hcatalog/scala/HCatInputFormat.scala
rename to flink-batch-connectors/flink-hcatalog/src/main/scala/org/apache/flink/hcatalog/scala/HCatInputFormat.scala
diff --git a/flink-staging/flink-jdbc/pom.xml b/flink-batch-connectors/flink-jdbc/pom.xml
similarity index 97%
rename from flink-staging/flink-jdbc/pom.xml
rename to flink-batch-connectors/flink-jdbc/pom.xml
index 79e26be8da551..ca2b132dcbe69 100644
--- a/flink-staging/flink-jdbc/pom.xml
+++ b/flink-batch-connectors/flink-jdbc/pom.xml
@@ -25,7 +25,7 @@ under the License.
 	
 	<parent>
 		<groupId>org.apache.flink</groupId>
-		<artifactId>flink-staging</artifactId>
+		<artifactId>flink-batch-connectors</artifactId>
 		<version>1.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
diff --git a/flink-staging/flink-jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormat.java b/flink-batch-connectors/flink-jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormat.java
similarity index 100%
rename from flink-staging/flink-jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormat.java
rename to flink-batch-connectors/flink-jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormat.java
diff --git a/flink-staging/flink-jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormat.java b/flink-batch-connectors/flink-jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormat.java
similarity index 100%
rename from flink-staging/flink-jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormat.java
rename to flink-batch-connectors/flink-jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormat.java
diff --git a/flink-staging/flink-jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/example/JDBCExample.java b/flink-batch-connectors/flink-jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/example/JDBCExample.java
similarity index 100%
rename from flink-staging/flink-jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/example/JDBCExample.java
rename to flink-batch-connectors/flink-jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/example/JDBCExample.java
diff --git a/flink-staging/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormatTest.java b/flink-batch-connectors/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormatTest.java
similarity index 100%
rename from flink-staging/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormatTest.java
rename to flink-batch-connectors/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormatTest.java
diff --git a/flink-staging/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormatTest.java b/flink-batch-connectors/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormatTest.java
similarity index 100%
rename from flink-staging/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormatTest.java
rename to flink-batch-connectors/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormatTest.java
diff --git a/flink-staging/flink-jdbc/src/test/resources/log4j-test.properties b/flink-batch-connectors/flink-jdbc/src/test/resources/log4j-test.properties
similarity index 100%
rename from flink-staging/flink-jdbc/src/test/resources/log4j-test.properties
rename to flink-batch-connectors/flink-jdbc/src/test/resources/log4j-test.properties
diff --git a/flink-staging/flink-jdbc/src/test/resources/logback-test.xml b/flink-batch-connectors/flink-jdbc/src/test/resources/logback-test.xml
similarity index 100%
rename from flink-staging/flink-jdbc/src/test/resources/logback-test.xml
rename to flink-batch-connectors/flink-jdbc/src/test/resources/logback-test.xml
diff --git a/flink-staging/pom.xml b/flink-batch-connectors/pom.xml
similarity index 64%
rename from flink-staging/pom.xml
rename to flink-batch-connectors/pom.xml
index 535c9105e5edd..25f98d1488f05 100644
--- a/flink-staging/pom.xml
+++ b/flink-batch-connectors/pom.xml
@@ -30,8 +30,8 @@ under the License.
 	</parent>
 
 
-	<artifactId>flink-staging</artifactId>
-	<name>flink-staging</name>
+	<artifactId>flink-batch-connectors</artifactId>
+	<name>flink-batch-connectors</name>
 	<packaging>pom</packaging>
 
 	<modules>
@@ -40,33 +40,6 @@ under the License.
 		<module>flink-hadoop-compatibility</module>
 		<module>flink-hbase</module>
 		<module>flink-hcatalog</module>
-		<module>flink-table</module>
-		<module>flink-ml</module>
-		<module>flink-scala-shell</module>
 	</modules>
 	
-	<!-- See main pom.xml for explanation of profiles -->
-	<profiles>
-		<profile>
-			<id>hadoop-2</id>
-			<activation>
-				<property>
-					<!-- Please do not remove the 'hadoop2' comment. See ./tools/generate_specific_pom.sh -->
-					<!--hadoop2--><name>!hadoop.profile</name>
-				</property>
-			</activation>
-			<modules>
-				<!-- Include the flink-fs-tests project only for HD2.
-				 	The HDFS minicluster interfaces changed between the two versions.
-				 -->
-				<module>flink-fs-tests</module>
-			</modules>
-		</profile>
-		<profile>
-			<id>include-tez</id>
-			<modules>
-				<module>flink-tez</module>
-			</modules>
-		</profile>
-	</profiles>
 </project>
diff --git a/flink-staging/flink-tez/pom.xml b/flink-contrib/flink-tez/pom.xml
similarity index 99%
rename from flink-staging/flink-tez/pom.xml
rename to flink-contrib/flink-tez/pom.xml
index 6083f7fa8af8c..412640a7bde8b 100644
--- a/flink-staging/flink-tez/pom.xml
+++ b/flink-contrib/flink-tez/pom.xml
@@ -24,7 +24,7 @@ under the License.
 
     <parent>
         <groupId>org.apache.flink</groupId>
-        <artifactId>flink-staging</artifactId>
+        <artifactId>flink-contrib-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
diff --git a/flink-staging/flink-tez/src/assembly/flink-fat-jar.xml b/flink-contrib/flink-tez/src/assembly/flink-fat-jar.xml
similarity index 100%
rename from flink-staging/flink-tez/src/assembly/flink-fat-jar.xml
rename to flink-contrib/flink-tez/src/assembly/flink-fat-jar.xml
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/client/LocalTezEnvironment.java b/flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/client/LocalTezEnvironment.java
similarity index 100%
rename from flink-staging/flink-tez/src/main/java/org/apache/flink/tez/client/LocalTezEnvironment.java
rename to flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/client/LocalTezEnvironment.java
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/client/RemoteTezEnvironment.java b/flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/client/RemoteTezEnvironment.java
similarity index 100%
rename from flink-staging/flink-tez/src/main/java/org/apache/flink/tez/client/RemoteTezEnvironment.java
rename to flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/client/RemoteTezEnvironment.java
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/client/TezExecutor.java b/flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/client/TezExecutor.java
similarity index 100%
rename from flink-staging/flink-tez/src/main/java/org/apache/flink/tez/client/TezExecutor.java
rename to flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/client/TezExecutor.java
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/client/TezExecutorTool.java b/flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/client/TezExecutorTool.java
similarity index 100%
rename from flink-staging/flink-tez/src/main/java/org/apache/flink/tez/client/TezExecutorTool.java
rename to flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/client/TezExecutorTool.java
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/dag/FlinkBroadcastEdge.java b/flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/dag/FlinkBroadcastEdge.java
similarity index 100%
rename from flink-staging/flink-tez/src/main/java/org/apache/flink/tez/dag/FlinkBroadcastEdge.java
rename to flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/dag/FlinkBroadcastEdge.java
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/dag/FlinkDataSinkVertex.java b/flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/dag/FlinkDataSinkVertex.java
similarity index 100%
rename from flink-staging/flink-tez/src/main/java/org/apache/flink/tez/dag/FlinkDataSinkVertex.java
rename to flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/dag/FlinkDataSinkVertex.java
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/dag/FlinkDataSourceVertex.java b/flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/dag/FlinkDataSourceVertex.java
similarity index 100%
rename from flink-staging/flink-tez/src/main/java/org/apache/flink/tez/dag/FlinkDataSourceVertex.java
rename to flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/dag/FlinkDataSourceVertex.java
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/dag/FlinkEdge.java b/flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/dag/FlinkEdge.java
similarity index 100%
rename from flink-staging/flink-tez/src/main/java/org/apache/flink/tez/dag/FlinkEdge.java
rename to flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/dag/FlinkEdge.java
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/dag/FlinkForwardEdge.java b/flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/dag/FlinkForwardEdge.java
similarity index 100%
rename from flink-staging/flink-tez/src/main/java/org/apache/flink/tez/dag/FlinkForwardEdge.java
rename to flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/dag/FlinkForwardEdge.java
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/dag/FlinkPartitionEdge.java b/flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/dag/FlinkPartitionEdge.java
similarity index 100%
rename from flink-staging/flink-tez/src/main/java/org/apache/flink/tez/dag/FlinkPartitionEdge.java
rename to flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/dag/FlinkPartitionEdge.java
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/dag/FlinkProcessorVertex.java b/flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/dag/FlinkProcessorVertex.java
similarity index 100%
rename from flink-staging/flink-tez/src/main/java/org/apache/flink/tez/dag/FlinkProcessorVertex.java
rename to flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/dag/FlinkProcessorVertex.java
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/dag/FlinkUnionVertex.java b/flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/dag/FlinkUnionVertex.java
similarity index 100%
rename from flink-staging/flink-tez/src/main/java/org/apache/flink/tez/dag/FlinkUnionVertex.java
rename to flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/dag/FlinkUnionVertex.java
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/dag/FlinkVertex.java b/flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/dag/FlinkVertex.java
similarity index 100%
rename from flink-staging/flink-tez/src/main/java/org/apache/flink/tez/dag/FlinkVertex.java
rename to flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/dag/FlinkVertex.java
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/dag/TezDAGGenerator.java b/flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/dag/TezDAGGenerator.java
similarity index 100%
rename from flink-staging/flink-tez/src/main/java/org/apache/flink/tez/dag/TezDAGGenerator.java
rename to flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/dag/TezDAGGenerator.java
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/examples/ConnectedComponentsStep.java b/flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/examples/ConnectedComponentsStep.java
similarity index 100%
rename from flink-staging/flink-tez/src/main/java/org/apache/flink/tez/examples/ConnectedComponentsStep.java
rename to flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/examples/ConnectedComponentsStep.java
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/examples/ExampleDriver.java b/flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/examples/ExampleDriver.java
similarity index 100%
rename from flink-staging/flink-tez/src/main/java/org/apache/flink/tez/examples/ExampleDriver.java
rename to flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/examples/ExampleDriver.java
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/examples/PageRankBasicStep.java b/flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/examples/PageRankBasicStep.java
similarity index 100%
rename from flink-staging/flink-tez/src/main/java/org/apache/flink/tez/examples/PageRankBasicStep.java
rename to flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/examples/PageRankBasicStep.java
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/examples/TPCHQuery3.java b/flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/examples/TPCHQuery3.java
similarity index 100%
rename from flink-staging/flink-tez/src/main/java/org/apache/flink/tez/examples/TPCHQuery3.java
rename to flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/examples/TPCHQuery3.java
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/examples/TransitiveClosureNaiveStep.java b/flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/examples/TransitiveClosureNaiveStep.java
similarity index 100%
rename from flink-staging/flink-tez/src/main/java/org/apache/flink/tez/examples/TransitiveClosureNaiveStep.java
rename to flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/examples/TransitiveClosureNaiveStep.java
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/examples/WordCount.java b/flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/examples/WordCount.java
similarity index 100%
rename from flink-staging/flink-tez/src/main/java/org/apache/flink/tez/examples/WordCount.java
rename to flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/examples/WordCount.java
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/runtime/DataSinkProcessor.java b/flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/runtime/DataSinkProcessor.java
similarity index 100%
rename from flink-staging/flink-tez/src/main/java/org/apache/flink/tez/runtime/DataSinkProcessor.java
rename to flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/runtime/DataSinkProcessor.java
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/runtime/DataSourceProcessor.java b/flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/runtime/DataSourceProcessor.java
similarity index 100%
rename from flink-staging/flink-tez/src/main/java/org/apache/flink/tez/runtime/DataSourceProcessor.java
rename to flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/runtime/DataSourceProcessor.java
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/runtime/RegularProcessor.java b/flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/runtime/RegularProcessor.java
similarity index 100%
rename from flink-staging/flink-tez/src/main/java/org/apache/flink/tez/runtime/RegularProcessor.java
rename to flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/runtime/RegularProcessor.java
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/runtime/TezRuntimeEnvironment.java b/flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/runtime/TezRuntimeEnvironment.java
similarity index 100%
rename from flink-staging/flink-tez/src/main/java/org/apache/flink/tez/runtime/TezRuntimeEnvironment.java
rename to flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/runtime/TezRuntimeEnvironment.java
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/runtime/TezTask.java b/flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/runtime/TezTask.java
similarity index 100%
rename from flink-staging/flink-tez/src/main/java/org/apache/flink/tez/runtime/TezTask.java
rename to flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/runtime/TezTask.java
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/runtime/TezTaskConfig.java b/flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/runtime/TezTaskConfig.java
similarity index 100%
rename from flink-staging/flink-tez/src/main/java/org/apache/flink/tez/runtime/TezTaskConfig.java
rename to flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/runtime/TezTaskConfig.java
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/runtime/UnionProcessor.java b/flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/runtime/UnionProcessor.java
similarity index 100%
rename from flink-staging/flink-tez/src/main/java/org/apache/flink/tez/runtime/UnionProcessor.java
rename to flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/runtime/UnionProcessor.java
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/runtime/input/FlinkInput.java b/flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/runtime/input/FlinkInput.java
similarity index 100%
rename from flink-staging/flink-tez/src/main/java/org/apache/flink/tez/runtime/input/FlinkInput.java
rename to flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/runtime/input/FlinkInput.java
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/runtime/input/FlinkInputSplitGenerator.java b/flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/runtime/input/FlinkInputSplitGenerator.java
similarity index 100%
rename from flink-staging/flink-tez/src/main/java/org/apache/flink/tez/runtime/input/FlinkInputSplitGenerator.java
rename to flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/runtime/input/FlinkInputSplitGenerator.java
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/runtime/input/TezReaderIterator.java b/flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/runtime/input/TezReaderIterator.java
similarity index 100%
rename from flink-staging/flink-tez/src/main/java/org/apache/flink/tez/runtime/input/TezReaderIterator.java
rename to flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/runtime/input/TezReaderIterator.java
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/runtime/output/SimplePartitioner.java b/flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/runtime/output/SimplePartitioner.java
similarity index 100%
rename from flink-staging/flink-tez/src/main/java/org/apache/flink/tez/runtime/output/SimplePartitioner.java
rename to flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/runtime/output/SimplePartitioner.java
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/runtime/output/TezChannelSelector.java b/flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/runtime/output/TezChannelSelector.java
similarity index 100%
rename from flink-staging/flink-tez/src/main/java/org/apache/flink/tez/runtime/output/TezChannelSelector.java
rename to flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/runtime/output/TezChannelSelector.java
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/runtime/output/TezOutputCollector.java b/flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/runtime/output/TezOutputCollector.java
similarity index 100%
rename from flink-staging/flink-tez/src/main/java/org/apache/flink/tez/runtime/output/TezOutputCollector.java
rename to flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/runtime/output/TezOutputCollector.java
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/runtime/output/TezOutputEmitter.java b/flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/runtime/output/TezOutputEmitter.java
similarity index 100%
rename from flink-staging/flink-tez/src/main/java/org/apache/flink/tez/runtime/output/TezOutputEmitter.java
rename to flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/runtime/output/TezOutputEmitter.java
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/util/DummyInvokable.java b/flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/util/DummyInvokable.java
similarity index 100%
rename from flink-staging/flink-tez/src/main/java/org/apache/flink/tez/util/DummyInvokable.java
rename to flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/util/DummyInvokable.java
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/util/EncodingUtils.java b/flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/util/EncodingUtils.java
similarity index 100%
rename from flink-staging/flink-tez/src/main/java/org/apache/flink/tez/util/EncodingUtils.java
rename to flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/util/EncodingUtils.java
diff --git a/flink-staging/flink-tez/src/main/java/org/apache/flink/tez/util/FlinkSerialization.java b/flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/util/FlinkSerialization.java
similarity index 100%
rename from flink-staging/flink-tez/src/main/java/org/apache/flink/tez/util/FlinkSerialization.java
rename to flink-contrib/flink-tez/src/main/java/org/apache/flink/tez/util/FlinkSerialization.java
diff --git a/flink-staging/flink-tez/src/main/resources/log4j.properties b/flink-contrib/flink-tez/src/main/resources/log4j.properties
similarity index 100%
rename from flink-staging/flink-tez/src/main/resources/log4j.properties
rename to flink-contrib/flink-tez/src/main/resources/log4j.properties
diff --git a/flink-staging/flink-tez/src/test/java/org/apache/flink/tez/test/ConnectedComponentsStepITCase.java b/flink-contrib/flink-tez/src/test/java/org/apache/flink/tez/test/ConnectedComponentsStepITCase.java
similarity index 100%
rename from flink-staging/flink-tez/src/test/java/org/apache/flink/tez/test/ConnectedComponentsStepITCase.java
rename to flink-contrib/flink-tez/src/test/java/org/apache/flink/tez/test/ConnectedComponentsStepITCase.java
diff --git a/flink-staging/flink-tez/src/test/java/org/apache/flink/tez/test/PageRankBasicStepITCase.java b/flink-contrib/flink-tez/src/test/java/org/apache/flink/tez/test/PageRankBasicStepITCase.java
similarity index 100%
rename from flink-staging/flink-tez/src/test/java/org/apache/flink/tez/test/PageRankBasicStepITCase.java
rename to flink-contrib/flink-tez/src/test/java/org/apache/flink/tez/test/PageRankBasicStepITCase.java
diff --git a/flink-staging/flink-tez/src/test/java/org/apache/flink/tez/test/TezProgramTestBase.java b/flink-contrib/flink-tez/src/test/java/org/apache/flink/tez/test/TezProgramTestBase.java
similarity index 100%
rename from flink-staging/flink-tez/src/test/java/org/apache/flink/tez/test/TezProgramTestBase.java
rename to flink-contrib/flink-tez/src/test/java/org/apache/flink/tez/test/TezProgramTestBase.java
diff --git a/flink-staging/flink-tez/src/test/java/org/apache/flink/tez/test/WebLogAnalysisITCase.java b/flink-contrib/flink-tez/src/test/java/org/apache/flink/tez/test/WebLogAnalysisITCase.java
similarity index 100%
rename from flink-staging/flink-tez/src/test/java/org/apache/flink/tez/test/WebLogAnalysisITCase.java
rename to flink-contrib/flink-tez/src/test/java/org/apache/flink/tez/test/WebLogAnalysisITCase.java
diff --git a/flink-staging/flink-tez/src/test/java/org/apache/flink/tez/test/WordCountITCase.java b/flink-contrib/flink-tez/src/test/java/org/apache/flink/tez/test/WordCountITCase.java
similarity index 100%
rename from flink-staging/flink-tez/src/test/java/org/apache/flink/tez/test/WordCountITCase.java
rename to flink-contrib/flink-tez/src/test/java/org/apache/flink/tez/test/WordCountITCase.java
diff --git a/flink-staging/flink-tez/src/test/resources/log4j-test.properties b/flink-contrib/flink-tez/src/test/resources/log4j-test.properties
similarity index 100%
rename from flink-staging/flink-tez/src/test/resources/log4j-test.properties
rename to flink-contrib/flink-tez/src/test/resources/log4j-test.properties
diff --git a/flink-staging/flink-tez/src/test/resources/logback-test.xml b/flink-contrib/flink-tez/src/test/resources/logback-test.xml
similarity index 100%
rename from flink-staging/flink-tez/src/test/resources/logback-test.xml
rename to flink-contrib/flink-tez/src/test/resources/logback-test.xml
diff --git a/flink-contrib/pom.xml b/flink-contrib/pom.xml
index 80080582d1c8d..5901621a3b612 100644
--- a/flink-contrib/pom.xml
+++ b/flink-contrib/pom.xml
@@ -31,6 +31,11 @@ under the License.
 		<relativePath>..</relativePath>
 	</parent>
 
+	<artifactId>flink-contrib-parent</artifactId>
+	<name>flink-contrib-parent</name>
+
+	<packaging>pom</packaging>
+
 	<modules>
 		<module>flink-storm</module>
 		<module>flink-storm-examples</module>
@@ -40,9 +45,14 @@ under the License.
 		<module>flink-connector-wikiedits</module>
 	</modules>
 
-	<artifactId>flink-contrib-parent</artifactId>
-	<name>flink-contrib</name>
 
-	<packaging>pom</packaging>
+	<profiles>
+		<profile>
+			<id>include-tez</id>
+			<modules>
+				<module>flink-tez</module>
+			</modules>
+		</profile>
+	</profiles>
 
 </project>
diff --git a/flink-dist/src/main/assemblies/bin.xml b/flink-dist/src/main/assemblies/bin.xml
index b0672803e3f4b..c28f01a4609e3 100644
--- a/flink-dist/src/main/assemblies/bin.xml
+++ b/flink-dist/src/main/assemblies/bin.xml
@@ -71,7 +71,7 @@ under the License.
 		
 		<!-- flink scala shell-->
 		<fileSet>
-			<directory>../flink-staging/flink-scala-shell/start-script/</directory>
+			<directory>../flink-scala-shell/start-script/</directory>
 			<outputDirectory>bin</outputDirectory>
 			<fileMode>755</fileMode>
 		</fileSet>
@@ -138,17 +138,6 @@ under the License.
 			<outputDirectory>tools</outputDirectory>
 			<fileMode>0644</fileMode>
 		</fileSet>
-		<fileSet>
-			<directory>../flink-clients/src/main/resources/web-docs</directory>
-			<outputDirectory>tools</outputDirectory>
-			<fileMode>0644</fileMode>
-			<excludes>
-				<exclude>*.html</exclude>
-				<exclude>img/delete-icon.png</exclude>
-				<exclude>img/GradientBoxes.png</exclude>
-				<exclude>img/gradient.jpg</exclude>
-			</excludes>
-		</fileSet>
 
 		<!-- copy jar files of the batch examples -->
 		<fileSet>
diff --git a/flink-examples/flink-examples-batch/pom.xml b/flink-examples/flink-examples-batch/pom.xml
index e31f35c9bbce8..d18a6f15ac4eb 100644
--- a/flink-examples/flink-examples-batch/pom.xml
+++ b/flink-examples/flink-examples-batch/pom.xml
@@ -246,13 +246,13 @@ under the License.
 					
 					<!-- EnumTriangles Basic -->
 					<execution>
-						<id>EnumerateGraphTriangles</id>
+						<id>EnumTriangles</id>
 						<phase>package</phase>
 						<goals>
 							<goal>jar</goal>
 						</goals>
 						<configuration>
-							<classifier>EnumerateGraphTriangles</classifier>
+							<classifier>EnumTriangles</classifier>
 
 							<archive>
 								<manifestEntries>
@@ -383,7 +383,7 @@ under the License.
 							<target>
 								<copy file="${project.basedir}/target/flink-examples-batch-${project.version}-KMeans.jar" tofile="${project.basedir}/target/KMeans.jar" />
 								<copy file="${project.basedir}/target/flink-examples-batch-${project.version}-ConnectedComponents.jar" tofile="${project.basedir}/target/ConnectedComponents.jar" />
-								<copy file="${project.basedir}/target/flink-examples-batch-${project.version}-EnumerateGraphTriangles.jar" tofile="${project.basedir}/target/EnumerateGraphTriangles.jar" />
+								<copy file="${project.basedir}/target/flink-examples-batch-${project.version}-EnumTriangles.jar" tofile="${project.basedir}/target/EnumTriangles.jar" />
 								<copy file="${project.basedir}/target/flink-examples-batch-${project.version}-PageRank.jar" tofile="${project.basedir}/target/PageRank.jar" />
 								<copy file="${project.basedir}/target/flink-examples-batch-${project.version}-TransitiveClosure.jar" tofile="${project.basedir}/target/TransitiveClosure.jar" />
 								<copy file="${project.basedir}/target/flink-examples-batch-${project.version}-WebLogAnalysis.jar" tofile="${project.basedir}/target/WebLogAnalysis.jar" />
diff --git a/flink-staging/flink-fs-tests/pom.xml b/flink-fs-tests/pom.xml
similarity index 98%
rename from flink-staging/flink-fs-tests/pom.xml
rename to flink-fs-tests/pom.xml
index 69c5f30f0ea1b..f8a2c3f6add46 100644
--- a/flink-staging/flink-fs-tests/pom.xml
+++ b/flink-fs-tests/pom.xml
@@ -22,7 +22,7 @@ under the License.
 
 	<parent>
 		<groupId>org.apache.flink</groupId>
-		<artifactId>flink-staging</artifactId>
+		<artifactId>flink-parent</artifactId>
 		<version>1.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
diff --git a/flink-staging/flink-fs-tests/src/test/java/org/apache/flink/hdfstests/FileStateBackendTest.java b/flink-fs-tests/src/test/java/org/apache/flink/hdfstests/FileStateBackendTest.java
similarity index 100%
rename from flink-staging/flink-fs-tests/src/test/java/org/apache/flink/hdfstests/FileStateBackendTest.java
rename to flink-fs-tests/src/test/java/org/apache/flink/hdfstests/FileStateBackendTest.java
diff --git a/flink-staging/flink-fs-tests/src/test/java/org/apache/flink/hdfstests/HDFSTest.java b/flink-fs-tests/src/test/java/org/apache/flink/hdfstests/HDFSTest.java
similarity index 100%
rename from flink-staging/flink-fs-tests/src/test/java/org/apache/flink/hdfstests/HDFSTest.java
rename to flink-fs-tests/src/test/java/org/apache/flink/hdfstests/HDFSTest.java
diff --git a/flink-staging/flink-fs-tests/src/test/resources/log4j-test.properties b/flink-fs-tests/src/test/resources/log4j-test.properties
similarity index 100%
rename from flink-staging/flink-fs-tests/src/test/resources/log4j-test.properties
rename to flink-fs-tests/src/test/resources/log4j-test.properties
diff --git a/flink-staging/flink-fs-tests/src/test/resources/log4j.properties b/flink-fs-tests/src/test/resources/log4j.properties
similarity index 100%
rename from flink-staging/flink-fs-tests/src/test/resources/log4j.properties
rename to flink-fs-tests/src/test/resources/log4j.properties
diff --git a/flink-staging/flink-ml/README.md b/flink-libraries/flink-ml/README.md
similarity index 100%
rename from flink-staging/flink-ml/README.md
rename to flink-libraries/flink-ml/README.md
diff --git a/flink-staging/flink-ml/pom.xml b/flink-libraries/flink-ml/pom.xml
similarity index 99%
rename from flink-staging/flink-ml/pom.xml
rename to flink-libraries/flink-ml/pom.xml
index 80c464c2aadda..2dd0516334508 100644
--- a/flink-staging/flink-ml/pom.xml
+++ b/flink-libraries/flink-ml/pom.xml
@@ -23,7 +23,7 @@
 
 	<parent>
 		<groupId>org.apache.flink</groupId>
-		<artifactId>flink-staging</artifactId>
+		<artifactId>flink-libraries</artifactId>
 		<version>1.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/MLUtils.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/MLUtils.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/MLUtils.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/MLUtils.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/classification/SVM.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/classification/SVM.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/classification/SVM.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/classification/SVM.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/common/Block.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/common/Block.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/common/Block.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/common/Block.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/common/FlinkMLTools.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/common/FlinkMLTools.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/common/FlinkMLTools.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/common/FlinkMLTools.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/common/LabeledVector.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/common/LabeledVector.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/common/LabeledVector.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/common/LabeledVector.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/common/ParameterMap.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/common/ParameterMap.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/common/ParameterMap.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/common/ParameterMap.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/common/WeightVector.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/common/WeightVector.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/common/WeightVector.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/common/WeightVector.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/common/WithParameters.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/common/WithParameters.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/common/WithParameters.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/common/WithParameters.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/math/BLAS.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/math/BLAS.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/math/BLAS.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/math/BLAS.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/math/Breeze.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/math/Breeze.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/math/Breeze.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/math/Breeze.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/math/BreezeVectorConverter.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/math/BreezeVectorConverter.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/math/BreezeVectorConverter.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/math/BreezeVectorConverter.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/math/DenseMatrix.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/math/DenseMatrix.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/math/DenseMatrix.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/math/DenseMatrix.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/math/DenseVector.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/math/DenseVector.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/math/DenseVector.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/math/DenseVector.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/math/Matrix.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/math/Matrix.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/math/Matrix.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/math/Matrix.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/math/SparseMatrix.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/math/SparseMatrix.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/math/SparseMatrix.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/math/SparseMatrix.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/math/SparseVector.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/math/SparseVector.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/math/SparseVector.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/math/SparseVector.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/math/Vector.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/math/Vector.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/math/Vector.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/math/Vector.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/math/VectorBuilder.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/math/VectorBuilder.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/math/VectorBuilder.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/math/VectorBuilder.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/math/package.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/math/package.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/math/package.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/math/package.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/metrics/distances/ChebyshevDistanceMetric.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/metrics/distances/ChebyshevDistanceMetric.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/metrics/distances/ChebyshevDistanceMetric.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/metrics/distances/ChebyshevDistanceMetric.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/metrics/distances/CosineDistanceMetric.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/metrics/distances/CosineDistanceMetric.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/metrics/distances/CosineDistanceMetric.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/metrics/distances/CosineDistanceMetric.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/metrics/distances/DistanceMetric.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/metrics/distances/DistanceMetric.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/metrics/distances/DistanceMetric.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/metrics/distances/DistanceMetric.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/metrics/distances/EuclideanDistanceMetric.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/metrics/distances/EuclideanDistanceMetric.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/metrics/distances/EuclideanDistanceMetric.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/metrics/distances/EuclideanDistanceMetric.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/metrics/distances/ManhattanDistanceMetric.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/metrics/distances/ManhattanDistanceMetric.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/metrics/distances/ManhattanDistanceMetric.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/metrics/distances/ManhattanDistanceMetric.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/metrics/distances/MinkowskiDistanceMetric.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/metrics/distances/MinkowskiDistanceMetric.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/metrics/distances/MinkowskiDistanceMetric.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/metrics/distances/MinkowskiDistanceMetric.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/metrics/distances/SquaredEuclideanDistanceMetric.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/metrics/distances/SquaredEuclideanDistanceMetric.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/metrics/distances/SquaredEuclideanDistanceMetric.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/metrics/distances/SquaredEuclideanDistanceMetric.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/metrics/distances/TanimotoDistanceMetric.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/metrics/distances/TanimotoDistanceMetric.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/metrics/distances/TanimotoDistanceMetric.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/metrics/distances/TanimotoDistanceMetric.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/optimization/GradientDescent.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/optimization/GradientDescent.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/optimization/GradientDescent.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/optimization/GradientDescent.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/optimization/LossFunction.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/optimization/LossFunction.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/optimization/LossFunction.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/optimization/LossFunction.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/optimization/PartialLossFunction.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/optimization/PartialLossFunction.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/optimization/PartialLossFunction.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/optimization/PartialLossFunction.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/optimization/PredictionFunction.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/optimization/PredictionFunction.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/optimization/PredictionFunction.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/optimization/PredictionFunction.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/optimization/Solver.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/optimization/Solver.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/optimization/Solver.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/optimization/Solver.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/package.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/package.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/package.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/package.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/pipeline/ChainedPredictor.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/pipeline/ChainedPredictor.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/pipeline/ChainedPredictor.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/pipeline/ChainedPredictor.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/pipeline/ChainedTransformer.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/pipeline/ChainedTransformer.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/pipeline/ChainedTransformer.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/pipeline/ChainedTransformer.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/pipeline/Estimator.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/pipeline/Estimator.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/pipeline/Estimator.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/pipeline/Estimator.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/pipeline/Predictor.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/pipeline/Predictor.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/pipeline/Predictor.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/pipeline/Predictor.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/pipeline/Transformer.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/pipeline/Transformer.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/pipeline/Transformer.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/pipeline/Transformer.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/preprocessing/MinMaxScaler.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/preprocessing/MinMaxScaler.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/preprocessing/MinMaxScaler.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/preprocessing/MinMaxScaler.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/preprocessing/PolynomialFeatures.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/preprocessing/PolynomialFeatures.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/preprocessing/PolynomialFeatures.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/preprocessing/PolynomialFeatures.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/preprocessing/StandardScaler.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/preprocessing/StandardScaler.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/preprocessing/StandardScaler.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/preprocessing/StandardScaler.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/recommendation/ALS.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/recommendation/ALS.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/recommendation/ALS.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/recommendation/ALS.scala
diff --git a/flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/regression/MultipleLinearRegression.scala b/flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/regression/MultipleLinearRegression.scala
similarity index 100%
rename from flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/regression/MultipleLinearRegression.scala
rename to flink-libraries/flink-ml/src/main/scala/org/apache/flink/ml/regression/MultipleLinearRegression.scala
diff --git a/flink-staging/flink-ml/src/test/resources/log4j-test.properties b/flink-libraries/flink-ml/src/test/resources/log4j-test.properties
similarity index 100%
rename from flink-staging/flink-ml/src/test/resources/log4j-test.properties
rename to flink-libraries/flink-ml/src/test/resources/log4j-test.properties
diff --git a/flink-staging/flink-ml/src/test/resources/logback-test.xml b/flink-libraries/flink-ml/src/test/resources/logback-test.xml
similarity index 100%
rename from flink-staging/flink-ml/src/test/resources/logback-test.xml
rename to flink-libraries/flink-ml/src/test/resources/logback-test.xml
diff --git a/flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/MLUtilsSuite.scala b/flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/MLUtilsSuite.scala
similarity index 100%
rename from flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/MLUtilsSuite.scala
rename to flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/MLUtilsSuite.scala
diff --git a/flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/classification/Classification.scala b/flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/classification/Classification.scala
similarity index 100%
rename from flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/classification/Classification.scala
rename to flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/classification/Classification.scala
diff --git a/flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/classification/SVMITSuite.scala b/flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/classification/SVMITSuite.scala
similarity index 100%
rename from flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/classification/SVMITSuite.scala
rename to flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/classification/SVMITSuite.scala
diff --git a/flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/common/FlinkMLToolsSuite.scala b/flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/common/FlinkMLToolsSuite.scala
similarity index 100%
rename from flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/common/FlinkMLToolsSuite.scala
rename to flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/common/FlinkMLToolsSuite.scala
diff --git a/flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/math/BreezeMathSuite.scala b/flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/math/BreezeMathSuite.scala
similarity index 100%
rename from flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/math/BreezeMathSuite.scala
rename to flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/math/BreezeMathSuite.scala
diff --git a/flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/math/DenseMatrixSuite.scala b/flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/math/DenseMatrixSuite.scala
similarity index 100%
rename from flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/math/DenseMatrixSuite.scala
rename to flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/math/DenseMatrixSuite.scala
diff --git a/flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/math/DenseVectorSuite.scala b/flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/math/DenseVectorSuite.scala
similarity index 100%
rename from flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/math/DenseVectorSuite.scala
rename to flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/math/DenseVectorSuite.scala
diff --git a/flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/math/SparseMatrixSuite.scala b/flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/math/SparseMatrixSuite.scala
similarity index 100%
rename from flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/math/SparseMatrixSuite.scala
rename to flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/math/SparseMatrixSuite.scala
diff --git a/flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/math/SparseVectorSuite.scala b/flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/math/SparseVectorSuite.scala
similarity index 100%
rename from flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/math/SparseVectorSuite.scala
rename to flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/math/SparseVectorSuite.scala
diff --git a/flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/metrics/distances/DistanceMetricSuite.scala b/flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/metrics/distances/DistanceMetricSuite.scala
similarity index 100%
rename from flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/metrics/distances/DistanceMetricSuite.scala
rename to flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/metrics/distances/DistanceMetricSuite.scala
diff --git a/flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/optimization/GradientDescentITSuite.scala b/flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/optimization/GradientDescentITSuite.scala
similarity index 100%
rename from flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/optimization/GradientDescentITSuite.scala
rename to flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/optimization/GradientDescentITSuite.scala
diff --git a/flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/optimization/LossFunctionITSuite.scala b/flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/optimization/LossFunctionITSuite.scala
similarity index 100%
rename from flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/optimization/LossFunctionITSuite.scala
rename to flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/optimization/LossFunctionITSuite.scala
diff --git a/flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/optimization/PredictionFunctionITSuite.scala b/flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/optimization/PredictionFunctionITSuite.scala
similarity index 100%
rename from flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/optimization/PredictionFunctionITSuite.scala
rename to flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/optimization/PredictionFunctionITSuite.scala
diff --git a/flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/pipeline/PipelineITSuite.scala b/flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/pipeline/PipelineITSuite.scala
similarity index 100%
rename from flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/pipeline/PipelineITSuite.scala
rename to flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/pipeline/PipelineITSuite.scala
diff --git a/flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/preprocessing/MinMaxScalerITSuite.scala b/flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/preprocessing/MinMaxScalerITSuite.scala
similarity index 100%
rename from flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/preprocessing/MinMaxScalerITSuite.scala
rename to flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/preprocessing/MinMaxScalerITSuite.scala
diff --git a/flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/preprocessing/PolynomialFeaturesITSuite.scala b/flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/preprocessing/PolynomialFeaturesITSuite.scala
similarity index 100%
rename from flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/preprocessing/PolynomialFeaturesITSuite.scala
rename to flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/preprocessing/PolynomialFeaturesITSuite.scala
diff --git a/flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/preprocessing/StandardScalerITSuite.scala b/flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/preprocessing/StandardScalerITSuite.scala
similarity index 100%
rename from flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/preprocessing/StandardScalerITSuite.scala
rename to flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/preprocessing/StandardScalerITSuite.scala
diff --git a/flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/recommendation/ALSITSuite.scala b/flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/recommendation/ALSITSuite.scala
similarity index 100%
rename from flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/recommendation/ALSITSuite.scala
rename to flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/recommendation/ALSITSuite.scala
diff --git a/flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/recommendation/Recommendation.scala b/flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/recommendation/Recommendation.scala
similarity index 100%
rename from flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/recommendation/Recommendation.scala
rename to flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/recommendation/Recommendation.scala
diff --git a/flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/regression/MultipleLinearRegressionITSuite.scala b/flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/regression/MultipleLinearRegressionITSuite.scala
similarity index 100%
rename from flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/regression/MultipleLinearRegressionITSuite.scala
rename to flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/regression/MultipleLinearRegressionITSuite.scala
diff --git a/flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/regression/RegressionData.scala b/flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/regression/RegressionData.scala
similarity index 100%
rename from flink-staging/flink-ml/src/test/scala/org/apache/flink/ml/regression/RegressionData.scala
rename to flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/regression/RegressionData.scala
diff --git a/flink-staging/flink-table/pom.xml b/flink-libraries/flink-table/pom.xml
similarity index 99%
rename from flink-staging/flink-table/pom.xml
rename to flink-libraries/flink-table/pom.xml
index f13f4225092a9..19951cbc3e1a1 100644
--- a/flink-staging/flink-table/pom.xml
+++ b/flink-libraries/flink-table/pom.xml
@@ -22,7 +22,7 @@ under the License.
 
 	<parent>
 		<groupId>org.apache.flink</groupId>
-		<artifactId>flink-staging</artifactId>
+		<artifactId>flink-libraries</artifactId>
 		<version>1.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
diff --git a/flink-staging/flink-table/src/main/java/org/apache/flink/api/java/table/package-info.java b/flink-libraries/flink-table/src/main/java/org/apache/flink/api/java/table/package-info.java
similarity index 100%
rename from flink-staging/flink-table/src/main/java/org/apache/flink/api/java/table/package-info.java
rename to flink-libraries/flink-table/src/main/java/org/apache/flink/api/java/table/package-info.java
diff --git a/flink-staging/flink-table/src/main/java/org/apache/flink/api/table/package-info.java b/flink-libraries/flink-table/src/main/java/org/apache/flink/api/table/package-info.java
similarity index 100%
rename from flink-staging/flink-table/src/main/java/org/apache/flink/api/table/package-info.java
rename to flink-libraries/flink-table/src/main/java/org/apache/flink/api/table/package-info.java
diff --git a/flink-staging/flink-table/src/main/java/org/apache/flink/examples/java/JavaTableExample.java b/flink-libraries/flink-table/src/main/java/org/apache/flink/examples/java/JavaTableExample.java
similarity index 100%
rename from flink-staging/flink-table/src/main/java/org/apache/flink/examples/java/JavaTableExample.java
rename to flink-libraries/flink-table/src/main/java/org/apache/flink/examples/java/JavaTableExample.java
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/java/table/JavaBatchTranslator.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/java/table/JavaBatchTranslator.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/java/table/JavaBatchTranslator.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/java/table/JavaBatchTranslator.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/java/table/JavaStreamingTranslator.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/java/table/JavaStreamingTranslator.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/java/table/JavaStreamingTranslator.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/java/table/JavaStreamingTranslator.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/java/table/TableEnvironment.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/java/table/TableEnvironment.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/java/table/TableEnvironment.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/java/table/TableEnvironment.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/scala/table/DataSetConversions.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/DataSetConversions.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/scala/table/DataSetConversions.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/DataSetConversions.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/scala/table/DataStreamConversions.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/DataStreamConversions.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/scala/table/DataStreamConversions.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/DataStreamConversions.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/scala/table/ScalaBatchTranslator.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/ScalaBatchTranslator.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/scala/table/ScalaBatchTranslator.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/ScalaBatchTranslator.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/scala/table/ScalaStreamingTranslator.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/ScalaStreamingTranslator.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/scala/table/ScalaStreamingTranslator.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/ScalaStreamingTranslator.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/scala/table/TableConversions.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/TableConversions.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/scala/table/TableConversions.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/TableConversions.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/scala/table/expressionDsl.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/expressionDsl.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/scala/table/expressionDsl.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/expressionDsl.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/scala/table/package.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/package.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/scala/table/package.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/scala/table/package.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/ExpressionException.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/ExpressionException.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/ExpressionException.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/ExpressionException.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/Row.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/Row.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/Row.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/Row.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/Table.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/Table.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/Table.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/Table.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/TableConfig.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/TableConfig.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/TableConfig.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/TableConfig.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/ExpressionCodeGenerator.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/ExpressionCodeGenerator.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/ExpressionCodeGenerator.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/ExpressionCodeGenerator.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/GenerateFilter.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/GenerateFilter.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/GenerateFilter.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/GenerateFilter.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/GenerateJoin.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/GenerateJoin.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/GenerateJoin.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/GenerateJoin.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/GenerateResultAssembler.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/GenerateResultAssembler.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/GenerateResultAssembler.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/GenerateResultAssembler.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/GenerateSelect.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/GenerateSelect.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/GenerateSelect.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/GenerateSelect.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/Indenter.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/Indenter.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/Indenter.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/Indenter.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/package.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/package.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/package.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/codegen/package.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/Expression.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/Expression.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/Expression.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/Expression.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/aggregations.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/aggregations.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/aggregations.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/aggregations.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/ExtractEquiJoinFields.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/ExtractEquiJoinFields.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/ExtractEquiJoinFields.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/ExtractEquiJoinFields.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/GroupByAnalyzer.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/GroupByAnalyzer.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/GroupByAnalyzer.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/GroupByAnalyzer.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/InsertAutoCasts.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/InsertAutoCasts.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/InsertAutoCasts.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/InsertAutoCasts.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/PredicateAnalyzer.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/PredicateAnalyzer.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/PredicateAnalyzer.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/PredicateAnalyzer.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/ResolveFieldReferences.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/ResolveFieldReferences.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/ResolveFieldReferences.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/ResolveFieldReferences.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/SelectionAnalyzer.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/SelectionAnalyzer.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/SelectionAnalyzer.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/SelectionAnalyzer.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/TypeCheck.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/TypeCheck.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/TypeCheck.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/TypeCheck.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/VerifyBoolean.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/VerifyBoolean.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/VerifyBoolean.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/VerifyBoolean.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/VerifyNoAggregates.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/VerifyNoAggregates.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/VerifyNoAggregates.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/VerifyNoAggregates.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/VerifyNoNestedAggregates.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/VerifyNoNestedAggregates.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/VerifyNoNestedAggregates.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/analysis/VerifyNoNestedAggregates.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/arithmetic.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/arithmetic.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/arithmetic.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/arithmetic.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/cast.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/cast.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/cast.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/cast.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/comparison.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/comparison.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/comparison.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/comparison.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/fieldExpression.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/fieldExpression.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/fieldExpression.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/fieldExpression.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/literals.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/literals.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/literals.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/literals.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/logic.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/logic.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/logic.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/logic.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/package.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/package.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/package.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/package.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/stringExpressions.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/stringExpressions.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/expressions/stringExpressions.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/expressions/stringExpressions.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/package.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/package.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/package.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/package.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/parser/ExpressionParser.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/parser/ExpressionParser.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/parser/ExpressionParser.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/parser/ExpressionParser.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/plan/ExpandAggregations.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/ExpandAggregations.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/plan/ExpandAggregations.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/ExpandAggregations.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/plan/PlanTranslator.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/PlanTranslator.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/plan/PlanTranslator.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/PlanTranslator.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/plan/operations.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/operations.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/plan/operations.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/operations.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/plan/package.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/package.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/plan/package.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/plan/package.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/runtime/ExpressionAggregateFunction.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/ExpressionAggregateFunction.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/runtime/ExpressionAggregateFunction.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/ExpressionAggregateFunction.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/runtime/ExpressionFilterFunction.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/ExpressionFilterFunction.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/runtime/ExpressionFilterFunction.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/ExpressionFilterFunction.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/runtime/ExpressionJoinFunction.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/ExpressionJoinFunction.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/runtime/ExpressionJoinFunction.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/ExpressionJoinFunction.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/runtime/ExpressionSelectFunction.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/ExpressionSelectFunction.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/runtime/ExpressionSelectFunction.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/ExpressionSelectFunction.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/runtime/package.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/package.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/runtime/package.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/runtime/package.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/trees/Analyzer.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/trees/Analyzer.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/trees/Analyzer.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/trees/Analyzer.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/trees/Rule.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/trees/Rule.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/trees/Rule.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/trees/Rule.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/trees/TreeNode.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/trees/TreeNode.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/trees/TreeNode.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/trees/TreeNode.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/typeinfo/RenameOperator.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeinfo/RenameOperator.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/typeinfo/RenameOperator.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeinfo/RenameOperator.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/typeinfo/RenamingProxyTypeInfo.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeinfo/RenamingProxyTypeInfo.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/typeinfo/RenamingProxyTypeInfo.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeinfo/RenamingProxyTypeInfo.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/typeinfo/RowSerializer.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeinfo/RowSerializer.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/typeinfo/RowSerializer.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeinfo/RowSerializer.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/typeinfo/RowTypeInfo.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeinfo/RowTypeInfo.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/typeinfo/RowTypeInfo.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/api/table/typeinfo/RowTypeInfo.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/examples/scala/PageRankTable.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/PageRankTable.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/examples/scala/PageRankTable.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/PageRankTable.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/examples/scala/StreamingTableFilter.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/StreamingTableFilter.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/examples/scala/StreamingTableFilter.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/StreamingTableFilter.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/examples/scala/TPCHQuery3Table.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/TPCHQuery3Table.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/examples/scala/TPCHQuery3Table.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/TPCHQuery3Table.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/examples/scala/WordCountTable.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/WordCountTable.scala
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/examples/scala/WordCountTable.scala
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/examples/scala/WordCountTable.scala
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/explain/Node.java b/flink-libraries/flink-table/src/main/scala/org/apache/flink/explain/Node.java
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/explain/Node.java
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/explain/Node.java
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/explain/PlanJsonParser.java b/flink-libraries/flink-table/src/main/scala/org/apache/flink/explain/PlanJsonParser.java
similarity index 100%
rename from flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/explain/PlanJsonParser.java
rename to flink-libraries/flink-table/src/main/scala/org/apache/flink/explain/PlanJsonParser.java
diff --git a/flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/AggregationsITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/AggregationsITCase.java
similarity index 100%
rename from flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/AggregationsITCase.java
rename to flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/AggregationsITCase.java
diff --git a/flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/AsITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/AsITCase.java
similarity index 100%
rename from flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/AsITCase.java
rename to flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/AsITCase.java
diff --git a/flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/CastingITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/CastingITCase.java
similarity index 100%
rename from flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/CastingITCase.java
rename to flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/CastingITCase.java
diff --git a/flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/ExpressionsITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/ExpressionsITCase.java
similarity index 100%
rename from flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/ExpressionsITCase.java
rename to flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/ExpressionsITCase.java
diff --git a/flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/FilterITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/FilterITCase.java
similarity index 100%
rename from flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/FilterITCase.java
rename to flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/FilterITCase.java
diff --git a/flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/GroupedAggregationsITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/GroupedAggregationsITCase.java
similarity index 100%
rename from flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/GroupedAggregationsITCase.java
rename to flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/GroupedAggregationsITCase.java
diff --git a/flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/JoinITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/JoinITCase.java
similarity index 100%
rename from flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/JoinITCase.java
rename to flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/JoinITCase.java
diff --git a/flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/PojoGroupingITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/PojoGroupingITCase.java
similarity index 100%
rename from flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/PojoGroupingITCase.java
rename to flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/PojoGroupingITCase.java
diff --git a/flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/SelectITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/SelectITCase.java
similarity index 100%
rename from flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/SelectITCase.java
rename to flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/SelectITCase.java
diff --git a/flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/SqlExplainITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/SqlExplainITCase.java
similarity index 100%
rename from flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/SqlExplainITCase.java
rename to flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/SqlExplainITCase.java
diff --git a/flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/StringExpressionsITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/StringExpressionsITCase.java
similarity index 100%
rename from flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/StringExpressionsITCase.java
rename to flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/StringExpressionsITCase.java
diff --git a/flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/UnionITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/UnionITCase.java
similarity index 100%
rename from flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/UnionITCase.java
rename to flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/UnionITCase.java
diff --git a/flink-staging/flink-table/src/test/java/org/apache/flink/api/scala/table/test/PageRankTableITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/scala/table/test/PageRankTableITCase.java
similarity index 100%
rename from flink-staging/flink-table/src/test/java/org/apache/flink/api/scala/table/test/PageRankTableITCase.java
rename to flink-libraries/flink-table/src/test/java/org/apache/flink/api/scala/table/test/PageRankTableITCase.java
diff --git a/flink-staging/flink-table/src/test/java/org/apache/flink/api/scala/table/test/TypeExceptionTest.scala b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/scala/table/test/TypeExceptionTest.scala
similarity index 100%
rename from flink-staging/flink-table/src/test/java/org/apache/flink/api/scala/table/test/TypeExceptionTest.scala
rename to flink-libraries/flink-table/src/test/java/org/apache/flink/api/scala/table/test/TypeExceptionTest.scala
diff --git a/flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/AggregationsITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/AggregationsITCase.scala
similarity index 100%
rename from flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/AggregationsITCase.scala
rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/AggregationsITCase.scala
diff --git a/flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/AsITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/AsITCase.scala
similarity index 100%
rename from flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/AsITCase.scala
rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/AsITCase.scala
diff --git a/flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/CastingITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/CastingITCase.scala
similarity index 100%
rename from flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/CastingITCase.scala
rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/CastingITCase.scala
diff --git a/flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/ExpressionsITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/ExpressionsITCase.scala
similarity index 100%
rename from flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/ExpressionsITCase.scala
rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/ExpressionsITCase.scala
diff --git a/flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/FilterITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/FilterITCase.scala
similarity index 100%
rename from flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/FilterITCase.scala
rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/FilterITCase.scala
diff --git a/flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/GroupedAggreagationsITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/GroupedAggreagationsITCase.scala
similarity index 100%
rename from flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/GroupedAggreagationsITCase.scala
rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/GroupedAggreagationsITCase.scala
diff --git a/flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/JoinITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/JoinITCase.scala
similarity index 100%
rename from flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/JoinITCase.scala
rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/JoinITCase.scala
diff --git a/flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/SelectITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/SelectITCase.scala
similarity index 100%
rename from flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/SelectITCase.scala
rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/SelectITCase.scala
diff --git a/flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/SqlExplainITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/SqlExplainITCase.scala
similarity index 100%
rename from flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/SqlExplainITCase.scala
rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/SqlExplainITCase.scala
diff --git a/flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/StringExpressionsITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/StringExpressionsITCase.scala
similarity index 100%
rename from flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/StringExpressionsITCase.scala
rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/StringExpressionsITCase.scala
diff --git a/flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/UnionITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/UnionITCase.scala
similarity index 100%
rename from flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/UnionITCase.scala
rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/UnionITCase.scala
diff --git a/flink-staging/flink-table/src/test/scala/org/apache/flink/api/table/typeinfo/RenamingProxyTypeInfoTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/typeinfo/RenamingProxyTypeInfoTest.scala
similarity index 100%
rename from flink-staging/flink-table/src/test/scala/org/apache/flink/api/table/typeinfo/RenamingProxyTypeInfoTest.scala
rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/typeinfo/RenamingProxyTypeInfoTest.scala
diff --git a/flink-staging/flink-table/src/test/scala/resources/testFilter0.out b/flink-libraries/flink-table/src/test/scala/resources/testFilter0.out
similarity index 100%
rename from flink-staging/flink-table/src/test/scala/resources/testFilter0.out
rename to flink-libraries/flink-table/src/test/scala/resources/testFilter0.out
diff --git a/flink-staging/flink-table/src/test/scala/resources/testFilter1.out b/flink-libraries/flink-table/src/test/scala/resources/testFilter1.out
similarity index 100%
rename from flink-staging/flink-table/src/test/scala/resources/testFilter1.out
rename to flink-libraries/flink-table/src/test/scala/resources/testFilter1.out
diff --git a/flink-staging/flink-table/src/test/scala/resources/testJoin0.out b/flink-libraries/flink-table/src/test/scala/resources/testJoin0.out
similarity index 100%
rename from flink-staging/flink-table/src/test/scala/resources/testJoin0.out
rename to flink-libraries/flink-table/src/test/scala/resources/testJoin0.out
diff --git a/flink-staging/flink-table/src/test/scala/resources/testJoin1.out b/flink-libraries/flink-table/src/test/scala/resources/testJoin1.out
similarity index 100%
rename from flink-staging/flink-table/src/test/scala/resources/testJoin1.out
rename to flink-libraries/flink-table/src/test/scala/resources/testJoin1.out
diff --git a/flink-staging/flink-table/src/test/scala/resources/testUnion0.out b/flink-libraries/flink-table/src/test/scala/resources/testUnion0.out
similarity index 100%
rename from flink-staging/flink-table/src/test/scala/resources/testUnion0.out
rename to flink-libraries/flink-table/src/test/scala/resources/testUnion0.out
diff --git a/flink-staging/flink-table/src/test/scala/resources/testUnion1.out b/flink-libraries/flink-table/src/test/scala/resources/testUnion1.out
similarity index 100%
rename from flink-staging/flink-table/src/test/scala/resources/testUnion1.out
rename to flink-libraries/flink-table/src/test/scala/resources/testUnion1.out
diff --git a/flink-libraries/pom.xml b/flink-libraries/pom.xml
index e1dc2d9a64aac..e0fbd4985330d 100644
--- a/flink-libraries/pom.xml
+++ b/flink-libraries/pom.xml
@@ -37,5 +37,7 @@ under the License.
 		<module>flink-gelly</module>
 		<module>flink-gelly-scala</module>
 		<module>flink-python</module>
+		<module>flink-table</module>
+		<module>flink-ml</module>
 	</modules>
 </project>
diff --git a/flink-staging/flink-scala-shell/pom.xml b/flink-scala-shell/pom.xml
similarity index 95%
rename from flink-staging/flink-scala-shell/pom.xml
rename to flink-scala-shell/pom.xml
index 45074eb5abaf0..21f5ea22e88e2 100644
--- a/flink-staging/flink-scala-shell/pom.xml
+++ b/flink-scala-shell/pom.xml
@@ -22,7 +22,7 @@ under the License.
 
 	<parent>
 		<groupId>org.apache.flink</groupId>
-		<artifactId>flink-staging</artifactId>
+		<artifactId>flink-parent</artifactId>
 		<version>1.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
@@ -167,8 +167,8 @@ under the License.
 					<!-- Add src/main/scala to eclipse build path -->
 					<execution>
 						<id>add-source</id>
-                                                <!-- phase should be initialize for successful javadoc generation -->
-                                                <phase>initialize</phase>
+						<!-- phase should be initialize for successful javadoc generation -->
+						<phase>initialize</phase>
 						<goals>
 							<goal>add-source</goal>
 						</goals>
@@ -213,7 +213,7 @@ under the License.
 					<failOnWarning>false</failOnWarning>
 					<sourceDirectory>${basedir}/src/main/scala</sourceDirectory>
 					<testSourceDirectory>${basedir}/src/test/scala</testSourceDirectory>
-					<configLocation>${project.basedir}/../../tools/maven/scalastyle-config.xml</configLocation>
+					<configLocation>${project.basedir}/../tools/maven/scalastyle-config.xml</configLocation>
 					<outputFile>${project.basedir}/scalastyle-output.xml</outputFile>
 					<outputEncoding>UTF-8</outputEncoding>
 				</configuration>
diff --git a/flink-staging/flink-scala-shell/src/main/java/org/apache/flink/api/java/JarHelper.java b/flink-scala-shell/src/main/java/org/apache/flink/api/java/JarHelper.java
similarity index 100%
rename from flink-staging/flink-scala-shell/src/main/java/org/apache/flink/api/java/JarHelper.java
rename to flink-scala-shell/src/main/java/org/apache/flink/api/java/JarHelper.java
diff --git a/flink-staging/flink-scala-shell/src/main/java/org/apache/flink/api/java/ScalaShellRemoteEnvironment.java b/flink-scala-shell/src/main/java/org/apache/flink/api/java/ScalaShellRemoteEnvironment.java
similarity index 100%
rename from flink-staging/flink-scala-shell/src/main/java/org/apache/flink/api/java/ScalaShellRemoteEnvironment.java
rename to flink-scala-shell/src/main/java/org/apache/flink/api/java/ScalaShellRemoteEnvironment.java
diff --git a/flink-staging/flink-scala-shell/src/main/scala-2.10/org/apache/flink/api/scala/ILoopCompat.scala b/flink-scala-shell/src/main/scala-2.10/org/apache/flink/api/scala/ILoopCompat.scala
similarity index 100%
rename from flink-staging/flink-scala-shell/src/main/scala-2.10/org/apache/flink/api/scala/ILoopCompat.scala
rename to flink-scala-shell/src/main/scala-2.10/org/apache/flink/api/scala/ILoopCompat.scala
diff --git a/flink-staging/flink-scala-shell/src/main/scala-2.11/org/apache/flink/api/scala/ILoopCompat.scala b/flink-scala-shell/src/main/scala-2.11/org/apache/flink/api/scala/ILoopCompat.scala
similarity index 100%
rename from flink-staging/flink-scala-shell/src/main/scala-2.11/org/apache/flink/api/scala/ILoopCompat.scala
rename to flink-scala-shell/src/main/scala-2.11/org/apache/flink/api/scala/ILoopCompat.scala
diff --git a/flink-staging/flink-scala-shell/src/main/scala/org/apache/flink/api/scala/FlinkILoop.scala b/flink-scala-shell/src/main/scala/org/apache/flink/api/scala/FlinkILoop.scala
similarity index 100%
rename from flink-staging/flink-scala-shell/src/main/scala/org/apache/flink/api/scala/FlinkILoop.scala
rename to flink-scala-shell/src/main/scala/org/apache/flink/api/scala/FlinkILoop.scala
diff --git a/flink-staging/flink-scala-shell/src/main/scala/org/apache/flink/api/scala/FlinkShell.scala b/flink-scala-shell/src/main/scala/org/apache/flink/api/scala/FlinkShell.scala
similarity index 100%
rename from flink-staging/flink-scala-shell/src/main/scala/org/apache/flink/api/scala/FlinkShell.scala
rename to flink-scala-shell/src/main/scala/org/apache/flink/api/scala/FlinkShell.scala
diff --git a/flink-staging/flink-scala-shell/src/test/resources/log4j-test.properties b/flink-scala-shell/src/test/resources/log4j-test.properties
similarity index 100%
rename from flink-staging/flink-scala-shell/src/test/resources/log4j-test.properties
rename to flink-scala-shell/src/test/resources/log4j-test.properties
diff --git a/flink-staging/flink-scala-shell/src/test/resources/logback-test.xml b/flink-scala-shell/src/test/resources/logback-test.xml
similarity index 100%
rename from flink-staging/flink-scala-shell/src/test/resources/logback-test.xml
rename to flink-scala-shell/src/test/resources/logback-test.xml
diff --git a/flink-staging/flink-scala-shell/src/test/scala/org/apache/flink/api/scala/ScalaShellITCase.scala b/flink-scala-shell/src/test/scala/org/apache/flink/api/scala/ScalaShellITCase.scala
similarity index 99%
rename from flink-staging/flink-scala-shell/src/test/scala/org/apache/flink/api/scala/ScalaShellITCase.scala
rename to flink-scala-shell/src/test/scala/org/apache/flink/api/scala/ScalaShellITCase.scala
index 00e36abdce64b..6ec0045cdb274 100644
--- a/flink-staging/flink-scala-shell/src/test/scala/org/apache/flink/api/scala/ScalaShellITCase.scala
+++ b/flink-scala-shell/src/test/scala/org/apache/flink/api/scala/ScalaShellITCase.scala
@@ -155,7 +155,7 @@ class ScalaShellITCase extends TestLogger {
 
     // find jar file that contains the ml code
     var externalJar = ""
-    val folder = new File("../flink-ml/target/")
+    val folder = new File("../flink-libraries/flink-ml/target/")
     val listOfFiles = folder.listFiles()
 
     for (i <- listOfFiles.indices) {
diff --git a/flink-staging/flink-scala-shell/src/test/scala/org/apache/flink/api/scala/ScalaShellLocalStartupITCase.scala b/flink-scala-shell/src/test/scala/org/apache/flink/api/scala/ScalaShellLocalStartupITCase.scala
similarity index 100%
rename from flink-staging/flink-scala-shell/src/test/scala/org/apache/flink/api/scala/ScalaShellLocalStartupITCase.scala
rename to flink-scala-shell/src/test/scala/org/apache/flink/api/scala/ScalaShellLocalStartupITCase.scala
diff --git a/flink-staging/flink-scala-shell/start-script/start-scala-shell.sh b/flink-scala-shell/start-script/start-scala-shell.sh
similarity index 100%
rename from flink-staging/flink-scala-shell/start-script/start-scala-shell.sh
rename to flink-scala-shell/start-script/start-scala-shell.sh
diff --git a/pom.xml b/pom.xml
index 6cba95681e30d..e503a117b23a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,12 +62,13 @@ under the License.
 		<module>flink-streaming-java</module>
 		<module>flink-streaming-scala</module>
 		<module>flink-streaming-connectors</module>
+		<module>flink-batch-connectors</module>
 		<module>flink-examples</module>
 		<module>flink-clients</module>
 		<module>flink-tests</module>
 		<module>flink-test-utils</module>
-		<module>flink-staging</module>
 		<module>flink-libraries</module>
+		<module>flink-scala-shell</module>
 		<module>flink-quickstart</module>
 		<module>flink-contrib</module>
 		<module>flink-dist</module>
@@ -428,6 +429,10 @@ under the License.
 			</properties>
 			<modules>
 				<module>flink-yarn</module>
+				<!-- Include the flink-fs-tests project only for HD2.
+				 	The HDFS minicluster interfaces changed between the two versions.
+				 -->
+				<module>flink-fs-tests</module>
 			</modules>
 		</profile>
 
@@ -802,13 +807,13 @@ under the License.
 
 						<!-- Test Data. -->
 						<exclude>flink-tests/src/test/resources/testdata/terainput.txt</exclude>
-						<exclude>flink-staging/flink-avro/src/test/resources/avro/*.avsc</exclude>
+						<exclude>flink-batch-connectors/flink-avro/src/test/resources/avro/*.avsc</exclude>
 						<exclude>out/test/flink-avro/avro/user.avsc</exclude>
-						<exclude>flink-staging/flink-table/src/test/scala/resources/*.out</exclude>
+						<exclude>flink-libraries/flink-table/src/test/scala/resources/*.out</exclude>
 						<!-- TweetInputFormat Test Data-->
 						<exclude>flink-contrib/flink-tweet-inputformat/src/main/resources/HashTagTweetSample.json</exclude>
-						<exclude>flink-staging/flink-avro/src/test/resources/testdata.avro</exclude>
-						<exclude>flink-staging/flink-avro/src/test/java/org/apache/flink/api/io/avro/generated/*.java</exclude>
+						<exclude>flink-batch-connectors/flink-avro/src/test/resources/testdata.avro</exclude>
+						<exclude>flink-batch-connectors/flink-avro/src/test/java/org/apache/flink/api/io/avro/generated/*.java</exclude>
 						<exclude>flink-libraries/flink-python/src/test/python/org/apache/flink/python/api/data_csv</exclude>
 						<exclude>flink-libraries/flink-python/src/test/python/org/apache/flink/python/api/data_text</exclude>
 						<!-- Configuration Files. -->