diff --git a/docs/linq.md b/docs/linq.md
index ebb0063d0947e..79fe6f2976d3d 100644
--- a/docs/linq.md
+++ b/docs/linq.md
@@ -1,5 +1,5 @@
 ---
-title: "Language-Integrated Queries"
+title: "Language-Integrated Queries (Table API)"
 ---
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
@@ -23,58 +23,92 @@ under the License.
 * This will be replaced by the TOC
 {:toc}
 
-**Language-Integrated Queries are an experimental feature and can currently only be used with
-the Scala API**
+**Language-Integrated Queries are an experimental feature**
 
-Flink provides an API that allows specifying operations using SQL-like expressions.
-This Expression API can be enabled by importing
-`org.apache.flink.api.scala.expressions._`.  This enables implicit conversions that allow
-converting a `DataSet` or `DataStream` to an `ExpressionOperation` on which relational queries
-can be specified. This example shows how a `DataSet` can be converted, how expression operations
-can be specified and how an expression operation can be converted back to a `DataSet`:
+Flink provides an API that allows specifying operations using SQL-like expressions. Instead of 
+manipulating `DataSet` or `DataStream` you work with `Table` on which relational operations can
+be performed. 
+
+The following dependency must be added to your project when using the Table API:
+
+{% highlight xml %}
+<dependency>
+  <groupId>org.apache.flink</groupId>
+  <artifactId>flink-table</artifactId>
+  <version>{{site.FLINK_VERSION_SHORT }}</version>
+</dependency>
+{% endhighlight %}
+
+## Scala Table API
+ 
+The Table API can be enabled by importing `org.apache.flink.api.scala.table._`.  This enables
+implicit conversions that allow
+converting a DataSet or DataStream to a Table. This example shows how a DataSet can
+be converted, how relational queries can be specified and how a Table can be
+converted back to a DataSet:
 
 {% highlight scala %}
 import org.apache.flink.api.scala._
-import org.apache.flink.api.scala.expressions._ 
+import org.apache.flink.api.scala.table._ 
 
 case class WC(word: String, count: Int)
 val input = env.fromElements(WC("hello", 1), WC("hello", 1), WC("ciao", 1))
-val expr = input.toExpression
-val result = expr.groupBy('word).select('word, 'count.sum).as[WC]
+val expr = input.toTable
+val result = expr.groupBy('word).select('word, 'count.sum).toSet[WC]
 {% endhighlight %}
 
 The expression DSL uses Scala symbols to refer to field names and we use code generation to
-transform expressions to efficient runtime code. Please not that the conversion to and from
-expression operations only works when using Scala case classes or Flink POJOs. Please check out
+transform expressions to efficient runtime code. Please note that the conversion to and from
+Tables only works when using Scala case classes or Flink POJOs. Please check out
 the [programming guide](programming_guide.html) to learn the requirements for a class to be 
 considered a POJO.
  
 This is another example that shows how you
-can join to operations:
+can join to Tables:
 
 {% highlight scala %}
 case class MyResult(a: String, b: Int)
 
 val input1 = env.fromElements(...).as('a, 'b)
 val input2 = env.fromElements(...).as('c, 'd)
-val joined = input1.join(input2).where('b == 'a && 'd > 42).select('a, 'd).as[MyResult]
+val joined = input1.join(input2).where("b = a && d > 42").select("a, d").as[MyResult]
 {% endhighlight %}
 
-Notice, how a `DataSet` can be converted to an expression operation by using `as` and specifying new
-names for the fields. This can also be used to disambiguate fields before a join operation.
+Notice, how a DataSet can be converted to a Table by using `as` and specifying new
+names for the fields. This can also be used to disambiguate fields before a join operation. Also,
+in this example we see that you can also use Strings to specify relational expressions.
 
-The Expression API can be used with the Streaming API, since we also have implicit conversions to
-and from `DataStream`.
+Please refer to the Scaladoc (and Javadoc) for a full list of supported operations and a
+description of the expression syntax. 
 
-The following dependency must be added to your project when using the Expression API:
+## Java Table API
 
-{% highlight xml %}
-<dependency>
-  <groupId>org.apache.flink</groupId>
-  <artifactId>flink-expressions</artifactId>
-  <version>{{site.FLINK_VERSION_SHORT }}</version>
-</dependency>
+When using Java, Tables can be converted to and from DataSet and DataStream using `TableEnvironment`.
+This example is equivalent to the above Scala Example:
+
+{% highlight java %}
+ExecutionEnvironment env = ExecutionEnvironment.createCollectionsEnvironment();
+TableEnvironment tableEnv = new TableEnvironment();
+
+DataSet<WC> input = env.fromElements(
+        new WC("Hello", 1),
+        new WC("Ciao", 1),
+        new WC("Hello", 1));
+
+Table table = tableEnv.toTable(input);
+
+Table filtered = table
+        .groupBy("word")
+        .select("word.count as count, word")
+        .filter("count = 2");
+
+DataSet<WC> result = tableEnv.toSet(filtered, WC.class);
 {% endhighlight %}
 
-Please refer to the scaladoc for a full list of supported operations and a description of the
+When using Java, the embedded DSL for specifying expressions cannot be used. Only String expressions
+are supported. They support exactly the same feature set as the expression DSL.
+
+Please refer to the Javadoc for a full list of supported operations and a description of the
 expression syntax. 
+
+
diff --git a/flink-scala/src/main/scala/org/apache/flink/api/scala/DataSet.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/DataSet.scala
index 2732112e4413c..de07a5783daaf 100644
--- a/flink-scala/src/main/scala/org/apache/flink/api/scala/DataSet.scala
+++ b/flink-scala/src/main/scala/org/apache/flink/api/scala/DataSet.scala
@@ -90,7 +90,7 @@ class DataSet[T: ClassTag](set: JavaDataSet[T]) {
   /**
    * Returns the TypeInformation for the elements of this DataSet.
    */
-  def getType: TypeInformation[T] = set.getType
+  def getType(): TypeInformation[T] = set.getType
 
   /**
    * Returns the execution environment associated with the current DataSet.
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/java/expressions/ExpressionUtil.scala b/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/java/expressions/ExpressionUtil.scala
deleted file mode 100644
index ad7cfe4fa8302..0000000000000
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/java/expressions/ExpressionUtil.scala
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.flink.api.java.expressions
-
-import org.apache.flink.api.expressions.ExpressionOperation
-import org.apache.flink.api.java.DataSet
-import org.apache.flink.api.java.typeutils.TypeExtractor
-import org.apache.flink.api.scala.expressions.JavaBatchTranslator
-import org.apache.flink.api.scala.expressions.JavaStreamingTranslator
-import org.apache.flink.streaming.api.datastream.DataStream
-
-/**
- * Convencience methods for creating an [[org.apache.flink.api.expressions.ExpressionOperation]]
- * and for converting an [[org.apache.flink.api.expressions.ExpressionOperation]] back
- * to a [[org.apache.flink.api.java.DataSet]] or
- * [[org.apache.flink.streaming.api.datastream.DataStream]].
- */
-object ExpressionUtil {
-  
-  /**
-   * Transforms the given DataSet to a [[org.apache.flink.api.expressions.ExpressionOperation]].
-   * The fields of the DataSet type are renamed to the given set of fields:
-   *
-   * Example:
-   *
-   * {{{
-   *   ExpressionUtil.from(set, "a, b")
-   * }}}
-   *
-   * This will transform the set containing elements of two fields to a table where the fields
-   * are named a and b.
-   */
-  def from[T](set: DataSet[T], fields: String): ExpressionOperation[JavaBatchTranslator] = {
-    new JavaBatchTranslator().createExpressionOperation(set, fields)
-  }
-
-  /**
-   * Transforms the given DataSet to a [[org.apache.flink.api.expressions.ExpressionOperation]].
-   * The fields of the DataSet type are used to name the
-   * [[org.apache.flink.api.expressions.ExpressionOperation]] fields.
-   */
-  def from[T](set: DataSet[T]): ExpressionOperation[JavaBatchTranslator] = {
-    new JavaBatchTranslator().createExpressionOperation(set)
-  }
-
-  /**
-   * Transforms the given DataStream to a [[org.apache.flink.api.expressions.ExpressionOperation]].
-   * The fields of the DataSet type are renamed to the given set of fields:
-   *
-   * Example:
-   *
-   * {{{
-   *   ExpressionUtil.from(set, "a, b")
-   * }}}
-   *
-   * This will transform the set containing elements of two fields to a table where the fields
-   * are named a and b.
-   */
-  def from[T](set: DataStream[T], fields: String): ExpressionOperation[JavaStreamingTranslator] = {
-    new JavaStreamingTranslator().createExpressionOperation(set, fields)
-  }
-
-  /**
-   * Transforms the given DataSet to a [[org.apache.flink.api.expressions.ExpressionOperation]].
-   * The fields of the DataSet type are used to name the
-   * [[org.apache.flink.api.expressions.ExpressionOperation]] fields.
-   */
-  def from[T](set: DataStream[T]): ExpressionOperation[JavaStreamingTranslator] = {
-    new JavaStreamingTranslator().createExpressionOperation(set)
-  }
-
-  /**
-   * Converts the given [[org.apache.flink.api.expressions.ExpressionOperation]] to
-   * a DataSet. The given type must have exactly the same fields as the
-   * [[org.apache.flink.api.expressions.ExpressionOperation]]. That is, the names of the
-   * fields and the types must match.
-   */
-  @SuppressWarnings(Array("unchecked"))
-  def toSet[T](
-      op: ExpressionOperation[JavaBatchTranslator],
-      clazz: Class[T]): DataSet[T] = {
-    op.as(TypeExtractor.createTypeInfo(clazz)).asInstanceOf[DataSet[T]]
-  }
-
-  /**
-   * Converts the given [[org.apache.flink.api.expressions.ExpressionOperation]] to
-   * a DataStream. The given type must have exactly the same fields as the
-   * [[org.apache.flink.api.expressions.ExpressionOperation]]. That is, the names of the
-   * fields and the types must match.
-   */
-  @SuppressWarnings(Array("unchecked"))
-  def toStream[T](
-      op: ExpressionOperation[JavaStreamingTranslator], clazz: Class[T]): DataStream[T] = {
-    op.as(TypeExtractor.createTypeInfo(clazz)).asInstanceOf[DataStream[T]]
-  }
-}
-
diff --git a/flink-staging/flink-streaming/flink-streaming-scala/src/main/scala/org/apache/flink/streaming/api/scala/DataStream.scala b/flink-staging/flink-streaming/flink-streaming-scala/src/main/scala/org/apache/flink/streaming/api/scala/DataStream.scala
index 3db65312baf2f..c869a188f7733 100644
--- a/flink-staging/flink-streaming/flink-streaming-scala/src/main/scala/org/apache/flink/streaming/api/scala/DataStream.scala
+++ b/flink-staging/flink-streaming/flink-streaming-scala/src/main/scala/org/apache/flink/streaming/api/scala/DataStream.scala
@@ -56,6 +56,11 @@ class DataStream[T](javaStream: JavaStream[T]) {
    */
   def getJavaStream: JavaStream[T] = javaStream
 
+  /**
+   * Returns the TypeInformation for the elements of this DataStream.
+   */
+  def getType(): TypeInformation[T] = javaStream.getType
+
   /**
    * Sets the parallelism of this operation. This must be greater than 1.
    */
diff --git a/flink-staging/flink-expressions/pom.xml b/flink-staging/flink-table/pom.xml
similarity index 98%
rename from flink-staging/flink-expressions/pom.xml
rename to flink-staging/flink-table/pom.xml
index f26ab0390d8de..dcdbe83eabbd4 100644
--- a/flink-staging/flink-expressions/pom.xml
+++ b/flink-staging/flink-table/pom.xml
@@ -27,8 +27,8 @@ under the License.
 		<relativePath>..</relativePath>
 	</parent>
 
-	<artifactId>flink-expressions</artifactId>
-	<name>flink-expressions</name>
+	<artifactId>flink-table</artifactId>
+	<name>flink-table</name>
 
 	<packaging>jar</packaging>
 
diff --git a/flink-staging/flink-table/src/main/java/org/apache/flink/api/java/table/package-info.java b/flink-staging/flink-table/src/main/java/org/apache/flink/api/java/table/package-info.java
new file mode 100644
index 0000000000000..6f9f0a313e2d1
--- /dev/null
+++ b/flink-staging/flink-table/src/main/java/org/apache/flink/api/java/table/package-info.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * <strong>Table API (Java)</strong><br>
+ *
+ * {@link org.apache.flink.api.java.table.TableEnvironment} can be used to create a
+ * {@link org.apache.flink.api.table.Table} from a {@link org.apache.flink.api.java.DataSet}
+ * or {@link org.apache.flink.streaming.api.datastream.DataStream}.
+ *
+ * <p>
+ * This can be used to perform SQL-like queries on data. Please have
+ * a look at {@link org.apache.flink.api.table.Table} to see which operations are supported and
+ * how query strings are written.
+ *
+ * <p>
+ * Example:
+ *
+ * <code>
+ * ExecutionEnvironment env = ExecutionEnvironment.createCollectionsEnvironment();
+ *
+ * DataSet<WC> input = env.fromElements(
+ *   new WC("Hello", 1),
+ *   new WC("Ciao", 1),
+ *   new WC("Hello", 1));
+ *
+ * Table table = TableUtil.from(input);
+ *
+ * Table filtered = table
+ *     .groupBy("word")
+ *     .select("word.count as count, word")
+ *     .filter("count = 2");
+ *
+ * DataSet<WC> result = TableUtil.toSet(filtered, WC.class);
+ *
+ * result.print();
+ * env.execute();
+ * </code>
+ *
+ * <p>
+ * As seen above, a {@link org.apache.flink.api.table.Table} can be converted back to the
+ * underlying API representation using {@link org.apache.flink.api.java.table.TableEnvironment.toSet}
+ * or {@link org.apache.flink.api.java.table.TableEnvironment.toStream}.
+ */
+package org.apache.flink.api.java.table;
diff --git a/flink-staging/flink-expressions/src/main/java/org/apache/flink/api/java/expressions/package-info.java b/flink-staging/flink-table/src/main/java/org/apache/flink/api/table/package-info.java
similarity index 50%
rename from flink-staging/flink-expressions/src/main/java/org/apache/flink/api/java/expressions/package-info.java
rename to flink-staging/flink-table/src/main/java/org/apache/flink/api/table/package-info.java
index 07e18b26f7cd3..d7fbc8e1840f3 100644
--- a/flink-staging/flink-expressions/src/main/java/org/apache/flink/api/java/expressions/package-info.java
+++ b/flink-staging/flink-table/src/main/java/org/apache/flink/api/table/package-info.java
@@ -1,4 +1,4 @@
-/*
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,6 +17,17 @@
  */
 
 /**
- * Package doc wohoooo
+ * <strong>Table API</strong><br>
+ *
+ * This package contains the generic part of the Table API. It can be used with Flink Streaming
+ * and Flink Batch. From Scala as well as from Java.
+ *
+ * When using the Table API, as user creates a [[org.apache.flink.api.table.Table]] from
+ * a DataSet or DataStream. On this relational operations can be performed. A table can also
+ * be converted back to a DataSet or DataStream.
+ *
+ * Packages [[org.apache.flink.api.scala.table]] and [[org.apache.flink.api.java.table]] contain
+ * the language specific part of the API. Refer to these packages for documentation on how
+ * the Table API can be used in Java and Scala.
  */
-package org.apache.flink.api.java.expressions;
+package org.apache.flink.api.table;
diff --git a/flink-staging/flink-expressions/src/main/java/org/apache/flink/examples/java/JavaExpressionExample.java b/flink-staging/flink-table/src/main/java/org/apache/flink/examples/java/JavaTableExample.java
similarity index 78%
rename from flink-staging/flink-expressions/src/main/java/org/apache/flink/examples/java/JavaExpressionExample.java
rename to flink-staging/flink-table/src/main/java/org/apache/flink/examples/java/JavaTableExample.java
index 42632f98c787b..1c1fdca9ae576 100644
--- a/flink-staging/flink-expressions/src/main/java/org/apache/flink/examples/java/JavaExpressionExample.java
+++ b/flink-staging/flink-table/src/main/java/org/apache/flink/examples/java/JavaTableExample.java
@@ -18,20 +18,21 @@
 package org.apache.flink.examples.java;
 
 
-import org.apache.flink.api.expressions.ExpressionOperation;
+import org.apache.flink.api.table.Table;
 import org.apache.flink.api.java.DataSet;
 import org.apache.flink.api.java.ExecutionEnvironment;
-import org.apache.flink.api.java.expressions.ExpressionUtil;
+import org.apache.flink.api.java.table.TableEnvironment;
 
 /**
- * Very simple example that shows how the Java Expression API can be used.
+ * Very simple example that shows how the Java Table API can be used.
  */
-public class JavaExpressionExample {
+public class JavaTableExample {
 
 	public static class WC {
 		public String word;
 		public int count;
 
+		// Public constructor to make it a Flink POJO
 		public WC() {
 
 		}
@@ -48,20 +49,21 @@ public String toString() {
 	}
 	public static void main(String[] args) throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.createCollectionsEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
 
 		DataSet<WC> input = env.fromElements(
 				new WC("Hello", 1),
 				new WC("Ciao", 1),
 				new WC("Hello", 1));
 
-		ExpressionOperation expr = ExpressionUtil.from(input);
+		Table table = tableEnv.toTable(input);
 
-		ExpressionOperation filtered = expr
+		Table filtered = table
 				.groupBy("word")
 				.select("word.count as count, word")
 				.filter("count = 2");
 
-		DataSet<WC> result = ExpressionUtil.toSet(filtered, WC.class);
+		DataSet<WC> result = tableEnv.toSet(filtered, WC.class);
 
 		result.print();
 		env.execute();
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/scala/expressions/JavaBatchTranslator.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/java/table/JavaBatchTranslator.scala
similarity index 72%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/scala/expressions/JavaBatchTranslator.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/java/table/JavaBatchTranslator.scala
index ae41ceba1c56e..17e4823a6dae2 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/scala/expressions/JavaBatchTranslator.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/java/table/JavaBatchTranslator.scala
@@ -16,115 +16,42 @@
  * limitations under the License.
  */
 
-package org.apache.flink.api.scala.expressions
+package org.apache.flink.api.java.table
 
 import java.lang.reflect.Modifier
 
 import org.apache.flink.api.common.operators.base.JoinOperatorBase.JoinHint
 import org.apache.flink.api.common.typeinfo.TypeInformation
 import org.apache.flink.api.common.typeutils.CompositeType
-import org.apache.flink.api.expressions.analysis.ExtractEquiJoinFields
-import org.apache.flink.api.expressions.operations._
-import org.apache.flink.api.expressions.parser.ExpressionParser
-import org.apache.flink.api.expressions.runtime.{ExpressionAggregateFunction, ExpressionFilterFunction, ExpressionJoinFunction, ExpressionSelectFunction}
-import org.apache.flink.api.expressions.tree._
-import org.apache.flink.api.expressions.typeinfo.{RenameOperator, RenamingProxyTypeInfo, RowTypeInfo}
-import org.apache.flink.api.expressions.{ExpressionException, ExpressionOperation, Row}
 import org.apache.flink.api.java.aggregation.AggregationFunction
 import org.apache.flink.api.java.operators.JoinOperator.EquiJoin
 import org.apache.flink.api.java.operators.Keys.ExpressionKeys
 import org.apache.flink.api.java.operators.{GroupReduceOperator, Keys, MapOperator, UnsortedGrouping}
 import org.apache.flink.api.java.{DataSet => JavaDataSet}
+import org.apache.flink.api.table.analysis.ExtractEquiJoinFields
+import org.apache.flink.api.table.operations._
+import org.apache.flink.api.table.runtime.{ExpressionAggregateFunction, ExpressionFilterFunction, ExpressionJoinFunction, ExpressionSelectFunction}
+import org.apache.flink.api.table.tree._
+import org.apache.flink.api.table.typeinfo.{RenameOperator, RenamingProxyTypeInfo, RowTypeInfo}
+import org.apache.flink.api.table.{ExpressionException, Row, Table}
 
 /**
- * [[OperationTranslator]] for creating [[ExpressionOperation]]s from Java [[JavaDataSet]]s and
- * translating them back to Scala [[JavaDataSet]]s.
+ * [[TableTranslator]] for creating [[Table]]s from Java [[org.apache.flink.api.java.DataSet]]s and
+ * translating them back to Java [[org.apache.flink.api.java.DataSet]]s.
  */
-class JavaBatchTranslator extends OperationTranslator {
+class JavaBatchTranslator extends TableTranslator {
 
   type Representation[A] = JavaDataSet[A]
 
-
-  def createExpressionOperation[A](
-    repr: JavaDataSet[A]): ExpressionOperation[JavaBatchTranslator] = {
-    val fields =
-      repr.getType.asInstanceOf[CompositeType[A]].getFieldNames.map(UnresolvedFieldReference)
-
-    createExpressionOperation(repr, fields.toArray.asInstanceOf[Array[Expression]], false)
-  }
-
-  def createExpressionOperation[A](
-    repr: JavaDataSet[A],
-    expression: String): ExpressionOperation[JavaBatchTranslator] = {
-    val fields = ExpressionParser.parseExpressionList(expression)
-
-    createExpressionOperation(repr, fields.toArray)
-  }
-
-  def createExpressionOperation[A](
-      repr: JavaDataSet[A],
-      fields: Array[Expression],
-      checkDeterministicFields: Boolean = true): ExpressionOperation[JavaBatchTranslator] = {
-
-    // shortcut for DataSet[Row]
-    repr.getType match {
-      case rowTypeInfo: RowTypeInfo =>
-        val expressions = rowTypeInfo.getFieldNames map {
-          name => (name, rowTypeInfo.getTypeAt(name))
-        }
-        new ExpressionOperation(
-          Root(repr.asInstanceOf[JavaDataSet[Row]], expressions), this)
-      case _ =>
-    }
-
-    val clazz = repr.getType.getTypeClass
-    if (clazz.isMemberClass && !Modifier.isStatic(clazz.getModifiers)) {
-      throw new ExpressionException("Cannot create expression Operation from DataSet of type " +
-        clazz.getName + ". Only top-level classes or static members classes " +
-        " are supported.")
-    }
-
-    if (!repr.getType.isInstanceOf[CompositeType[_]]) {
-      throw new ExpressionException("Only DataSets of composite type can be transformed to an" +
-        " Expression Operation. These would be tuples, case classes and POJOs.")
-    }
-
-    val inputType = repr.getType.asInstanceOf[CompositeType[A]]
-
-    if (!inputType.hasDeterministicFieldOrder && checkDeterministicFields) {
-      throw new ExpressionException(s"You cannot rename fields upon Table creaton: " +
-          s"Field order of input type $inputType is not deterministic." )
-    }
-
-    if (fields.length != inputType.getFieldNames.length) {
-      throw new ExpressionException("Number of selected fields: '" + fields.mkString(",") +
-        "' and number of fields in input type " + inputType + " do not match.")
-    }
-
-    val newFieldNames = fields map {
-      case UnresolvedFieldReference(name) => name
-      case e =>
-        throw new ExpressionException("Only field references allowed in 'as' operation, " +
-          " offending expression: " + e)
-    }
-
-    if (newFieldNames.toSet.size != newFieldNames.size) {
-      throw new ExpressionException(s"Ambiguous field names in ${fields.mkString(", ")}")
-    }
-
-    val resultFields: Seq[(String, TypeInformation[_])] = newFieldNames.zipWithIndex map {
-      case (name, index) => (name, inputType.getTypeAt(index))
-    }
-
-    val inputFields = inputType.getFieldNames
-    val fieldMappings = inputFields.zip(resultFields)
-    val expressions: Array[Expression] = fieldMappings map {
-      case (oldName, (newName, tpe)) => Naming(ResolvedFieldReference(oldName, tpe), newName)
-    }
+  override def createTable[A](
+      repr: Representation[A],
+      inputType: CompositeType[A],
+      expressions: Array[Expression],
+      resultFields: Seq[(String, TypeInformation[_])]): Table[this.type] = {
 
     val rowDataSet = createSelect(expressions, repr, inputType)
 
-    new ExpressionOperation(Root(rowDataSet, resultFields), new JavaBatchTranslator)
+    Table(Root(rowDataSet, resultFields), this)
   }
 
   override def translate[A](op: Operation)(implicit tpe: TypeInformation[A]): JavaDataSet[A] = {
@@ -143,7 +70,7 @@ class JavaBatchTranslator extends OperationTranslator {
 
     if (!implicitly[TypeInformation[A]].isInstanceOf[CompositeType[A]]) {
       throw new ExpressionException(
-        "Expression operations can only be converted to composite types, type is: " +
+        "A Table can only be converted to composite types, type is: " +
           implicitly[TypeInformation[A]] +
           ". Composite types would be tuples, case classes and POJOs.")
     }
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/scala/expressions/JavaStreamingTranslator.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/java/table/JavaStreamingTranslator.scala
similarity index 68%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/scala/expressions/JavaStreamingTranslator.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/java/table/JavaStreamingTranslator.scala
index 56c38af1fc009..4fd79e4475df2 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/scala/expressions/JavaStreamingTranslator.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/java/table/JavaStreamingTranslator.scala
@@ -16,109 +16,42 @@
  * limitations under the License.
  */
 
-package org.apache.flink.api.scala.expressions
+package org.apache.flink.api.java.table
 
 import java.lang.reflect.Modifier
 
 import org.apache.flink.api.common.operators.base.JoinOperatorBase.JoinHint
 import org.apache.flink.api.common.typeinfo.TypeInformation
 import org.apache.flink.api.common.typeutils.CompositeType
-import org.apache.flink.api.expressions.operations._
-import org.apache.flink.api.expressions.parser.ExpressionParser
-import org.apache.flink.api.expressions.runtime.{ExpressionFilterFunction, ExpressionSelectFunction}
-import org.apache.flink.api.expressions.tree._
-import org.apache.flink.api.expressions.typeinfo.RowTypeInfo
-import org.apache.flink.api.expressions.{ExpressionException, ExpressionOperation, Row}
+import org.apache.flink.api.table.operations._
+import org.apache.flink.api.table.runtime.{ExpressionFilterFunction, ExpressionSelectFunction}
+import org.apache.flink.api.table.tree._
+import org.apache.flink.api.table.typeinfo.RowTypeInfo
+import org.apache.flink.api.table.{ExpressionException, Row, Table}
 import org.apache.flink.streaming.api.datastream.DataStream
 import org.apache.flink.streaming.api.invokable.operator.MapInvokable
 
 /**
- * [[OperationTranslator]] for creating [[ExpressionOperation]]s from Java [[DataStream]]s and
+ * [[TableTranslator]] for creating [[Table]]s from Java [[DataStream]]s and
  * translating them back to Java [[DataStream]]s.
  *
  * This is very limited right now. Only select and filter are implemented. Also, the expression
  * operations must be extended to allow windowing operations.
  */
 
-class JavaStreamingTranslator extends OperationTranslator {
+class JavaStreamingTranslator extends TableTranslator {
 
   type Representation[A] = DataStream[A]
 
+  override def createTable[A](
+      repr: Representation[A],
+      inputType: CompositeType[A],
+      expressions: Array[Expression],
+      resultFields: Seq[(String, TypeInformation[_])]): Table[this.type] = {
 
-  def createExpressionOperation[A](
-    repr: DataStream[A]): ExpressionOperation[JavaStreamingTranslator] = {
-    val fields =
-      repr.getType.asInstanceOf[CompositeType[A]].getFieldNames.map(UnresolvedFieldReference)
+    val rowDataStream = createSelect(expressions, repr, inputType)
 
-    createExpressionOperation(repr, fields.toArray.asInstanceOf[Array[Expression]])
-  }
-
-  def createExpressionOperation[A](
-      repr: DataStream[A],
-      expression: String): ExpressionOperation[JavaStreamingTranslator] = {
-    val fields = ExpressionParser.parseExpressionList(expression)
-
-    createExpressionOperation(repr, fields.toArray)
-  }
-
-  def createExpressionOperation[A](
-      repr: DataStream[A],
-      fields: Array[Expression]): ExpressionOperation[JavaStreamingTranslator] = {
-
-    // shortcut for DataSet[Row]
-    repr.getType match {
-      case rowTypeInfo: RowTypeInfo =>
-        val expressions = rowTypeInfo.getFieldNames map {
-          name => (name, rowTypeInfo.getTypeAt(name))
-        }
-        new ExpressionOperation(
-          Root(repr.asInstanceOf[DataStream[Row]], expressions), this)
-      case _ =>
-    }
-
-    val clazz = repr.getType.getTypeClass
-    if (clazz.isMemberClass && !Modifier.isStatic(clazz.getModifiers)) {
-      throw new ExpressionException("Cannot create expression Operation from DataSet of type " +
-        clazz.getName + ". Only top-level classes or static members classes " +
-        " are supported.")
-    }
-
-    if (!repr.getType.isInstanceOf[CompositeType[_]]) {
-      throw new ExpressionException("Only DataSets of composite type can be transformed to an" +
-        " Expression Operation. These would be tuples, case classes and POJOs.")
-    }
-
-    val inputType = repr.getType.asInstanceOf[CompositeType[A]]
-
-    if (fields.length != inputType.getFieldNames.length) {
-      throw new ExpressionException("Number of selected fields: '" + fields.mkString(",") +
-        "' and number of fields in input type " + inputType + " do not match.")
-    }
-
-    val newFieldNames = fields map {
-      case UnresolvedFieldReference(name) => name
-      case e =>
-        throw new ExpressionException("Only field references allowed in 'as' operation, " +
-          " offending expression: " + e)
-    }
-
-    if (newFieldNames.toSet.size != newFieldNames.size) {
-      throw new ExpressionException(s"Ambiguous field names in ${fields.mkString(", ")}")
-    }
-
-    val resultFields: Seq[(String, TypeInformation[_])] = newFieldNames.zipWithIndex map {
-      case (name, index) => (name, inputType.getTypeAt(index))
-    }
-
-    val inputFields = inputType.getFieldNames
-    val fieldMappings = inputFields.zip(resultFields)
-    val expressions: Array[Expression] = fieldMappings map {
-      case (oldName, (newName, tpe)) => Naming(ResolvedFieldReference(oldName, tpe), newName)
-    }
-
-    val rowDataSet = createSelect(expressions, repr, inputType)
-
-    new ExpressionOperation(Root(rowDataSet, resultFields), new JavaStreamingTranslator)
+    new Table(Root(rowDataStream, resultFields), this)
   }
 
   override def translate[A](op: Operation)(implicit tpe: TypeInformation[A]): DataStream[A] = {
@@ -136,7 +69,7 @@ class JavaStreamingTranslator extends OperationTranslator {
 
     if (!implicitly[TypeInformation[A]].isInstanceOf[CompositeType[A]]) {
       throw new ExpressionException(
-        "Expression operations can only be converted to composite types, type is: " +
+        "A Table can only be converted to composite types, type is: " +
           implicitly[TypeInformation[A]] +
           ". Composite types would be tuples, case classes and POJOs.")
 
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/java/table/TableEnvironment.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/java/table/TableEnvironment.scala
new file mode 100644
index 0000000000000..030fa12b4b75b
--- /dev/null
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/java/table/TableEnvironment.scala
@@ -0,0 +1,112 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.flink.api.java.table
+
+import org.apache.flink.api.java.DataSet
+import org.apache.flink.api.java.typeutils.TypeExtractor
+import org.apache.flink.api.table.Table
+import org.apache.flink.streaming.api.datastream.DataStream
+
+/**
+ * Environment for working with the Table API.
+ *
+ * This can be used to convert [[DataSet]] or [[DataStream]] to a [[Table]] and back again. You
+ * can also use the provided methods to create a [[Table]] directly from a data source.
+ */
+class TableEnvironment {
+
+  /**
+   * Transforms the given DataSet to a [[org.apache.flink.api.table.Table]].
+   * The fields of the DataSet type are renamed to the given set of fields:
+   *
+   * Example:
+   *
+   * {{{
+   *   tableEnv.toTable(set, "a, b")
+   * }}}
+   *
+   * This will transform the set containing elements of two fields to a table where the fields
+   * are named a and b.
+   */
+  def toTable[T](set: DataSet[T], fields: String): Table[JavaBatchTranslator] = {
+    new JavaBatchTranslator().createTable(set, fields).asInstanceOf[Table[JavaBatchTranslator]]
+  }
+
+  /**
+   * Transforms the given DataSet to a [[org.apache.flink.api.table.Table]].
+   * The fields of the DataSet type are used to name the
+   * [[org.apache.flink.api.table.Table]] fields.
+   */
+  def toTable[T](set: DataSet[T]): Table[JavaBatchTranslator] = {
+    new JavaBatchTranslator().createTable(set).asInstanceOf[Table[JavaBatchTranslator]]
+  }
+
+  /**
+   * Transforms the given DataStream to a [[org.apache.flink.api.table.Table]].
+   * The fields of the DataSet type are renamed to the given set of fields:
+   *
+   * Example:
+   *
+   * {{{
+   *   tableEnv.toTable(set, "a, b")
+   * }}}
+   *
+   * This will transform the set containing elements of two fields to a table where the fields
+   * are named a and b.
+   */
+  def toTable[T](set: DataStream[T], fields: String): Table[JavaStreamingTranslator] = {
+    new JavaStreamingTranslator().createTable(set, fields)
+      .asInstanceOf[Table[JavaStreamingTranslator]]
+  }
+
+  /**
+   * Transforms the given DataSet to a [[org.apache.flink.api.table.Table]].
+   * The fields of the DataSet type are used to name the
+   * [[org.apache.flink.api.table.Table]] fields.
+   */
+  def toTable[T](set: DataStream[T]): Table[JavaStreamingTranslator] = {
+    new JavaStreamingTranslator().createTable(set).asInstanceOf[Table[JavaStreamingTranslator]]
+  }
+
+  /**
+   * Converts the given [[org.apache.flink.api.table.Table]] to
+   * a DataSet. The given type must have exactly the same fields as the
+   * [[org.apache.flink.api.table.Table]]. That is, the names of the
+   * fields and the types must match.
+   */
+  @SuppressWarnings(Array("unchecked"))
+  def toSet[T](
+      table: Table[JavaBatchTranslator],
+      clazz: Class[T]): DataSet[T] = {
+    table.as(TypeExtractor.createTypeInfo(clazz)).asInstanceOf[DataSet[T]]
+  }
+
+  /**
+   * Converts the given [[org.apache.flink.api.table.Table]] to
+   * a DataStream. The given type must have exactly the same fields as the
+   * [[org.apache.flink.api.table.Table]]. That is, the names of the
+   * fields and the types must match.
+   */
+  @SuppressWarnings(Array("unchecked"))
+  def toStream[T](
+      table: Table[JavaStreamingTranslator],
+    clazz: Class[T]): DataStream[T] = {
+    table.as(TypeExtractor.createTypeInfo(clazz)).asInstanceOf[DataStream[T]]
+  }
+}
+
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/scala/expressions/DataSetConversions.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/scala/table/DataSetConversions.scala
similarity index 55%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/scala/expressions/DataSetConversions.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/scala/table/DataSetConversions.scala
index 567d19c8195fa..8b72cb6f929fa 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/scala/expressions/DataSetConversions.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/scala/table/DataSetConversions.scala
@@ -15,49 +15,50 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.scala.expressions
+package org.apache.flink.api.scala.table
 
-import org.apache.flink.api.expressions._
-import org.apache.flink.api.expressions.tree.{UnresolvedFieldReference, Expression}
+import org.apache.flink.api.table._
+import org.apache.flink.api.table.tree.{UnresolvedFieldReference, Expression}
 import org.apache.flink.api.common.typeutils.CompositeType
 
 import org.apache.flink.api.scala._
 
 /**
- * Methods for converting a [[DataSet]] to an [[ExpressionOperation]]. A [[DataSet]] is
- * wrapped in this by the implicit conversions in [[org.apache.flink.api.scala.expressions]].
+ * Methods for converting a [[DataSet]] to a [[Table]]. A [[DataSet]] is
+ * wrapped in this by the implicit conversions in [[org.apache.flink.api.scala.table]].
  */
 class DataSetConversions[T](set: DataSet[T], inputType: CompositeType[T]) {
 
   /**
-   * Converts the [[DataSet]] to an [[ExpressionOperation]]. The field names of the resulting
-   * expression operation can be specified like this:
+   * Converts the [[DataSet]] to a [[Table]]. The field names can be specified like this:
    *
    * {{{
    *   val in: DataSet[(String, Int)] = ...
-   *   val expr = in.as('a, 'b)
+   *   val table = in.as('a, 'b)
    * }}}
    *
-   * This results in an expression operation that has field `a` of type `String` and field `b`
+   * This results in a [[Table]] that has field `a` of type `String` and field `b`
    * of type `Int`.
    */
-  def as(fields: Expression*): ExpressionOperation[ScalaBatchTranslator] = {
-     new ScalaBatchTranslator().createExpressionOperation(set, fields.toArray)
+  def as(fields: Expression*): Table[ScalaBatchTranslator] = {
+     new ScalaBatchTranslator().createTable(set, fields.toArray)
   }
 
   /**
-   * Converts the [[DataSet]] to an [[ExpressionOperation]]. The field names of the resulting
-   * expression operation will be taken from the field names of the input type:
+   * Converts the [[DataSet]] to a [[Table]]. The field names will be taken from the field names
+   * of the input type.
+   *
+   * Example:
    *
    * {{{
    *   val in: DataSet[(String, Int)] = ...
-   *   val expr = in.toExpression
+   *   val table = in.toTable
    * }}}
    *
-   * This results in an expression operation that has field `_1` of type `String` and field `_2`
+   * Here, the result is a [[Table]] that has field `_1` of type `String` and field `_2`
    * of type `Int`.
    */
-  def toExpression: ExpressionOperation[ScalaBatchTranslator] = {
+  def toTable: Table[ScalaBatchTranslator] = {
     val resultFields = inputType.getFieldNames.map(UnresolvedFieldReference)
     as(resultFields: _*)
   }
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/scala/expressions/DataStreamConversions.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/scala/table/DataStreamConversions.scala
similarity index 52%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/scala/expressions/DataStreamConversions.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/scala/table/DataStreamConversions.scala
index 49dbce781aac5..5da02c4a06632 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/scala/expressions/DataStreamConversions.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/scala/table/DataStreamConversions.scala
@@ -16,47 +16,50 @@
  * limitations under the License.
  */
 
-package org.apache.flink.api.scala.expressions
+package org.apache.flink.api.scala.table
 
 import org.apache.flink.api.common.typeutils.CompositeType
-import org.apache.flink.api.expressions._
-import org.apache.flink.api.expressions.tree.{Expression, UnresolvedFieldReference}
-import org.apache.flink.api.scala._
+import org.apache.flink.api.table._
+import org.apache.flink.api.table.tree.{Expression, UnresolvedFieldReference}
 import org.apache.flink.streaming.api.scala.DataStream
 
-class DataStreamConversions[T](set: DataStream[T], inputType: CompositeType[T]) {
+class DataStreamConversions[T](stream: DataStream[T], inputType: CompositeType[T]) {
 
   /**
-   * Converts the [[DataStream]] to an [[ExpressionOperation]]. The field names of the resulting
-   * expression operation can be specified like this:
+   * Converts the [[DataStream]] to a [[Table]]. The field names can be specified like this:
    *
    * {{{
    *   val in: DataSet[(String, Int)] = ...
-   *   val expr = in.as('a, 'b)
+   *   val table = in.as('a, 'b)
    * }}}
    *
-   * This results in an expression operation that has field `a` of type `String` and field `b`
+   * This results in a [[Table]] that has field `a` of type `String` and field `b`
    * of type `Int`.
    */
 
-  def as(fields: Expression*): ExpressionOperation[ScalaStreamingTranslator] = {
-     new ScalaStreamingTranslator().createExpressionOperation(set, fields.toArray)
+  def as(fields: Expression*): Table[ScalaStreamingTranslator] = {
+     new ScalaStreamingTranslator().createTable(
+       stream,
+       fields.toArray,
+       checkDeterministicFields = true).asInstanceOf[Table[ScalaStreamingTranslator]]
   }
 
   /**
-   * Converts the [[DataStream]] to an [[ExpressionOperation]]. The field names of the resulting
-   * expression operation will be taken from the field names of the input type:
+   * Converts the [[DataStream]] to a [[Table]]. The field names will be taken from the field
+   * names of the input type.
+   *
+   * Example:
    *
    * {{{
    *   val in: DataSet[(String, Int)] = ...
-   *   val expr = in.toExpression
+   *   val table = in.toTable
    * }}}
    *
-   * This results in an expression operation that has field `_1` of type `String` and field `_2`
+   * This results in a [[Table]] that has field `_1` of type `String` and field `_2`
    * of type `Int`.
    */
 
-  def toExpression: ExpressionOperation[ScalaStreamingTranslator] = {
+  def toTable: Table[ScalaStreamingTranslator] = {
     val resultFields = inputType.getFieldNames.map(UnresolvedFieldReference)
     as(resultFields: _*)
   }
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/scala/expressions/ScalaBatchTranslator.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/scala/table/ScalaBatchTranslator.scala
similarity index 56%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/scala/expressions/ScalaBatchTranslator.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/scala/table/ScalaBatchTranslator.scala
index 724c8a700c857..4b25a5017205b 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/scala/expressions/ScalaBatchTranslator.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/scala/table/ScalaBatchTranslator.scala
@@ -16,13 +16,15 @@
  * limitations under the License.
  */
 
-package org.apache.flink.api.scala.expressions
+package org.apache.flink.api.scala.table
 
 
-import org.apache.flink.api.expressions.tree.Expression
+import org.apache.flink.api.common.typeutils.CompositeType
+import org.apache.flink.api.java.table.JavaBatchTranslator
+import org.apache.flink.api.table.tree.Expression
 import org.apache.flink.api.scala.wrap
-import org.apache.flink.api.expressions.operations._
-import org.apache.flink.api.expressions.ExpressionOperation
+import org.apache.flink.api.table.operations._
+import org.apache.flink.api.table.Table
 import org.apache.flink.api.common.typeinfo.TypeInformation
 import org.apache.flink.api.scala.DataSet
 
@@ -30,26 +32,37 @@ import scala.reflect.ClassTag
 
 
 /**
- * [[OperationTranslator]] for creating [[ExpressionOperation]]s from Scala [[DataSet]]s and
+ * [[TableTranslator]] for creating [[Table]]s from Scala [[DataSet]]s and
  * translating them back to Scala [[DataSet]]s.
  */
-class ScalaBatchTranslator extends OperationTranslator {
+class ScalaBatchTranslator extends TableTranslator {
 
   private val javaTranslator = new JavaBatchTranslator
 
-  override type Representation[A] = DataSet[A]
+  type Representation[A] = DataSet[A]
 
-  def createExpressionOperation[A](
+  def createTable[A](
       repr: DataSet[A],
-      fields: Array[Expression]): ExpressionOperation[ScalaBatchTranslator] = {
+      fields: Array[Expression]): Table[ScalaBatchTranslator] = {
 
-    val result = javaTranslator.createExpressionOperation(repr.javaSet, fields)
+    val result = javaTranslator.createTable(repr.javaSet, fields)
 
-    new ExpressionOperation[ScalaBatchTranslator](result.operation, this)
+    new Table[ScalaBatchTranslator](result.operation, this)
   }
 
   override def translate[O](op: Operation)(implicit tpe: TypeInformation[O]): DataSet[O] = {
     // fake it till you make it ...
     wrap(javaTranslator.translate(op))(ClassTag.AnyRef.asInstanceOf[ClassTag[O]])
   }
+
+  override def createTable[A](
+      repr: Representation[A],
+      inputType: CompositeType[A],
+      expressions: Array[Expression],
+      resultFields: Seq[(String, TypeInformation[_])]): Table[this.type] = {
+
+    val result = javaTranslator.createTable(repr.javaSet, inputType, expressions, resultFields)
+
+    Table(result.operation, this)
+  }
 }
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/scala/expressions/ScalaStreamingTranslator.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/scala/table/ScalaStreamingTranslator.scala
similarity index 61%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/scala/expressions/ScalaStreamingTranslator.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/scala/table/ScalaStreamingTranslator.scala
index 7db483fc36abe..f17f2730627aa 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/scala/expressions/ScalaStreamingTranslator.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/scala/table/ScalaStreamingTranslator.scala
@@ -16,41 +16,43 @@
  * limitations under the License.
  */
 
-package org.apache.flink.api.scala.expressions
+package org.apache.flink.api.scala.table
 
 import org.apache.flink.api.common.typeinfo.TypeInformation
-import org.apache.flink.api.expressions.operations._
-import org.apache.flink.api.expressions.tree.Expression
-import org.apache.flink.api.expressions.{ExpressionOperation, Row}
-import org.apache.flink.api.scala.DataSet
-import org.apache.flink.streaming.api.scala.DataStream
-
-import org.apache.flink.streaming.api.scala.javaToScalaStream
+import org.apache.flink.api.common.typeutils.CompositeType
+import org.apache.flink.api.java.table.JavaStreamingTranslator
+import org.apache.flink.api.table.Table
+import org.apache.flink.api.table.operations._
+import org.apache.flink.api.table.tree.Expression
+import org.apache.flink.streaming.api.scala.{DataStream, javaToScalaStream}
 
 /**
- * [[OperationTranslator]] for creating [[ExpressionOperation]]s from Scala [[DataStream]]s and
+ * [[TableTranslator]] for creating [[Table]]s from Scala [[DataStream]]s and
  * translating them back to Scala [[DataStream]]s.
  *
  * This is very limited right now. Only select and filter are implemented. Also, the expression
  * operations must be extended to allow windowing operations.
  */
-class ScalaStreamingTranslator extends OperationTranslator {
+class ScalaStreamingTranslator extends TableTranslator {
 
   private val javaTranslator = new JavaStreamingTranslator
 
   override type Representation[A] = DataStream[A]
 
-  def createExpressionOperation[A](
-      repr: DataStream[A],
-      fields: Array[Expression]): ExpressionOperation[ScalaStreamingTranslator] = {
-
-    val result = javaTranslator.createExpressionOperation(repr.getJavaStream, fields)
-
-    new ExpressionOperation[ScalaStreamingTranslator](result.operation, this)
-  }
-
   override def translate[O](op: Operation)(implicit tpe: TypeInformation[O]): DataStream[O] = {
     // fake it till you make it ...
     javaToScalaStream(javaTranslator.translate(op))
   }
+
+  override def createTable[A](
+      repr: Representation[A],
+      inputType: CompositeType[A],
+      expressions: Array[Expression],
+      resultFields: Seq[(String, TypeInformation[_])]): Table[this.type] = {
+
+    val result =
+      javaTranslator.createTable(repr.getJavaStream, inputType, expressions, resultFields)
+
+    new Table(result.operation, this)
+  }
 }
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/scala/expressions/expressionDsl.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/scala/table/expressionDsl.scala
similarity index 96%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/scala/expressions/expressionDsl.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/scala/table/expressionDsl.scala
index 1f6c39764dfd9..e08ceb3cf73f3 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/scala/expressions/expressionDsl.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/scala/table/expressionDsl.scala
@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.scala.expressions
+package org.apache.flink.api.scala.table
 
-import org.apache.flink.api.expressions.tree._
+import org.apache.flink.api.table.tree._
 import org.apache.flink.api.common.typeinfo.TypeInformation
 
 import scala.language.implicitConversions
@@ -27,7 +27,7 @@ import scala.language.implicitConversions
  * operations.
  *
  * These operations must be kept in sync with the parser in
- * [[org.apache.flink.api.expressions.parser.ExpressionParser]].
+ * [[org.apache.flink.api.table.parser.ExpressionParser]].
  */
 trait ImplicitExpressionOperations {
   def expr: Expression
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/scala/expressions/package.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/scala/table/package.scala
similarity index 60%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/scala/expressions/package.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/scala/table/package.scala
index f12e7a04e1fd3..10084de12706d 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/scala/expressions/package.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/scala/table/package.scala
@@ -17,29 +17,28 @@
  */
 package org.apache.flink.api.scala
 
-import com.google.common.base.Preconditions
-import org.apache.flink.api.expressions.{Row, ExpressionOperation}
 import org.apache.flink.api.common.typeutils.CompositeType
+import org.apache.flink.api.table.{Row, Table}
 import org.apache.flink.streaming.api.scala.DataStream
 
 import scala.language.implicitConversions
 
 /**
- * == Language Integrated Queries (aka Expression Operations) ==
+ * == Table API (Scala) ==
  *
  * Importing this package with:
  *
  * {{{
- *   import org.apache.flink.api.scala.expressions._
+ *   import org.apache.flink.api.scala.table._
  * }}}
  *
- * imports implicit conversions for converting a [[DataSet]] or [[DataStream]] to an
- * [[ExpressionOperation]]. This can be used to perform SQL-like queries on data. Please have
- * a look at [[ExpressionOperation]] to see which operations are supported and
- * [[org.apache.flink.api.scala.expressions.ImplicitExpressionOperations]] to see how an
+ * imports implicit conversions for converting a [[DataSet]] or [[DataStream]] to a
+ * [[Table]]. This can be used to perform SQL-like queries on data. Please have
+ * a look at [[Table]] to see which operations are supported and
+ * [[org.apache.flink.api.scala.table.ImplicitExpressionOperations]] to see how an
  * expression can be specified.
  *
- * Inside an expression operation you can use Scala Symbols to refer to field names. One would
+ * When writing a query you can use Scala Symbols to refer to field names. One would
  * refer to field `a` by writing `'a`. Sometimes it is necessary to manually confert a
  * Scala literal to an Expression Literal, in those cases use `Literal`, as in `Literal(3)`.
  *
@@ -47,7 +46,7 @@ import scala.language.implicitConversions
  *
  * {{{
  *   import org.apache.flink.api.scala._
- *   import org.apache.flink.api.scala.expressions._
+ *   import org.apache.flink.api.scala.table._
  *
  *   val env = ExecutionEnvironment.getExecutionEnvironment
  *   val input = env.fromElements(("Hello", 2), ("Hello", 5), ("Ciao", 3))
@@ -57,7 +56,7 @@ import scala.language.implicitConversions
  *   env.execute()
  * }}}
  *
- * The result of an [[ExpressionOperation]] can be converted back to the underlying API
+ * A [[Table]] can be converted back to the underlying API
  * representation using `as`:
  *
  * {{{
@@ -67,20 +66,20 @@ import scala.language.implicitConversions
  *   val set = result.as[Word]
  * }}}
  */
-package object expressions extends ImplicitExpressionConversions {
+package object table extends ImplicitExpressionConversions {
 
   implicit def dataSet2DataSetConversions[T](set: DataSet[T]): DataSetConversions[T] = {
     new DataSetConversions[T](set, set.getType.asInstanceOf[CompositeType[T]])
   }
 
-  implicit def expressionOperation2RowDataSet(
-      expressionOperation: ExpressionOperation[ScalaBatchTranslator]): DataSet[Row] = {
-    expressionOperation.as[Row]
+  implicit def table2RowDataSet(
+      table: Table[ScalaBatchTranslator]): DataSet[Row] = {
+    table.as[Row]
   }
 
-  implicit def rowDataSet2ExpressionOperation(
-      rowDataSet: DataSet[Row]): ExpressionOperation[ScalaBatchTranslator] = {
-    rowDataSet.toExpression
+  implicit def rowDataSet2Table(
+      rowDataSet: DataSet[Row]): Table[ScalaBatchTranslator] = {
+    rowDataSet.toTable
   }
 
   implicit def dataStream2DataSetConversions[T](
@@ -90,13 +89,13 @@ package object expressions extends ImplicitExpressionConversions {
       stream.getJavaStream.getType.asInstanceOf[CompositeType[T]])
   }
 
-  implicit def expressionOperation2RowDataStream(
-      expressionOperation: ExpressionOperation[ScalaStreamingTranslator]): DataStream[Row] = {
-    expressionOperation.as[Row]
+  implicit def table2RowDataStream(
+      table: Table[ScalaStreamingTranslator]): DataStream[Row] = {
+    table.as[Row]
   }
 
-  implicit def rowDataStream2ExpressionOperation(
-      rowDataStream: DataStream[Row]): ExpressionOperation[ScalaStreamingTranslator] = {
-    rowDataStream.toExpression
+  implicit def rowDataStream2Table(
+      rowDataStream: DataStream[Row]): Table[ScalaStreamingTranslator] = {
+    rowDataStream.toTable
   }
 }
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/ExpressionException.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/ExpressionException.scala
similarity index 89%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/ExpressionException.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/ExpressionException.scala
index 34e400ff4a1d6..51c0a4d03a4e2 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/ExpressionException.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/ExpressionException.scala
@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions
+package org.apache.flink.api.table
 
 /**
- * Exception for all errors occurring during expression operations.
+ * Exception for all errors occurring during expression evaluation.
  */
 class ExpressionException(msg: String) extends RuntimeException(msg)
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/Row.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/Row.scala
similarity index 90%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/Row.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/Row.scala
index 47ef59ef091bc..e3baab3f9a3ca 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/Row.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/Row.scala
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions
+package org.apache.flink.api.table
 
 /**
- * This is used for executing expression operations. We use manually generated
+ * This is used for executing Table API operations. We use manually generated
  * TypeInfo to check the field types and create serializers and comparators.
  */
 class Row(arity: Int) extends Product {
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/ExpressionOperation.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/Table.scala
similarity index 82%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/ExpressionOperation.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/Table.scala
index 38417b22964e5..38a17607ff5ee 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/ExpressionOperation.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/Table.scala
@@ -15,25 +15,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions
+package org.apache.flink.api.table
 
 import org.apache.flink.api.common.typeinfo.TypeInformation
-import org.apache.flink.api.expressions.analysis.{GroupByAnalyzer, SelectionAnalyzer,
-PredicateAnalyzer}
-import org.apache.flink.api.expressions.operations._
-import org.apache.flink.api.expressions.parser.ExpressionParser
-import org.apache.flink.api.expressions.tree.{ResolvedFieldReference,
-UnresolvedFieldReference, Expression}
+import org.apache.flink.api.table.analysis.{GroupByAnalyzer, SelectionAnalyzer, PredicateAnalyzer}
+import org.apache.flink.api.table.operations._
+import org.apache.flink.api.table.parser.ExpressionParser
+import org.apache.flink.api.table.tree.{ResolvedFieldReference, UnresolvedFieldReference, Expression}
 
 /**
- * The abstraction for writing expression API programs. Similar to how the batch and streaming APIs
+ * The abstraction for writing Table API programs. Similar to how the batch and streaming APIs
  * have [[org.apache.flink.api.scala.DataSet]] and
  * [[org.apache.flink.streaming.api.scala.DataStream]].
  *
- * Use the methods of [[ExpressionOperation]] to transform data or to revert back to the underlying
+ * Use the methods of [[Table]] to transform data or to revert back to the underlying
  * batch or streaming representation.
  */
-case class ExpressionOperation[A <: OperationTranslator](
+case class Table[A <: TableTranslator](
     private[flink] val operation: Operation,
     private[flink] val operationTranslator: A) {
 
@@ -56,7 +54,7 @@ case class ExpressionOperation[A <: OperationTranslator](
    *   in.select('key, 'value.avg + " The average" as 'average, 'other.substring(0, 10))
    * }}}
    */
-  def select(fields: Expression*): ExpressionOperation[A] = {
+  def select(fields: Expression*): Table[A] = {
     val analyzer = new SelectionAnalyzer(operation.outputFields)
     val analyzedFields = fields.map(analyzer.analyze)
     val fieldNames = analyzedFields map(_.name)
@@ -77,7 +75,7 @@ case class ExpressionOperation[A <: OperationTranslator](
    *   in.select("key, value.avg + " The average" as average, other.substring(0, 10)")
    * }}}
    */
-  def select(fields: String): ExpressionOperation[A] = {
+  def select(fields: String): Table[A] = {
     val fieldExprs = ExpressionParser.parseExpressionList(fields)
     select(fieldExprs: _*)
   }
@@ -92,7 +90,7 @@ case class ExpressionOperation[A <: OperationTranslator](
    *   in.as('a, 'b)
    * }}}
    */
-  def as(fields: Expression*): ExpressionOperation[A] = {
+  def as(fields: Expression*): Table[A] = {
     fields forall {
       f => f.isInstanceOf[UnresolvedFieldReference]
     } match {
@@ -112,7 +110,7 @@ case class ExpressionOperation[A <: OperationTranslator](
    *   in.as("a, b")
    * }}}
    */
-  def as(fields: String): ExpressionOperation[A] = {
+  def as(fields: String): Table[A] = {
     val fieldExprs = ExpressionParser.parseExpressionList(fields)
     as(fieldExprs: _*)
   }
@@ -127,7 +125,7 @@ case class ExpressionOperation[A <: OperationTranslator](
    *   in.filter('name === "Fred")
    * }}}
    */
-  def filter(predicate: Expression): ExpressionOperation[A] = {
+  def filter(predicate: Expression): Table[A] = {
     val analyzer = new PredicateAnalyzer(operation.outputFields)
     val analyzedPredicate = analyzer.analyze(predicate)
     this.copy(operation = Filter(operation, analyzedPredicate))
@@ -143,7 +141,7 @@ case class ExpressionOperation[A <: OperationTranslator](
    *   in.filter("name === 'Fred'")
    * }}}
    */
-  def filter(predicate: String): ExpressionOperation[A] = {
+  def filter(predicate: String): Table[A] = {
     val predicateExpr = ExpressionParser.parseExpression(predicate)
     filter(predicateExpr)
   }
@@ -158,7 +156,7 @@ case class ExpressionOperation[A <: OperationTranslator](
    *   in.filter(name === "Fred")
    * }}}
    */
-  def where(predicate: Expression): ExpressionOperation[A] = {
+  def where(predicate: Expression): Table[A] = {
     filter(predicate)
   }
 
@@ -172,7 +170,7 @@ case class ExpressionOperation[A <: OperationTranslator](
    *   in.filter("name === 'Fred'")
    * }}}
    */
-  def where(predicate: String): ExpressionOperation[A] = {
+  def where(predicate: String): Table[A] = {
     filter(predicate)
   }
 
@@ -186,7 +184,7 @@ case class ExpressionOperation[A <: OperationTranslator](
    *   in.groupBy('key).select('key, 'value.avg)
    * }}}
    */
-  def groupBy(fields: Expression*): ExpressionOperation[A] = {
+  def groupBy(fields: Expression*): Table[A] = {
     val analyzer = new GroupByAnalyzer(operation.outputFields)
     val analyzedFields = fields.map(analyzer.analyze)
 
@@ -212,13 +210,13 @@ case class ExpressionOperation[A <: OperationTranslator](
    *   in.groupBy("key").select("key, value.avg")
    * }}}
    */
-  def groupBy(fields: String): ExpressionOperation[A] = {
+  def groupBy(fields: String): Table[A] = {
     val fieldsExpr = ExpressionParser.parseExpressionList(fields)
     groupBy(fieldsExpr: _*)
   }
 
   /**
-   * Joins to expression operations. Similar to an SQL join. The fields of the two joined
+   * Joins to [[Table]]s. Similar to an SQL join. The fields of the two joined
    * operations must not overlap, use [[as]] to rename fields if necessary. You can use
    * where and select clauses after a join to further specify the behaviour of the join.
    *
@@ -228,7 +226,7 @@ case class ExpressionOperation[A <: OperationTranslator](
    *   left.join(right).where('a === 'b && 'c > 3).select('a, 'b, 'd)
    * }}}
    */
-  def join(right: ExpressionOperation[A]): ExpressionOperation[A] = {
+  def join(right: Table[A]): Table[A] = {
     val leftInputNames = operation.outputFields.map(_._1).toSet
     val rightInputNames = right.operation.outputFields.map(_._1).toSet
     if (leftInputNames.intersect(rightInputNames).nonEmpty) {
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/analysis/Analyzer.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/analysis/Analyzer.scala
similarity index 92%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/analysis/Analyzer.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/analysis/Analyzer.scala
index da71cdd1965ca..5db17d5b19225 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/analysis/Analyzer.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/analysis/Analyzer.scala
@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions.analysis
+package org.apache.flink.api.table.analysis
 
-import org.apache.flink.api.expressions.tree.Expression
+import org.apache.flink.api.table.tree.Expression
 
 /**
  * Base class for expression analyzers/transformers. Analyzers must implement method `rules` to
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/analysis/ExtractEquiJoinFields.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/analysis/ExtractEquiJoinFields.scala
similarity index 96%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/analysis/ExtractEquiJoinFields.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/analysis/ExtractEquiJoinFields.scala
index a4f8f25cda733..6381a9be88cca 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/analysis/ExtractEquiJoinFields.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/analysis/ExtractEquiJoinFields.scala
@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions.analysis
+package org.apache.flink.api.table.analysis
 
-import org.apache.flink.api.expressions.tree._
+import org.apache.flink.api.table.tree._
 import org.apache.flink.api.common.typeutils.CompositeType
 
 import scala.collection.mutable
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/analysis/GroupByAnalyzer.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/analysis/GroupByAnalyzer.scala
similarity index 90%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/analysis/GroupByAnalyzer.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/analysis/GroupByAnalyzer.scala
index 21f989c8112bb..4106a4cfbbab2 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/analysis/GroupByAnalyzer.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/analysis/GroupByAnalyzer.scala
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions.analysis
+package org.apache.flink.api.table.analysis
 
-import org.apache.flink.api.expressions._
-import org.apache.flink.api.expressions.tree.{ResolvedFieldReference, Expression}
+import org.apache.flink.api.table._
+import org.apache.flink.api.table.tree.{ResolvedFieldReference, Expression}
 import org.apache.flink.api.common.typeinfo.TypeInformation
 
 import scala.collection.mutable
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/analysis/InsertAutoCasts.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/analysis/InsertAutoCasts.scala
similarity index 97%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/analysis/InsertAutoCasts.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/analysis/InsertAutoCasts.scala
index 319e72fae5134..29e76cd9b618e 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/analysis/InsertAutoCasts.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/analysis/InsertAutoCasts.scala
@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-package org.apache.flink.api.expressions.analysis
+package org.apache.flink.api.table.analysis
 
-import org.apache.flink.api.expressions.tree._
+import org.apache.flink.api.table.tree._
 import org.apache.flink.api.common.typeinfo.{IntegerTypeInfo, BasicTypeInfo}
 
 /**
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/analysis/PredicateAnalyzer.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/analysis/PredicateAnalyzer.scala
similarity index 90%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/analysis/PredicateAnalyzer.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/analysis/PredicateAnalyzer.scala
index f108f5c211234..0c746957af8db 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/analysis/PredicateAnalyzer.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/analysis/PredicateAnalyzer.scala
@@ -15,12 +15,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions.analysis
+package org.apache.flink.api.table.analysis
 
 import org.apache.flink.api.common.typeinfo.TypeInformation
 
 /**
- * Analyzer for unary predicates, i.e. filter operations.
+ * Analyzer for predicates, i.e. filter operations and where clauses of joins.
  */
 class PredicateAnalyzer(inputFields: Seq[(String, TypeInformation[_])]) extends Analyzer {
   def rules = Seq(
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/analysis/ResolveFieldReferences.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/analysis/ResolveFieldReferences.scala
similarity index 92%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/analysis/ResolveFieldReferences.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/analysis/ResolveFieldReferences.scala
index 693dd88c5fa21..3f7cbd2c8493b 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/analysis/ResolveFieldReferences.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/analysis/ResolveFieldReferences.scala
@@ -15,12 +15,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions.analysis
+package org.apache.flink.api.table.analysis
 
-import org.apache.flink.api.expressions.tree.{ResolvedFieldReference,
+import org.apache.flink.api.table.tree.{ResolvedFieldReference,
 UnresolvedFieldReference, Expression}
 import org.apache.flink.api.common.typeinfo.TypeInformation
-import org.apache.flink.api.expressions._
+import org.apache.flink.api.table._
 
 import scala.collection.mutable
 
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/analysis/Rule.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/analysis/Rule.scala
similarity index 91%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/analysis/Rule.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/analysis/Rule.scala
index 853ee7aaaddbb..34c5750f85b6b 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/analysis/Rule.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/analysis/Rule.scala
@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions.analysis
+package org.apache.flink.api.table.analysis
 
-import org.apache.flink.api.expressions.tree.Expression
+import org.apache.flink.api.table.tree.Expression
 
 /**
  * Base class for a rule that is part of an [[Analyzer]] rule chain. Method `rule` gets on
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/analysis/SelectionAnalyzer.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/analysis/SelectionAnalyzer.scala
similarity index 95%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/analysis/SelectionAnalyzer.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/analysis/SelectionAnalyzer.scala
index eca007fe47fa4..70aadb8ed2131 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/analysis/SelectionAnalyzer.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/analysis/SelectionAnalyzer.scala
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions.analysis
+package org.apache.flink.api.table.analysis
 
 import org.apache.flink.api.common.typeinfo.TypeInformation
 
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/analysis/TypeCheck.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/analysis/TypeCheck.scala
similarity index 91%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/analysis/TypeCheck.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/analysis/TypeCheck.scala
index 632daa3204069..3304726be9aa4 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/analysis/TypeCheck.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/analysis/TypeCheck.scala
@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package org.apache.flink.api.expressions.analysis
+package org.apache.flink.api.table.analysis
 
-import org.apache.flink.api.expressions.tree.Expression
-import org.apache.flink.api.expressions.{_}
+import org.apache.flink.api.table.tree.Expression
+import org.apache.flink.api.table.{_}
 
 import scala.collection.mutable
 
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/analysis/VerifyBoolean.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/analysis/VerifyBoolean.scala
similarity index 88%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/analysis/VerifyBoolean.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/analysis/VerifyBoolean.scala
index d0bd6b68ed9e3..d554c444b0ce0 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/analysis/VerifyBoolean.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/analysis/VerifyBoolean.scala
@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package org.apache.flink.api.expressions.analysis
+package org.apache.flink.api.table.analysis
 
-import org.apache.flink.api.expressions.tree.{NopExpression, Expression}
-import org.apache.flink.api.expressions.{_}
+import org.apache.flink.api.table.tree.{NopExpression, Expression}
+import org.apache.flink.api.table.{_}
 import org.apache.flink.api.common.typeinfo.BasicTypeInfo
 
 import scala.collection.mutable
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/analysis/VerifyNoAggregates.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/analysis/VerifyNoAggregates.scala
similarity index 89%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/analysis/VerifyNoAggregates.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/analysis/VerifyNoAggregates.scala
index e9f878864d22f..6f5201c629688 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/analysis/VerifyNoAggregates.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/analysis/VerifyNoAggregates.scala
@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package org.apache.flink.api.expressions.analysis
+package org.apache.flink.api.table.analysis
 
-import org.apache.flink.api.expressions.ExpressionException
-import org.apache.flink.api.expressions.tree.{Aggregation, Expression}
+import org.apache.flink.api.table.ExpressionException
+import org.apache.flink.api.table.tree.{Aggregation, Expression}
 
 import scala.collection.mutable
 
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/analysis/VerifyNoNestedAggregates.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/analysis/VerifyNoNestedAggregates.scala
similarity index 89%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/analysis/VerifyNoNestedAggregates.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/analysis/VerifyNoNestedAggregates.scala
index de5063a5284aa..90553556cc008 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/analysis/VerifyNoNestedAggregates.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/analysis/VerifyNoNestedAggregates.scala
@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package org.apache.flink.api.expressions.analysis
+package org.apache.flink.api.table.analysis
 
-import org.apache.flink.api.expressions.ExpressionException
-import org.apache.flink.api.expressions.tree.{Expression, Aggregation}
+import org.apache.flink.api.table.ExpressionException
+import org.apache.flink.api.table.tree.{Expression, Aggregation}
 
 import scala.collection.mutable
 
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/codegen/ExpressionCodeGenerator.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/ExpressionCodeGenerator.scala
similarity index 98%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/codegen/ExpressionCodeGenerator.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/ExpressionCodeGenerator.scala
index cafba57cd3ccb..5ec8579cd4f6e 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/codegen/ExpressionCodeGenerator.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/ExpressionCodeGenerator.scala
@@ -15,12 +15,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions.codegen
+package org.apache.flink.api.table.codegen
 
 import java.util.concurrent.atomic.AtomicInteger
-import org.apache.flink.api.expressions.tree._
-import org.apache.flink.api.expressions.typeinfo.{RenamingProxyTypeInfo, RowTypeInfo}
-import org.apache.flink.api.expressions.{ExpressionException, tree}
+import org.apache.flink.api.table.tree._
+import org.apache.flink.api.table.typeinfo.{RenamingProxyTypeInfo, RowTypeInfo}
+import org.apache.flink.api.table.{ExpressionException, tree}
 import org.apache.flink.api.common.typeinfo.{PrimitiveArrayTypeInfo, BasicTypeInfo, TypeInformation}
 
 import org.apache.flink.api.common.typeinfo.BasicTypeInfo._
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/codegen/GenerateBinaryPredicate.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/GenerateBinaryPredicate.scala
similarity index 95%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/codegen/GenerateBinaryPredicate.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/GenerateBinaryPredicate.scala
index ce8046956b978..9c9faa447af99 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/codegen/GenerateBinaryPredicate.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/GenerateBinaryPredicate.scala
@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions.codegen
+package org.apache.flink.api.table.codegen
 
-import org.apache.flink.api.expressions.tree.Expression
+import org.apache.flink.api.table.tree.Expression
 import org.apache.flink.api.common.typeutils.CompositeType
 import org.slf4j.LoggerFactory
 
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/codegen/GenerateBinaryResultAssembler.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/GenerateBinaryResultAssembler.scala
similarity index 94%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/codegen/GenerateBinaryResultAssembler.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/GenerateBinaryResultAssembler.scala
index 4066831c58ddb..253cac943746f 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/codegen/GenerateBinaryResultAssembler.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/GenerateBinaryResultAssembler.scala
@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions.codegen
+package org.apache.flink.api.table.codegen
 
-import org.apache.flink.api.expressions.tree.Expression
+import org.apache.flink.api.table.tree.Expression
 import org.apache.flink.api.common.typeutils.CompositeType
 import org.slf4j.LoggerFactory
 
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/codegen/GenerateResultAssembler.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/GenerateResultAssembler.scala
similarity index 94%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/codegen/GenerateResultAssembler.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/GenerateResultAssembler.scala
index 977126d8e2e5e..42f256fdc7d14 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/codegen/GenerateResultAssembler.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/GenerateResultAssembler.scala
@@ -15,11 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions.codegen
+package org.apache.flink.api.table.codegen
 
-import org.apache.flink.api.expressions.tree.Expression
+import org.apache.flink.api.table.tree.Expression
 import org.apache.flink.api.common.typeutils.CompositeType
-import org.apache.flink.api.expressions.typeinfo.RowTypeInfo
+import org.apache.flink.api.table.typeinfo.RowTypeInfo
 import org.apache.flink.api.java.typeutils.{TupleTypeInfo, PojoTypeInfo}
 import org.apache.flink.api.scala.typeutils.CaseClassTypeInfo
 
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/codegen/GenerateUnaryPredicate.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/GenerateUnaryPredicate.scala
similarity index 94%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/codegen/GenerateUnaryPredicate.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/GenerateUnaryPredicate.scala
index cd8edc4632f16..32af2a943d995 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/codegen/GenerateUnaryPredicate.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/GenerateUnaryPredicate.scala
@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions.codegen
+package org.apache.flink.api.table.codegen
 
-import org.apache.flink.api.expressions.tree.Expression
+import org.apache.flink.api.table.tree.Expression
 import org.apache.flink.api.common.typeutils.CompositeType
 import org.slf4j.LoggerFactory
 
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/codegen/GenerateUnaryResultAssembler.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/GenerateUnaryResultAssembler.scala
similarity index 94%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/codegen/GenerateUnaryResultAssembler.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/GenerateUnaryResultAssembler.scala
index 49970c1a46f7f..38d710943d33f 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/codegen/GenerateUnaryResultAssembler.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/GenerateUnaryResultAssembler.scala
@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions.codegen
+package org.apache.flink.api.table.codegen
 
-import org.apache.flink.api.expressions.tree.Expression
+import org.apache.flink.api.table.tree.Expression
 import org.apache.flink.api.common.typeutils.CompositeType
 import org.slf4j.LoggerFactory
 
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/codegen/package.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/package.scala
similarity index 96%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/codegen/package.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/package.scala
index 0b7c95d244c64..b69ac1c0149f0 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/codegen/package.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/package.scala
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions
+package org.apache.flink.api.table
 
 package object codegen {
   // Used in ExpressionCodeGenerator because Scala 2.10 reflection is not thread safe. We might
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/operations/ExpandAggregations.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/operations/ExpandAggregations.scala
similarity index 96%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/operations/ExpandAggregations.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/operations/ExpandAggregations.scala
index 723483c3368d7..894dd22046eae 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/operations/ExpandAggregations.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/operations/ExpandAggregations.scala
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions.operations
+package org.apache.flink.api.table.operations
 
-import org.apache.flink.api.expressions.analysis.SelectionAnalyzer
-import org.apache.flink.api.expressions.tree._
+import org.apache.flink.api.table.analysis.SelectionAnalyzer
+import org.apache.flink.api.table.tree._
 import org.apache.flink.api.java.aggregation.Aggregations
 
 import scala.collection.mutable
diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/operations/TableTranslator.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/operations/TableTranslator.scala
new file mode 100644
index 0000000000000..194eddae5ad06
--- /dev/null
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/operations/TableTranslator.scala
@@ -0,0 +1,158 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.flink.api.table.operations
+
+import java.lang.reflect.Modifier
+
+import org.apache.flink.api.common.typeinfo.TypeInformation
+import org.apache.flink.api.common.typeutils.CompositeType
+import org.apache.flink.api.table.parser.ExpressionParser
+import org.apache.flink.api.table.tree.{Expression, Naming, ResolvedFieldReference, UnresolvedFieldReference}
+import org.apache.flink.api.table.typeinfo.RowTypeInfo
+import org.apache.flink.api.table.{ExpressionException, Table}
+
+import scala.language.reflectiveCalls
+
+/**
+ * When an [[org.apache.flink.api.table.Table]] is created a [[TableTranslator]] corresponding to
+ * the underlying representation (either [[org.apache.flink.api.scala.DataSet]] or
+ * [[org.apache.flink.streaming.api.scala.DataStream]] is created. This way, the Table API can be
+ * completely agnostic while translation back to the correct API is handled by the API specific
+ * [[TableTranslator]].
+ */
+abstract class TableTranslator {
+
+  type Representation[A] <: { def getType(): TypeInformation[A] }
+
+  /**
+   * Translates the given Table API [[Operation]] back to the underlying representation, i.e,
+   * a DataSet or a DataStream.
+   */
+  def translate[A](op: Operation)(implicit tpe: TypeInformation[A]): Representation[A]
+
+  /**
+   * Creates a [[Table]] from a DataSet or a DataStream (the underlying representation).
+   */
+  def createTable[A](
+      repr: Representation[A],
+      inputType: CompositeType[A],
+      expressions: Array[Expression],
+      resultFields: Seq[(String, TypeInformation[_])]): Table[this.type]
+
+  /**
+   * Creates a [[Table]] from the given DataSet or DataStream.
+   */
+  def createTable[A](repr: Representation[A]): Table[this.type] = {
+
+    val fields = repr.getType() match {
+      case c: CompositeType[A] => c.getFieldNames.map(UnresolvedFieldReference)
+
+      case tpe => Array() // createTable will throw an exception for this later
+    }
+    createTable(
+      repr,
+      fields.toArray.asInstanceOf[Array[Expression]],
+      checkDeterministicFields = false)
+  }
+
+  /**
+   * Creates a [[Table]] from the given DataSet or DataStream while only taking those
+   * fields mentioned in the field expression.
+   */
+  def createTable[A](repr: Representation[A], expression: String): Table[this.type] = {
+
+    val fields = ExpressionParser.parseExpressionList(expression)
+
+    createTable(repr, fields.toArray, checkDeterministicFields = true)
+  }
+
+  /**
+   * Creates a [[Table]] from the given DataSet or DataStream while only taking those
+   * fields mentioned in the fields parameter.
+   *
+   * When checkDeterministicFields is true check whether the fields of the underlying
+   * [[TypeInformation]] have a deterministic ordering. This is only the case for Tuples
+   * and Case classes. For a POJO, the field order is not obvious, this can lead to problems
+   * when a user renames fields and assumes a certain ordering.
+   */
+  def createTable[A](
+      repr: Representation[A],
+      fields: Array[Expression],
+      checkDeterministicFields: Boolean = true): Table[this.type] = {
+
+    // shortcut for DataSet[Row] or DataStream[Row]
+    repr.getType() match {
+      case rowTypeInfo: RowTypeInfo =>
+        val expressions = rowTypeInfo.getFieldNames map {
+          name => (name, rowTypeInfo.getTypeAt(name))
+        }
+        new Table(
+          Root(repr, expressions), this)
+
+      case c: CompositeType[A] => // us ok
+
+      case tpe => throw new ExpressionException("Only DataSets or DataStreams of composite type" +
+        "can be transformed to a Table. These would be tuples, case classes and " +
+        "POJOs. Type is: " + tpe)
+
+    }
+
+    val clazz = repr.getType().getTypeClass
+    if (clazz.isMemberClass && !Modifier.isStatic(clazz.getModifiers)) {
+      throw new ExpressionException("Cannot create Table from DataSet or DataStream of type " +
+        clazz.getName + ". Only top-level classes or static members classes " +
+        " are supported.")
+    }
+
+    val inputType = repr.getType().asInstanceOf[CompositeType[A]]
+
+    if (!inputType.hasDeterministicFieldOrder && checkDeterministicFields) {
+      throw new ExpressionException(s"You cannot rename fields upon Table creaton: " +
+        s"Field order of input type $inputType is not deterministic." )
+    }
+
+    if (fields.length != inputType.getFieldNames.length) {
+      throw new ExpressionException("Number of selected fields: '" + fields.mkString(",") +
+        "' and number of fields in input type " + inputType + " do not match.")
+    }
+
+    val newFieldNames = fields map {
+      case UnresolvedFieldReference(name) => name
+      case e =>
+        throw new ExpressionException("Only field references allowed in 'as' operation, " +
+          " offending expression: " + e)
+    }
+
+    if (newFieldNames.toSet.size != newFieldNames.size) {
+      throw new ExpressionException(s"Ambiguous field names in ${fields.mkString(", ")}")
+    }
+
+    val resultFields: Seq[(String, TypeInformation[_])] = newFieldNames.zipWithIndex map {
+      case (name, index) => (name, inputType.getTypeAt(index))
+    }
+
+    val inputFields = inputType.getFieldNames
+    val fieldMappings = inputFields.zip(resultFields)
+    val expressions: Array[Expression] = fieldMappings map {
+      case (oldName, (newName, tpe)) => Naming(ResolvedFieldReference(oldName, tpe), newName)
+    }
+
+    createTable(repr, inputType, expressions, resultFields)
+  }
+
+}
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/operations/operations.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/operations/operations.scala
similarity index 89%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/operations/operations.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/operations/operations.scala
index d0366312c046b..5b80570b942af 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/operations/operations.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/operations/operations.scala
@@ -15,14 +15,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions.operations
+package org.apache.flink.api.table.operations
 
-import org.apache.flink.api.expressions.tree.Expression
+import org.apache.flink.api.table.tree.Expression
 import org.apache.flink.api.common.typeinfo.TypeInformation
 import org.apache.flink.api.java.aggregation.Aggregations
 
 /**
- * Base class for all expression operations.
+ * Base class for all Table API operations.
  */
 sealed abstract class Operation {
   def outputFields: Seq[(String, TypeInformation[_])]
@@ -30,13 +30,13 @@ sealed abstract class Operation {
 
 /**
  * Operation that transforms a [[org.apache.flink.api.scala.DataSet]] or
- * [[org.apache.flink.streaming.api.scala.DataStream]] into an expression operation.
+ * [[org.apache.flink.streaming.api.scala.DataStream]] into a [[org.apache.flink.api.table.Table]].
  */
 case class Root[T](input: T, outputFields: Seq[(String, TypeInformation[_])]) extends Operation
 
 /**
- * Operation that joins two expression operations. A "filter" and a "select" should be applied
- * after a join operation.
+ * Operation that joins two [[org.apache.flink.api.table.Table]]s. A "filter" and a "select"
+ * should be applied after a join operation.
  */
 case class Join(left: Operation, right: Operation) extends Operation {
   def outputFields = left.outputFields ++ right.outputFields
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/operations/package.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/operations/package.scala
similarity index 92%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/operations/package.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/operations/package.scala
index 2aa80b353ef48..0f75424ce9da9 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/operations/package.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/operations/package.scala
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions
+package org.apache.flink.api.table
 
 /**
- * The operations in this package are created by calling methods on [[ExpressionOperation]] they
+ * The operations in this package are created by calling methods on [[Table]] they
  * should not be manually created by users of the API.
  */
 package object operations
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/operations/OperationTranslator.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/package.scala
similarity index 54%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/operations/OperationTranslator.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/package.scala
index 12e4793fd0877..bdcb22c218694 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/operations/OperationTranslator.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/package.scala
@@ -15,21 +15,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions.operations
-
-import org.apache.flink.api.common.typeinfo.TypeInformation
+package org.apache.flink.api
 
 /**
- * When an [[org.apache.flink.api.expressions.ExpressionOperation]] is created an
- * [[OperationTranslator]] corresponding to the underlying representation (either
- * [[org.apache.flink.api.scala.DataSet]] or [[org.apache.flink.streaming.api.scala.DataStream]] is
- * created. This way, the expression API can be completely agnostic while translation back to the
- * correct API is handled by the API specific translator.
+ * == Table API ==
+ *
+ * This package contains the generic part of the Table API. It can be used with Flink Streaming
+ * and Flink Batch. From Scala as well as from Java.
+ *
+ * When using the Table API, as user creates a [[org.apache.flink.api.table.Table]] from
+ * a DataSet or DataStream. On this relational operations can be performed. A table can also
+ * be converted back to a DataSet or DataStream.
+ *
+ * Packages [[org.apache.flink.api.scala.table]] and [[org.apache.flink.api.java.table]] contain
+ * the language specific part of the API. Refer to these packages for documentation on how
+ * the Table API can be used in Java and Scala.
  */
-abstract class OperationTranslator {
-
-  type Representation[A]
-
-  def translate[A](op: Operation)(implicit tpe: TypeInformation[A]): Representation[A]
-
-}
+package object table
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/parser/ExpressionParser.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/parser/ExpressionParser.scala
similarity index 97%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/parser/ExpressionParser.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/parser/ExpressionParser.scala
index da53dedec7bb1..a0bc2b9e6d95a 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/parser/ExpressionParser.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/parser/ExpressionParser.scala
@@ -15,11 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions.parser
+package org.apache.flink.api.table.parser
 
-import org.apache.flink.api.expressions.ExpressionException
-import org.apache.flink.api.expressions.operations.As
-import org.apache.flink.api.expressions.tree._
+import org.apache.flink.api.table.ExpressionException
+import org.apache.flink.api.table.operations.As
+import org.apache.flink.api.table.tree._
 
 import scala.util.parsing.combinator.{PackratParsers, JavaTokenParsers}
 
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/runtime/ExpressionAggregateFunction.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/runtime/ExpressionAggregateFunction.scala
similarity index 95%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/runtime/ExpressionAggregateFunction.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/runtime/ExpressionAggregateFunction.scala
index 5a2b87d54a747..7e9bc0d8085c3 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/runtime/ExpressionAggregateFunction.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/runtime/ExpressionAggregateFunction.scala
@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions.runtime
+package org.apache.flink.api.table.runtime
 
-import org.apache.flink.api.expressions.Row
+import org.apache.flink.api.table.Row
 import org.apache.flink.api.common.functions.RichGroupReduceFunction
 import org.apache.flink.api.common.functions.RichGroupReduceFunction.Combinable
 import org.apache.flink.api.java.aggregation.AggregationFunction
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/runtime/ExpressionFilterFunction.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/runtime/ExpressionFilterFunction.scala
similarity index 89%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/runtime/ExpressionFilterFunction.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/runtime/ExpressionFilterFunction.scala
index d766486e852a7..b0e2d05477236 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/runtime/ExpressionFilterFunction.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/runtime/ExpressionFilterFunction.scala
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions.runtime
+package org.apache.flink.api.table.runtime
 
-import org.apache.flink.api.expressions.codegen.GenerateUnaryPredicate
-import org.apache.flink.api.expressions.tree.{NopExpression, Expression}
+import org.apache.flink.api.table.codegen.GenerateUnaryPredicate
+import org.apache.flink.api.table.tree.{NopExpression, Expression}
 import org.apache.flink.api.common.functions.RichFilterFunction
 import org.apache.flink.api.common.typeutils.CompositeType
 import org.apache.flink.configuration.Configuration
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/runtime/ExpressionJoinFunction.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/runtime/ExpressionJoinFunction.scala
similarity index 92%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/runtime/ExpressionJoinFunction.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/runtime/ExpressionJoinFunction.scala
index 46715cfb107e5..f0f563657f106 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/runtime/ExpressionJoinFunction.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/runtime/ExpressionJoinFunction.scala
@@ -15,12 +15,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions.runtime
+package org.apache.flink.api.table.runtime
 
-import org.apache.flink.api.expressions.tree.{NopExpression, Expression}
+import org.apache.flink.api.table.tree.{NopExpression, Expression}
 import org.apache.flink.api.common.functions.RichFlatJoinFunction
 import org.apache.flink.api.common.typeutils.CompositeType
-import org.apache.flink.api.expressions.codegen.{GenerateBinaryResultAssembler,
+import org.apache.flink.api.table.codegen.{GenerateBinaryResultAssembler,
 GenerateBinaryPredicate}
 import org.apache.flink.configuration.Configuration
 import org.apache.flink.util.Collector
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/runtime/ExpressionSelectFunction.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/runtime/ExpressionSelectFunction.scala
similarity index 90%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/runtime/ExpressionSelectFunction.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/runtime/ExpressionSelectFunction.scala
index 5cdd8b2bd1bcb..0a2830bc6f4e2 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/runtime/ExpressionSelectFunction.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/runtime/ExpressionSelectFunction.scala
@@ -15,12 +15,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions.runtime
+package org.apache.flink.api.table.runtime
 
-import org.apache.flink.api.expressions.tree.Expression
+import org.apache.flink.api.table.tree.Expression
 import org.apache.flink.api.common.functions.RichMapFunction
 import org.apache.flink.api.common.typeutils.CompositeType
-import org.apache.flink.api.expressions.codegen.GenerateUnaryResultAssembler
+import org.apache.flink.api.table.codegen.GenerateUnaryResultAssembler
 import org.apache.flink.configuration.Configuration
 
 class ExpressionSelectFunction[I, O](
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/runtime/package.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/runtime/package.scala
similarity index 85%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/runtime/package.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/runtime/package.scala
index 0a3d683934a91..a1bc4b78f81e3 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/runtime/package.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/runtime/package.scala
@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions
+package org.apache.flink.api.table
 
 /**
- * The functions in this package are used to translate expression operations to Java API operations.
+ * The functions in this package are used transforming Table API operations to Java API operations.
  */
 package object runtime
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/tree/Expression.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/tree/Expression.scala
similarity index 98%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/tree/Expression.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/tree/Expression.scala
index 8264705801058..63025727ead45 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/tree/Expression.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/tree/Expression.scala
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions.tree
+package org.apache.flink.api.table.tree
 
 import java.util.concurrent.atomic.AtomicInteger
 
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/tree/aggregations.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/tree/aggregations.scala
similarity index 97%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/tree/aggregations.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/tree/aggregations.scala
index d3b19fa8a6932..e5cdac548212d 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/tree/aggregations.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/tree/aggregations.scala
@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions.tree
+package org.apache.flink.api.table.tree
 
-import org.apache.flink.api.expressions.ExpressionException
+import org.apache.flink.api.table.ExpressionException
 import org.apache.flink.api.common.typeinfo.BasicTypeInfo
 import org.apache.flink.api.java.aggregation.Aggregations
 
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/tree/arithmetic.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/tree/arithmetic.scala
similarity index 97%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/tree/arithmetic.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/tree/arithmetic.scala
index e3f62f8dafadb..84f9b18ebf107 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/tree/arithmetic.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/tree/arithmetic.scala
@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions.tree
+package org.apache.flink.api.table.tree
 
-import org.apache.flink.api.expressions.ExpressionException
+import org.apache.flink.api.table.ExpressionException
 import org.apache.flink.api.common.typeinfo.{BasicTypeInfo, IntegerTypeInfo, NumericTypeInfo, TypeInformation}
 
 abstract class BinaryArithmetic extends BinaryExpression {
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/tree/cast.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/tree/cast.scala
similarity index 95%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/tree/cast.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/tree/cast.scala
index f83de5b4ebb9d..a3acc3585abe8 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/tree/cast.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/tree/cast.scala
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions.tree
+package org.apache.flink.api.table.tree
 
 import org.apache.flink.api.common.typeinfo.TypeInformation
 
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/tree/comparison.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/tree/comparison.scala
similarity index 96%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/tree/comparison.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/tree/comparison.scala
index fdb5fd0b172f7..e0a34a9f7c181 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/tree/comparison.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/tree/comparison.scala
@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions.tree
+package org.apache.flink.api.table.tree
 
-import org.apache.flink.api.expressions.ExpressionException
+import org.apache.flink.api.table.ExpressionException
 import org.apache.flink.api.common.typeinfo.{BasicTypeInfo, NumericTypeInfo}
 
 abstract class BinaryComparison extends BinaryExpression {
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/tree/fieldExpression.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/tree/fieldExpression.scala
similarity index 93%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/tree/fieldExpression.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/tree/fieldExpression.scala
index a1d8589296ef5..cc421485a28ed 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/tree/fieldExpression.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/tree/fieldExpression.scala
@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions.tree
+package org.apache.flink.api.table.tree
 
-import org.apache.flink.api.expressions.ExpressionException
+import org.apache.flink.api.table.ExpressionException
 import org.apache.flink.api.common.typeinfo.TypeInformation
 
 case class UnresolvedFieldReference(override val name: String) extends LeafExpression {
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/tree/literals.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/tree/literals.scala
similarity index 92%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/tree/literals.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/tree/literals.scala
index 03949ee980769..852d5a1ea901e 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/tree/literals.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/tree/literals.scala
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions.tree
+package org.apache.flink.api.table.tree
 
 import org.apache.flink.api.common.typeinfo.{BasicTypeInfo, TypeInformation}
-import org.apache.flink.api.scala.expressions.ImplicitExpressionOperations
+import org.apache.flink.api.scala.table.ImplicitExpressionOperations
 
 object Literal {
   def apply(l: Any): Literal = l match {
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/tree/logic.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/tree/logic.scala
similarity index 95%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/tree/logic.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/tree/logic.scala
index 8f0a0680a5ff4..8ab838d229496 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/tree/logic.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/tree/logic.scala
@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions.tree
+package org.apache.flink.api.table.tree
 
-import org.apache.flink.api.expressions.ExpressionException
+import org.apache.flink.api.table.ExpressionException
 import org.apache.flink.api.common.typeinfo.BasicTypeInfo
 
 abstract class BinaryPredicate extends BinaryExpression {
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/tree/package.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/tree/package.scala
similarity index 97%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/tree/package.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/tree/package.scala
index 04c29f7282144..caac40265300c 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/tree/package.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/tree/package.scala
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions
+package org.apache.flink.api.table
 
 /**
  * This package contains the base class of AST nodes and all the expression language AST classes.
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/tree/stringExpressions.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/tree/stringExpressions.scala
similarity index 94%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/tree/stringExpressions.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/tree/stringExpressions.scala
index 175d4451a82d3..e14374ff2a015 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/tree/stringExpressions.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/tree/stringExpressions.scala
@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions.tree
+package org.apache.flink.api.table.tree
 
-import org.apache.flink.api.expressions.ExpressionException
+import org.apache.flink.api.table.ExpressionException
 import org.apache.flink.api.common.typeinfo.{BasicTypeInfo, IntegerTypeInfo}
 
 case class Substring(
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/typeinfo/RenameOperator.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/typeinfo/RenameOperator.scala
similarity index 96%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/typeinfo/RenameOperator.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/typeinfo/RenameOperator.scala
index 38c908dec342a..3b5459b6d724b 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/typeinfo/RenameOperator.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/typeinfo/RenameOperator.scala
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions.typeinfo
+package org.apache.flink.api.table.typeinfo
 
 import org.apache.flink.api.common.operators.Operator
 import org.apache.flink.api.java.operators.SingleInputOperator
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/typeinfo/RenamingProxyTypeInfo.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/typeinfo/RenamingProxyTypeInfo.scala
similarity index 96%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/typeinfo/RenamingProxyTypeInfo.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/typeinfo/RenamingProxyTypeInfo.scala
index 0263f8aeccf18..6a9cbfebf7129 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/typeinfo/RenamingProxyTypeInfo.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/typeinfo/RenamingProxyTypeInfo.scala
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions.typeinfo
+package org.apache.flink.api.table.typeinfo
 
 import java.util
 
@@ -26,7 +26,7 @@ import org.apache.flink.api.common.typeutils.{CompositeType, TypeComparator, Typ
 
 /**
  * A TypeInformation that is used to rename fields of an underlying CompositeType. This
- * allows the system to translate "as" expression operations to a [[RenameOperator]]
+ * allows the system to translate "as" Table API operations to a [[RenameOperator]]
  * that does not get translated to a runtime operator.
  */
 class RenamingProxyTypeInfo[T](
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/typeinfo/RowSerializer.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/typeinfo/RowSerializer.scala
similarity index 97%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/typeinfo/RowSerializer.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/typeinfo/RowSerializer.scala
index 006c0c925a7b9..8a8dc3df01457 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/typeinfo/RowSerializer.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/typeinfo/RowSerializer.scala
@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions.typeinfo
+package org.apache.flink.api.table.typeinfo
 
-import org.apache.flink.api.expressions.Row
+import org.apache.flink.api.table.Row
 import org.apache.flink.api.common.typeutils.TypeSerializer
 import org.apache.flink.core.memory.{DataOutputView, DataInputView}
 ;
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/typeinfo/RowTypeInfo.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/typeinfo/RowTypeInfo.scala
similarity index 92%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/typeinfo/RowTypeInfo.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/typeinfo/RowTypeInfo.scala
index 92e9bc8b27d8e..7ffa91ca64ed8 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/api/expressions/typeinfo/RowTypeInfo.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/typeinfo/RowTypeInfo.scala
@@ -15,13 +15,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.expressions.typeinfo
+package org.apache.flink.api.table.typeinfo
 
 import org.apache.flink.api.common.ExecutionConfig
-import org.apache.flink.api.expressions.Row
+import org.apache.flink.api.table.Row
 import org.apache.flink.api.common.typeinfo.TypeInformation
 import org.apache.flink.api.common.typeutils.TypeSerializer
-import org.apache.flink.api.expressions.tree.Expression
+import org.apache.flink.api.table.tree.Expression
 import org.apache.flink.api.scala.typeutils.{CaseClassTypeInfo}
 
 /**
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/examples/scala/PageRankExpression.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/examples/scala/PageRankExpression.scala
similarity index 97%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/examples/scala/PageRankExpression.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/examples/scala/PageRankExpression.scala
index dadfe09585775..604bdcf1d993e 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/examples/scala/PageRankExpression.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/examples/scala/PageRankExpression.scala
@@ -17,10 +17,10 @@
  */
 package org.apache.flink.examples.scala
 
-import org.apache.flink.api.expressions.tree.Literal
+import org.apache.flink.api.table.tree.Literal
 import org.apache.flink.api.common.functions.GroupReduceFunction
 import org.apache.flink.api.scala._
-import org.apache.flink.api.scala.expressions._
+import org.apache.flink.api.scala.table._
 import org.apache.flink.examples.java.graph.util.PageRankData
 import org.apache.flink.util.Collector
 
@@ -60,7 +60,7 @@ import _root_.scala.collection.JavaConverters._
 * This example shows how to use:
 *
 *  - Bulk Iterations
-*  - Expression Operations
+*  - Table API expressions
 */
 object PageRankExpression {
 
@@ -98,7 +98,7 @@ object PageRankExpression {
     // start iteration
     val finalRanks = pagesWithRanks.iterateWithTermination(maxIterations) {
       currentRanks =>
-        val newRanks = currentRanks.toExpression
+        val newRanks = currentRanks.toTable
           // distribute ranks to target pages
           .join(adjacencyLists).where('pageId === 'sourceId)
           .select('rank, 'targetIds).as[RankOutput]
@@ -117,7 +117,7 @@ object PageRankExpression {
             ('rank * DAMPENING_FACTOR) + (Literal(1) - DAMPENING_FACTOR) / numPages as 'rank)
 
 
-        val termination = currentRanks.toExpression
+        val termination = currentRanks.toTable
           .as('curId, 'curRank).join(newRanks.as('newId, 'newRank))
           .where('curId === 'newId && ('curRank - 'newRank).abs > EPSILON)
 
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/examples/scala/StreamingExpressionFilter.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/examples/scala/StreamingExpressionFilter.scala
similarity index 93%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/examples/scala/StreamingExpressionFilter.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/examples/scala/StreamingExpressionFilter.scala
index 2d1d0ec8ccbff..0ff97bf139d08 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/examples/scala/StreamingExpressionFilter.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/examples/scala/StreamingExpressionFilter.scala
@@ -20,7 +20,7 @@ package org.apache.flink.examples.scala
 
 import org.apache.flink.streaming.api.scala._
 
-import org.apache.flink.api.scala.expressions._
+import org.apache.flink.api.scala.table._
 
 import scala.Stream._
 import scala.math._
@@ -28,7 +28,7 @@ import scala.language.postfixOps
 import scala.util.Random
 
 /**
- * Simple example for demonstrating the working streaming api expression operations.
+ * Simple example for demonstrating the use of the Table API with Flink Streaming.
  */
 object StreamingExpressionFilter {
 
@@ -39,7 +39,7 @@ object StreamingExpressionFilter {
       return
     }
 
-    val cars = genCarStream().toExpression
+    val cars = genCarStream().toTable
       .filter('carId === 0)
       .select('carId, 'speed, 'distance + 1000 as 'distance, 'time % 5 as 'time)
       .as[CarEvent]
diff --git a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/examples/scala/TPCHQuery3Expression.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/examples/scala/TPCHQuery3Expression.scala
similarity index 97%
rename from flink-staging/flink-expressions/src/main/scala/org/apache/flink/examples/scala/TPCHQuery3Expression.scala
rename to flink-staging/flink-table/src/main/scala/org/apache/flink/examples/scala/TPCHQuery3Expression.scala
index 1803bddd7baf8..96ec4ba71fa3d 100644
--- a/flink-staging/flink-expressions/src/main/scala/org/apache/flink/examples/scala/TPCHQuery3Expression.scala
+++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/examples/scala/TPCHQuery3Expression.scala
@@ -17,9 +17,9 @@
  */
 package org.apache.flink.examples.scala
 
-import org.apache.flink.api.expressions.tree.Literal
+import org.apache.flink.api.table.tree.Literal
 import org.apache.flink.api.scala._
-import org.apache.flink.api.scala.expressions._
+import org.apache.flink.api.scala.table._
 
 /**
  * This program implements a modified version of the TPC-H query 3. The
@@ -64,7 +64,7 @@ import org.apache.flink.api.scala.expressions._
  * }}}
  *  
  * This example shows how to use:
- *  - Expression Operations
+ *  - Table API expressions
  *
  */
 object TPCHQuery3Expression {
diff --git a/flink-staging/flink-expressions/src/test/java/org/apache/flink/api/java/expressions/test/AggregationsITCase.java b/flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/AggregationsITCase.java
similarity index 71%
rename from flink-staging/flink-expressions/src/test/java/org/apache/flink/api/java/expressions/test/AggregationsITCase.java
rename to flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/AggregationsITCase.java
index 76c7fed2fd451..0b2a5df963c5c 100644
--- a/flink-staging/flink-expressions/src/test/java/org/apache/flink/api/java/expressions/test/AggregationsITCase.java
+++ b/flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/AggregationsITCase.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.flink.api.java.expressions.test;
+package org.apache.flink.api.java.table.test;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -35,16 +35,16 @@
  * limitations under the License.
  */
 
-import org.apache.flink.api.expressions.ExpressionException;
-import org.apache.flink.api.expressions.ExpressionOperation;
-import org.apache.flink.api.expressions.Row;
+import org.apache.flink.api.table.ExpressionException;
+import org.apache.flink.api.table.Table;
+import org.apache.flink.api.table.Row;
 import org.apache.flink.api.java.DataSet;
 import org.apache.flink.api.java.ExecutionEnvironment;
-import org.apache.flink.api.java.expressions.ExpressionUtil;
+import org.apache.flink.api.java.table.TableEnvironment;
 import org.apache.flink.api.java.operators.DataSource;
 import org.apache.flink.api.java.tuple.Tuple2;
 import org.apache.flink.api.java.tuple.Tuple7;
-import org.apache.flink.api.scala.expressions.JavaBatchTranslator;
+import org.apache.flink.api.java.table.JavaBatchTranslator;
 import org.apache.flink.core.fs.FileSystem;
 import org.apache.flink.test.javaApiOperators.util.CollectionDataSets;
 import org.apache.flink.test.util.MultipleProgramsTestBase;
@@ -83,14 +83,14 @@ public void after() throws Exception{
 	@Test
 	public void testAggregationTypes() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
 
-		ExpressionOperation<JavaBatchTranslator> expressionOperation =
-				ExpressionUtil.from(CollectionDataSets.get3TupleDataSet(env));
+		Table<JavaBatchTranslator> table = tableEnv.toTable(CollectionDataSets.get3TupleDataSet(env));
 
-		ExpressionOperation<JavaBatchTranslator> result =
-				expressionOperation.select("f0.sum, f0.min, f0.max, f0.count, f0.avg");
+		Table<JavaBatchTranslator> result =
+				table.select("f0.sum, f0.min, f0.max, f0.count, f0.avg");
 
-		DataSet<Row> ds = ExpressionUtil.toSet(result, Row.class);
+		DataSet<Row> ds = tableEnv.toSet(result, Row.class);
 		ds.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
@@ -101,14 +101,15 @@ public void testAggregationTypes() throws Exception {
 	@Test(expected = ExpressionException.class)
 	public void testAggregationOnNonExistingField() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
 
-		ExpressionOperation<JavaBatchTranslator> expressionOperation =
-				ExpressionUtil.from(CollectionDataSets.get3TupleDataSet(env));
+		Table<JavaBatchTranslator> table =
+				tableEnv.toTable(CollectionDataSets.get3TupleDataSet(env));
 
-		ExpressionOperation<JavaBatchTranslator> result =
-				expressionOperation.select("'foo.avg");
+		Table<JavaBatchTranslator> result =
+				table.select("foo.avg");
 
-		DataSet<Row> ds = ExpressionUtil.toSet(result, Row.class);
+		DataSet<Row> ds = tableEnv.toSet(result, Row.class);
 		ds.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
@@ -119,19 +120,20 @@ public void testAggregationOnNonExistingField() throws Exception {
 	@Test
 	public void testWorkingAggregationDataTypes() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
 
 		DataSource<Tuple7<Byte, Short, Integer, Long, Float, Double, String>> input =
 				env.fromElements(
 						new Tuple7<Byte, Short, Integer, Long, Float, Double, String>((byte) 1, (short) 1, 1, 1L, 1.0f, 1.0d, "Hello"),
 						new Tuple7<Byte, Short, Integer, Long, Float, Double, String>((byte) 2, (short) 2, 2, 2L, 2.0f, 2.0d, "Ciao"));
 
-		ExpressionOperation<JavaBatchTranslator> expressionOperation =
-				ExpressionUtil.from(input);
+		Table<JavaBatchTranslator> table =
+				tableEnv.toTable(input);
 
-		ExpressionOperation<JavaBatchTranslator> result =
-				expressionOperation.select("f0.avg, f1.avg, f2.avg, f3.avg, f4.avg, f5.avg, f6.count");
+		Table<JavaBatchTranslator> result =
+				table.select("f0.avg, f1.avg, f2.avg, f3.avg, f4.avg, f5.avg, f6.count");
 
-		DataSet<Row> ds = ExpressionUtil.toSet(result, Row.class);
+		DataSet<Row> ds = tableEnv.toSet(result, Row.class);
 		ds.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
@@ -142,20 +144,21 @@ public void testWorkingAggregationDataTypes() throws Exception {
 	@Test
 	public void testAggregationWithArithmetic() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
 
 		DataSource<Tuple2<Float, String>> input =
 				env.fromElements(
 						new Tuple2<Float, String>(1f, "Hello"),
 						new Tuple2<Float, String>(2f, "Ciao"));
 
-		ExpressionOperation<JavaBatchTranslator> expressionOperation =
-				ExpressionUtil.from(input);
+		Table<JavaBatchTranslator> table =
+				tableEnv.toTable(input);
 
-		ExpressionOperation<JavaBatchTranslator> result =
-				expressionOperation.select("(f0 + 2).avg + 2, f1.count + \" THE COUNT\"");
+		Table<JavaBatchTranslator> result =
+				table.select("(f0 + 2).avg + 2, f1.count + \" THE COUNT\"");
 
 
-		DataSet<Row> ds = ExpressionUtil.toSet(result, Row.class);
+		DataSet<Row> ds = tableEnv.toSet(result, Row.class);
 		ds.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
@@ -166,18 +169,19 @@ public void testAggregationWithArithmetic() throws Exception {
 	@Test(expected = ExpressionException.class)
 	public void testNonWorkingDataTypes() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
 
 		DataSource<Tuple2<Float, String>> input = env.fromElements(new Tuple2<Float, String>(1f,
 				"Hello"));
 
-		ExpressionOperation<JavaBatchTranslator> expressionOperation =
-				ExpressionUtil.from(input);
+		Table<JavaBatchTranslator> table =
+				tableEnv.toTable(input);
 
-		ExpressionOperation<JavaBatchTranslator> result =
-				expressionOperation.select("f1.sum");
+		Table<JavaBatchTranslator> result =
+				table.select("f1.sum");
 
 
-		DataSet<Row> ds = ExpressionUtil.toSet(result, Row.class);
+		DataSet<Row> ds = tableEnv.toSet(result, Row.class);
 		ds.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
@@ -188,17 +192,18 @@ public void testNonWorkingDataTypes() throws Exception {
 	@Test(expected = ExpressionException.class)
 	public void testNoNestedAggregation() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
 
 		DataSource<Tuple2<Float, String>> input = env.fromElements(new Tuple2<Float, String>(1f, "Hello"));
 
-		ExpressionOperation<JavaBatchTranslator> expressionOperation =
-				ExpressionUtil.from(input);
+		Table<JavaBatchTranslator> table =
+				tableEnv.toTable(input);
 
-		ExpressionOperation<JavaBatchTranslator> result =
-				expressionOperation.select("f0.sum.sum");
+		Table<JavaBatchTranslator> result =
+				table.select("f0.sum.sum");
 
 
-		DataSet<Row> ds = ExpressionUtil.toSet(result, Row.class);
+		DataSet<Row> ds = tableEnv.toSet(result, Row.class);
 		ds.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
diff --git a/flink-staging/flink-expressions/src/test/java/org/apache/flink/api/java/expressions/test/AsITCase.java b/flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/AsITCase.java
similarity index 70%
rename from flink-staging/flink-expressions/src/test/java/org/apache/flink/api/java/expressions/test/AsITCase.java
rename to flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/AsITCase.java
index 3b69be0ec9468..ee877e9b49058 100644
--- a/flink-staging/flink-expressions/src/test/java/org/apache/flink/api/java/expressions/test/AsITCase.java
+++ b/flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/AsITCase.java
@@ -16,15 +16,15 @@
  * limitations under the License.
  */
 
-package org.apache.flink.api.java.expressions.test;
+package org.apache.flink.api.java.table.test;
 
-import org.apache.flink.api.expressions.ExpressionException;
-import org.apache.flink.api.expressions.ExpressionOperation;
-import org.apache.flink.api.expressions.Row;
+import org.apache.flink.api.table.ExpressionException;
+import org.apache.flink.api.table.Table;
+import org.apache.flink.api.table.Row;
 import org.apache.flink.api.java.DataSet;
 import org.apache.flink.api.java.ExecutionEnvironment;
-import org.apache.flink.api.java.expressions.ExpressionUtil;
-import org.apache.flink.api.scala.expressions.JavaBatchTranslator;
+import org.apache.flink.api.java.table.TableEnvironment;
+import org.apache.flink.api.java.table.JavaBatchTranslator;
 import org.apache.flink.core.fs.FileSystem;
 import org.apache.flink.test.javaApiOperators.util.CollectionDataSets;
 import org.apache.flink.test.util.MultipleProgramsTestBase;
@@ -63,11 +63,12 @@ public void after() throws Exception{
 	@Test
 	public void testAs() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
 
-		ExpressionOperation<JavaBatchTranslator> expressionOperation =
-				ExpressionUtil.from(CollectionDataSets.get3TupleDataSet(env), "a, b, c");
+		Table<JavaBatchTranslator> table =
+				tableEnv.toTable(CollectionDataSets.get3TupleDataSet(env), "a, b, c");
 
-		DataSet<Row> ds = ExpressionUtil.toSet(expressionOperation, Row.class);
+		DataSet<Row> ds = tableEnv.toSet(table, Row.class);
 		ds.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
@@ -83,11 +84,12 @@ public void testAs() throws Exception {
 	@Test(expected = ExpressionException.class)
 	public void testAsWithToFewFields() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
 
-		ExpressionOperation<JavaBatchTranslator> expressionOperation =
-				ExpressionUtil.from(CollectionDataSets.get3TupleDataSet(env), "a, b");
+		Table<JavaBatchTranslator> table =
+				tableEnv.toTable(CollectionDataSets.get3TupleDataSet(env), "a, b");
 
-		DataSet<Row> ds = ExpressionUtil.toSet(expressionOperation, Row.class);
+		DataSet<Row> ds = tableEnv.toSet(table, Row.class);
 		ds.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
@@ -98,11 +100,12 @@ public void testAsWithToFewFields() throws Exception {
 	@Test(expected = ExpressionException.class)
 	public void testAsWithToManyFields() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
 
-		ExpressionOperation<JavaBatchTranslator> expressionOperation =
-				ExpressionUtil.from(CollectionDataSets.get3TupleDataSet(env), "a, b, c, d");
+		Table<JavaBatchTranslator> table =
+				tableEnv.toTable(CollectionDataSets.get3TupleDataSet(env), "a, b, c, d");
 
-		DataSet<Row> ds = ExpressionUtil.toSet(expressionOperation, Row.class);
+		DataSet<Row> ds = tableEnv.toSet(table, Row.class);
 		ds.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
@@ -113,11 +116,12 @@ public void testAsWithToManyFields() throws Exception {
 	@Test(expected = ExpressionException.class)
 	public void testAsWithAmbiguousFields() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
 
-		ExpressionOperation<JavaBatchTranslator> expressionOperation =
-				ExpressionUtil.from(CollectionDataSets.get3TupleDataSet(env), "a, b, b");
+		Table<JavaBatchTranslator> table =
+				tableEnv.toTable(CollectionDataSets.get3TupleDataSet(env), "a, b, b");
 
-		DataSet<Row> ds = ExpressionUtil.toSet(expressionOperation, Row.class);
+		DataSet<Row> ds = tableEnv.toSet(table, Row.class);
 		ds.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
@@ -128,11 +132,12 @@ public void testAsWithAmbiguousFields() throws Exception {
 	@Test(expected = ExpressionException.class)
 	public void testAsWithNonFieldReference1() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
 
-		ExpressionOperation<JavaBatchTranslator> expressionOperation =
-				ExpressionUtil.from(CollectionDataSets.get3TupleDataSet(env), "a + 1, b, c");
+		Table<JavaBatchTranslator> table =
+				tableEnv.toTable(CollectionDataSets.get3TupleDataSet(env), "a + 1, b, c");
 
-		DataSet<Row> ds = ExpressionUtil.toSet(expressionOperation, Row.class);
+		DataSet<Row> ds = tableEnv.toSet(table, Row.class);
 		ds.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
@@ -143,11 +148,13 @@ public void testAsWithNonFieldReference1() throws Exception {
 	@Test(expected = ExpressionException.class)
 	public void testAsWithNonFieldReference2() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
 
-		ExpressionOperation<JavaBatchTranslator> expressionOperation =
-				ExpressionUtil.from(CollectionDataSets.get3TupleDataSet(env), "a as foo, b, c");
+		Table<JavaBatchTranslator> table =
+				tableEnv.toTable(CollectionDataSets.get3TupleDataSet(env), "a as foo, b," +
+						" c");
 
-		DataSet<Row> ds = ExpressionUtil.toSet(expressionOperation, Row.class);
+		DataSet<Row> ds = tableEnv.toSet(table, Row.class);
 		ds.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
diff --git a/flink-staging/flink-expressions/src/test/java/org/apache/flink/api/java/expressions/test/CastingITCase.java b/flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/CastingITCase.java
similarity index 77%
rename from flink-staging/flink-expressions/src/test/java/org/apache/flink/api/java/expressions/test/CastingITCase.java
rename to flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/CastingITCase.java
index b4d11593848a8..57824eb0a3015 100644
--- a/flink-staging/flink-expressions/src/test/java/org/apache/flink/api/java/expressions/test/CastingITCase.java
+++ b/flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/CastingITCase.java
@@ -16,16 +16,16 @@
  * limitations under the License.
  */
 
-package org.apache.flink.api.java.expressions.test;
+package org.apache.flink.api.java.table.test;
 
-import org.apache.flink.api.expressions.ExpressionOperation;
-import org.apache.flink.api.expressions.Row;
+import org.apache.flink.api.table.Table;
+import org.apache.flink.api.table.Row;
 import org.apache.flink.api.java.DataSet;
 import org.apache.flink.api.java.ExecutionEnvironment;
-import org.apache.flink.api.java.expressions.ExpressionUtil;
+import org.apache.flink.api.java.table.TableEnvironment;
 import org.apache.flink.api.java.operators.DataSource;
 import org.apache.flink.api.java.tuple.Tuple7;
-import org.apache.flink.api.scala.expressions.JavaBatchTranslator;
+import org.apache.flink.api.java.table.JavaBatchTranslator;
 import org.apache.flink.core.fs.FileSystem;
 import org.apache.flink.test.util.MultipleProgramsTestBase;
 import org.junit.After;
@@ -63,18 +63,19 @@ public void after() throws Exception{
 	@Test
 	public void testAutoCastToString() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
 
 		DataSource<Tuple7<Byte, Short, Integer, Long, Float, Double, String>> input =
 				env.fromElements(new Tuple7<Byte, Short, Integer, Long, Float, Double, String>(
 						(byte) 1, (short) 1, 1, 1L, 1.0f, 1.0d, "Hello"));
 
-		ExpressionOperation<JavaBatchTranslator> expressionOperation =
-				ExpressionUtil.from(input);
+		Table<JavaBatchTranslator> table =
+				tableEnv.toTable(input);
 
-		ExpressionOperation<JavaBatchTranslator> result = expressionOperation.select(
+		Table<JavaBatchTranslator> result = table.select(
 				"f0 + 'b', f1 + 's', f2 + 'i', f3 + 'L', f4 + 'f', f5 + \"d\"");
 
-		DataSet<Row> ds = ExpressionUtil.toSet(result, Row.class);
+		DataSet<Row> ds = tableEnv.toSet(result, Row.class);
 		ds.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
@@ -85,18 +86,19 @@ public void testAutoCastToString() throws Exception {
 	@Test
 	public void testNumericAutocastInArithmetic() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
 
 		DataSource<Tuple7<Byte, Short, Integer, Long, Float, Double, String>> input =
 				env.fromElements(new Tuple7<Byte, Short, Integer, Long, Float, Double, String>(
 						(byte) 1, (short) 1, 1, 1L, 1.0f, 1.0d, "Hello"));
 
-		ExpressionOperation<JavaBatchTranslator> expressionOperation =
-				ExpressionUtil.from(input);
+		Table<JavaBatchTranslator> table =
+				tableEnv.toTable(input);
 
-		ExpressionOperation<JavaBatchTranslator> result = expressionOperation.select("f0 + 1, f1 +" +
+		Table<JavaBatchTranslator> result = table.select("f0 + 1, f1 +" +
 				" 1, f2 + 1L, f3 + 1.0f, f4 + 1.0d, f5 + 1");
 
-		DataSet<Row> ds = ExpressionUtil.toSet(result, Row.class);
+		DataSet<Row> ds = tableEnv.toSet(result, Row.class);
 		ds.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
@@ -107,19 +109,20 @@ public void testNumericAutocastInArithmetic() throws Exception {
 	@Test
 	public void testNumericAutocastInComparison() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
 
 		DataSource<Tuple7<Byte, Short, Integer, Long, Float, Double, String>> input =
 				env.fromElements(
 						new Tuple7<Byte, Short, Integer, Long, Float, Double, String>((byte) 1, (short) 1, 1, 1L, 1.0f, 1.0d, "Hello"),
 						new Tuple7<Byte, Short, Integer, Long, Float, Double, String>((byte) 2, (short) 2, 2, 2L, 2.0f, 2.0d, "Hello"));
 
-		ExpressionOperation<JavaBatchTranslator> expressionOperation =
-				ExpressionUtil.from(input, "a,b,c,d,e,f,g");
+		Table<JavaBatchTranslator> table =
+				tableEnv.toTable(input, "a,b,c,d,e,f,g");
 
-		ExpressionOperation<JavaBatchTranslator> result = expressionOperation
+		Table<JavaBatchTranslator> result = table
 				.filter("a > 1 && b > 1 && c > 1L && d > 1.0f && e > 1.0d && f > 1");
 
-		DataSet<Row> ds = ExpressionUtil.toSet(result, Row.class);
+		DataSet<Row> ds = tableEnv.toSet(result, Row.class);
 		ds.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
diff --git a/flink-staging/flink-expressions/src/test/java/org/apache/flink/api/java/expressions/test/ExpressionsITCase.java b/flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/ExpressionsITCase.java
similarity index 69%
rename from flink-staging/flink-expressions/src/test/java/org/apache/flink/api/java/expressions/test/ExpressionsITCase.java
rename to flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/ExpressionsITCase.java
index 5c3a92aaf70ef..938af2d6f073a 100644
--- a/flink-staging/flink-expressions/src/test/java/org/apache/flink/api/java/expressions/test/ExpressionsITCase.java
+++ b/flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/ExpressionsITCase.java
@@ -16,19 +16,18 @@
  * limitations under the License.
  */
 
-package org.apache.flink.api.java.expressions.test;
+package org.apache.flink.api.java.table.test;
 
-import org.apache.flink.api.expressions.ExpressionException;
-import org.apache.flink.api.expressions.ExpressionOperation;
-import org.apache.flink.api.expressions.Row;
+import org.apache.flink.api.table.ExpressionException;
+import org.apache.flink.api.table.Table;
+import org.apache.flink.api.table.Row;
 import org.apache.flink.api.java.DataSet;
 import org.apache.flink.api.java.ExecutionEnvironment;
-import org.apache.flink.api.java.expressions.ExpressionUtil;
+import org.apache.flink.api.java.table.TableEnvironment;
 import org.apache.flink.api.java.operators.DataSource;
 import org.apache.flink.api.java.tuple.Tuple2;
 import org.apache.flink.api.java.tuple.Tuple3;
-import org.apache.flink.api.java.tuple.Tuple7;
-import org.apache.flink.api.scala.expressions.JavaBatchTranslator;
+import org.apache.flink.api.java.table.JavaBatchTranslator;
 import org.apache.flink.core.fs.FileSystem;
 import org.apache.flink.test.util.MultipleProgramsTestBase;
 import org.junit.After;
@@ -66,17 +65,18 @@ public void after() throws Exception{
 	@Test
 	public void testArithmetic() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
 
 		DataSource<Tuple2<Integer, Integer>> input =
 				env.fromElements(new Tuple2<Integer, Integer>(5, 10));
 
-		ExpressionOperation<JavaBatchTranslator> expressionOperation =
-				ExpressionUtil.from(input, "a, b");
+		Table<JavaBatchTranslator> table =
+				tableEnv.toTable(input, "a, b");
 
-		ExpressionOperation<JavaBatchTranslator> result = expressionOperation.select(
+		Table<JavaBatchTranslator> result = table.select(
 				"a - 5, a + 5, a / 2, a * 2, a % 2, -a");
 
-		DataSet<Row> ds = ExpressionUtil.toSet(result, Row.class);
+		DataSet<Row> ds = tableEnv.toSet(result, Row.class);
 		ds.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
@@ -87,17 +87,18 @@ public void testArithmetic() throws Exception {
 	@Test
 	public void testLogic() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
 
 		DataSource<Tuple2<Integer, Boolean>> input =
 				env.fromElements(new Tuple2<Integer, Boolean>(5, true));
 
-		ExpressionOperation<JavaBatchTranslator> expressionOperation =
-				ExpressionUtil.from(input, "a, b");
+		Table<JavaBatchTranslator> table =
+				tableEnv.toTable(input, "a, b");
 
-		ExpressionOperation<JavaBatchTranslator> result = expressionOperation.select(
+		Table<JavaBatchTranslator> result = table.select(
 				"b && true, b && false, b || false, !b");
 
-		DataSet<Row> ds = ExpressionUtil.toSet(result, Row.class);
+		DataSet<Row> ds = tableEnv.toSet(result, Row.class);
 		ds.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
@@ -108,17 +109,18 @@ public void testLogic() throws Exception {
 	@Test
 	public void testComparisons() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
 
 		DataSource<Tuple3<Integer, Integer, Integer>> input =
 				env.fromElements(new Tuple3<Integer, Integer, Integer>(5, 5, 4));
 
-		ExpressionOperation<JavaBatchTranslator> expressionOperation =
-				ExpressionUtil.from(input, "a, b, c");
+		Table<JavaBatchTranslator> table =
+				tableEnv.toTable(input, "a, b, c");
 
-		ExpressionOperation<JavaBatchTranslator> result = expressionOperation.select(
+		Table<JavaBatchTranslator> result = table.select(
 				"a > c, a >= b, a < c, a.isNull, a.isNotNull");
 
-		DataSet<Row> ds = ExpressionUtil.toSet(result, Row.class);
+		DataSet<Row> ds = tableEnv.toSet(result, Row.class);
 		ds.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
@@ -129,17 +131,18 @@ public void testComparisons() throws Exception {
 	@Test
 	public void testBitwiseOperation() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
 
 		DataSource<Tuple2<Byte, Byte>> input =
 				env.fromElements(new Tuple2<Byte, Byte>((byte) 3, (byte) 5));
 
-		ExpressionOperation<JavaBatchTranslator> expressionOperation =
-				ExpressionUtil.from(input, "a, b");
+		Table<JavaBatchTranslator> table =
+				tableEnv.toTable(input, "a, b");
 
-		ExpressionOperation<JavaBatchTranslator> result = expressionOperation.select(
+		Table<JavaBatchTranslator> result = table.select(
 				"a & b, a | b, a ^ b, ~a");
 
-		DataSet<Row> ds = ExpressionUtil.toSet(result, Row.class);
+		DataSet<Row> ds = tableEnv.toSet(result, Row.class);
 		ds.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
@@ -150,17 +153,18 @@ public void testBitwiseOperation() throws Exception {
 	@Test
 	public void testBitwiseWithAutocast() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
 
 		DataSource<Tuple2<Integer, Byte>> input =
 				env.fromElements(new Tuple2<Integer, Byte>(3, (byte) 5));
 
-		ExpressionOperation<JavaBatchTranslator> expressionOperation =
-				ExpressionUtil.from(input, "a, b");
+		Table<JavaBatchTranslator> table =
+				tableEnv.toTable(input, "a, b");
 
-		ExpressionOperation<JavaBatchTranslator> result = expressionOperation.select(
+		Table<JavaBatchTranslator> result = table.select(
 				"a & b, a | b, a ^ b, ~a");
 
-		DataSet<Row> ds = ExpressionUtil.toSet(result, Row.class);
+		DataSet<Row> ds = tableEnv.toSet(result, Row.class);
 		ds.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
@@ -171,17 +175,18 @@ public void testBitwiseWithAutocast() throws Exception {
 	@Test(expected = ExpressionException.class)
 	public void testBitwiseWithNonWorkingAutocast() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
 
 		DataSource<Tuple2<Float, Byte>> input =
 				env.fromElements(new Tuple2<Float, Byte>(3.0f, (byte) 5));
 
-		ExpressionOperation<JavaBatchTranslator> expressionOperation =
-				ExpressionUtil.from(input, "a, b");
+		Table<JavaBatchTranslator> table =
+				tableEnv.toTable(input, "a, b");
 
-		ExpressionOperation<JavaBatchTranslator> result =
-				expressionOperation.select("a & b, a | b, a ^ b, ~a");
+		Table<JavaBatchTranslator> result =
+				table.select("a & b, a | b, a ^ b, ~a");
 
-		DataSet<Row> ds = ExpressionUtil.toSet(result, Row.class);
+		DataSet<Row> ds = tableEnv.toSet(result, Row.class);
 		ds.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
diff --git a/flink-staging/flink-expressions/src/test/java/org/apache/flink/api/java/expressions/test/FilterITCase.java b/flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/FilterITCase.java
similarity index 75%
rename from flink-staging/flink-expressions/src/test/java/org/apache/flink/api/java/expressions/test/FilterITCase.java
rename to flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/FilterITCase.java
index 7da5fa3472b8f..e70907979a9d1 100644
--- a/flink-staging/flink-expressions/src/test/java/org/apache/flink/api/java/expressions/test/FilterITCase.java
+++ b/flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/FilterITCase.java
@@ -16,18 +16,15 @@
  * limitations under the License.
  */
 
-package org.apache.flink.api.java.expressions.test;
+package org.apache.flink.api.java.table.test;
 
-import org.apache.flink.api.expressions.ExpressionException;
-import org.apache.flink.api.expressions.ExpressionOperation;
-import org.apache.flink.api.expressions.Row;
+import org.apache.flink.api.table.Table;
+import org.apache.flink.api.table.Row;
 import org.apache.flink.api.java.DataSet;
 import org.apache.flink.api.java.ExecutionEnvironment;
-import org.apache.flink.api.java.expressions.ExpressionUtil;
-import org.apache.flink.api.java.operators.DataSource;
-import org.apache.flink.api.java.tuple.Tuple2;
+import org.apache.flink.api.java.table.TableEnvironment;
 import org.apache.flink.api.java.tuple.Tuple3;
-import org.apache.flink.api.scala.expressions.JavaBatchTranslator;
+import org.apache.flink.api.java.table.JavaBatchTranslator;
 import org.apache.flink.core.fs.FileSystem;
 import org.apache.flink.test.javaApiOperators.util.CollectionDataSets;
 import org.apache.flink.test.util.MultipleProgramsTestBase;
@@ -66,15 +63,17 @@ public void after() throws Exception{
 	@Test
 	public void testAllRejectingFilter() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
+
 		DataSet<Tuple3<Integer, Long, String>> input = CollectionDataSets.get3TupleDataSet(env);
 
-		ExpressionOperation<JavaBatchTranslator> expressionOperation =
-				ExpressionUtil.from(input, "a, b, c");
+		Table<JavaBatchTranslator> table =
+				tableEnv.toTable(input, "a, b, c");
 
-		ExpressionOperation<JavaBatchTranslator> result = expressionOperation
+		Table<JavaBatchTranslator> result = table
 				.filter("false");
 
-		DataSet<Row> ds = ExpressionUtil.toSet(result, Row.class);
+		DataSet<Row> ds = tableEnv.toSet(result, Row.class);
 		ds.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
@@ -85,15 +84,17 @@ public void testAllRejectingFilter() throws Exception {
 	@Test
 	public void testAllPassingFilter() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
+
 		DataSet<Tuple3<Integer, Long, String>> input = CollectionDataSets.get3TupleDataSet(env);
 
-		ExpressionOperation<JavaBatchTranslator> expressionOperation =
-				ExpressionUtil.from(input, "a, b, c");
+		Table<JavaBatchTranslator> table =
+				tableEnv.toTable(input, "a, b, c");
 
-		ExpressionOperation<JavaBatchTranslator> result = expressionOperation
+		Table<JavaBatchTranslator> result = table
 				.filter("true");
 
-		DataSet<Row> ds = ExpressionUtil.toSet(result, Row.class);
+		DataSet<Row> ds = tableEnv.toSet(result, Row.class);
 		ds.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
@@ -109,15 +110,17 @@ public void testAllPassingFilter() throws Exception {
 	@Test
 	public void testFilterOnIntegerTupleField() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
+
 		DataSet<Tuple3<Integer, Long, String>> input = CollectionDataSets.get3TupleDataSet(env);
 
-		ExpressionOperation<JavaBatchTranslator> expressionOperation =
-				ExpressionUtil.from(input, "a, b, c");
+		Table<JavaBatchTranslator> table =
+				tableEnv.toTable(input, "a, b, c");
 
-		ExpressionOperation<JavaBatchTranslator> result = expressionOperation
+		Table<JavaBatchTranslator> result = table
 				.filter(" a % 2 === 0 ");
 
-		DataSet<Row> ds = ExpressionUtil.toSet(result, Row.class);
+		DataSet<Row> ds = tableEnv.toSet(result, Row.class);
 		ds.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
diff --git a/flink-staging/flink-expressions/src/test/java/org/apache/flink/api/java/expressions/test/GroupedAggregationsITCase.java b/flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/GroupedAggregationsITCase.java
similarity index 75%
rename from flink-staging/flink-expressions/src/test/java/org/apache/flink/api/java/expressions/test/GroupedAggregationsITCase.java
rename to flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/GroupedAggregationsITCase.java
index 8141deaa15823..e0dd28e2f23b7 100644
--- a/flink-staging/flink-expressions/src/test/java/org/apache/flink/api/java/expressions/test/GroupedAggregationsITCase.java
+++ b/flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/GroupedAggregationsITCase.java
@@ -16,16 +16,16 @@
  * limitations under the License.
  */
 
-package org.apache.flink.api.java.expressions.test;
+package org.apache.flink.api.java.table.test;
 
-import org.apache.flink.api.expressions.ExpressionException;
-import org.apache.flink.api.expressions.ExpressionOperation;
-import org.apache.flink.api.expressions.Row;
+import org.apache.flink.api.table.ExpressionException;
+import org.apache.flink.api.table.Table;
+import org.apache.flink.api.table.Row;
 import org.apache.flink.api.java.DataSet;
 import org.apache.flink.api.java.ExecutionEnvironment;
-import org.apache.flink.api.java.expressions.ExpressionUtil;
+import org.apache.flink.api.java.table.TableEnvironment;
 import org.apache.flink.api.java.tuple.Tuple3;
-import org.apache.flink.api.scala.expressions.JavaBatchTranslator;
+import org.apache.flink.api.java.table.JavaBatchTranslator;
 import org.apache.flink.core.fs.FileSystem;
 import org.apache.flink.test.javaApiOperators.util.CollectionDataSets;
 import org.apache.flink.test.util.MultipleProgramsTestBase;
@@ -64,15 +64,17 @@ public void after() throws Exception{
 	@Test(expected = ExpressionException.class)
 	public void testGroupingOnNonExistentField() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
+
 		DataSet<Tuple3<Integer, Long, String>> input = CollectionDataSets.get3TupleDataSet(env);
 
-		ExpressionOperation<JavaBatchTranslator> expressionOperation =
-				ExpressionUtil.from(input, "a, b, c");
+		Table<JavaBatchTranslator> table =
+				tableEnv.toTable(input, "a, b, c");
 
-		ExpressionOperation<JavaBatchTranslator> result = expressionOperation
+		Table<JavaBatchTranslator> result = table
 				.groupBy("foo").select("a.avg");
 
-		DataSet<Row> ds = ExpressionUtil.toSet(result, Row.class);
+		DataSet<Row> ds = tableEnv.toSet(result, Row.class);
 		ds.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
@@ -82,17 +84,18 @@ public void testGroupingOnNonExistentField() throws Exception {
 
 	@Test
 	public void testGroupedAggregate() throws Exception {
-
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
+
 		DataSet<Tuple3<Integer, Long, String>> input = CollectionDataSets.get3TupleDataSet(env);
 
-		ExpressionOperation<JavaBatchTranslator> expressionOperation =
-				ExpressionUtil.from(input, "a, b, c");
+		Table<JavaBatchTranslator> table =
+				tableEnv.toTable(input, "a, b, c");
 
-		ExpressionOperation<JavaBatchTranslator> result = expressionOperation
+		Table<JavaBatchTranslator> result = table
 				.groupBy("b").select("b, a.sum");
 
-		DataSet<Row> ds = ExpressionUtil.toSet(result, Row.class);
+		DataSet<Row> ds = tableEnv.toSet(result, Row.class);
 		ds.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
@@ -107,15 +110,17 @@ public void testGroupingKeyForwardIfNotUsed() throws Exception {
 		// if we don't want the key in the output
 
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
+
 		DataSet<Tuple3<Integer, Long, String>> input = CollectionDataSets.get3TupleDataSet(env);
 
-		ExpressionOperation<JavaBatchTranslator> expressionOperation =
-				ExpressionUtil.from(input, "a, b, c");
+		Table<JavaBatchTranslator> table =
+				tableEnv.toTable(input, "a, b, c");
 
-		ExpressionOperation<JavaBatchTranslator> result = expressionOperation
+		Table<JavaBatchTranslator> result = table
 				.groupBy("b").select("a.sum");
 
-		DataSet<Row> ds = ExpressionUtil.toSet(result, Row.class);
+		DataSet<Row> ds = tableEnv.toSet(result, Row.class);
 		ds.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
diff --git a/flink-staging/flink-expressions/src/test/java/org/apache/flink/api/java/expressions/test/JoinITCase.java b/flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/JoinITCase.java
similarity index 67%
rename from flink-staging/flink-expressions/src/test/java/org/apache/flink/api/java/expressions/test/JoinITCase.java
rename to flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/JoinITCase.java
index 3ece3dce4605a..9ed8f84cee0d3 100644
--- a/flink-staging/flink-expressions/src/test/java/org/apache/flink/api/java/expressions/test/JoinITCase.java
+++ b/flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/JoinITCase.java
@@ -16,17 +16,17 @@
  * limitations under the License.
  */
 
-package org.apache.flink.api.java.expressions.test;
+package org.apache.flink.api.java.table.test;
 
-import org.apache.flink.api.expressions.ExpressionException;
-import org.apache.flink.api.expressions.ExpressionOperation;
-import org.apache.flink.api.expressions.Row;
+import org.apache.flink.api.table.ExpressionException;
+import org.apache.flink.api.table.Table;
+import org.apache.flink.api.table.Row;
 import org.apache.flink.api.java.DataSet;
 import org.apache.flink.api.java.ExecutionEnvironment;
-import org.apache.flink.api.java.expressions.ExpressionUtil;
+import org.apache.flink.api.java.table.TableEnvironment;
 import org.apache.flink.api.java.tuple.Tuple3;
 import org.apache.flink.api.java.tuple.Tuple5;
-import org.apache.flink.api.scala.expressions.JavaBatchTranslator;
+import org.apache.flink.api.java.table.JavaBatchTranslator;
 import org.apache.flink.core.fs.FileSystem;
 import org.apache.flink.test.javaApiOperators.util.CollectionDataSets;
 import org.apache.flink.test.util.MultipleProgramsTestBase;
@@ -65,15 +65,17 @@ public void after() throws Exception {
 	@Test
 	public void testJoin() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
+
 		DataSet<Tuple3<Integer, Long, String>> ds1 = CollectionDataSets.getSmall3TupleDataSet(env);
 		DataSet<Tuple5<Integer, Long, Integer, String, Long>> ds2 = CollectionDataSets.get5TupleDataSet(env);
 
-		ExpressionOperation<JavaBatchTranslator> in1 = ExpressionUtil.from(ds1, "a, b, c");
-		ExpressionOperation<JavaBatchTranslator> in2 = ExpressionUtil.from(ds2, "d, e, f, g, h");
+		Table<JavaBatchTranslator> in1 = tableEnv.toTable(ds1, "a, b, c");
+		Table<JavaBatchTranslator> in2 = tableEnv.toTable(ds2, "d, e, f, g, h");
 
-		ExpressionOperation<JavaBatchTranslator> result = in1.join(in2).where("b === e").select("c, g");
+		Table<JavaBatchTranslator> result = in1.join(in2).where("b === e").select("c, g");
 
-		DataSet<Row> ds = ExpressionUtil.toSet(result, Row.class);
+		DataSet<Row> ds = tableEnv.toSet(result, Row.class);
 		ds.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
@@ -84,15 +86,17 @@ public void testJoin() throws Exception {
 	@Test
 	public void testJoinWithFilter() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
+
 		DataSet<Tuple3<Integer, Long, String>> ds1 = CollectionDataSets.getSmall3TupleDataSet(env);
 		DataSet<Tuple5<Integer, Long, Integer, String, Long>> ds2 = CollectionDataSets.get5TupleDataSet(env);
 
-		ExpressionOperation<JavaBatchTranslator> in1 = ExpressionUtil.from(ds1, "a, b, c");
-		ExpressionOperation<JavaBatchTranslator> in2 = ExpressionUtil.from(ds2, "d, e, f, g, h");
+		Table<JavaBatchTranslator> in1 = tableEnv.toTable(ds1, "a, b, c");
+		Table<JavaBatchTranslator> in2 = tableEnv.toTable(ds2, "d, e, f, g, h");
 
-		ExpressionOperation<JavaBatchTranslator> result = in1.join(in2).where("b === e && b < 2").select("c, g");
+		Table<JavaBatchTranslator> result = in1.join(in2).where("b === e && b < 2").select("c, g");
 
-		DataSet<Row> ds = ExpressionUtil.toSet(result, Row.class);
+		DataSet<Row> ds = tableEnv.toSet(result, Row.class);
 		ds.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
@@ -103,15 +107,17 @@ public void testJoinWithFilter() throws Exception {
 	@Test
 	public void testJoinWithMultipleKeys() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
+
 		DataSet<Tuple3<Integer, Long, String>> ds1 = CollectionDataSets.get3TupleDataSet(env);
 		DataSet<Tuple5<Integer, Long, Integer, String, Long>> ds2 = CollectionDataSets.get5TupleDataSet(env);
 
-		ExpressionOperation<JavaBatchTranslator> in1 = ExpressionUtil.from(ds1, "a, b, c");
-		ExpressionOperation<JavaBatchTranslator> in2 = ExpressionUtil.from(ds2, "d, e, f, g, h");
+		Table<JavaBatchTranslator> in1 = tableEnv.toTable(ds1, "a, b, c");
+		Table<JavaBatchTranslator> in2 = tableEnv.toTable(ds2, "d, e, f, g, h");
 
-		ExpressionOperation<JavaBatchTranslator> result = in1.join(in2).where("a === d && b === h").select("c, g");
+		Table<JavaBatchTranslator> result = in1.join(in2).where("a === d && b === h").select("c, g");
 
-		DataSet<Row> ds = ExpressionUtil.toSet(result, Row.class);
+		DataSet<Row> ds = tableEnv.toSet(result, Row.class);
 		ds.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
@@ -123,15 +129,17 @@ public void testJoinWithMultipleKeys() throws Exception {
 	@Test(expected = ExpressionException.class)
 	public void testJoinNonExistingKey() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
+
 		DataSet<Tuple3<Integer, Long, String>> ds1 = CollectionDataSets.getSmall3TupleDataSet(env);
 		DataSet<Tuple5<Integer, Long, Integer, String, Long>> ds2 = CollectionDataSets.get5TupleDataSet(env);
 
-		ExpressionOperation<JavaBatchTranslator> in1 = ExpressionUtil.from(ds1, "a, b, c");
-		ExpressionOperation<JavaBatchTranslator> in2 = ExpressionUtil.from(ds2, "d, e, f, g, h");
+		Table<JavaBatchTranslator> in1 = tableEnv.toTable(ds1, "a, b, c");
+		Table<JavaBatchTranslator> in2 = tableEnv.toTable(ds2, "d, e, f, g, h");
 
-		ExpressionOperation<JavaBatchTranslator> result = in1.join(in2).where("foo === e").select("c, g");
+		Table<JavaBatchTranslator> result = in1.join(in2).where("foo === e").select("c, g");
 
-		DataSet<Row> ds = ExpressionUtil.toSet(result, Row.class);
+		DataSet<Row> ds = tableEnv.toSet(result, Row.class);
 		ds.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
@@ -142,16 +150,18 @@ public void testJoinNonExistingKey() throws Exception {
 	@Test(expected = ExpressionException.class)
 	public void testJoinWithNonMatchingKeyTypes() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
+
 		DataSet<Tuple3<Integer, Long, String>> ds1 = CollectionDataSets.getSmall3TupleDataSet(env);
 		DataSet<Tuple5<Integer, Long, Integer, String, Long>> ds2 = CollectionDataSets.get5TupleDataSet(env);
 
-		ExpressionOperation<JavaBatchTranslator> in1 = ExpressionUtil.from(ds1, "a, b, c");
-		ExpressionOperation<JavaBatchTranslator> in2 = ExpressionUtil.from(ds2, "d, e, f, g, h");
+		Table<JavaBatchTranslator> in1 = tableEnv.toTable(ds1, "a, b, c");
+		Table<JavaBatchTranslator> in2 = tableEnv.toTable(ds2, "d, e, f, g, h");
 
-		ExpressionOperation<JavaBatchTranslator> result = in1
+		Table<JavaBatchTranslator> result = in1
 				.join(in2).where("a === g").select("c, g");
 
-		DataSet<Row> ds = ExpressionUtil.toSet(result, Row.class);
+		DataSet<Row> ds = tableEnv.toSet(result, Row.class);
 		ds.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
@@ -162,16 +172,18 @@ public void testJoinWithNonMatchingKeyTypes() throws Exception {
 	@Test(expected = ExpressionException.class)
 	public void testJoinWithAmbiguousFields() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
+
 		DataSet<Tuple3<Integer, Long, String>> ds1 = CollectionDataSets.getSmall3TupleDataSet(env);
 		DataSet<Tuple5<Integer, Long, Integer, String, Long>> ds2 = CollectionDataSets.get5TupleDataSet(env);
 
-		ExpressionOperation<JavaBatchTranslator> in1 = ExpressionUtil.from(ds1, "a, b, c");
-		ExpressionOperation<JavaBatchTranslator> in2 = ExpressionUtil.from(ds2, "d, e, f, g, c");
+		Table<JavaBatchTranslator> in1 = tableEnv.toTable(ds1, "a, b, c");
+		Table<JavaBatchTranslator> in2 = tableEnv.toTable(ds2, "d, e, f, g, c");
 
-		ExpressionOperation<JavaBatchTranslator> result = in1
+		Table<JavaBatchTranslator> result = in1
 				.join(in2).where("a === d").select("c, g");
 
-		DataSet<Row> ds = ExpressionUtil.toSet(result, Row.class);
+		DataSet<Row> ds = tableEnv.toSet(result, Row.class);
 		ds.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
@@ -182,16 +194,18 @@ public void testJoinWithAmbiguousFields() throws Exception {
 	@Test
 	public void testJoinWithAggregation() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
+
 		DataSet<Tuple3<Integer, Long, String>> ds1 = CollectionDataSets.getSmall3TupleDataSet(env);
 		DataSet<Tuple5<Integer, Long, Integer, String, Long>> ds2 = CollectionDataSets.get5TupleDataSet(env);
 
-		ExpressionOperation<JavaBatchTranslator> in1 = ExpressionUtil.from(ds1, "a, b, c");
-		ExpressionOperation<JavaBatchTranslator> in2 = ExpressionUtil.from(ds2, "d, e, f, g, h");
+		Table<JavaBatchTranslator> in1 = tableEnv.toTable(ds1, "a, b, c");
+		Table<JavaBatchTranslator> in2 = tableEnv.toTable(ds2, "d, e, f, g, h");
 
-		ExpressionOperation<JavaBatchTranslator> result = in1
+		Table<JavaBatchTranslator> result = in1
 				.join(in2).where("a === d").select("g.count");
 
-		DataSet<Row> ds = ExpressionUtil.toSet(result, Row.class);
+		DataSet<Row> ds = tableEnv.toSet(result, Row.class);
 		ds.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
diff --git a/flink-staging/flink-expressions/src/test/java/org/apache/flink/api/java/expressions/test/SelectITCase.java b/flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/SelectITCase.java
similarity index 76%
rename from flink-staging/flink-expressions/src/test/java/org/apache/flink/api/java/expressions/test/SelectITCase.java
rename to flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/SelectITCase.java
index 89ec2e5b3cff9..2f18ce6c7e9e6 100644
--- a/flink-staging/flink-expressions/src/test/java/org/apache/flink/api/java/expressions/test/SelectITCase.java
+++ b/flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/SelectITCase.java
@@ -16,17 +16,16 @@
  * limitations under the License.
  */
 
-package org.apache.flink.api.java.expressions.test;
+package org.apache.flink.api.java.table.test;
 
-import org.apache.flink.api.expressions.ExpressionException;
-import org.apache.flink.api.expressions.ExpressionOperation;
-import org.apache.flink.api.expressions.Row;
+import org.apache.flink.api.table.ExpressionException;
+import org.apache.flink.api.table.Table;
+import org.apache.flink.api.table.Row;
 import org.apache.flink.api.java.DataSet;
 import org.apache.flink.api.java.ExecutionEnvironment;
-import org.apache.flink.api.java.expressions.ExpressionUtil;
+import org.apache.flink.api.java.table.TableEnvironment;
 import org.apache.flink.api.java.tuple.Tuple3;
-import org.apache.flink.api.java.tuple.Tuple5;
-import org.apache.flink.api.scala.expressions.JavaBatchTranslator;
+import org.apache.flink.api.java.table.JavaBatchTranslator;
 import org.apache.flink.core.fs.FileSystem;
 import org.apache.flink.test.javaApiOperators.util.CollectionDataSets;
 import org.apache.flink.test.util.MultipleProgramsTestBase;
@@ -65,14 +64,16 @@ public void after() throws Exception {
 	@Test
 	public void testSimpleSelectAllWithAs() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
+
 		DataSet<Tuple3<Integer, Long, String>> ds = CollectionDataSets.get3TupleDataSet(env);
 
-		ExpressionOperation<JavaBatchTranslator> in = ExpressionUtil.from(ds, "a,b,c");
+		Table<JavaBatchTranslator> in = tableEnv.toTable(ds, "a,b,c");
 
-		ExpressionOperation<JavaBatchTranslator> result = in
+		Table<JavaBatchTranslator> result = in
 				.select("a, b, c");
 
-		DataSet<Row> resultSet = ExpressionUtil.toSet(result, Row.class);
+		DataSet<Row> resultSet = tableEnv.toSet(result, Row.class);
 		resultSet.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
@@ -89,15 +90,17 @@ public void testSimpleSelectAllWithAs() throws Exception {
 	@Test
 	public void testSimpleSelectWithNaming() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
+
 		DataSet<Tuple3<Integer, Long, String>> ds = CollectionDataSets.get3TupleDataSet(env);
 
-		ExpressionOperation<JavaBatchTranslator> in = ExpressionUtil.from(ds);
+		Table<JavaBatchTranslator> in = tableEnv.toTable(ds);
 
-		ExpressionOperation<JavaBatchTranslator> result = in
+		Table<JavaBatchTranslator> result = in
 				.select("f0 as a, f1 as b")
 				.select("a, b");
 
-		DataSet<Row> resultSet = ExpressionUtil.toSet(result, Row.class);
+		DataSet<Row> resultSet = tableEnv.toSet(result, Row.class);
 		resultSet.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
@@ -110,11 +113,13 @@ public void testSimpleSelectWithNaming() throws Exception {
 	@Test(expected = ExpressionException.class)
 	public void testAsWithToFewFields() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
+
 		DataSet<Tuple3<Integer, Long, String>> ds = CollectionDataSets.get3TupleDataSet(env);
 
-		ExpressionOperation<JavaBatchTranslator> in = ExpressionUtil.from(ds, "a, b");
+		Table<JavaBatchTranslator> in = tableEnv.toTable(ds, "a, b");
 
-		DataSet<Row> resultSet = ExpressionUtil.toSet(in, Row.class);
+		DataSet<Row> resultSet = tableEnv.toSet(in, Row.class);
 		resultSet.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
@@ -125,11 +130,13 @@ public void testAsWithToFewFields() throws Exception {
 	@Test(expected = ExpressionException.class)
 	public void testAsWithToManyFields() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
+
 		DataSet<Tuple3<Integer, Long, String>> ds = CollectionDataSets.get3TupleDataSet(env);
 
-		ExpressionOperation<JavaBatchTranslator> in = ExpressionUtil.from(ds, "a, b, c, d");
+		Table<JavaBatchTranslator> in = tableEnv.toTable(ds, "a, b, c, d");
 
-		DataSet<Row> resultSet = ExpressionUtil.toSet(in, Row.class);
+		DataSet<Row> resultSet = tableEnv.toSet(in, Row.class);
 		resultSet.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
@@ -140,11 +147,13 @@ public void testAsWithToManyFields() throws Exception {
 	@Test(expected = ExpressionException.class)
 	public void testAsWithAmbiguousFields() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
+
 		DataSet<Tuple3<Integer, Long, String>> ds = CollectionDataSets.get3TupleDataSet(env);
 
-		ExpressionOperation<JavaBatchTranslator> in = ExpressionUtil.from(ds, "a, b, c, b");
+		Table<JavaBatchTranslator> in = tableEnv.toTable(ds, "a, b, c, b");
 
-		DataSet<Row> resultSet = ExpressionUtil.toSet(in, Row.class);
+		DataSet<Row> resultSet = tableEnv.toSet(in, Row.class);
 		resultSet.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
@@ -155,11 +164,13 @@ public void testAsWithAmbiguousFields() throws Exception {
 	@Test(expected = ExpressionException.class)
 	public void testOnlyFieldRefInAs() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
+
 		DataSet<Tuple3<Integer, Long, String>> ds = CollectionDataSets.get3TupleDataSet(env);
 
-		ExpressionOperation<JavaBatchTranslator> in = ExpressionUtil.from(ds, "a, b as c, d");
+		Table<JavaBatchTranslator> in = tableEnv.toTable(ds, "a, b as c, d");
 
-		DataSet<Row> resultSet = ExpressionUtil.toSet(in, Row.class);
+		DataSet<Row> resultSet = tableEnv.toSet(in, Row.class);
 		resultSet.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
diff --git a/flink-staging/flink-expressions/src/test/java/org/apache/flink/api/java/expressions/test/StringExpressionsITCase.java b/flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/StringExpressionsITCase.java
similarity index 73%
rename from flink-staging/flink-expressions/src/test/java/org/apache/flink/api/java/expressions/test/StringExpressionsITCase.java
rename to flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/StringExpressionsITCase.java
index f9f1c6bfbd6b2..e0b53d12e1f11 100644
--- a/flink-staging/flink-expressions/src/test/java/org/apache/flink/api/java/expressions/test/StringExpressionsITCase.java
+++ b/flink-staging/flink-table/src/test/java/org/apache/flink/api/java/table/test/StringExpressionsITCase.java
@@ -16,19 +16,17 @@
  * limitations under the License.
  */
 
-package org.apache.flink.api.java.expressions.test;
+package org.apache.flink.api.java.table.test;
 
-import org.apache.flink.api.expressions.ExpressionException;
-import org.apache.flink.api.expressions.ExpressionOperation;
-import org.apache.flink.api.expressions.Row;
+import org.apache.flink.api.table.ExpressionException;
+import org.apache.flink.api.table.Table;
+import org.apache.flink.api.table.Row;
 import org.apache.flink.api.java.DataSet;
 import org.apache.flink.api.java.ExecutionEnvironment;
-import org.apache.flink.api.java.expressions.ExpressionUtil;
+import org.apache.flink.api.java.table.TableEnvironment;
 import org.apache.flink.api.java.tuple.Tuple2;
-import org.apache.flink.api.java.tuple.Tuple3;
-import org.apache.flink.api.scala.expressions.JavaBatchTranslator;
+import org.apache.flink.api.java.table.JavaBatchTranslator;
 import org.apache.flink.core.fs.FileSystem;
-import org.apache.flink.test.javaApiOperators.util.CollectionDataSets;
 import org.apache.flink.test.util.MultipleProgramsTestBase;
 import org.junit.After;
 import org.junit.Before;
@@ -65,16 +63,18 @@ public void after() throws Exception {
 	@Test
 	public void testSubstring() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
+
 		DataSet<Tuple2<String, Integer>> ds = env.fromElements(
 				new Tuple2<String, Integer>("AAAA", 2),
 				new Tuple2<String, Integer>("BBBB", 1));
 
-		ExpressionOperation<JavaBatchTranslator> in = ExpressionUtil.from(ds, "a, b");
+		Table<JavaBatchTranslator> in = tableEnv.toTable(ds, "a, b");
 
-		ExpressionOperation<JavaBatchTranslator> result = in
+		Table<JavaBatchTranslator> result = in
 				.select("a.substring(0, b)");
 
-		DataSet<Row> resultSet = ExpressionUtil.toSet(result, Row.class);
+		DataSet<Row> resultSet = tableEnv.toSet(result, Row.class);
 		resultSet.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
@@ -85,16 +85,18 @@ public void testSubstring() throws Exception {
 	@Test
 	public void testSubstringWithMaxEnd() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
+
 		DataSet<Tuple2<String, Integer>> ds = env.fromElements(
 				new Tuple2<String, Integer>("ABCD", 2),
 				new Tuple2<String, Integer>("ABCD", 1));
 
-		ExpressionOperation<JavaBatchTranslator> in = ExpressionUtil.from(ds, "a, b");
+		Table<JavaBatchTranslator> in = tableEnv.toTable(ds, "a, b");
 
-		ExpressionOperation<JavaBatchTranslator> result = in
+		Table<JavaBatchTranslator> result = in
 				.select("a.substring(b)");
 
-		DataSet<Row> resultSet = ExpressionUtil.toSet(result, Row.class);
+		DataSet<Row> resultSet = tableEnv.toSet(result, Row.class);
 		resultSet.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
@@ -105,16 +107,18 @@ public void testSubstringWithMaxEnd() throws Exception {
 	@Test(expected = ExpressionException.class)
 	public void testNonWorkingSubstring1() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
+
 		DataSet<Tuple2<String, Float>> ds = env.fromElements(
 				new Tuple2<String, Float>("ABCD", 2.0f),
 				new Tuple2<String, Float>("ABCD", 1.0f));
 
-		ExpressionOperation<JavaBatchTranslator> in = ExpressionUtil.from(ds, "a, b");
+		Table<JavaBatchTranslator> in = tableEnv.toTable(ds, "a, b");
 
-		ExpressionOperation<JavaBatchTranslator> result = in
+		Table<JavaBatchTranslator> result = in
 				.select("a.substring(0, b)");
 
-		DataSet<Row> resultSet = ExpressionUtil.toSet(result, Row.class);
+		DataSet<Row> resultSet = tableEnv.toSet(result, Row.class);
 		resultSet.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
@@ -125,16 +129,18 @@ public void testNonWorkingSubstring1() throws Exception {
 	@Test(expected = ExpressionException.class)
 	public void testNonWorkingSubstring2() throws Exception {
 		ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
+		TableEnvironment tableEnv = new TableEnvironment();
+
 		DataSet<Tuple2<String, String>> ds = env.fromElements(
 				new Tuple2<String, String>("ABCD", "a"),
 				new Tuple2<String, String>("ABCD", "b"));
 
-		ExpressionOperation<JavaBatchTranslator> in = ExpressionUtil.from(ds, "a, b");
+		Table<JavaBatchTranslator> in = tableEnv.toTable(ds, "a, b");
 
-		ExpressionOperation<JavaBatchTranslator> result = in
+		Table<JavaBatchTranslator> result = in
 				.select("a.substring(b, 15)");
 
-		DataSet<Row> resultSet = ExpressionUtil.toSet(result, Row.class);
+		DataSet<Row> resultSet = tableEnv.toSet(result, Row.class);
 		resultSet.writeAsText(resultPath, FileSystem.WriteMode.OVERWRITE);
 
 		env.execute();
diff --git a/flink-staging/flink-expressions/src/test/java/org/apache/flink/api/scala/expressions/test/PageRankExpressionITCase.java b/flink-staging/flink-table/src/test/java/org/apache/flink/api/scala/table/test/PageRankExpressionITCase.java
similarity index 98%
rename from flink-staging/flink-expressions/src/test/java/org/apache/flink/api/scala/expressions/test/PageRankExpressionITCase.java
rename to flink-staging/flink-table/src/test/java/org/apache/flink/api/scala/table/test/PageRankExpressionITCase.java
index b75a2eedd546b..e99a223adee3c 100644
--- a/flink-staging/flink-expressions/src/test/java/org/apache/flink/api/scala/expressions/test/PageRankExpressionITCase.java
+++ b/flink-staging/flink-table/src/test/java/org/apache/flink/api/scala/table/test/PageRankExpressionITCase.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 */
 
-package org.apache.flink.api.scala.expressions.test;
+package org.apache.flink.api.scala.table.test;
 
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.examples.scala.PageRankExpression;
diff --git a/flink-staging/flink-expressions/src/test/scala/org/apache/flink/api/scala/expressions/test/AggregationsITCase.scala b/flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/AggregationsITCase.scala
similarity index 86%
rename from flink-staging/flink-expressions/src/test/scala/org/apache/flink/api/scala/expressions/test/AggregationsITCase.scala
rename to flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/AggregationsITCase.scala
index 4a358bccd7c54..9049f3c37561d 100644
--- a/flink-staging/flink-expressions/src/test/scala/org/apache/flink/api/scala/expressions/test/AggregationsITCase.scala
+++ b/flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/AggregationsITCase.scala
@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-package org.apache.flink.api.scala.expressions.test
+package org.apache.flink.api.scala.table.test
 
-import org.apache.flink.api.expressions.ExpressionException
+import org.apache.flink.api.table.ExpressionException
 import org.apache.flink.api.scala._
-import org.apache.flink.api.scala.expressions._
+import org.apache.flink.api.scala.table._
 import org.apache.flink.api.scala.util.CollectionDataSets
 import org.apache.flink.core.fs.FileSystem.WriteMode
 import org.apache.flink.test.util.MultipleProgramsTestBase
@@ -53,7 +53,7 @@ class AggregationsITCase(mode: TestExecutionMode) extends MultipleProgramsTestBa
   def testAggregationTypes: Unit = {
 
     val env = ExecutionEnvironment.getExecutionEnvironment
-    val ds = CollectionDataSets.get3TupleDataSet(env).toExpression
+    val ds = CollectionDataSets.get3TupleDataSet(env).toTable
       .select('_1.sum, '_1.min, '_1.max, '_1.count, '_1.avg)
 
     ds.writeAsText(resultPath, WriteMode.OVERWRITE)
@@ -65,7 +65,7 @@ class AggregationsITCase(mode: TestExecutionMode) extends MultipleProgramsTestBa
   def testAggregationOnNonExistingField: Unit = {
 
     val env = ExecutionEnvironment.getExecutionEnvironment
-    val ds = CollectionDataSets.get3TupleDataSet(env).toExpression
+    val ds = CollectionDataSets.get3TupleDataSet(env).toTable
       .select('foo.avg)
 
     ds.writeAsText(resultPath, WriteMode.OVERWRITE)
@@ -79,7 +79,7 @@ class AggregationsITCase(mode: TestExecutionMode) extends MultipleProgramsTestBa
     val env = ExecutionEnvironment.getExecutionEnvironment
     val ds = env.fromElements(
       (1: Byte, 1: Short, 1, 1L, 1.0f, 1.0d, "Hello"),
-      (2: Byte, 2: Short, 2, 2L, 2.0f, 2.0d, "Ciao")).toExpression
+      (2: Byte, 2: Short, 2, 2L, 2.0f, 2.0d, "Ciao")).toTable
       .select('_1.avg, '_2.avg, '_3.avg, '_4.avg, '_5.avg, '_6.avg, '_7.count)
 
     ds.writeAsText(resultPath, WriteMode.OVERWRITE)
@@ -91,7 +91,7 @@ class AggregationsITCase(mode: TestExecutionMode) extends MultipleProgramsTestBa
   def testAggregationWithArithmetic: Unit = {
 
     val env = ExecutionEnvironment.getExecutionEnvironment
-    val ds = env.fromElements((1f, "Hello"), (2f, "Ciao")).toExpression
+    val ds = env.fromElements((1f, "Hello"), (2f, "Ciao")).toTable
       .select(('_1 + 2).avg + 2, '_2.count + " THE COUNT")
 
     ds.writeAsText(resultPath, WriteMode.OVERWRITE)
@@ -103,7 +103,7 @@ class AggregationsITCase(mode: TestExecutionMode) extends MultipleProgramsTestBa
   def testNonWorkingAggregationDataTypes: Unit = {
 
     val env = ExecutionEnvironment.getExecutionEnvironment
-    val ds = env.fromElements(("Hello", 1)).toExpression
+    val ds = env.fromElements(("Hello", 1)).toTable
       .select('_1.sum)
 
     ds.writeAsText(resultPath, WriteMode.OVERWRITE)
@@ -115,7 +115,7 @@ class AggregationsITCase(mode: TestExecutionMode) extends MultipleProgramsTestBa
   def testNoNestedAggregations: Unit = {
 
     val env = ExecutionEnvironment.getExecutionEnvironment
-    val ds = env.fromElements(("Hello", 1)).toExpression
+    val ds = env.fromElements(("Hello", 1)).toTable
       .select('_2.sum.sum)
 
     ds.writeAsText(resultPath, WriteMode.OVERWRITE)
diff --git a/flink-staging/flink-expressions/src/test/scala/org/apache/flink/api/scala/expressions/test/AsITCase.scala b/flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/AsITCase.scala
similarity index 96%
rename from flink-staging/flink-expressions/src/test/scala/org/apache/flink/api/scala/expressions/test/AsITCase.scala
rename to flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/AsITCase.scala
index 18d7b09cb0295..536bad4603af2 100644
--- a/flink-staging/flink-expressions/src/test/scala/org/apache/flink/api/scala/expressions/test/AsITCase.scala
+++ b/flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/AsITCase.scala
@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-package org.apache.flink.api.scala.expressions.test
+package org.apache.flink.api.scala.table.test
 
-import org.apache.flink.api.expressions.ExpressionException
+import org.apache.flink.api.table.ExpressionException
 import org.apache.flink.api.scala._
-import org.apache.flink.api.scala.expressions._
+import org.apache.flink.api.scala.table._
 import org.apache.flink.api.scala.util.CollectionDataSets
 import org.apache.flink.core.fs.FileSystem.WriteMode
 import org.apache.flink.test.util.MultipleProgramsTestBase
diff --git a/flink-staging/flink-expressions/src/test/scala/org/apache/flink/api/scala/expressions/test/CastingITCase.scala b/flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/CastingITCase.scala
similarity index 95%
rename from flink-staging/flink-expressions/src/test/scala/org/apache/flink/api/scala/expressions/test/CastingITCase.scala
rename to flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/CastingITCase.scala
index 599ef6b8e6e53..4c0e624624e5f 100644
--- a/flink-staging/flink-expressions/src/test/scala/org/apache/flink/api/scala/expressions/test/CastingITCase.scala
+++ b/flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/CastingITCase.scala
@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package org.apache.flink.api.scala.expressions.test
+package org.apache.flink.api.scala.table.test
 
 import org.apache.flink.api.scala._
-import org.apache.flink.api.scala.expressions._
+import org.apache.flink.api.scala.table._
 import org.apache.flink.core.fs.FileSystem.WriteMode
 import org.apache.flink.test.util.MultipleProgramsTestBase
 import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode
@@ -51,7 +51,7 @@ class CastingITCase(mode: TestExecutionMode) extends MultipleProgramsTestBase(mo
   def testAutoCastToString: Unit = {
 
     val env = ExecutionEnvironment.getExecutionEnvironment
-    val ds = env.fromElements((1: Byte, 1: Short, 1, 1L, 1.0f, 1.0d)).toExpression
+    val ds = env.fromElements((1: Byte, 1: Short, 1, 1L, 1.0f, 1.0d)).toTable
       .select('_1 + "b", '_2 + "s", '_3 + "i", '_4 + "L", '_5 + "f", '_6 + "d")
 
     ds.writeAsText(resultPath, WriteMode.OVERWRITE)
@@ -65,7 +65,7 @@ class CastingITCase(mode: TestExecutionMode) extends MultipleProgramsTestBase(mo
     // don't test everything, just some common cast directions
 
     val env = ExecutionEnvironment.getExecutionEnvironment
-    val ds = env.fromElements((1: Byte, 1: Short, 1, 1L, 1.0f, 1.0d)).toExpression
+    val ds = env.fromElements((1: Byte, 1: Short, 1, 1L, 1.0f, 1.0d)).toTable
       .select('_1 + 1, '_2 + 1, '_3 + 1L, '_4 + 1.0f, '_5 + 1.0d, '_6 + 1)
 
     ds.writeAsText(resultPath, WriteMode.OVERWRITE)
diff --git a/flink-staging/flink-expressions/src/test/scala/org/apache/flink/api/scala/expressions/test/ExpressionsITCase.scala b/flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/ExpressionsITCase.scala
similarity index 95%
rename from flink-staging/flink-expressions/src/test/scala/org/apache/flink/api/scala/expressions/test/ExpressionsITCase.scala
rename to flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/ExpressionsITCase.scala
index 9d37f70ee6d71..9a52f8fff8268 100644
--- a/flink-staging/flink-expressions/src/test/scala/org/apache/flink/api/scala/expressions/test/ExpressionsITCase.scala
+++ b/flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/ExpressionsITCase.scala
@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-package org.apache.flink.api.scala.expressions.test
+package org.apache.flink.api.scala.table.test
 
-import org.apache.flink.api.expressions.ExpressionException
+import org.apache.flink.api.table.ExpressionException
 import org.apache.flink.api.scala._
-import org.apache.flink.api.scala.expressions._
+import org.apache.flink.api.scala.table._
 import org.apache.flink.core.fs.FileSystem.WriteMode
 import org.apache.flink.test.util.MultipleProgramsTestBase
 import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode
diff --git a/flink-staging/flink-expressions/src/test/scala/org/apache/flink/api/scala/expressions/test/FilterITCase.scala b/flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/FilterITCase.scala
similarity index 97%
rename from flink-staging/flink-expressions/src/test/scala/org/apache/flink/api/scala/expressions/test/FilterITCase.scala
rename to flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/FilterITCase.scala
index 28415341e7dec..131c27ceb58fd 100644
--- a/flink-staging/flink-expressions/src/test/scala/org/apache/flink/api/scala/expressions/test/FilterITCase.scala
+++ b/flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/FilterITCase.scala
@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-package org.apache.flink.api.scala.expressions.test
+package org.apache.flink.api.scala.table.test
 
-import org.apache.flink.api.expressions.tree.Literal
+import org.apache.flink.api.table.tree.Literal
 import org.apache.flink.api.scala._
-import org.apache.flink.api.scala.expressions._
+import org.apache.flink.api.scala.table._
 import org.apache.flink.api.scala.util.CollectionDataSets
 import org.apache.flink.core.fs.FileSystem.WriteMode
 import org.apache.flink.test.util.MultipleProgramsTestBase
diff --git a/flink-staging/flink-expressions/src/test/scala/org/apache/flink/api/scala/expressions/test/GroupedAggreagationsITCase.scala b/flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/GroupedAggreagationsITCase.scala
similarity index 95%
rename from flink-staging/flink-expressions/src/test/scala/org/apache/flink/api/scala/expressions/test/GroupedAggreagationsITCase.scala
rename to flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/GroupedAggreagationsITCase.scala
index f2e0286cb912c..30498fae0ad2e 100644
--- a/flink-staging/flink-expressions/src/test/scala/org/apache/flink/api/scala/expressions/test/GroupedAggreagationsITCase.scala
+++ b/flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/GroupedAggreagationsITCase.scala
@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-package org.apache.flink.api.scala.expressions.test
+package org.apache.flink.api.scala.table.test
 
-import org.apache.flink.api.expressions.ExpressionException
+import org.apache.flink.api.table.ExpressionException
 import org.apache.flink.api.scala._
-import org.apache.flink.api.scala.expressions._
+import org.apache.flink.api.scala.table._
 import org.apache.flink.api.scala.util.CollectionDataSets
 import org.apache.flink.core.fs.FileSystem.WriteMode
 import org.apache.flink.test.util.MultipleProgramsTestBase
diff --git a/flink-staging/flink-expressions/src/test/scala/org/apache/flink/api/scala/expressions/test/JoinITCase.scala b/flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/JoinITCase.scala
similarity index 97%
rename from flink-staging/flink-expressions/src/test/scala/org/apache/flink/api/scala/expressions/test/JoinITCase.scala
rename to flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/JoinITCase.scala
index 91b3b19def370..1ddaa5bc89271 100644
--- a/flink-staging/flink-expressions/src/test/scala/org/apache/flink/api/scala/expressions/test/JoinITCase.scala
+++ b/flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/JoinITCase.scala
@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-package org.apache.flink.api.scala.expressions.test
+package org.apache.flink.api.scala.table.test
 
-import org.apache.flink.api.expressions.ExpressionException
+import org.apache.flink.api.table.ExpressionException
 import org.apache.flink.api.scala._
-import org.apache.flink.api.scala.expressions._
+import org.apache.flink.api.scala.table._
 import org.apache.flink.api.scala.util.CollectionDataSets
 import org.apache.flink.core.fs.FileSystem.WriteMode
 import org.apache.flink.test.util.MultipleProgramsTestBase
diff --git a/flink-staging/flink-expressions/src/test/scala/org/apache/flink/api/scala/expressions/test/SelectITCase.scala b/flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/SelectITCase.scala
similarity index 93%
rename from flink-staging/flink-expressions/src/test/scala/org/apache/flink/api/scala/expressions/test/SelectITCase.scala
rename to flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/SelectITCase.scala
index a799b60c5687a..2396cea04d826 100644
--- a/flink-staging/flink-expressions/src/test/scala/org/apache/flink/api/scala/expressions/test/SelectITCase.scala
+++ b/flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/SelectITCase.scala
@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-package org.apache.flink.api.scala.expressions.test
+package org.apache.flink.api.scala.table.test
 
-import org.apache.flink.api.expressions.ExpressionException
+import org.apache.flink.api.table.ExpressionException
 import org.apache.flink.api.scala._
-import org.apache.flink.api.scala.expressions._
+import org.apache.flink.api.scala.table._
 import org.apache.flink.api.scala.util.CollectionDataSets
 import org.apache.flink.core.fs.FileSystem.WriteMode
 import org.apache.flink.test.util.MultipleProgramsTestBase
@@ -53,7 +53,7 @@ class SelectITCase(mode: TestExecutionMode) extends MultipleProgramsTestBase(mod
   def testSimpleSelectAll: Unit = {
 
     val env = ExecutionEnvironment.getExecutionEnvironment
-    val ds = CollectionDataSets.get3TupleDataSet(env).toExpression.select('_1, '_2, '_3)
+    val ds = CollectionDataSets.get3TupleDataSet(env).toTable.select('_1, '_2, '_3)
 
     ds.writeAsText(resultPath, WriteMode.OVERWRITE)
     env.execute()
@@ -85,7 +85,7 @@ class SelectITCase(mode: TestExecutionMode) extends MultipleProgramsTestBase(mod
   def testSimpleSelectWithNaming: Unit = {
 
     val env = ExecutionEnvironment.getExecutionEnvironment
-    val ds = CollectionDataSets.get3TupleDataSet(env).toExpression
+    val ds = CollectionDataSets.get3TupleDataSet(env).toTable
       .select('_1 as 'a, '_2 as 'b)
       .select('a, 'b)
 
diff --git a/flink-staging/flink-expressions/src/test/scala/org/apache/flink/api/scala/expressions/test/StringExpressionsITCase.scala b/flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/StringExpressionsITCase.scala
similarity index 94%
rename from flink-staging/flink-expressions/src/test/scala/org/apache/flink/api/scala/expressions/test/StringExpressionsITCase.scala
rename to flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/StringExpressionsITCase.scala
index c6c11136fc55a..c5950bff00d4b 100644
--- a/flink-staging/flink-expressions/src/test/scala/org/apache/flink/api/scala/expressions/test/StringExpressionsITCase.scala
+++ b/flink-staging/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/StringExpressionsITCase.scala
@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-package org.apache.flink.api.scala.expressions.test
+package org.apache.flink.api.scala.table.test
 
-import org.apache.flink.api.expressions.ExpressionException
+import org.apache.flink.api.table.ExpressionException
 import org.apache.flink.api.scala._
-import org.apache.flink.api.scala.expressions._
+import org.apache.flink.api.scala.table._
 import org.apache.flink.core.fs.FileSystem.WriteMode
 import org.apache.flink.test.util.MultipleProgramsTestBase
 import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode
diff --git a/flink-staging/pom.xml b/flink-staging/pom.xml
index d52f2ab7e692c..29ba7b590a9a4 100644
--- a/flink-staging/pom.xml
+++ b/flink-staging/pom.xml
@@ -42,7 +42,7 @@ under the License.
 		<module>flink-hbase</module>
 		<module>flink-gelly</module>
 		<module>flink-hcatalog</module>
-		<module>flink-expressions</module>
+		<module>flink-table</module>
 		<module>flink-ml</module>
 	</modules>