diff --git a/hivesterix-common/pom.xml b/hivesterix-common/pom.xml
new file mode 100644
index 0000000..33d8fb3
--- /dev/null
+++ b/hivesterix-common/pom.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>hivesterix-common</artifactId>
+	<name>hivesterix-common</name>
+
+	<parent>
+		<artifactId>hivesterix</artifactId>
+		<groupId>edu.uci.ics.hyracks</groupId>
+		<version>0.2.3-SNAPSHOT</version>
+	</parent>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.0.2</version>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+					<encoding>UTF-8</encoding>
+					<fork>true</fork>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+		<dependency>
+			<groupId>edu.uci.ics.hyracks</groupId>
+			<artifactId>hyracks-api</artifactId>
+			<version>0.2.3-SNAPSHOT</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>edu.uci.ics.hyracks</groupId>
+			<artifactId>algebricks-compiler</artifactId>
+			<version>0.2.3-SNAPSHOT</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>edu.uci.ics.hyracks</groupId>
+			<artifactId>hyracks-hdfs-core</artifactId>
+			<version>0.2.3-SNAPSHOT</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.hadoop.hive</groupId>
+			<artifactId>hive-exec</artifactId>
+			<version>0.7.0</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/config/ConfUtil.java b/hivesterix-common/src/main/java/edu/uci/ics/hivesterix/common/config/ConfUtil.java
similarity index 93%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/config/ConfUtil.java
rename to hivesterix-common/src/main/java/edu/uci/ics/hivesterix/common/config/ConfUtil.java
index 9ed1558..025f423 100644
--- a/src/main/java/edu/uci/ics/hivesterix/runtime/config/ConfUtil.java
+++ b/hivesterix-common/src/main/java/edu/uci/ics/hivesterix/common/config/ConfUtil.java
@@ -1,4 +1,4 @@
-package edu.uci.ics.hivesterix.runtime.config;
+package edu.uci.ics.hivesterix.common.config;
 
 import java.net.InetAddress;
 import java.util.ArrayList;
@@ -13,10 +13,10 @@
 import org.apache.hadoop.mapred.InputFormat;
 import org.apache.hadoop.mapred.JobConf;
 
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
 import edu.uci.ics.hyracks.api.client.HyracksConnection;
 import edu.uci.ics.hyracks.api.client.IHyracksClientConnection;
 import edu.uci.ics.hyracks.api.client.NodeControllerInfo;
+import edu.uci.ics.hyracks.api.exceptions.HyracksException;
 import edu.uci.ics.hyracks.api.topology.ClusterTopology;
 
 @SuppressWarnings({ "rawtypes", "deprecation" })
@@ -79,23 +79,23 @@
         return hconf;
     }
 
-    public static String[] getNCs() throws AlgebricksException {
+    public static String[] getNCs() throws HyracksException {
         if (NCs == null) {
             try {
                 loadClusterConfig();
             } catch (Exception e) {
-                throw new AlgebricksException(e);
+                throw new HyracksException(e);
             }
         }
         return NCs;
     }
 
-    public static Map<String, List<String>> getNCMapping() throws AlgebricksException {
+    public static Map<String, List<String>> getNCMapping() throws HyracksException {
         if (ncMapping == null) {
             try {
                 loadClusterConfig();
             } catch (Exception e) {
-                throw new AlgebricksException(e);
+                throw new HyracksException(e);
             }
         }
         return ncMapping;
diff --git a/src/main/java/edu/uci/ics/hivesterix/logical/expression/ExpressionConstant.java b/hivesterix-common/src/main/java/edu/uci/ics/hivesterix/logical/expression/ExpressionConstant.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/logical/expression/ExpressionConstant.java
rename to hivesterix-common/src/main/java/edu/uci/ics/hivesterix/logical/expression/ExpressionConstant.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/ExpressionTranslator.java b/hivesterix-common/src/main/java/edu/uci/ics/hivesterix/logical/expression/ExpressionTranslator.java
similarity index 96%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/ExpressionTranslator.java
rename to hivesterix-common/src/main/java/edu/uci/ics/hivesterix/logical/expression/ExpressionTranslator.java
index c40ef73..662ed83 100644
--- a/src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/ExpressionTranslator.java
+++ b/hivesterix-common/src/main/java/edu/uci/ics/hivesterix/logical/expression/ExpressionTranslator.java
@@ -1,4 +1,4 @@
-package edu.uci.ics.hivesterix.runtime.evaluator;
+package edu.uci.ics.hivesterix.logical.expression;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -21,10 +21,6 @@
 import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
 import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory;
 
-import edu.uci.ics.hivesterix.logical.expression.ExpressionConstant;
-import edu.uci.ics.hivesterix.logical.expression.HiveAlgebricksBuiltInFunctionMap;
-import edu.uci.ics.hivesterix.logical.expression.HiveFunctionInfo;
-import edu.uci.ics.hivesterix.logical.expression.HivesterixConstantValue;
 import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
 import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
 import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
diff --git a/src/main/java/edu/uci/ics/hivesterix/logical/expression/HiveAlgebricksBuiltInFunctionMap.java b/hivesterix-common/src/main/java/edu/uci/ics/hivesterix/logical/expression/HiveAlgebricksBuiltInFunctionMap.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/logical/expression/HiveAlgebricksBuiltInFunctionMap.java
rename to hivesterix-common/src/main/java/edu/uci/ics/hivesterix/logical/expression/HiveAlgebricksBuiltInFunctionMap.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/logical/expression/HiveExpressionTypeComputer.java b/hivesterix-common/src/main/java/edu/uci/ics/hivesterix/logical/expression/HiveExpressionTypeComputer.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/logical/expression/HiveExpressionTypeComputer.java
rename to hivesterix-common/src/main/java/edu/uci/ics/hivesterix/logical/expression/HiveExpressionTypeComputer.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/logical/expression/HiveFunctionInfo.java b/hivesterix-common/src/main/java/edu/uci/ics/hivesterix/logical/expression/HiveFunctionInfo.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/logical/expression/HiveFunctionInfo.java
rename to hivesterix-common/src/main/java/edu/uci/ics/hivesterix/logical/expression/HiveFunctionInfo.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/logical/expression/HiveMergeAggregationExpressionFactory.java b/hivesterix-common/src/main/java/edu/uci/ics/hivesterix/logical/expression/HiveMergeAggregationExpressionFactory.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/logical/expression/HiveMergeAggregationExpressionFactory.java
rename to hivesterix-common/src/main/java/edu/uci/ics/hivesterix/logical/expression/HiveMergeAggregationExpressionFactory.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/logical/expression/HiveNullableTypeComputer.java b/hivesterix-common/src/main/java/edu/uci/ics/hivesterix/logical/expression/HiveNullableTypeComputer.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/logical/expression/HiveNullableTypeComputer.java
rename to hivesterix-common/src/main/java/edu/uci/ics/hivesterix/logical/expression/HiveNullableTypeComputer.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/logical/expression/HivePartialAggregationTypeComputer.java b/hivesterix-common/src/main/java/edu/uci/ics/hivesterix/logical/expression/HivePartialAggregationTypeComputer.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/logical/expression/HivePartialAggregationTypeComputer.java
rename to hivesterix-common/src/main/java/edu/uci/ics/hivesterix/logical/expression/HivePartialAggregationTypeComputer.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/logical/expression/HivesterixConstantValue.java b/hivesterix-common/src/main/java/edu/uci/ics/hivesterix/logical/expression/HivesterixConstantValue.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/logical/expression/HivesterixConstantValue.java
rename to hivesterix-common/src/main/java/edu/uci/ics/hivesterix/logical/expression/HivesterixConstantValue.java
diff --git a/hivesterix-common/src/test/java/edu/uci/ics/hyracks/AppTest.java b/hivesterix-common/src/test/java/edu/uci/ics/hyracks/AppTest.java
new file mode 100644
index 0000000..0c701c8
--- /dev/null
+++ b/hivesterix-common/src/test/java/edu/uci/ics/hyracks/AppTest.java
@@ -0,0 +1,38 @@
+package edu.uci.ics.hyracks;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest 
+    extends TestCase
+{
+    /**
+     * Create the test case
+     *
+     * @param testName name of the test case
+     */
+    public AppTest( String testName )
+    {
+        super( testName );
+    }
+
+    /**
+     * @return the suite of tests being tested
+     */
+    public static Test suite()
+    {
+        return new TestSuite( AppTest.class );
+    }
+
+    /**
+     * Rigourous Test :-)
+     */
+    public void testApp()
+    {
+        assertTrue( true );
+    }
+}
diff --git a/conf/cluster b/hivesterix-core/conf/cluster
similarity index 100%
rename from conf/cluster
rename to hivesterix-core/conf/cluster
diff --git a/conf/configuration.xsl b/hivesterix-core/conf/configuration.xsl
similarity index 100%
rename from conf/configuration.xsl
rename to hivesterix-core/conf/configuration.xsl
diff --git a/conf/hive-default.xml b/hivesterix-core/conf/hive-default.xml
similarity index 100%
rename from conf/hive-default.xml
rename to hivesterix-core/conf/hive-default.xml
diff --git a/conf/hive-log4j.properties b/hivesterix-core/conf/hive-log4j.properties
similarity index 100%
rename from conf/hive-log4j.properties
rename to hivesterix-core/conf/hive-log4j.properties
diff --git a/hivesterix-core/pom.xml b/hivesterix-core/pom.xml
new file mode 100644
index 0000000..dd8243b
--- /dev/null
+++ b/hivesterix-core/pom.xml
@@ -0,0 +1,578 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>edu.uci.ics.hyracks</groupId>
+	<artifactId>hivesterix-core</artifactId>
+	<version>0.2.3-SNAPSHOT</version>
+	<name>hivesterix-core</name>
+	<dependencies>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>2.5</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.8.1</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>args4j</groupId>
+			<artifactId>args4j</artifactId>
+			<version>2.0.12</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.json</groupId>
+			<artifactId>json</artifactId>
+			<version>20090211</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-server</artifactId>
+			<version>8.0.0.M1</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-servlet</artifactId>
+			<version>8.0.0.M1</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.hadoop</groupId>
+			<artifactId>hadoop-core</artifactId>
+			<version>0.20.2</version>
+		</dependency>
+		<dependency>
+			<groupId>jline</groupId>
+			<artifactId>jline</artifactId>
+			<version>0.9.94</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.datanucleus</groupId>
+			<artifactId>datanucleus-core</artifactId>
+			<version>2.0.3</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.datanucleus</groupId>
+			<artifactId>datanucleus-connectionpool</artifactId>
+			<version>2.0.3</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.datanucleus</groupId>
+			<artifactId>datanucleus-enhancer</artifactId>
+			<version>2.0.3</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.datanucleus</groupId>
+			<artifactId>datanucleus-rdbms</artifactId>
+			<version>2.0.3</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-dbcp</groupId>
+			<artifactId>commons-dbcp</artifactId>
+			<version>1.4</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-pool</groupId>
+			<artifactId>commons-pool</artifactId>
+			<version>1.5.4</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-collections</groupId>
+			<artifactId>commons-collections</artifactId>
+			<version>3.2.1</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>2.4</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax</groupId>
+			<artifactId>jdo2-api</artifactId>
+			<version>2.3-ec</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.facebook</groupId>
+			<artifactId>libfb303</artifactId>
+			<version>0.5.0</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.thrift</groupId>
+			<artifactId>libthrift</artifactId>
+			<version>0.5.0</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>cli</artifactId>
+			<version>1.2</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.15</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.antlr</groupId>
+			<artifactId>antlr-runtime</artifactId>
+			<version>3.0.1</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.hadoop.hive</groupId>
+			<artifactId>hive-cli</artifactId>
+			<version>0.7.0</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.hadoop.hive</groupId>
+			<artifactId>hive-common</artifactId>
+			<version>0.7.0</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.hadoop.hive</groupId>
+			<artifactId>hive-exec</artifactId>
+			<version>0.7.0</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.hadoop.hive</groupId>
+			<artifactId>hive-hwi</artifactId>
+			<version>0.7.0</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.hadoop.hive</groupId>
+			<artifactId>hive-jdbc</artifactId>
+			<version>0.7.0</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.hadoop.hive</groupId>
+			<artifactId>hive-metastore</artifactId>
+			<version>0.7.0</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.hadoop.hive</groupId>
+			<artifactId>hive-service</artifactId>
+			<version>0.7.0</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.hadoop.hive</groupId>
+			<artifactId>hive-shims</artifactId>
+			<version>0.7.0</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.hadoop.hive</groupId>
+			<artifactId>hive-serde</artifactId>
+			<version>0.7.0</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>1.6.1</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-cli</groupId>
+			<artifactId>commons-cli</artifactId>
+			<version>1.2</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<version>1.6.1</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.hadoop</groupId>
+			<artifactId>hadoop-test</artifactId>
+			<version>0.20.2</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.1.1</version>
+			<type>jar</type>
+			<classifier>api</classifier>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>r06</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.antlr</groupId>
+			<artifactId>stringtemplate</artifactId>
+			<version>3.2</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.derby</groupId>
+			<artifactId>derby</artifactId>
+			<version>10.8.1.2</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.hbase</groupId>
+			<artifactId>hbase</artifactId>
+			<version>0.90.3</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>edu.uci.ics.hyracks</groupId>
+			<artifactId>algebricks-compiler</artifactId>
+			<version>0.2.3-SNAPSHOT</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>edu.uci.ics.hyracks</groupId>
+			<artifactId>hyracks-control-cc</artifactId>
+			<version>0.2.3-SNAPSHOT</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>edu.uci.ics.hyracks</groupId>
+			<artifactId>hyracks-control-nc</artifactId>
+			<version>0.2.3-SNAPSHOT</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>edu.uci.ics.hyracks</groupId>
+			<artifactId>hivesterix-translator</artifactId>
+			<version>0.2.3-SNAPSHOT</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>edu.uci.ics.hyracks</groupId>
+			<artifactId>hivesterix-optimizer</artifactId>
+			<version>0.2.3-SNAPSHOT</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.0.2</version>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+					<encoding>UTF-8</encoding>
+					<fork>true</fork>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>patch</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<phase>package</phase>
+						<configuration>
+							<classifier>patch</classifier>
+							<finalName>a-hive</finalName>
+							<includes>
+								<include>**/org/apache/**</include>
+							</includes>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>appassembler-maven-plugin</artifactId>
+				<version>1.3</version>
+				<executions>
+					<execution>
+						<configuration>
+							<programs>
+								<program>
+									<mainClass>edu.uci.ics.asterix.hive.cli.CliDriver</mainClass>
+									<name>algebricks-hivesterix-cmd</name>
+								</program>
+							</programs>
+							<repositoryLayout>flat</repositoryLayout>
+							<repositoryName>lib</repositoryName>
+						</configuration>
+						<phase>package</phase>
+						<goals>
+							<goal>assemble</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>2.2-beta-5</version>
+				<executions>
+					<execution>
+						<configuration>
+							<descriptors>
+								<descriptor>src/main/assembly/binary-assembly.xml</descriptor>
+							</descriptors>
+						</configuration>
+						<phase>package</phase>
+						<goals>
+							<goal>attached</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.13</version>
+				<configuration>
+					<forkMode>pertest</forkMode>
+					<argLine>-enableassertions -Xmx2047m -Dfile.encoding=UTF-8
+						-Djava.util.logging.config.file=src/test/resources/logging.properties</argLine>
+					<includes>
+						<include>**/test/optimizer/*TestSuite.java</include>
+						<include>**/test/optimizer/*Test.java</include>
+						<include>**/test/runtimefunction/*TestSuite.java</include>
+						<include>**/test/runtimefunction/*Test.java</include>
+					</includes>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>2.5</version>
+				<executions>
+					<execution>
+						<id>copy-resources</id>
+						<!-- here the phase you need -->
+						<phase>package</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>target/appassembler/bin</outputDirectory>
+							<resources>
+								<resource>
+									<directory>resource/bin</directory>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+					<execution>
+						<id>copy-conf</id>
+						<!-- here the phase you need -->
+						<phase>package</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>target/appassembler/conf</outputDirectory>
+							<resources>
+								<resource>
+									<directory>conf</directory>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+					<execution>
+						<id>copy-asterix</id>
+						<!-- here the phase you need -->
+						<phase>package</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>target/appassembler/asterix</outputDirectory>
+							<resources>
+								<resource>
+									<directory>resource/asterix</directory>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+					<execution>
+						<id>copy-asterix-dbg</id>
+						<!-- here the phase you need -->
+						<phase>package</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>target/appassembler/asterix_dbg</outputDirectory>
+							<resources>
+								<resource>
+									<directory>resource/asterix_dbg</directory>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+					<execution>
+						<id>copy-hivesterix</id>
+						<!-- here the phase you need -->
+						<phase>package</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>target/appassembler/hivesterix</outputDirectory>
+							<resources>
+								<resource>
+									<directory>resource/hivesterix</directory>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+					<execution>
+						<id>copy-conf2</id>
+						<!-- here the phase you need -->
+						<phase>package</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>target/appassembler/hivesterix/conf</outputDirectory>
+							<resources>
+								<resource>
+									<directory>conf</directory>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+					<execution>
+						<id>copy-data</id>
+						<!-- here the phase you need -->
+						<phase>package</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>data</outputDirectory>
+							<resources>
+								<resource>
+									<directory>resource/data</directory>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-clean-plugin</artifactId>
+				<version>2.5</version>
+				<configuration>
+					<filesets>
+						<fileset>
+							<directory>.</directory>
+							<includes>
+								<include>metastore*</include>
+								<include>hadoop*</include>
+								<include>edu*</include>
+								<include>tmp*</include>
+								<include>build*</include>
+								<include>target*</include>
+								<include>log*</include>
+								<include>derby.log</include>
+								<include>ClusterController*</include>
+							</includes>
+						</fileset>
+					</filesets>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<repositories>
+		<repository>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+				<checksumPolicy>warn</checksumPolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+				<checksumPolicy>fail</checksumPolicy>
+			</snapshots>
+			<id>third-party</id>
+			<url>http://obelix.ics.uci.edu/nexus/content/repositories/third-party</url>
+		</repository>
+		<repository>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+				<checksumPolicy>warn</checksumPolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+				<checksumPolicy>fail</checksumPolicy>
+			</snapshots>
+			<id>hyracks-public-release</id>
+			<url>http://obelix.ics.uci.edu/nexus/content/repositories/hyracks-public-releases</url>
+		</repository>
+	</repositories>
+</project>
diff --git a/resource/asterix/destroy.sh b/hivesterix-core/resource/asterix/destroy.sh
similarity index 100%
rename from resource/asterix/destroy.sh
rename to hivesterix-core/resource/asterix/destroy.sh
diff --git a/resource/asterix/hivedeploy.hcli b/hivesterix-core/resource/asterix/hivedeploy.hcli
similarity index 100%
rename from resource/asterix/hivedeploy.hcli
rename to hivesterix-core/resource/asterix/hivedeploy.hcli
diff --git a/resource/asterix/hivedestroy.hcli b/hivesterix-core/resource/asterix/hivedestroy.hcli
similarity index 100%
rename from resource/asterix/hivedestroy.hcli
rename to hivesterix-core/resource/asterix/hivedestroy.hcli
diff --git a/resource/asterix/startall.sh b/hivesterix-core/resource/asterix/startall.sh
similarity index 100%
rename from resource/asterix/startall.sh
rename to hivesterix-core/resource/asterix/startall.sh
diff --git a/resource/asterix/startcc.sh b/hivesterix-core/resource/asterix/startcc.sh
similarity index 100%
rename from resource/asterix/startcc.sh
rename to hivesterix-core/resource/asterix/startcc.sh
diff --git a/resource/asterix/startnc.sh b/hivesterix-core/resource/asterix/startnc.sh
similarity index 100%
rename from resource/asterix/startnc.sh
rename to hivesterix-core/resource/asterix/startnc.sh
diff --git a/resource/asterix/stopall.sh b/hivesterix-core/resource/asterix/stopall.sh
similarity index 100%
rename from resource/asterix/stopall.sh
rename to hivesterix-core/resource/asterix/stopall.sh
diff --git a/resource/asterix/stopcc.sh b/hivesterix-core/resource/asterix/stopcc.sh
similarity index 100%
rename from resource/asterix/stopcc.sh
rename to hivesterix-core/resource/asterix/stopcc.sh
diff --git a/resource/asterix/stopnc.sh b/hivesterix-core/resource/asterix/stopnc.sh
similarity index 100%
rename from resource/asterix/stopnc.sh
rename to hivesterix-core/resource/asterix/stopnc.sh
diff --git a/resource/asterix_dbg/destroy.sh b/hivesterix-core/resource/asterix_dbg/destroy.sh
similarity index 100%
rename from resource/asterix_dbg/destroy.sh
rename to hivesterix-core/resource/asterix_dbg/destroy.sh
diff --git a/resource/asterix_dbg/hivedeploy.hcli b/hivesterix-core/resource/asterix_dbg/hivedeploy.hcli
similarity index 100%
rename from resource/asterix_dbg/hivedeploy.hcli
rename to hivesterix-core/resource/asterix_dbg/hivedeploy.hcli
diff --git a/resource/asterix_dbg/hivedestroy.hcli b/hivesterix-core/resource/asterix_dbg/hivedestroy.hcli
similarity index 100%
rename from resource/asterix_dbg/hivedestroy.hcli
rename to hivesterix-core/resource/asterix_dbg/hivedestroy.hcli
diff --git a/resource/asterix_dbg/startall.sh b/hivesterix-core/resource/asterix_dbg/startall.sh
similarity index 100%
rename from resource/asterix_dbg/startall.sh
rename to hivesterix-core/resource/asterix_dbg/startall.sh
diff --git a/resource/asterix_dbg/startcc.sh b/hivesterix-core/resource/asterix_dbg/startcc.sh
similarity index 100%
rename from resource/asterix_dbg/startcc.sh
rename to hivesterix-core/resource/asterix_dbg/startcc.sh
diff --git a/resource/asterix_dbg/startnc.sh b/hivesterix-core/resource/asterix_dbg/startnc.sh
similarity index 100%
rename from resource/asterix_dbg/startnc.sh
rename to hivesterix-core/resource/asterix_dbg/startnc.sh
diff --git a/resource/asterix_dbg/stopall.sh b/hivesterix-core/resource/asterix_dbg/stopall.sh
similarity index 100%
rename from resource/asterix_dbg/stopall.sh
rename to hivesterix-core/resource/asterix_dbg/stopall.sh
diff --git a/resource/asterix_dbg/stopcc.sh b/hivesterix-core/resource/asterix_dbg/stopcc.sh
similarity index 100%
rename from resource/asterix_dbg/stopcc.sh
rename to hivesterix-core/resource/asterix_dbg/stopcc.sh
diff --git a/resource/asterix_dbg/stopnc.sh b/hivesterix-core/resource/asterix_dbg/stopnc.sh
similarity index 100%
rename from resource/asterix_dbg/stopnc.sh
rename to hivesterix-core/resource/asterix_dbg/stopnc.sh
diff --git a/resource/bin/ext/cli.sh b/hivesterix-core/resource/bin/ext/cli.sh
similarity index 100%
rename from resource/bin/ext/cli.sh
rename to hivesterix-core/resource/bin/ext/cli.sh
diff --git a/resource/bin/ext/help.sh b/hivesterix-core/resource/bin/ext/help.sh
similarity index 100%
rename from resource/bin/ext/help.sh
rename to hivesterix-core/resource/bin/ext/help.sh
diff --git a/resource/bin/ext/hiveserver.sh b/hivesterix-core/resource/bin/ext/hiveserver.sh
similarity index 100%
rename from resource/bin/ext/hiveserver.sh
rename to hivesterix-core/resource/bin/ext/hiveserver.sh
diff --git a/resource/bin/ext/hwi.sh b/hivesterix-core/resource/bin/ext/hwi.sh
similarity index 100%
rename from resource/bin/ext/hwi.sh
rename to hivesterix-core/resource/bin/ext/hwi.sh
diff --git a/resource/bin/ext/jar.sh b/hivesterix-core/resource/bin/ext/jar.sh
similarity index 100%
rename from resource/bin/ext/jar.sh
rename to hivesterix-core/resource/bin/ext/jar.sh
diff --git a/resource/bin/ext/lineage.sh b/hivesterix-core/resource/bin/ext/lineage.sh
similarity index 100%
rename from resource/bin/ext/lineage.sh
rename to hivesterix-core/resource/bin/ext/lineage.sh
diff --git a/resource/bin/ext/metastore.sh b/hivesterix-core/resource/bin/ext/metastore.sh
similarity index 100%
rename from resource/bin/ext/metastore.sh
rename to hivesterix-core/resource/bin/ext/metastore.sh
diff --git a/resource/bin/ext/rcfilecat.sh b/hivesterix-core/resource/bin/ext/rcfilecat.sh
similarity index 100%
rename from resource/bin/ext/rcfilecat.sh
rename to hivesterix-core/resource/bin/ext/rcfilecat.sh
diff --git a/resource/bin/ext/util/execHiveCmd.sh b/hivesterix-core/resource/bin/ext/util/execHiveCmd.sh
similarity index 100%
rename from resource/bin/ext/util/execHiveCmd.sh
rename to hivesterix-core/resource/bin/ext/util/execHiveCmd.sh
diff --git a/resource/bin/hive b/hivesterix-core/resource/bin/hive
similarity index 100%
rename from resource/bin/hive
rename to hivesterix-core/resource/bin/hive
diff --git a/resource/bin/hive-config.sh b/hivesterix-core/resource/bin/hive-config.sh
similarity index 100%
rename from resource/bin/hive-config.sh
rename to hivesterix-core/resource/bin/hive-config.sh
diff --git a/resource/bin/init-hive-dfs.sh b/hivesterix-core/resource/bin/init-hive-dfs.sh
similarity index 100%
rename from resource/bin/init-hive-dfs.sh
rename to hivesterix-core/resource/bin/init-hive-dfs.sh
diff --git a/resource/deploy/balance.jar b/hivesterix-core/resource/deploy/balance.jar
similarity index 100%
rename from resource/deploy/balance.jar
rename to hivesterix-core/resource/deploy/balance.jar
Binary files differ
diff --git a/resource/deploy/deploy.sh b/hivesterix-core/resource/deploy/deploy.sh
similarity index 100%
rename from resource/deploy/deploy.sh
rename to hivesterix-core/resource/deploy/deploy.sh
diff --git a/resource/deploy/jar.sh b/hivesterix-core/resource/deploy/jar.sh
similarity index 100%
rename from resource/deploy/jar.sh
rename to hivesterix-core/resource/deploy/jar.sh
diff --git a/resource/hivesterix/execute.sh b/hivesterix-core/resource/hivesterix/execute.sh
similarity index 100%
rename from resource/hivesterix/execute.sh
rename to hivesterix-core/resource/hivesterix/execute.sh
diff --git a/resource/hivesterix/loop.sh b/hivesterix-core/resource/hivesterix/loop.sh
similarity index 100%
rename from resource/hivesterix/loop.sh
rename to hivesterix-core/resource/hivesterix/loop.sh
diff --git a/resource/hivesterix/perf.sh b/hivesterix-core/resource/hivesterix/perf.sh
similarity index 100%
rename from resource/hivesterix/perf.sh
rename to hivesterix-core/resource/hivesterix/perf.sh
diff --git a/resource/hivesterix/perflog/tpch100/result.log b/hivesterix-core/resource/hivesterix/perflog/tpch100/result.log
similarity index 100%
rename from resource/hivesterix/perflog/tpch100/result.log
rename to hivesterix-core/resource/hivesterix/perflog/tpch100/result.log
diff --git a/resource/hivesterix/perflog/tpch_sample/result.log b/hivesterix-core/resource/hivesterix/perflog/tpch_sample/result.log
similarity index 100%
rename from resource/hivesterix/perflog/tpch_sample/result.log
rename to hivesterix-core/resource/hivesterix/perflog/tpch_sample/result.log
diff --git a/resource/hivesterix/startcluster.sh b/hivesterix-core/resource/hivesterix/startcluster.sh
similarity index 100%
rename from resource/hivesterix/startcluster.sh
rename to hivesterix-core/resource/hivesterix/startcluster.sh
diff --git a/resource/hivesterix/stress.sh b/hivesterix-core/resource/hivesterix/stress.sh
similarity index 100%
rename from resource/hivesterix/stress.sh
rename to hivesterix-core/resource/hivesterix/stress.sh
diff --git a/resource/hivesterix/tpch100/q10_returned_item.hive b/hivesterix-core/resource/hivesterix/tpch100/q10_returned_item.hive
similarity index 100%
rename from resource/hivesterix/tpch100/q10_returned_item.hive
rename to hivesterix-core/resource/hivesterix/tpch100/q10_returned_item.hive
diff --git a/resource/hivesterix/tpch100/q11_important_stock.hive b/hivesterix-core/resource/hivesterix/tpch100/q11_important_stock.hive
similarity index 100%
rename from resource/hivesterix/tpch100/q11_important_stock.hive
rename to hivesterix-core/resource/hivesterix/tpch100/q11_important_stock.hive
diff --git a/resource/hivesterix/tpch100/q12_shipping.hive b/hivesterix-core/resource/hivesterix/tpch100/q12_shipping.hive
similarity index 100%
rename from resource/hivesterix/tpch100/q12_shipping.hive
rename to hivesterix-core/resource/hivesterix/tpch100/q12_shipping.hive
diff --git a/resource/hivesterix/tpch100/q13_customer_distribution.hive b/hivesterix-core/resource/hivesterix/tpch100/q13_customer_distribution.hive
similarity index 100%
rename from resource/hivesterix/tpch100/q13_customer_distribution.hive
rename to hivesterix-core/resource/hivesterix/tpch100/q13_customer_distribution.hive
diff --git a/resource/hivesterix/tpch100/q14_promotion_effect.hive b/hivesterix-core/resource/hivesterix/tpch100/q14_promotion_effect.hive
similarity index 100%
rename from resource/hivesterix/tpch100/q14_promotion_effect.hive
rename to hivesterix-core/resource/hivesterix/tpch100/q14_promotion_effect.hive
diff --git a/resource/hivesterix/tpch100/q15_top_supplier.hive b/hivesterix-core/resource/hivesterix/tpch100/q15_top_supplier.hive
similarity index 100%
rename from resource/hivesterix/tpch100/q15_top_supplier.hive
rename to hivesterix-core/resource/hivesterix/tpch100/q15_top_supplier.hive
diff --git a/resource/hivesterix/tpch100/q16_parts_supplier_relationship.hive b/hivesterix-core/resource/hivesterix/tpch100/q16_parts_supplier_relationship.hive
similarity index 100%
rename from resource/hivesterix/tpch100/q16_parts_supplier_relationship.hive
rename to hivesterix-core/resource/hivesterix/tpch100/q16_parts_supplier_relationship.hive
diff --git a/resource/hivesterix/tpch100/q17_small_quantity_order_revenue.hive b/hivesterix-core/resource/hivesterix/tpch100/q17_small_quantity_order_revenue.hive
similarity index 100%
rename from resource/hivesterix/tpch100/q17_small_quantity_order_revenue.hive
rename to hivesterix-core/resource/hivesterix/tpch100/q17_small_quantity_order_revenue.hive
diff --git a/resource/hivesterix/tpch100/q18_large_volume_customer.hive b/hivesterix-core/resource/hivesterix/tpch100/q18_large_volume_customer.hive
similarity index 100%
rename from resource/hivesterix/tpch100/q18_large_volume_customer.hive
rename to hivesterix-core/resource/hivesterix/tpch100/q18_large_volume_customer.hive
diff --git a/resource/hivesterix/tpch100/q19_discounted_revenue.hive b/hivesterix-core/resource/hivesterix/tpch100/q19_discounted_revenue.hive
similarity index 100%
rename from resource/hivesterix/tpch100/q19_discounted_revenue.hive
rename to hivesterix-core/resource/hivesterix/tpch100/q19_discounted_revenue.hive
diff --git a/resource/hivesterix/tpch100/q1_pricing_summary_report.hive b/hivesterix-core/resource/hivesterix/tpch100/q1_pricing_summary_report.hive
similarity index 100%
rename from resource/hivesterix/tpch100/q1_pricing_summary_report.hive
rename to hivesterix-core/resource/hivesterix/tpch100/q1_pricing_summary_report.hive
diff --git a/resource/hivesterix/tpch100/q20_potential_part_promotion.hive b/hivesterix-core/resource/hivesterix/tpch100/q20_potential_part_promotion.hive
similarity index 100%
rename from resource/hivesterix/tpch100/q20_potential_part_promotion.hive
rename to hivesterix-core/resource/hivesterix/tpch100/q20_potential_part_promotion.hive
diff --git a/resource/hivesterix/tpch100/q21_suppliers_who_kept_orders_waiting.hive b/hivesterix-core/resource/hivesterix/tpch100/q21_suppliers_who_kept_orders_waiting.hive
similarity index 100%
rename from resource/hivesterix/tpch100/q21_suppliers_who_kept_orders_waiting.hive
rename to hivesterix-core/resource/hivesterix/tpch100/q21_suppliers_who_kept_orders_waiting.hive
diff --git a/resource/hivesterix/tpch100/q22_global_sales_opportunity.hive b/hivesterix-core/resource/hivesterix/tpch100/q22_global_sales_opportunity.hive
similarity index 100%
rename from resource/hivesterix/tpch100/q22_global_sales_opportunity.hive
rename to hivesterix-core/resource/hivesterix/tpch100/q22_global_sales_opportunity.hive
diff --git a/resource/hivesterix/tpch100/q2_minimum_cost_supplier.hive b/hivesterix-core/resource/hivesterix/tpch100/q2_minimum_cost_supplier.hive
similarity index 100%
rename from resource/hivesterix/tpch100/q2_minimum_cost_supplier.hive
rename to hivesterix-core/resource/hivesterix/tpch100/q2_minimum_cost_supplier.hive
diff --git a/resource/hivesterix/tpch100/q3_shipping_priority.hive b/hivesterix-core/resource/hivesterix/tpch100/q3_shipping_priority.hive
similarity index 100%
rename from resource/hivesterix/tpch100/q3_shipping_priority.hive
rename to hivesterix-core/resource/hivesterix/tpch100/q3_shipping_priority.hive
diff --git a/resource/hivesterix/tpch100/q4_order_priority.hive b/hivesterix-core/resource/hivesterix/tpch100/q4_order_priority.hive
similarity index 100%
rename from resource/hivesterix/tpch100/q4_order_priority.hive
rename to hivesterix-core/resource/hivesterix/tpch100/q4_order_priority.hive
diff --git a/resource/hivesterix/tpch100/q5_local_supplier_volume.hive b/hivesterix-core/resource/hivesterix/tpch100/q5_local_supplier_volume.hive
similarity index 100%
rename from resource/hivesterix/tpch100/q5_local_supplier_volume.hive
rename to hivesterix-core/resource/hivesterix/tpch100/q5_local_supplier_volume.hive
diff --git a/resource/hivesterix/tpch100/q6_forecast_revenue_change.hive b/hivesterix-core/resource/hivesterix/tpch100/q6_forecast_revenue_change.hive
similarity index 100%
rename from resource/hivesterix/tpch100/q6_forecast_revenue_change.hive
rename to hivesterix-core/resource/hivesterix/tpch100/q6_forecast_revenue_change.hive
diff --git a/resource/hivesterix/tpch100/q7_volume_shipping.hive b/hivesterix-core/resource/hivesterix/tpch100/q7_volume_shipping.hive
similarity index 100%
rename from resource/hivesterix/tpch100/q7_volume_shipping.hive
rename to hivesterix-core/resource/hivesterix/tpch100/q7_volume_shipping.hive
diff --git a/resource/hivesterix/tpch100/q8_national_market_share.hive b/hivesterix-core/resource/hivesterix/tpch100/q8_national_market_share.hive
similarity index 100%
rename from resource/hivesterix/tpch100/q8_national_market_share.hive
rename to hivesterix-core/resource/hivesterix/tpch100/q8_national_market_share.hive
diff --git a/resource/hivesterix/tpch100/q9_product_type_profit.hive b/hivesterix-core/resource/hivesterix/tpch100/q9_product_type_profit.hive
similarity index 100%
rename from resource/hivesterix/tpch100/q9_product_type_profit.hive
rename to hivesterix-core/resource/hivesterix/tpch100/q9_product_type_profit.hive
diff --git a/resource/hivesterix/tpch_sample/q1_pricing_summary_report.hive b/hivesterix-core/resource/hivesterix/tpch_sample/q1_pricing_summary_report.hive
similarity index 100%
rename from resource/hivesterix/tpch_sample/q1_pricing_summary_report.hive
rename to hivesterix-core/resource/hivesterix/tpch_sample/q1_pricing_summary_report.hive
diff --git a/resource/hivesterix/tpch_sample/q3_shipping_priority.hive b/hivesterix-core/resource/hivesterix/tpch_sample/q3_shipping_priority.hive
similarity index 100%
rename from resource/hivesterix/tpch_sample/q3_shipping_priority.hive
rename to hivesterix-core/resource/hivesterix/tpch_sample/q3_shipping_priority.hive
diff --git a/resource/hivesterix/tpch_sample/q5_local_supplier_volume.hive b/hivesterix-core/resource/hivesterix/tpch_sample/q5_local_supplier_volume.hive
similarity index 100%
rename from resource/hivesterix/tpch_sample/q5_local_supplier_volume.hive
rename to hivesterix-core/resource/hivesterix/tpch_sample/q5_local_supplier_volume.hive
diff --git a/resource/hivesterix/tpch_sample/q9_product_type_profit.hive b/hivesterix-core/resource/hivesterix/tpch_sample/q9_product_type_profit.hive
similarity index 100%
rename from resource/hivesterix/tpch_sample/q9_product_type_profit.hive
rename to hivesterix-core/resource/hivesterix/tpch_sample/q9_product_type_profit.hive
diff --git a/resource/tpch/q10_returned_item.hive b/hivesterix-core/resource/tpch/q10_returned_item.hive
similarity index 100%
rename from resource/tpch/q10_returned_item.hive
rename to hivesterix-core/resource/tpch/q10_returned_item.hive
diff --git a/resource/tpch/q11_important_stock.hive b/hivesterix-core/resource/tpch/q11_important_stock.hive
similarity index 100%
rename from resource/tpch/q11_important_stock.hive
rename to hivesterix-core/resource/tpch/q11_important_stock.hive
diff --git a/resource/tpch/q12_shipping.hive b/hivesterix-core/resource/tpch/q12_shipping.hive
similarity index 100%
rename from resource/tpch/q12_shipping.hive
rename to hivesterix-core/resource/tpch/q12_shipping.hive
diff --git a/resource/tpch/q13_customer_distribution.hive b/hivesterix-core/resource/tpch/q13_customer_distribution.hive
similarity index 100%
rename from resource/tpch/q13_customer_distribution.hive
rename to hivesterix-core/resource/tpch/q13_customer_distribution.hive
diff --git a/resource/tpch/q14_promotion_effect.hive b/hivesterix-core/resource/tpch/q14_promotion_effect.hive
similarity index 100%
rename from resource/tpch/q14_promotion_effect.hive
rename to hivesterix-core/resource/tpch/q14_promotion_effect.hive
diff --git a/resource/tpch/q15_top_supplier.hive b/hivesterix-core/resource/tpch/q15_top_supplier.hive
similarity index 100%
rename from resource/tpch/q15_top_supplier.hive
rename to hivesterix-core/resource/tpch/q15_top_supplier.hive
diff --git a/resource/tpch/q16_parts_supplier_relationship.hive b/hivesterix-core/resource/tpch/q16_parts_supplier_relationship.hive
similarity index 100%
rename from resource/tpch/q16_parts_supplier_relationship.hive
rename to hivesterix-core/resource/tpch/q16_parts_supplier_relationship.hive
diff --git a/resource/tpch/q17_small_quantity_order_revenue.hive b/hivesterix-core/resource/tpch/q17_small_quantity_order_revenue.hive
similarity index 100%
rename from resource/tpch/q17_small_quantity_order_revenue.hive
rename to hivesterix-core/resource/tpch/q17_small_quantity_order_revenue.hive
diff --git a/resource/tpch/q18_large_volume_customer.hive b/hivesterix-core/resource/tpch/q18_large_volume_customer.hive
similarity index 100%
rename from resource/tpch/q18_large_volume_customer.hive
rename to hivesterix-core/resource/tpch/q18_large_volume_customer.hive
diff --git a/resource/tpch/q19_discounted_revenue.hive b/hivesterix-core/resource/tpch/q19_discounted_revenue.hive
similarity index 100%
rename from resource/tpch/q19_discounted_revenue.hive
rename to hivesterix-core/resource/tpch/q19_discounted_revenue.hive
diff --git a/resource/tpch/q1_pricing_summary_report.hive b/hivesterix-core/resource/tpch/q1_pricing_summary_report.hive
similarity index 100%
rename from resource/tpch/q1_pricing_summary_report.hive
rename to hivesterix-core/resource/tpch/q1_pricing_summary_report.hive
diff --git a/resource/tpch/q20_potential_part_promotion.hive b/hivesterix-core/resource/tpch/q20_potential_part_promotion.hive
similarity index 100%
rename from resource/tpch/q20_potential_part_promotion.hive
rename to hivesterix-core/resource/tpch/q20_potential_part_promotion.hive
diff --git a/resource/tpch/q21_suppliers_who_kept_orders_waiting.hive b/hivesterix-core/resource/tpch/q21_suppliers_who_kept_orders_waiting.hive
similarity index 100%
rename from resource/tpch/q21_suppliers_who_kept_orders_waiting.hive
rename to hivesterix-core/resource/tpch/q21_suppliers_who_kept_orders_waiting.hive
diff --git a/resource/tpch/q22_global_sales_opportunity.hive b/hivesterix-core/resource/tpch/q22_global_sales_opportunity.hive
similarity index 100%
rename from resource/tpch/q22_global_sales_opportunity.hive
rename to hivesterix-core/resource/tpch/q22_global_sales_opportunity.hive
diff --git a/resource/tpch/q2_copy.hive b/hivesterix-core/resource/tpch/q2_copy.hive
similarity index 100%
rename from resource/tpch/q2_copy.hive
rename to hivesterix-core/resource/tpch/q2_copy.hive
diff --git a/resource/tpch/q2_minimum_cost_supplier.hive b/hivesterix-core/resource/tpch/q2_minimum_cost_supplier.hive
similarity index 100%
rename from resource/tpch/q2_minimum_cost_supplier.hive
rename to hivesterix-core/resource/tpch/q2_minimum_cost_supplier.hive
diff --git a/resource/tpch/q3_shipping_priority.hive b/hivesterix-core/resource/tpch/q3_shipping_priority.hive
similarity index 100%
rename from resource/tpch/q3_shipping_priority.hive
rename to hivesterix-core/resource/tpch/q3_shipping_priority.hive
diff --git a/resource/tpch/q4_order_priority.hive b/hivesterix-core/resource/tpch/q4_order_priority.hive
similarity index 100%
rename from resource/tpch/q4_order_priority.hive
rename to hivesterix-core/resource/tpch/q4_order_priority.hive
diff --git a/resource/tpch/q5_local_supplier_volume.hive b/hivesterix-core/resource/tpch/q5_local_supplier_volume.hive
similarity index 100%
rename from resource/tpch/q5_local_supplier_volume.hive
rename to hivesterix-core/resource/tpch/q5_local_supplier_volume.hive
diff --git a/resource/tpch/q6_forecast_revenue_change.hive b/hivesterix-core/resource/tpch/q6_forecast_revenue_change.hive
similarity index 100%
rename from resource/tpch/q6_forecast_revenue_change.hive
rename to hivesterix-core/resource/tpch/q6_forecast_revenue_change.hive
diff --git a/resource/tpch/q7_volume_shipping.hive b/hivesterix-core/resource/tpch/q7_volume_shipping.hive
similarity index 100%
rename from resource/tpch/q7_volume_shipping.hive
rename to hivesterix-core/resource/tpch/q7_volume_shipping.hive
diff --git a/resource/tpch/q8_national_market_share.hive b/hivesterix-core/resource/tpch/q8_national_market_share.hive
similarity index 100%
rename from resource/tpch/q8_national_market_share.hive
rename to hivesterix-core/resource/tpch/q8_national_market_share.hive
diff --git a/resource/tpch/q9_product_type_profit.hive b/hivesterix-core/resource/tpch/q9_product_type_profit.hive
similarity index 100%
rename from resource/tpch/q9_product_type_profit.hive
rename to hivesterix-core/resource/tpch/q9_product_type_profit.hive
diff --git a/resource/tpch100/q10_returned_item.hive b/hivesterix-core/resource/tpch100/q10_returned_item.hive
similarity index 100%
rename from resource/tpch100/q10_returned_item.hive
rename to hivesterix-core/resource/tpch100/q10_returned_item.hive
diff --git a/resource/tpch100/q11_important_stock.hive b/hivesterix-core/resource/tpch100/q11_important_stock.hive
similarity index 100%
rename from resource/tpch100/q11_important_stock.hive
rename to hivesterix-core/resource/tpch100/q11_important_stock.hive
diff --git a/resource/tpch100/q12_shipping.hive b/hivesterix-core/resource/tpch100/q12_shipping.hive
similarity index 100%
rename from resource/tpch100/q12_shipping.hive
rename to hivesterix-core/resource/tpch100/q12_shipping.hive
diff --git a/resource/tpch100/q13_customer_distribution.hive b/hivesterix-core/resource/tpch100/q13_customer_distribution.hive
similarity index 100%
rename from resource/tpch100/q13_customer_distribution.hive
rename to hivesterix-core/resource/tpch100/q13_customer_distribution.hive
diff --git a/resource/tpch100/q14_promotion_effect.hive b/hivesterix-core/resource/tpch100/q14_promotion_effect.hive
similarity index 100%
rename from resource/tpch100/q14_promotion_effect.hive
rename to hivesterix-core/resource/tpch100/q14_promotion_effect.hive
diff --git a/resource/tpch100/q15_top_supplier.hive b/hivesterix-core/resource/tpch100/q15_top_supplier.hive
similarity index 100%
rename from resource/tpch100/q15_top_supplier.hive
rename to hivesterix-core/resource/tpch100/q15_top_supplier.hive
diff --git a/resource/tpch100/q16_parts_supplier_relationship.hive b/hivesterix-core/resource/tpch100/q16_parts_supplier_relationship.hive
similarity index 100%
rename from resource/tpch100/q16_parts_supplier_relationship.hive
rename to hivesterix-core/resource/tpch100/q16_parts_supplier_relationship.hive
diff --git a/resource/tpch100/q17_small_quantity_order_revenue.hive b/hivesterix-core/resource/tpch100/q17_small_quantity_order_revenue.hive
similarity index 100%
rename from resource/tpch100/q17_small_quantity_order_revenue.hive
rename to hivesterix-core/resource/tpch100/q17_small_quantity_order_revenue.hive
diff --git a/resource/tpch100/q18_large_volume_customer.hive b/hivesterix-core/resource/tpch100/q18_large_volume_customer.hive
similarity index 100%
rename from resource/tpch100/q18_large_volume_customer.hive
rename to hivesterix-core/resource/tpch100/q18_large_volume_customer.hive
diff --git a/resource/tpch100/q19_discounted_revenue.hive b/hivesterix-core/resource/tpch100/q19_discounted_revenue.hive
similarity index 100%
rename from resource/tpch100/q19_discounted_revenue.hive
rename to hivesterix-core/resource/tpch100/q19_discounted_revenue.hive
diff --git a/resource/tpch100/q1_pricing_summary_report.hive b/hivesterix-core/resource/tpch100/q1_pricing_summary_report.hive
similarity index 100%
rename from resource/tpch100/q1_pricing_summary_report.hive
rename to hivesterix-core/resource/tpch100/q1_pricing_summary_report.hive
diff --git a/resource/tpch100/q20_potential_part_promotion.hive b/hivesterix-core/resource/tpch100/q20_potential_part_promotion.hive
similarity index 100%
rename from resource/tpch100/q20_potential_part_promotion.hive
rename to hivesterix-core/resource/tpch100/q20_potential_part_promotion.hive
diff --git a/resource/tpch100/q21_suppliers_who_kept_orders_waiting.hive b/hivesterix-core/resource/tpch100/q21_suppliers_who_kept_orders_waiting.hive
similarity index 100%
rename from resource/tpch100/q21_suppliers_who_kept_orders_waiting.hive
rename to hivesterix-core/resource/tpch100/q21_suppliers_who_kept_orders_waiting.hive
diff --git a/resource/tpch100/q22_global_sales_opportunity.hive b/hivesterix-core/resource/tpch100/q22_global_sales_opportunity.hive
similarity index 100%
rename from resource/tpch100/q22_global_sales_opportunity.hive
rename to hivesterix-core/resource/tpch100/q22_global_sales_opportunity.hive
diff --git a/resource/tpch100/q2_minimum_cost_supplier.hive b/hivesterix-core/resource/tpch100/q2_minimum_cost_supplier.hive
similarity index 100%
rename from resource/tpch100/q2_minimum_cost_supplier.hive
rename to hivesterix-core/resource/tpch100/q2_minimum_cost_supplier.hive
diff --git a/resource/tpch100/q3_shipping_priority.hive b/hivesterix-core/resource/tpch100/q3_shipping_priority.hive
similarity index 100%
rename from resource/tpch100/q3_shipping_priority.hive
rename to hivesterix-core/resource/tpch100/q3_shipping_priority.hive
diff --git a/resource/tpch100/q4_order_priority.hive b/hivesterix-core/resource/tpch100/q4_order_priority.hive
similarity index 100%
rename from resource/tpch100/q4_order_priority.hive
rename to hivesterix-core/resource/tpch100/q4_order_priority.hive
diff --git a/resource/tpch100/q5_local_supplier_volume.hive b/hivesterix-core/resource/tpch100/q5_local_supplier_volume.hive
similarity index 100%
rename from resource/tpch100/q5_local_supplier_volume.hive
rename to hivesterix-core/resource/tpch100/q5_local_supplier_volume.hive
diff --git a/resource/tpch100/q6_forecast_revenue_change.hive b/hivesterix-core/resource/tpch100/q6_forecast_revenue_change.hive
similarity index 100%
rename from resource/tpch100/q6_forecast_revenue_change.hive
rename to hivesterix-core/resource/tpch100/q6_forecast_revenue_change.hive
diff --git a/resource/tpch100/q7_volume_shipping.hive b/hivesterix-core/resource/tpch100/q7_volume_shipping.hive
similarity index 100%
rename from resource/tpch100/q7_volume_shipping.hive
rename to hivesterix-core/resource/tpch100/q7_volume_shipping.hive
diff --git a/resource/tpch100/q8_national_market_share.hive b/hivesterix-core/resource/tpch100/q8_national_market_share.hive
similarity index 100%
rename from resource/tpch100/q8_national_market_share.hive
rename to hivesterix-core/resource/tpch100/q8_national_market_share.hive
diff --git a/resource/tpch100/q9_product_type_profit.hive b/hivesterix-core/resource/tpch100/q9_product_type_profit.hive
similarity index 100%
rename from resource/tpch100/q9_product_type_profit.hive
rename to hivesterix-core/resource/tpch100/q9_product_type_profit.hive
diff --git a/src/main/assembly/binary-assembly.xml b/hivesterix-core/src/main/assembly/binary-assembly.xml
similarity index 100%
rename from src/main/assembly/binary-assembly.xml
rename to hivesterix-core/src/main/assembly/binary-assembly.xml
diff --git a/hivesterix-core/src/main/java/edu/uci/ics/hivesterix/runtime/exec/HyracksExecutionEngine.java b/hivesterix-core/src/main/java/edu/uci/ics/hivesterix/runtime/exec/HyracksExecutionEngine.java
new file mode 100644
index 0000000..88ecf6d
--- /dev/null
+++ b/hivesterix-core/src/main/java/edu/uci/ics/hivesterix/runtime/exec/HyracksExecutionEngine.java
@@ -0,0 +1,595 @@
+package edu.uci.ics.hivesterix.runtime.exec;
+
+import java.io.PrintWriter;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hive.conf.HiveConf;
+import org.apache.hadoop.hive.ql.exec.ConditionalTask;
+import org.apache.hadoop.hive.ql.exec.FileSinkOperator;
+import org.apache.hadoop.hive.ql.exec.MapRedTask;
+import org.apache.hadoop.hive.ql.exec.Operator;
+import org.apache.hadoop.hive.ql.exec.TableScanOperator;
+import org.apache.hadoop.hive.ql.exec.Task;
+import org.apache.hadoop.hive.ql.plan.DynamicPartitionCtx;
+import org.apache.hadoop.hive.ql.plan.FetchWork;
+import org.apache.hadoop.hive.ql.plan.FileSinkDesc;
+import org.apache.hadoop.hive.ql.plan.MapredLocalWork;
+import org.apache.hadoop.hive.ql.plan.MapredWork;
+import org.apache.hadoop.hive.ql.plan.PartitionDesc;
+import org.apache.hadoop.hive.ql.plan.TableScanDesc;
+
+import edu.uci.ics.hivesterix.common.config.ConfUtil;
+import edu.uci.ics.hivesterix.logical.expression.HiveExpressionTypeComputer;
+import edu.uci.ics.hivesterix.logical.expression.HiveMergeAggregationExpressionFactory;
+import edu.uci.ics.hivesterix.logical.expression.HiveNullableTypeComputer;
+import edu.uci.ics.hivesterix.logical.expression.HivePartialAggregationTypeComputer;
+import edu.uci.ics.hivesterix.logical.plan.HiveAlgebricksTranslator;
+import edu.uci.ics.hivesterix.logical.plan.HiveLogicalPlanAndMetaData;
+import edu.uci.ics.hivesterix.optimizer.rulecollections.HiveRuleCollections;
+import edu.uci.ics.hivesterix.runtime.factory.evaluator.HiveExpressionRuntimeProvider;
+import edu.uci.ics.hivesterix.runtime.factory.nullwriter.HiveNullWriterFactory;
+import edu.uci.ics.hivesterix.runtime.inspector.HiveBinaryBooleanInspectorFactory;
+import edu.uci.ics.hivesterix.runtime.inspector.HiveBinaryIntegerInspectorFactory;
+import edu.uci.ics.hivesterix.runtime.jobgen.HiveConnectorPolicyAssignmentPolicy;
+import edu.uci.ics.hivesterix.runtime.jobgen.HiveConnectorPolicyAssignmentPolicy.Policy;
+import edu.uci.ics.hivesterix.runtime.provider.HiveBinaryComparatorFactoryProvider;
+import edu.uci.ics.hivesterix.runtime.provider.HiveBinaryHashFunctionFactoryProvider;
+import edu.uci.ics.hivesterix.runtime.provider.HiveBinaryHashFunctionFamilyProvider;
+import edu.uci.ics.hivesterix.runtime.provider.HiveNormalizedKeyComputerFactoryProvider;
+import edu.uci.ics.hivesterix.runtime.provider.HivePrinterFactoryProvider;
+import edu.uci.ics.hivesterix.runtime.provider.HiveSerializerDeserializerProvider;
+import edu.uci.ics.hivesterix.runtime.provider.HiveTypeTraitProvider;
+import edu.uci.ics.hyracks.algebricks.common.constraints.AlgebricksAbsolutePartitionConstraint;
+import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
+import edu.uci.ics.hyracks.algebricks.common.utils.Pair;
+import edu.uci.ics.hyracks.algebricks.compiler.api.HeuristicCompilerFactoryBuilder;
+import edu.uci.ics.hyracks.algebricks.compiler.api.HeuristicCompilerFactoryBuilder.DefaultOptimizationContextFactory;
+import edu.uci.ics.hyracks.algebricks.compiler.api.ICompiler;
+import edu.uci.ics.hyracks.algebricks.compiler.api.ICompilerFactory;
+import edu.uci.ics.hyracks.algebricks.compiler.rewriter.rulecontrollers.SequentialFixpointRuleController;
+import edu.uci.ics.hyracks.algebricks.compiler.rewriter.rulecontrollers.SequentialOnceRuleController;
+import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalPlan;
+import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalPlanAndMetadata;
+import edu.uci.ics.hyracks.algebricks.core.algebra.prettyprint.LogicalOperatorPrettyPrintVisitor;
+import edu.uci.ics.hyracks.algebricks.core.algebra.prettyprint.PlanPrettyPrinter;
+import edu.uci.ics.hyracks.algebricks.core.rewriter.base.AbstractRuleController;
+import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
+import edu.uci.ics.hyracks.algebricks.core.rewriter.base.PhysicalOptimizationConfig;
+import edu.uci.ics.hyracks.api.client.HyracksConnection;
+import edu.uci.ics.hyracks.api.client.IHyracksClientConnection;
+import edu.uci.ics.hyracks.api.job.JobId;
+import edu.uci.ics.hyracks.api.job.JobSpecification;
+
+@SuppressWarnings({ "rawtypes", "unchecked" })
+public class HyracksExecutionEngine implements IExecutionEngine {
+
+	private static final Log LOG = LogFactory
+			.getLog(HyracksExecutionEngine.class.getName());
+
+	private static List<Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>> DEFAULT_LOGICAL_REWRITES = new ArrayList<Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>>();
+	private static List<Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>> DEFAULT_PHYSICAL_REWRITES = new ArrayList<Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>>();
+	static {
+		SequentialFixpointRuleController seqCtrlNoDfs = new SequentialFixpointRuleController(
+				false);
+		SequentialFixpointRuleController seqCtrlFullDfs = new SequentialFixpointRuleController(
+				true);
+		SequentialOnceRuleController seqOnceCtrl = new SequentialOnceRuleController(
+				true);
+		DEFAULT_LOGICAL_REWRITES
+				.add(new Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>(
+						seqCtrlFullDfs, HiveRuleCollections.NORMALIZATION));
+		DEFAULT_LOGICAL_REWRITES
+				.add(new Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>(
+						seqCtrlNoDfs,
+						HiveRuleCollections.COND_PUSHDOWN_AND_JOIN_INFERENCE));
+		DEFAULT_LOGICAL_REWRITES
+				.add(new Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>(
+						seqCtrlFullDfs, HiveRuleCollections.LOAD_FIELDS));
+		DEFAULT_LOGICAL_REWRITES
+				.add(new Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>(
+						seqCtrlNoDfs, HiveRuleCollections.OP_PUSHDOWN));
+		DEFAULT_LOGICAL_REWRITES
+				.add(new Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>(
+						seqOnceCtrl, HiveRuleCollections.DATA_EXCHANGE));
+		DEFAULT_LOGICAL_REWRITES
+				.add(new Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>(
+						seqCtrlNoDfs, HiveRuleCollections.CONSOLIDATION));
+
+		DEFAULT_PHYSICAL_REWRITES
+				.add(new Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>(
+						seqOnceCtrl, HiveRuleCollections.PHYSICAL_PLAN_REWRITES));
+		DEFAULT_PHYSICAL_REWRITES
+				.add(new Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>(
+						seqOnceCtrl, HiveRuleCollections.prepareJobGenRules));
+	}
+
+	/**
+	 * static configurations for compiler
+	 */
+	private HeuristicCompilerFactoryBuilder builder;
+
+	/**
+	 * compiler
+	 */
+	private ICompiler compiler;
+
+	/**
+	 * physical optimization config
+	 */
+	private PhysicalOptimizationConfig physicalOptimizationConfig;
+
+	/**
+	 * final ending operators
+	 */
+	private List<Operator> leaveOps = new ArrayList<Operator>();
+
+	/**
+	 * tasks that are already visited
+	 */
+	private Map<Task<? extends Serializable>, Boolean> tasksVisited = new HashMap<Task<? extends Serializable>, Boolean>();
+
+	/**
+	 * hyracks job spec
+	 */
+	private JobSpecification jobSpec;
+
+	/**
+	 * hive configuration
+	 */
+	private HiveConf conf;
+
+	/**
+	 * plan printer
+	 */
+	private PrintWriter planPrinter;
+
+	public HyracksExecutionEngine(HiveConf conf) {
+		this.conf = conf;
+		init(conf);
+	}
+
+	public HyracksExecutionEngine(HiveConf conf, PrintWriter planPrinter) {
+		this.conf = conf;
+		this.planPrinter = planPrinter;
+		init(conf);
+	}
+
+	private void init(HiveConf conf) {
+		builder = new HeuristicCompilerFactoryBuilder(
+				DefaultOptimizationContextFactory.INSTANCE);
+		builder.setLogicalRewrites(DEFAULT_LOGICAL_REWRITES);
+		builder.setPhysicalRewrites(DEFAULT_PHYSICAL_REWRITES);
+		builder.setIMergeAggregationExpressionFactory(HiveMergeAggregationExpressionFactory.INSTANCE);
+		builder.setExpressionTypeComputer(HiveExpressionTypeComputer.INSTANCE);
+		builder.setNullableTypeComputer(HiveNullableTypeComputer.INSTANCE);
+
+		long memSizeExternalGby = conf.getLong(
+				"hive.algebricks.groupby.external.memory", 268435456);
+		long memSizeExternalSort = conf.getLong("hive.algebricks.sort.memory",
+				536870912);
+		int frameSize = conf.getInt("hive.algebricks.framesize", 32768);
+
+		physicalOptimizationConfig = new PhysicalOptimizationConfig();
+		int frameLimitExtGby = (int) (memSizeExternalGby / frameSize);
+		physicalOptimizationConfig
+				.setMaxFramesExternalGroupBy(frameLimitExtGby);
+		int frameLimitExtSort = (int) (memSizeExternalSort / frameSize);
+		physicalOptimizationConfig.setMaxFramesExternalSort(frameLimitExtSort);
+		builder.setPhysicalOptimizationConfig(physicalOptimizationConfig);
+	}
+
+	@Override
+	public int compileJob(List<Task<? extends Serializable>> rootTasks) {
+		// clean up
+		leaveOps.clear();
+		tasksVisited.clear();
+		jobSpec = null;
+
+		HashMap<String, PartitionDesc> aliasToPath = new HashMap<String, PartitionDesc>();
+		List<Operator> rootOps = generateRootOperatorDAG(rootTasks, aliasToPath);
+
+		// get all leave Ops
+		getLeaves(rootOps, leaveOps);
+
+		HiveAlgebricksTranslator translator = new HiveAlgebricksTranslator();
+		try {
+			translator.translate(rootOps, null, aliasToPath);
+
+			ILogicalPlan plan = translator.genLogicalPlan();
+
+			if (plan.getRoots() != null && plan.getRoots().size() > 0
+					&& plan.getRoots().get(0).getValue() != null) {
+				translator.printOperators();
+				ILogicalPlanAndMetadata planAndMetadata = new HiveLogicalPlanAndMetaData(
+						plan, translator.getMetadataProvider());
+
+				ICompilerFactory compilerFactory = builder.create();
+				compiler = compilerFactory.createCompiler(
+						planAndMetadata.getPlan(),
+						planAndMetadata.getMetadataProvider(),
+						translator.getVariableCounter());
+
+				// run optimization and re-writing rules for Hive plan
+				compiler.optimize();
+
+				// print optimized plan
+				LogicalOperatorPrettyPrintVisitor pvisitor = new LogicalOperatorPrettyPrintVisitor();
+				StringBuilder buffer = new StringBuilder();
+				PlanPrettyPrinter.printPlan(plan, buffer, pvisitor, 0);
+				String planStr = buffer.toString();
+				System.out.println(planStr);
+
+				if (planPrinter != null)
+					planPrinter.print(planStr);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			return 1;
+		}
+
+		return 0;
+	}
+
+	private void codeGen() throws AlgebricksException {
+		try {
+			// number of cpu cores in the cluster
+			builder.setClusterLocations(new AlgebricksAbsolutePartitionConstraint(
+					ConfUtil.getNCs()));
+		} catch (Exception e) {
+			throw new AlgebricksException(e);
+		}
+		// builder.setClusterTopology(ConfUtil.getClusterTopology());
+		builder.setBinaryBooleanInspectorFactory(HiveBinaryBooleanInspectorFactory.INSTANCE);
+		builder.setBinaryIntegerInspectorFactory(HiveBinaryIntegerInspectorFactory.INSTANCE);
+		builder.setComparatorFactoryProvider(HiveBinaryComparatorFactoryProvider.INSTANCE);
+		builder.setExpressionRuntimeProvider(HiveExpressionRuntimeProvider.INSTANCE);
+		builder.setHashFunctionFactoryProvider(HiveBinaryHashFunctionFactoryProvider.INSTANCE);
+		builder.setPrinterProvider(HivePrinterFactoryProvider.INSTANCE);
+		builder.setSerializerDeserializerProvider(HiveSerializerDeserializerProvider.INSTANCE);
+		builder.setNullWriterFactory(HiveNullWriterFactory.INSTANCE);
+		builder.setNormalizedKeyComputerFactoryProvider(HiveNormalizedKeyComputerFactoryProvider.INSTANCE);
+		builder.setPartialAggregationTypeComputer(HivePartialAggregationTypeComputer.INSTANCE);
+		builder.setTypeTraitProvider(HiveTypeTraitProvider.INSTANCE);
+		builder.setHashFunctionFamilyProvider(HiveBinaryHashFunctionFamilyProvider.INSTANCE);
+
+		jobSpec = compiler.createJob(null);
+
+		// set the policy
+		String policyStr = conf.get("hive.hyracks.connectorpolicy");
+		if (policyStr == null)
+			policyStr = "PIPELINING";
+		Policy policyValue = Policy.valueOf(policyStr);
+		jobSpec.setConnectorPolicyAssignmentPolicy(new HiveConnectorPolicyAssignmentPolicy(
+				policyValue));
+		jobSpec.setUseConnectorPolicyForScheduling(false);
+	}
+
+	@Override
+	public int executeJob() {
+		try {
+			codeGen();
+			executeHyraxJob(jobSpec);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return 1;
+		}
+		return 0;
+	}
+
+	private List<Operator> generateRootOperatorDAG(
+			List<Task<? extends Serializable>> rootTasks,
+			HashMap<String, PartitionDesc> aliasToPath) {
+
+		List<Operator> rootOps = new ArrayList<Operator>();
+		List<Task<? extends Serializable>> toDelete = new ArrayList<Task<? extends Serializable>>();
+		tasksVisited.clear();
+
+		for (int i = rootTasks.size() - 1; i >= 0; i--) {
+			/**
+			 * list of map-reduce tasks
+			 */
+			Task<? extends Serializable> task = rootTasks.get(i);
+
+			if (task instanceof MapRedTask) {
+				List<Operator> mapRootOps = articulateMapReduceOperators(task,
+						rootOps, aliasToPath, rootTasks);
+				if (i == 0)
+					rootOps.addAll(mapRootOps);
+				else {
+					List<Operator> leaves = new ArrayList<Operator>();
+					getLeaves(rootOps, leaves);
+
+					List<Operator> mapChildren = new ArrayList<Operator>();
+					for (Operator childMap : mapRootOps) {
+						if (childMap instanceof TableScanOperator) {
+							TableScanDesc topDesc = (TableScanDesc) childMap
+									.getConf();
+							if (topDesc == null)
+								mapChildren.add(childMap);
+							else {
+								rootOps.add(childMap);
+							}
+						} else
+							mapChildren.add(childMap);
+					}
+
+					if (mapChildren.size() > 0) {
+						for (Operator leaf : leaves)
+							leaf.setChildOperators(mapChildren);
+						for (Operator child : mapChildren)
+							child.setParentOperators(leaves);
+					}
+				}
+
+				MapredWork mr = (MapredWork) task.getWork();
+				HashMap<String, PartitionDesc> map = mr.getAliasToPartnInfo();
+
+				addAliasToPartition(aliasToPath, map);
+				toDelete.add(task);
+			}
+		}
+
+		for (Task<? extends Serializable> task : toDelete)
+			rootTasks.remove(task);
+
+		return rootOps;
+	}
+
+	private void addAliasToPartition(
+			HashMap<String, PartitionDesc> aliasToPath,
+			HashMap<String, PartitionDesc> map) {
+		Iterator<String> keys = map.keySet().iterator();
+		while (keys.hasNext()) {
+			String key = keys.next();
+			PartitionDesc part = map.get(key);
+			String[] names = key.split(":");
+			for (String name : names) {
+				aliasToPath.put(name, part);
+			}
+		}
+	}
+
+	private List<Operator> articulateMapReduceOperators(Task task,
+			List<Operator> rootOps, HashMap<String, PartitionDesc> aliasToPath,
+			List<Task<? extends Serializable>> rootTasks) {
+		// System.out.println("!"+task.getName());
+		if (!(task instanceof MapRedTask)) {
+			if (!(task instanceof ConditionalTask)) {
+				rootTasks.add(task);
+				return null;
+			} else {
+				// remove map-reduce branches in condition task
+				ConditionalTask condition = (ConditionalTask) task;
+				List<Task<? extends Serializable>> branches = condition
+						.getListTasks();
+				for (int i = branches.size() - 1; i >= 0; i--) {
+					Task branch = branches.get(i);
+					if (branch instanceof MapRedTask) {
+						return articulateMapReduceOperators(branch, rootOps,
+								aliasToPath, rootTasks);
+					}
+				}
+				rootTasks.add(task);
+				return null;
+			}
+		}
+
+		MapredWork mr = (MapredWork) task.getWork();
+		HashMap<String, PartitionDesc> map = mr.getAliasToPartnInfo();
+
+		// put all aliasToParitionDesc mapping into the map
+		addAliasToPartition(aliasToPath, map);
+
+		MapRedTask mrtask = (MapRedTask) task;
+		MapredWork work = (MapredWork) mrtask.getWork();
+		HashMap<String, Operator<? extends Serializable>> operators = work
+				.getAliasToWork();
+
+		Set entries = operators.entrySet();
+		Iterator<Entry<String, Operator>> iterator = entries.iterator();
+		List<Operator> mapRootOps = new ArrayList<Operator>();
+
+		// get map root operators
+		while (iterator.hasNext()) {
+			Operator next = iterator.next().getValue();
+			if (!mapRootOps.contains(next)) {
+				// clear that only for the case of union
+				mapRootOps.add(next);
+			}
+		}
+
+		// get map local work
+		MapredLocalWork localWork = work.getMapLocalWork();
+		if (localWork != null) {
+			HashMap<String, Operator<? extends Serializable>> localOperators = localWork
+					.getAliasToWork();
+
+			Set localEntries = localOperators.entrySet();
+			Iterator<Entry<String, Operator>> localIterator = localEntries
+					.iterator();
+			while (localIterator.hasNext()) {
+				mapRootOps.add(localIterator.next().getValue());
+			}
+
+			HashMap<String, FetchWork> localFetch = localWork
+					.getAliasToFetchWork();
+			Set localFetchEntries = localFetch.entrySet();
+			Iterator<Entry<String, FetchWork>> localFetchIterator = localFetchEntries
+					.iterator();
+			while (localFetchIterator.hasNext()) {
+				Entry<String, FetchWork> fetchMap = localFetchIterator.next();
+				FetchWork fetch = fetchMap.getValue();
+				String alias = fetchMap.getKey();
+				List<PartitionDesc> dirPart = fetch.getPartDesc();
+
+				// temporary hack: put the first partitionDesc into the map
+				aliasToPath.put(alias, dirPart.get(0));
+			}
+		}
+
+		Boolean visited = tasksVisited.get(task);
+		if (visited != null && visited.booleanValue() == true) {
+			return mapRootOps;
+		}
+
+		// do that only for union operator
+		for (Operator op : mapRootOps)
+			if (op.getParentOperators() != null)
+				op.getParentOperators().clear();
+
+		List<Operator> mapLeaves = new ArrayList<Operator>();
+		downToLeaves(mapRootOps, mapLeaves);
+		List<Operator> reduceOps = new ArrayList<Operator>();
+
+		if (work.getReducer() != null)
+			reduceOps.add(work.getReducer());
+
+		for (Operator mapLeaf : mapLeaves) {
+			mapLeaf.setChildOperators(reduceOps);
+		}
+
+		for (Operator reduceOp : reduceOps) {
+			if (reduceOp != null)
+				reduceOp.setParentOperators(mapLeaves);
+		}
+
+		List<Operator> leafs = new ArrayList<Operator>();
+		if (reduceOps.size() > 0) {
+			downToLeaves(reduceOps, leafs);
+		} else {
+			leafs = mapLeaves;
+		}
+
+		List<Operator> mapChildren = new ArrayList<Operator>();
+		if (task.getChildTasks() != null && task.getChildTasks().size() > 0) {
+			for (Object child : task.getChildTasks()) {
+				List<Operator> childMapOps = articulateMapReduceOperators(
+						(Task) child, rootOps, aliasToPath, rootTasks);
+				if (childMapOps == null)
+					continue;
+
+				for (Operator childMap : childMapOps) {
+					if (childMap instanceof TableScanOperator) {
+						TableScanDesc topDesc = (TableScanDesc) childMap
+								.getConf();
+						if (topDesc == null)
+							mapChildren.add(childMap);
+						else {
+							rootOps.add(childMap);
+						}
+					} else {
+						// if not table scan, add the child
+						mapChildren.add(childMap);
+					}
+				}
+			}
+
+			if (mapChildren.size() > 0) {
+				int i = 0;
+				for (Operator leaf : leafs) {
+					if (leaf.getChildOperators() == null
+							|| leaf.getChildOperators().size() == 0)
+						leaf.setChildOperators(new ArrayList<Operator>());
+					leaf.getChildOperators().add(mapChildren.get(i));
+					i++;
+				}
+				i = 0;
+				for (Operator child : mapChildren) {
+					if (child.getParentOperators() == null
+							|| child.getParentOperators().size() == 0)
+						child.setParentOperators(new ArrayList<Operator>());
+					child.getParentOperators().add(leafs.get(i));
+					i++;
+				}
+			}
+		}
+
+		// mark this task as visited
+		this.tasksVisited.put(task, true);
+		return mapRootOps;
+	}
+
+	/**
+	 * down to leaf nodes
+	 * 
+	 * @param ops
+	 * @param leaves
+	 */
+	private void downToLeaves(List<Operator> ops, List<Operator> leaves) {
+
+		// Operator currentOp;
+		for (Operator op : ops) {
+			if (op != null && op.getChildOperators() != null
+					&& op.getChildOperators().size() > 0) {
+				downToLeaves(op.getChildOperators(), leaves);
+			} else {
+				if (op != null && leaves.indexOf(op) < 0)
+					leaves.add(op);
+			}
+		}
+	}
+
+	private void getLeaves(List<Operator> roots, List<Operator> currentLeaves) {
+		for (Operator op : roots) {
+			List<Operator> children = op.getChildOperators();
+			if (children == null || children.size() <= 0) {
+				currentLeaves.add(op);
+			} else {
+				getLeaves(children, currentLeaves);
+			}
+		}
+	}
+
+	private void executeHyraxJob(JobSpecification job) throws Exception {
+		String ipAddress = conf.get("hive.hyracks.host");
+		int port = Integer.parseInt(conf.get("hive.hyracks.port"));
+		String applicationName = conf.get("hive.hyracks.app");
+		// System.out.println("connect to " + ipAddress + " " + port);
+
+		IHyracksClientConnection hcc = new HyracksConnection(ipAddress, port);
+
+		// System.out.println("get connected");
+		long start = System.currentTimeMillis();
+		JobId jobId = hcc.startJob(applicationName, job);
+		hcc.waitForCompletion(jobId);
+
+		// System.out.println("job finished: " + jobId.toString());
+		// call all leave nodes to end
+		for (Operator leaf : leaveOps) {
+			jobClose(leaf);
+		}
+
+		long end = System.currentTimeMillis();
+		System.err.println(start + " " + end + " " + (end - start));
+	}
+
+	/**
+	 * mv to final directory on hdfs (not real final)
+	 * 
+	 * @param leaf
+	 * @throws Exception
+	 */
+	private void jobClose(Operator leaf) throws Exception {
+		FileSinkOperator fsOp = (FileSinkOperator) leaf;
+		FileSinkDesc desc = fsOp.getConf();
+		boolean isNativeTable = !desc.getTableInfo().isNonNative();
+		if ((conf != null) && isNativeTable) {
+			String specPath = desc.getDirName();
+			DynamicPartitionCtx dpCtx = desc.getDynPartCtx();
+			// for 0.7.0
+			fsOp.mvFileToFinalPath(specPath, conf, true, LOG, dpCtx);
+			// for 0.8.0
+			// Utilities.mvFileToFinalPath(specPath, conf, true, LOG, dpCtx,
+			// desc);
+		}
+	}
+}
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/exec/IExecutionEngine.java b/hivesterix-core/src/main/java/edu/uci/ics/hivesterix/runtime/exec/IExecutionEngine.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/exec/IExecutionEngine.java
rename to hivesterix-core/src/main/java/edu/uci/ics/hivesterix/runtime/exec/IExecutionEngine.java
diff --git a/src/main/java/org/apache/hadoop/hive/ql/Driver.java b/hivesterix-core/src/main/java/org/apache/hadoop/hive/ql/Driver.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/hive/ql/Driver.java
rename to hivesterix-core/src/main/java/org/apache/hadoop/hive/ql/Driver.java
diff --git a/src/main/scripts/run.cmd b/hivesterix-core/src/main/scripts/run.cmd
similarity index 100%
rename from src/main/scripts/run.cmd
rename to hivesterix-core/src/main/scripts/run.cmd
diff --git a/src/main/scripts/run.sh b/hivesterix-core/src/main/scripts/run.sh
similarity index 100%
rename from src/main/scripts/run.sh
rename to hivesterix-core/src/main/scripts/run.sh
diff --git a/src/test/java/edu/uci/ics/hivesterix/perf/PerfTestCase.java b/hivesterix-core/src/test/java/edu/uci/ics/hivesterix/perf/PerfTestCase.java
similarity index 98%
rename from src/test/java/edu/uci/ics/hivesterix/perf/PerfTestCase.java
rename to hivesterix-core/src/test/java/edu/uci/ics/hivesterix/perf/PerfTestCase.java
index 3a0f381..aa38fe7 100644
--- a/src/test/java/edu/uci/ics/hivesterix/perf/PerfTestCase.java
+++ b/hivesterix-core/src/test/java/edu/uci/ics/hivesterix/perf/PerfTestCase.java
@@ -11,8 +11,8 @@
 import org.apache.hadoop.hive.ql.Driver;
 import org.junit.Test;
 
+import edu.uci.ics.hivesterix.common.config.ConfUtil;
 import edu.uci.ics.hivesterix.perf.base.AbstractPerfTestCase;
-import edu.uci.ics.hivesterix.runtime.config.ConfUtil;
 
 public class PerfTestCase extends AbstractPerfTestCase {
     private File resultFile;
diff --git a/src/test/java/edu/uci/ics/hivesterix/perf/PerfTestSuite.java b/hivesterix-core/src/test/java/edu/uci/ics/hivesterix/perf/PerfTestSuite.java
similarity index 100%
rename from src/test/java/edu/uci/ics/hivesterix/perf/PerfTestSuite.java
rename to hivesterix-core/src/test/java/edu/uci/ics/hivesterix/perf/PerfTestSuite.java
diff --git a/src/test/java/edu/uci/ics/hivesterix/perf/PerfTestSuiteCaseGenerator.java b/hivesterix-core/src/test/java/edu/uci/ics/hivesterix/perf/PerfTestSuiteCaseGenerator.java
similarity index 98%
rename from src/test/java/edu/uci/ics/hivesterix/perf/PerfTestSuiteCaseGenerator.java
rename to hivesterix-core/src/test/java/edu/uci/ics/hivesterix/perf/PerfTestSuiteCaseGenerator.java
index 75a325e..4777351 100644
--- a/src/test/java/edu/uci/ics/hivesterix/perf/PerfTestSuiteCaseGenerator.java
+++ b/hivesterix-core/src/test/java/edu/uci/ics/hivesterix/perf/PerfTestSuiteCaseGenerator.java
@@ -9,8 +9,8 @@
 import org.apache.hadoop.hive.ql.Driver;
 import org.junit.Test;
 
+import edu.uci.ics.hivesterix.common.config.ConfUtil;
 import edu.uci.ics.hivesterix.perf.base.AbstractPerfTestCase;
-import edu.uci.ics.hivesterix.runtime.config.ConfUtil;
 
 public class PerfTestSuiteCaseGenerator extends AbstractPerfTestCase {
     private File resultFile;
diff --git a/src/test/java/edu/uci/ics/hivesterix/perf/PerfTestSuiteGenerator.java b/hivesterix-core/src/test/java/edu/uci/ics/hivesterix/perf/PerfTestSuiteGenerator.java
similarity index 100%
rename from src/test/java/edu/uci/ics/hivesterix/perf/PerfTestSuiteGenerator.java
rename to hivesterix-core/src/test/java/edu/uci/ics/hivesterix/perf/PerfTestSuiteGenerator.java
diff --git a/src/test/java/edu/uci/ics/hivesterix/perf/base/AbstractPerfTestCase.java b/hivesterix-core/src/test/java/edu/uci/ics/hivesterix/perf/base/AbstractPerfTestCase.java
similarity index 100%
rename from src/test/java/edu/uci/ics/hivesterix/perf/base/AbstractPerfTestCase.java
rename to hivesterix-core/src/test/java/edu/uci/ics/hivesterix/perf/base/AbstractPerfTestCase.java
diff --git a/src/test/java/edu/uci/ics/hivesterix/perf/base/AbstractPerfTestSuiteClass.java b/hivesterix-core/src/test/java/edu/uci/ics/hivesterix/perf/base/AbstractPerfTestSuiteClass.java
similarity index 98%
rename from src/test/java/edu/uci/ics/hivesterix/perf/base/AbstractPerfTestSuiteClass.java
rename to hivesterix-core/src/test/java/edu/uci/ics/hivesterix/perf/base/AbstractPerfTestSuiteClass.java
index 08797d5..d9492d9 100644
--- a/src/test/java/edu/uci/ics/hivesterix/perf/base/AbstractPerfTestSuiteClass.java
+++ b/hivesterix-core/src/test/java/edu/uci/ics/hivesterix/perf/base/AbstractPerfTestSuiteClass.java
@@ -21,7 +21,7 @@
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapred.MiniMRCluster;
 
-import edu.uci.ics.hivesterix.runtime.config.ConfUtil;
+import edu.uci.ics.hivesterix.common.config.ConfUtil;
 import edu.uci.ics.hyracks.api.client.HyracksConnection;
 import edu.uci.ics.hyracks.api.client.IHyracksClientConnection;
 import edu.uci.ics.hyracks.control.cc.ClusterControllerService;
diff --git a/src/test/java/edu/uci/ics/hivesterix/test/base/AbstractHivesterixTestCase.java b/hivesterix-core/src/test/java/edu/uci/ics/hivesterix/test/base/AbstractHivesterixTestCase.java
similarity index 100%
rename from src/test/java/edu/uci/ics/hivesterix/test/base/AbstractHivesterixTestCase.java
rename to hivesterix-core/src/test/java/edu/uci/ics/hivesterix/test/base/AbstractHivesterixTestCase.java
diff --git a/src/test/java/edu/uci/ics/hivesterix/test/base/AbstractTestSuiteClass.java b/hivesterix-core/src/test/java/edu/uci/ics/hivesterix/test/base/AbstractTestSuiteClass.java
similarity index 98%
rename from src/test/java/edu/uci/ics/hivesterix/test/base/AbstractTestSuiteClass.java
rename to hivesterix-core/src/test/java/edu/uci/ics/hivesterix/test/base/AbstractTestSuiteClass.java
index 4d3128b..50d8529 100644
--- a/src/test/java/edu/uci/ics/hivesterix/test/base/AbstractTestSuiteClass.java
+++ b/hivesterix-core/src/test/java/edu/uci/ics/hivesterix/test/base/AbstractTestSuiteClass.java
@@ -22,7 +22,7 @@
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapred.MiniMRCluster;
 
-import edu.uci.ics.hivesterix.runtime.config.ConfUtil;
+import edu.uci.ics.hivesterix.common.config.ConfUtil;
 import edu.uci.ics.hyracks.api.client.HyracksConnection;
 import edu.uci.ics.hyracks.api.client.IHyracksClientConnection;
 import edu.uci.ics.hyracks.control.cc.ClusterControllerService;
diff --git a/src/test/java/edu/uci/ics/hivesterix/test/datagen/RecordBalance.java b/hivesterix-core/src/test/java/edu/uci/ics/hivesterix/test/datagen/RecordBalance.java
similarity index 100%
rename from src/test/java/edu/uci/ics/hivesterix/test/datagen/RecordBalance.java
rename to hivesterix-core/src/test/java/edu/uci/ics/hivesterix/test/datagen/RecordBalance.java
diff --git a/src/test/java/edu/uci/ics/hivesterix/test/legacy/LegacyTestCase.java b/hivesterix-core/src/test/java/edu/uci/ics/hivesterix/test/legacy/LegacyTestCase.java
similarity index 98%
rename from src/test/java/edu/uci/ics/hivesterix/test/legacy/LegacyTestCase.java
rename to hivesterix-core/src/test/java/edu/uci/ics/hivesterix/test/legacy/LegacyTestCase.java
index a286747..32c1c3f 100644
--- a/src/test/java/edu/uci/ics/hivesterix/test/legacy/LegacyTestCase.java
+++ b/hivesterix-core/src/test/java/edu/uci/ics/hivesterix/test/legacy/LegacyTestCase.java
@@ -11,7 +11,7 @@
 import org.apache.hadoop.hive.ql.Driver;
 import org.junit.Test;
 
-import edu.uci.ics.hivesterix.runtime.config.ConfUtil;
+import edu.uci.ics.hivesterix.common.config.ConfUtil;
 import edu.uci.ics.hivesterix.test.base.AbstractHivesterixTestCase;
 
 public class LegacyTestCase extends AbstractHivesterixTestCase {
diff --git a/src/test/java/edu/uci/ics/hivesterix/test/optimizer/OptimizerTestCase.java b/hivesterix-core/src/test/java/edu/uci/ics/hivesterix/test/optimizer/OptimizerTestCase.java
similarity index 96%
rename from src/test/java/edu/uci/ics/hivesterix/test/optimizer/OptimizerTestCase.java
rename to hivesterix-core/src/test/java/edu/uci/ics/hivesterix/test/optimizer/OptimizerTestCase.java
index f80405f..0e2a5d5 100644
--- a/src/test/java/edu/uci/ics/hivesterix/test/optimizer/OptimizerTestCase.java
+++ b/hivesterix-core/src/test/java/edu/uci/ics/hivesterix/test/optimizer/OptimizerTestCase.java
@@ -8,7 +8,7 @@
 import org.apache.hadoop.hive.ql.Driver;
 import org.junit.Test;
 
-import edu.uci.ics.hivesterix.runtime.config.ConfUtil;
+import edu.uci.ics.hivesterix.common.config.ConfUtil;
 import edu.uci.ics.hivesterix.test.base.AbstractHivesterixTestCase;
 
 public class OptimizerTestCase extends AbstractHivesterixTestCase {
diff --git a/src/test/java/edu/uci/ics/hivesterix/test/optimizer/OptimizerTestSuitGenerator.java b/hivesterix-core/src/test/java/edu/uci/ics/hivesterix/test/optimizer/OptimizerTestSuitGenerator.java
similarity index 100%
rename from src/test/java/edu/uci/ics/hivesterix/test/optimizer/OptimizerTestSuitGenerator.java
rename to hivesterix-core/src/test/java/edu/uci/ics/hivesterix/test/optimizer/OptimizerTestSuitGenerator.java
diff --git a/src/test/java/edu/uci/ics/hivesterix/test/optimizer/OptimizerTestSuite.java b/hivesterix-core/src/test/java/edu/uci/ics/hivesterix/test/optimizer/OptimizerTestSuite.java
similarity index 100%
rename from src/test/java/edu/uci/ics/hivesterix/test/optimizer/OptimizerTestSuite.java
rename to hivesterix-core/src/test/java/edu/uci/ics/hivesterix/test/optimizer/OptimizerTestSuite.java
diff --git a/src/test/java/edu/uci/ics/hivesterix/test/optimizer/OptimizerTestSuiteCaseGenerator.java b/hivesterix-core/src/test/java/edu/uci/ics/hivesterix/test/optimizer/OptimizerTestSuiteCaseGenerator.java
similarity index 96%
rename from src/test/java/edu/uci/ics/hivesterix/test/optimizer/OptimizerTestSuiteCaseGenerator.java
rename to hivesterix-core/src/test/java/edu/uci/ics/hivesterix/test/optimizer/OptimizerTestSuiteCaseGenerator.java
index b71ecf8..ee82eb3 100644
--- a/src/test/java/edu/uci/ics/hivesterix/test/optimizer/OptimizerTestSuiteCaseGenerator.java
+++ b/hivesterix-core/src/test/java/edu/uci/ics/hivesterix/test/optimizer/OptimizerTestSuiteCaseGenerator.java
@@ -8,7 +8,7 @@
 import org.apache.hadoop.hive.ql.Driver;
 import org.junit.Test;
 
-import edu.uci.ics.hivesterix.runtime.config.ConfUtil;
+import edu.uci.ics.hivesterix.common.config.ConfUtil;
 import edu.uci.ics.hivesterix.test.base.AbstractHivesterixTestCase;
 
 public class OptimizerTestSuiteCaseGenerator extends AbstractHivesterixTestCase {
diff --git a/src/test/java/edu/uci/ics/hivesterix/test/runtimefunction/RuntimeFunctionTestCase.java b/hivesterix-core/src/test/java/edu/uci/ics/hivesterix/test/runtimefunction/RuntimeFunctionTestCase.java
similarity index 98%
rename from src/test/java/edu/uci/ics/hivesterix/test/runtimefunction/RuntimeFunctionTestCase.java
rename to hivesterix-core/src/test/java/edu/uci/ics/hivesterix/test/runtimefunction/RuntimeFunctionTestCase.java
index 60a8b13..fdc4c68 100644
--- a/src/test/java/edu/uci/ics/hivesterix/test/runtimefunction/RuntimeFunctionTestCase.java
+++ b/hivesterix-core/src/test/java/edu/uci/ics/hivesterix/test/runtimefunction/RuntimeFunctionTestCase.java
@@ -11,7 +11,7 @@
 import org.apache.hadoop.hive.ql.Driver;
 import org.junit.Test;
 
-import edu.uci.ics.hivesterix.runtime.config.ConfUtil;
+import edu.uci.ics.hivesterix.common.config.ConfUtil;
 import edu.uci.ics.hivesterix.test.base.AbstractHivesterixTestCase;
 
 public class RuntimeFunctionTestCase extends AbstractHivesterixTestCase {
diff --git a/src/test/java/edu/uci/ics/hivesterix/test/runtimefunction/RuntimeFunctionTestSuite.java b/hivesterix-core/src/test/java/edu/uci/ics/hivesterix/test/runtimefunction/RuntimeFunctionTestSuite.java
similarity index 100%
rename from src/test/java/edu/uci/ics/hivesterix/test/runtimefunction/RuntimeFunctionTestSuite.java
rename to hivesterix-core/src/test/java/edu/uci/ics/hivesterix/test/runtimefunction/RuntimeFunctionTestSuite.java
diff --git a/src/test/java/edu/uci/ics/hivesterix/test/runtimefunction/RuntimeFunctionTestSuiteCaseGenerator.java b/hivesterix-core/src/test/java/edu/uci/ics/hivesterix/test/runtimefunction/RuntimeFunctionTestSuiteCaseGenerator.java
similarity index 98%
rename from src/test/java/edu/uci/ics/hivesterix/test/runtimefunction/RuntimeFunctionTestSuiteCaseGenerator.java
rename to hivesterix-core/src/test/java/edu/uci/ics/hivesterix/test/runtimefunction/RuntimeFunctionTestSuiteCaseGenerator.java
index b669e28..a416759 100644
--- a/src/test/java/edu/uci/ics/hivesterix/test/runtimefunction/RuntimeFunctionTestSuiteCaseGenerator.java
+++ b/hivesterix-core/src/test/java/edu/uci/ics/hivesterix/test/runtimefunction/RuntimeFunctionTestSuiteCaseGenerator.java
@@ -11,7 +11,7 @@
 import org.apache.hadoop.hive.ql.Driver;
 import org.junit.Test;
 
-import edu.uci.ics.hivesterix.runtime.config.ConfUtil;
+import edu.uci.ics.hivesterix.common.config.ConfUtil;
 import edu.uci.ics.hivesterix.test.base.AbstractHivesterixTestCase;
 
 public class RuntimeFunctionTestSuiteCaseGenerator extends AbstractHivesterixTestCase {
diff --git a/src/test/java/edu/uci/ics/hivesterix/test/runtimefunction/RuntimeFunctionTestSuiteGenerator.java b/hivesterix-core/src/test/java/edu/uci/ics/hivesterix/test/runtimefunction/RuntimeFunctionTestSuiteGenerator.java
similarity index 100%
rename from src/test/java/edu/uci/ics/hivesterix/test/runtimefunction/RuntimeFunctionTestSuiteGenerator.java
rename to hivesterix-core/src/test/java/edu/uci/ics/hivesterix/test/runtimefunction/RuntimeFunctionTestSuiteGenerator.java
diff --git a/src/test/java/edu/uci/ics/hivesterix/test/serde/SerDeTest.java b/hivesterix-core/src/test/java/edu/uci/ics/hivesterix/test/serde/SerDeTest.java
similarity index 100%
rename from src/test/java/edu/uci/ics/hivesterix/test/serde/SerDeTest.java
rename to hivesterix-core/src/test/java/edu/uci/ics/hivesterix/test/serde/SerDeTest.java
diff --git a/src/test/resources/log4j.properties b/hivesterix-core/src/test/resources/log4j.properties
similarity index 100%
rename from src/test/resources/log4j.properties
rename to hivesterix-core/src/test/resources/log4j.properties
diff --git a/src/test/resources/logging.properties b/hivesterix-core/src/test/resources/logging.properties
similarity index 100%
rename from src/test/resources/logging.properties
rename to hivesterix-core/src/test/resources/logging.properties
diff --git a/src/test/resources/optimizerts/hive/conf/hive-default.xml b/hivesterix-core/src/test/resources/optimizerts/hive/conf/hive-default.xml
similarity index 100%
rename from src/test/resources/optimizerts/hive/conf/hive-default.xml
rename to hivesterix-core/src/test/resources/optimizerts/hive/conf/hive-default.xml
diff --git a/src/test/resources/optimizerts/ignore.txt b/hivesterix-core/src/test/resources/optimizerts/ignore.txt
similarity index 100%
rename from src/test/resources/optimizerts/ignore.txt
rename to hivesterix-core/src/test/resources/optimizerts/ignore.txt
diff --git a/src/test/resources/optimizerts/queries/h11_share_scan.hive b/hivesterix-core/src/test/resources/optimizerts/queries/h11_share_scan.hive
similarity index 100%
rename from src/test/resources/optimizerts/queries/h11_share_scan.hive
rename to hivesterix-core/src/test/resources/optimizerts/queries/h11_share_scan.hive
diff --git a/src/test/resources/optimizerts/queries/h12_select_struct.hive b/hivesterix-core/src/test/resources/optimizerts/queries/h12_select_struct.hive
similarity index 100%
rename from src/test/resources/optimizerts/queries/h12_select_struct.hive
rename to hivesterix-core/src/test/resources/optimizerts/queries/h12_select_struct.hive
diff --git a/src/test/resources/optimizerts/queries/q10_returned_item.hive b/hivesterix-core/src/test/resources/optimizerts/queries/q10_returned_item.hive
similarity index 100%
rename from src/test/resources/optimizerts/queries/q10_returned_item.hive
rename to hivesterix-core/src/test/resources/optimizerts/queries/q10_returned_item.hive
diff --git a/src/test/resources/optimizerts/queries/q11_important_stock.hive b/hivesterix-core/src/test/resources/optimizerts/queries/q11_important_stock.hive
similarity index 100%
rename from src/test/resources/optimizerts/queries/q11_important_stock.hive
rename to hivesterix-core/src/test/resources/optimizerts/queries/q11_important_stock.hive
diff --git a/src/test/resources/optimizerts/queries/q12_shipping.hive b/hivesterix-core/src/test/resources/optimizerts/queries/q12_shipping.hive
similarity index 100%
rename from src/test/resources/optimizerts/queries/q12_shipping.hive
rename to hivesterix-core/src/test/resources/optimizerts/queries/q12_shipping.hive
diff --git a/src/test/resources/optimizerts/queries/q13_customer_distribution.hive b/hivesterix-core/src/test/resources/optimizerts/queries/q13_customer_distribution.hive
similarity index 100%
rename from src/test/resources/optimizerts/queries/q13_customer_distribution.hive
rename to hivesterix-core/src/test/resources/optimizerts/queries/q13_customer_distribution.hive
diff --git a/src/test/resources/optimizerts/queries/q14_promotion_effect.hive b/hivesterix-core/src/test/resources/optimizerts/queries/q14_promotion_effect.hive
similarity index 100%
rename from src/test/resources/optimizerts/queries/q14_promotion_effect.hive
rename to hivesterix-core/src/test/resources/optimizerts/queries/q14_promotion_effect.hive
diff --git a/src/test/resources/optimizerts/queries/q15_top_supplier.hive b/hivesterix-core/src/test/resources/optimizerts/queries/q15_top_supplier.hive
similarity index 100%
rename from src/test/resources/optimizerts/queries/q15_top_supplier.hive
rename to hivesterix-core/src/test/resources/optimizerts/queries/q15_top_supplier.hive
diff --git a/src/test/resources/optimizerts/queries/q16_parts_supplier_relationship.hive b/hivesterix-core/src/test/resources/optimizerts/queries/q16_parts_supplier_relationship.hive
similarity index 100%
rename from src/test/resources/optimizerts/queries/q16_parts_supplier_relationship.hive
rename to hivesterix-core/src/test/resources/optimizerts/queries/q16_parts_supplier_relationship.hive
diff --git a/src/test/resources/optimizerts/queries/q17_small_quantity_order_revenue.hive b/hivesterix-core/src/test/resources/optimizerts/queries/q17_small_quantity_order_revenue.hive
similarity index 100%
rename from src/test/resources/optimizerts/queries/q17_small_quantity_order_revenue.hive
rename to hivesterix-core/src/test/resources/optimizerts/queries/q17_small_quantity_order_revenue.hive
diff --git a/src/test/resources/optimizerts/queries/q18_large_volume_customer.hive b/hivesterix-core/src/test/resources/optimizerts/queries/q18_large_volume_customer.hive
similarity index 100%
rename from src/test/resources/optimizerts/queries/q18_large_volume_customer.hive
rename to hivesterix-core/src/test/resources/optimizerts/queries/q18_large_volume_customer.hive
diff --git a/src/test/resources/optimizerts/queries/q19_discounted_revenue.hive b/hivesterix-core/src/test/resources/optimizerts/queries/q19_discounted_revenue.hive
similarity index 100%
rename from src/test/resources/optimizerts/queries/q19_discounted_revenue.hive
rename to hivesterix-core/src/test/resources/optimizerts/queries/q19_discounted_revenue.hive
diff --git a/src/test/resources/optimizerts/queries/q1_pricing_summary_report.hive b/hivesterix-core/src/test/resources/optimizerts/queries/q1_pricing_summary_report.hive
similarity index 100%
rename from src/test/resources/optimizerts/queries/q1_pricing_summary_report.hive
rename to hivesterix-core/src/test/resources/optimizerts/queries/q1_pricing_summary_report.hive
diff --git a/src/test/resources/optimizerts/queries/q20_potential_part_promotion.hive b/hivesterix-core/src/test/resources/optimizerts/queries/q20_potential_part_promotion.hive
similarity index 100%
rename from src/test/resources/optimizerts/queries/q20_potential_part_promotion.hive
rename to hivesterix-core/src/test/resources/optimizerts/queries/q20_potential_part_promotion.hive
diff --git a/src/test/resources/optimizerts/queries/q21_suppliers_who_kept_orders_waiting.hive b/hivesterix-core/src/test/resources/optimizerts/queries/q21_suppliers_who_kept_orders_waiting.hive
similarity index 100%
rename from src/test/resources/optimizerts/queries/q21_suppliers_who_kept_orders_waiting.hive
rename to hivesterix-core/src/test/resources/optimizerts/queries/q21_suppliers_who_kept_orders_waiting.hive
diff --git a/src/test/resources/optimizerts/queries/q22_global_sales_opportunity.hive b/hivesterix-core/src/test/resources/optimizerts/queries/q22_global_sales_opportunity.hive
similarity index 100%
rename from src/test/resources/optimizerts/queries/q22_global_sales_opportunity.hive
rename to hivesterix-core/src/test/resources/optimizerts/queries/q22_global_sales_opportunity.hive
diff --git a/src/test/resources/optimizerts/queries/q2_minimum_cost_supplier.hive b/hivesterix-core/src/test/resources/optimizerts/queries/q2_minimum_cost_supplier.hive
similarity index 100%
rename from src/test/resources/optimizerts/queries/q2_minimum_cost_supplier.hive
rename to hivesterix-core/src/test/resources/optimizerts/queries/q2_minimum_cost_supplier.hive
diff --git a/src/test/resources/optimizerts/queries/q3_shipping_priority.hive b/hivesterix-core/src/test/resources/optimizerts/queries/q3_shipping_priority.hive
similarity index 100%
rename from src/test/resources/optimizerts/queries/q3_shipping_priority.hive
rename to hivesterix-core/src/test/resources/optimizerts/queries/q3_shipping_priority.hive
diff --git a/src/test/resources/optimizerts/queries/q4_order_priority.hive b/hivesterix-core/src/test/resources/optimizerts/queries/q4_order_priority.hive
similarity index 100%
rename from src/test/resources/optimizerts/queries/q4_order_priority.hive
rename to hivesterix-core/src/test/resources/optimizerts/queries/q4_order_priority.hive
diff --git a/src/test/resources/optimizerts/queries/q5_local_supplier_volume.hive b/hivesterix-core/src/test/resources/optimizerts/queries/q5_local_supplier_volume.hive
similarity index 100%
rename from src/test/resources/optimizerts/queries/q5_local_supplier_volume.hive
rename to hivesterix-core/src/test/resources/optimizerts/queries/q5_local_supplier_volume.hive
diff --git a/src/test/resources/optimizerts/queries/q6_forecast_revenue_change.hive b/hivesterix-core/src/test/resources/optimizerts/queries/q6_forecast_revenue_change.hive
similarity index 100%
rename from src/test/resources/optimizerts/queries/q6_forecast_revenue_change.hive
rename to hivesterix-core/src/test/resources/optimizerts/queries/q6_forecast_revenue_change.hive
diff --git a/src/test/resources/optimizerts/queries/q7_volume_shipping.hive b/hivesterix-core/src/test/resources/optimizerts/queries/q7_volume_shipping.hive
similarity index 100%
rename from src/test/resources/optimizerts/queries/q7_volume_shipping.hive
rename to hivesterix-core/src/test/resources/optimizerts/queries/q7_volume_shipping.hive
diff --git a/src/test/resources/optimizerts/queries/q8_national_market_share.hive b/hivesterix-core/src/test/resources/optimizerts/queries/q8_national_market_share.hive
similarity index 100%
rename from src/test/resources/optimizerts/queries/q8_national_market_share.hive
rename to hivesterix-core/src/test/resources/optimizerts/queries/q8_national_market_share.hive
diff --git a/src/test/resources/optimizerts/queries/q9_product_type_profit.hive b/hivesterix-core/src/test/resources/optimizerts/queries/q9_product_type_profit.hive
similarity index 100%
rename from src/test/resources/optimizerts/queries/q9_product_type_profit.hive
rename to hivesterix-core/src/test/resources/optimizerts/queries/q9_product_type_profit.hive
diff --git a/src/test/resources/optimizerts/queries/u10_nestedloop_join.hive b/hivesterix-core/src/test/resources/optimizerts/queries/u10_nestedloop_join.hive
similarity index 100%
rename from src/test/resources/optimizerts/queries/u10_nestedloop_join.hive
rename to hivesterix-core/src/test/resources/optimizerts/queries/u10_nestedloop_join.hive
diff --git a/src/test/resources/optimizerts/queries/u1_group_by.hive b/hivesterix-core/src/test/resources/optimizerts/queries/u1_group_by.hive
similarity index 100%
rename from src/test/resources/optimizerts/queries/u1_group_by.hive
rename to hivesterix-core/src/test/resources/optimizerts/queries/u1_group_by.hive
diff --git a/src/test/resources/optimizerts/queries/u2_select-project.hive b/hivesterix-core/src/test/resources/optimizerts/queries/u2_select-project.hive
similarity index 100%
rename from src/test/resources/optimizerts/queries/u2_select-project.hive
rename to hivesterix-core/src/test/resources/optimizerts/queries/u2_select-project.hive
diff --git a/src/test/resources/optimizerts/queries/u3_union.hive b/hivesterix-core/src/test/resources/optimizerts/queries/u3_union.hive
similarity index 100%
rename from src/test/resources/optimizerts/queries/u3_union.hive
rename to hivesterix-core/src/test/resources/optimizerts/queries/u3_union.hive
diff --git a/src/test/resources/optimizerts/queries/u4_join.hive b/hivesterix-core/src/test/resources/optimizerts/queries/u4_join.hive
similarity index 100%
rename from src/test/resources/optimizerts/queries/u4_join.hive
rename to hivesterix-core/src/test/resources/optimizerts/queries/u4_join.hive
diff --git a/src/test/resources/optimizerts/queries/u5_lateral_view.hive b/hivesterix-core/src/test/resources/optimizerts/queries/u5_lateral_view.hive
similarity index 100%
rename from src/test/resources/optimizerts/queries/u5_lateral_view.hive
rename to hivesterix-core/src/test/resources/optimizerts/queries/u5_lateral_view.hive
diff --git a/src/test/resources/optimizerts/queries/u6_limit.hive b/hivesterix-core/src/test/resources/optimizerts/queries/u6_limit.hive
similarity index 100%
rename from src/test/resources/optimizerts/queries/u6_limit.hive
rename to hivesterix-core/src/test/resources/optimizerts/queries/u6_limit.hive
diff --git a/src/test/resources/optimizerts/queries/u7_multi_join.hive b/hivesterix-core/src/test/resources/optimizerts/queries/u7_multi_join.hive
similarity index 100%
rename from src/test/resources/optimizerts/queries/u7_multi_join.hive
rename to hivesterix-core/src/test/resources/optimizerts/queries/u7_multi_join.hive
diff --git a/src/test/resources/optimizerts/queries/u8_non_mapred.hive b/hivesterix-core/src/test/resources/optimizerts/queries/u8_non_mapred.hive
similarity index 100%
rename from src/test/resources/optimizerts/queries/u8_non_mapred.hive
rename to hivesterix-core/src/test/resources/optimizerts/queries/u8_non_mapred.hive
diff --git a/src/test/resources/optimizerts/queries/u9_order_by.hive b/hivesterix-core/src/test/resources/optimizerts/queries/u9_order_by.hive
similarity index 100%
rename from src/test/resources/optimizerts/queries/u9_order_by.hive
rename to hivesterix-core/src/test/resources/optimizerts/queries/u9_order_by.hive
diff --git a/src/test/resources/optimizerts/results/h11_share_scan.plan b/hivesterix-core/src/test/resources/optimizerts/results/h11_share_scan.plan
similarity index 100%
rename from src/test/resources/optimizerts/results/h11_share_scan.plan
rename to hivesterix-core/src/test/resources/optimizerts/results/h11_share_scan.plan
diff --git a/src/test/resources/optimizerts/results/h12_select_struct.plan b/hivesterix-core/src/test/resources/optimizerts/results/h12_select_struct.plan
similarity index 100%
rename from src/test/resources/optimizerts/results/h12_select_struct.plan
rename to hivesterix-core/src/test/resources/optimizerts/results/h12_select_struct.plan
diff --git a/src/test/resources/optimizerts/results/q10_returned_item.plan b/hivesterix-core/src/test/resources/optimizerts/results/q10_returned_item.plan
similarity index 100%
rename from src/test/resources/optimizerts/results/q10_returned_item.plan
rename to hivesterix-core/src/test/resources/optimizerts/results/q10_returned_item.plan
diff --git a/src/test/resources/optimizerts/results/q11_important_stock.plan b/hivesterix-core/src/test/resources/optimizerts/results/q11_important_stock.plan
similarity index 100%
rename from src/test/resources/optimizerts/results/q11_important_stock.plan
rename to hivesterix-core/src/test/resources/optimizerts/results/q11_important_stock.plan
diff --git a/src/test/resources/optimizerts/results/q12_shipping.plan b/hivesterix-core/src/test/resources/optimizerts/results/q12_shipping.plan
similarity index 100%
rename from src/test/resources/optimizerts/results/q12_shipping.plan
rename to hivesterix-core/src/test/resources/optimizerts/results/q12_shipping.plan
diff --git a/src/test/resources/optimizerts/results/q13_customer_distribution.plan b/hivesterix-core/src/test/resources/optimizerts/results/q13_customer_distribution.plan
similarity index 100%
rename from src/test/resources/optimizerts/results/q13_customer_distribution.plan
rename to hivesterix-core/src/test/resources/optimizerts/results/q13_customer_distribution.plan
diff --git a/src/test/resources/optimizerts/results/q14_promotion_effect.plan b/hivesterix-core/src/test/resources/optimizerts/results/q14_promotion_effect.plan
similarity index 100%
rename from src/test/resources/optimizerts/results/q14_promotion_effect.plan
rename to hivesterix-core/src/test/resources/optimizerts/results/q14_promotion_effect.plan
diff --git a/src/test/resources/optimizerts/results/q15_top_supplier.plan b/hivesterix-core/src/test/resources/optimizerts/results/q15_top_supplier.plan
similarity index 100%
rename from src/test/resources/optimizerts/results/q15_top_supplier.plan
rename to hivesterix-core/src/test/resources/optimizerts/results/q15_top_supplier.plan
diff --git a/src/test/resources/optimizerts/results/q16_parts_supplier_relationship.plan b/hivesterix-core/src/test/resources/optimizerts/results/q16_parts_supplier_relationship.plan
similarity index 100%
rename from src/test/resources/optimizerts/results/q16_parts_supplier_relationship.plan
rename to hivesterix-core/src/test/resources/optimizerts/results/q16_parts_supplier_relationship.plan
diff --git a/src/test/resources/optimizerts/results/q17_small_quantity_order_revenue.plan b/hivesterix-core/src/test/resources/optimizerts/results/q17_small_quantity_order_revenue.plan
similarity index 100%
rename from src/test/resources/optimizerts/results/q17_small_quantity_order_revenue.plan
rename to hivesterix-core/src/test/resources/optimizerts/results/q17_small_quantity_order_revenue.plan
diff --git a/src/test/resources/optimizerts/results/q18_large_volume_customer.plan b/hivesterix-core/src/test/resources/optimizerts/results/q18_large_volume_customer.plan
similarity index 100%
rename from src/test/resources/optimizerts/results/q18_large_volume_customer.plan
rename to hivesterix-core/src/test/resources/optimizerts/results/q18_large_volume_customer.plan
diff --git a/src/test/resources/optimizerts/results/q19_discounted_revenue.plan b/hivesterix-core/src/test/resources/optimizerts/results/q19_discounted_revenue.plan
similarity index 100%
rename from src/test/resources/optimizerts/results/q19_discounted_revenue.plan
rename to hivesterix-core/src/test/resources/optimizerts/results/q19_discounted_revenue.plan
diff --git a/src/test/resources/optimizerts/results/q1_pricing_summary_report.plan b/hivesterix-core/src/test/resources/optimizerts/results/q1_pricing_summary_report.plan
similarity index 100%
rename from src/test/resources/optimizerts/results/q1_pricing_summary_report.plan
rename to hivesterix-core/src/test/resources/optimizerts/results/q1_pricing_summary_report.plan
diff --git a/src/test/resources/optimizerts/results/q20_potential_part_promotion.plan b/hivesterix-core/src/test/resources/optimizerts/results/q20_potential_part_promotion.plan
similarity index 100%
rename from src/test/resources/optimizerts/results/q20_potential_part_promotion.plan
rename to hivesterix-core/src/test/resources/optimizerts/results/q20_potential_part_promotion.plan
diff --git a/src/test/resources/optimizerts/results/q21_suppliers_who_kept_orders_waiting.plan b/hivesterix-core/src/test/resources/optimizerts/results/q21_suppliers_who_kept_orders_waiting.plan
similarity index 100%
rename from src/test/resources/optimizerts/results/q21_suppliers_who_kept_orders_waiting.plan
rename to hivesterix-core/src/test/resources/optimizerts/results/q21_suppliers_who_kept_orders_waiting.plan
diff --git a/src/test/resources/optimizerts/results/q22_global_sales_opportunity.plan b/hivesterix-core/src/test/resources/optimizerts/results/q22_global_sales_opportunity.plan
similarity index 100%
rename from src/test/resources/optimizerts/results/q22_global_sales_opportunity.plan
rename to hivesterix-core/src/test/resources/optimizerts/results/q22_global_sales_opportunity.plan
diff --git a/src/test/resources/optimizerts/results/q2_minimum_cost_supplier.plan b/hivesterix-core/src/test/resources/optimizerts/results/q2_minimum_cost_supplier.plan
similarity index 100%
rename from src/test/resources/optimizerts/results/q2_minimum_cost_supplier.plan
rename to hivesterix-core/src/test/resources/optimizerts/results/q2_minimum_cost_supplier.plan
diff --git a/src/test/resources/optimizerts/results/q3_shipping_priority.plan b/hivesterix-core/src/test/resources/optimizerts/results/q3_shipping_priority.plan
similarity index 100%
rename from src/test/resources/optimizerts/results/q3_shipping_priority.plan
rename to hivesterix-core/src/test/resources/optimizerts/results/q3_shipping_priority.plan
diff --git a/src/test/resources/optimizerts/results/q4_order_priority.plan b/hivesterix-core/src/test/resources/optimizerts/results/q4_order_priority.plan
similarity index 100%
rename from src/test/resources/optimizerts/results/q4_order_priority.plan
rename to hivesterix-core/src/test/resources/optimizerts/results/q4_order_priority.plan
diff --git a/src/test/resources/optimizerts/results/q5_local_supplier_volume.plan b/hivesterix-core/src/test/resources/optimizerts/results/q5_local_supplier_volume.plan
similarity index 100%
rename from src/test/resources/optimizerts/results/q5_local_supplier_volume.plan
rename to hivesterix-core/src/test/resources/optimizerts/results/q5_local_supplier_volume.plan
diff --git a/src/test/resources/optimizerts/results/q6_forecast_revenue_change.plan b/hivesterix-core/src/test/resources/optimizerts/results/q6_forecast_revenue_change.plan
similarity index 100%
rename from src/test/resources/optimizerts/results/q6_forecast_revenue_change.plan
rename to hivesterix-core/src/test/resources/optimizerts/results/q6_forecast_revenue_change.plan
diff --git a/src/test/resources/optimizerts/results/q7_volume_shipping.plan b/hivesterix-core/src/test/resources/optimizerts/results/q7_volume_shipping.plan
similarity index 100%
rename from src/test/resources/optimizerts/results/q7_volume_shipping.plan
rename to hivesterix-core/src/test/resources/optimizerts/results/q7_volume_shipping.plan
diff --git a/src/test/resources/optimizerts/results/q8_national_market_share.plan b/hivesterix-core/src/test/resources/optimizerts/results/q8_national_market_share.plan
similarity index 100%
rename from src/test/resources/optimizerts/results/q8_national_market_share.plan
rename to hivesterix-core/src/test/resources/optimizerts/results/q8_national_market_share.plan
diff --git a/src/test/resources/optimizerts/results/q9_product_type_profit.plan b/hivesterix-core/src/test/resources/optimizerts/results/q9_product_type_profit.plan
similarity index 100%
rename from src/test/resources/optimizerts/results/q9_product_type_profit.plan
rename to hivesterix-core/src/test/resources/optimizerts/results/q9_product_type_profit.plan
diff --git a/src/test/resources/optimizerts/results/u10_nestedloop_join.plan b/hivesterix-core/src/test/resources/optimizerts/results/u10_nestedloop_join.plan
similarity index 100%
rename from src/test/resources/optimizerts/results/u10_nestedloop_join.plan
rename to hivesterix-core/src/test/resources/optimizerts/results/u10_nestedloop_join.plan
diff --git a/src/test/resources/optimizerts/results/u1_group_by.plan b/hivesterix-core/src/test/resources/optimizerts/results/u1_group_by.plan
similarity index 100%
rename from src/test/resources/optimizerts/results/u1_group_by.plan
rename to hivesterix-core/src/test/resources/optimizerts/results/u1_group_by.plan
diff --git a/src/test/resources/optimizerts/results/u2_select-project.plan b/hivesterix-core/src/test/resources/optimizerts/results/u2_select-project.plan
similarity index 100%
rename from src/test/resources/optimizerts/results/u2_select-project.plan
rename to hivesterix-core/src/test/resources/optimizerts/results/u2_select-project.plan
diff --git a/src/test/resources/optimizerts/results/u3_union.plan b/hivesterix-core/src/test/resources/optimizerts/results/u3_union.plan
similarity index 100%
rename from src/test/resources/optimizerts/results/u3_union.plan
rename to hivesterix-core/src/test/resources/optimizerts/results/u3_union.plan
diff --git a/src/test/resources/optimizerts/results/u4_join.plan b/hivesterix-core/src/test/resources/optimizerts/results/u4_join.plan
similarity index 100%
rename from src/test/resources/optimizerts/results/u4_join.plan
rename to hivesterix-core/src/test/resources/optimizerts/results/u4_join.plan
diff --git a/src/test/resources/optimizerts/results/u5_lateral_view.plan b/hivesterix-core/src/test/resources/optimizerts/results/u5_lateral_view.plan
similarity index 100%
rename from src/test/resources/optimizerts/results/u5_lateral_view.plan
rename to hivesterix-core/src/test/resources/optimizerts/results/u5_lateral_view.plan
diff --git a/src/test/resources/optimizerts/results/u6_limit.plan b/hivesterix-core/src/test/resources/optimizerts/results/u6_limit.plan
similarity index 100%
rename from src/test/resources/optimizerts/results/u6_limit.plan
rename to hivesterix-core/src/test/resources/optimizerts/results/u6_limit.plan
diff --git a/src/test/resources/optimizerts/results/u7_multi_join.plan b/hivesterix-core/src/test/resources/optimizerts/results/u7_multi_join.plan
similarity index 100%
rename from src/test/resources/optimizerts/results/u7_multi_join.plan
rename to hivesterix-core/src/test/resources/optimizerts/results/u7_multi_join.plan
diff --git a/src/test/resources/optimizerts/results/u8_non_mapred.plan b/hivesterix-core/src/test/resources/optimizerts/results/u8_non_mapred.plan
similarity index 100%
rename from src/test/resources/optimizerts/results/u8_non_mapred.plan
rename to hivesterix-core/src/test/resources/optimizerts/results/u8_non_mapred.plan
diff --git a/src/test/resources/optimizerts/results/u9_order_by.plan b/hivesterix-core/src/test/resources/optimizerts/results/u9_order_by.plan
similarity index 100%
rename from src/test/resources/optimizerts/results/u9_order_by.plan
rename to hivesterix-core/src/test/resources/optimizerts/results/u9_order_by.plan
diff --git a/src/test/resources/runtimefunctionts/conf/cluster b/hivesterix-core/src/test/resources/runtimefunctionts/conf/cluster
similarity index 100%
rename from src/test/resources/runtimefunctionts/conf/cluster
rename to hivesterix-core/src/test/resources/runtimefunctionts/conf/cluster
diff --git a/src/test/resources/runtimefunctionts/data/customer.tbl b/hivesterix-core/src/test/resources/runtimefunctionts/data/customer.tbl
similarity index 100%
rename from src/test/resources/runtimefunctionts/data/customer.tbl
rename to hivesterix-core/src/test/resources/runtimefunctionts/data/customer.tbl
diff --git a/src/test/resources/runtimefunctionts/data/large_card_join_src.tbl b/hivesterix-core/src/test/resources/runtimefunctionts/data/large_card_join_src.tbl
similarity index 100%
rename from src/test/resources/runtimefunctionts/data/large_card_join_src.tbl
rename to hivesterix-core/src/test/resources/runtimefunctionts/data/large_card_join_src.tbl
diff --git a/src/test/resources/runtimefunctionts/data/large_card_join_src_small.tbl b/hivesterix-core/src/test/resources/runtimefunctionts/data/large_card_join_src_small.tbl
similarity index 100%
rename from src/test/resources/runtimefunctionts/data/large_card_join_src_small.tbl
rename to hivesterix-core/src/test/resources/runtimefunctionts/data/large_card_join_src_small.tbl
diff --git a/src/test/resources/runtimefunctionts/data/lineitem.tbl b/hivesterix-core/src/test/resources/runtimefunctionts/data/lineitem.tbl
similarity index 100%
rename from src/test/resources/runtimefunctionts/data/lineitem.tbl
rename to hivesterix-core/src/test/resources/runtimefunctionts/data/lineitem.tbl
diff --git a/src/test/resources/runtimefunctionts/data/nation.tbl b/hivesterix-core/src/test/resources/runtimefunctionts/data/nation.tbl
similarity index 100%
rename from src/test/resources/runtimefunctionts/data/nation.tbl
rename to hivesterix-core/src/test/resources/runtimefunctionts/data/nation.tbl
diff --git a/src/test/resources/runtimefunctionts/data/orders.tbl b/hivesterix-core/src/test/resources/runtimefunctionts/data/orders.tbl
similarity index 100%
rename from src/test/resources/runtimefunctionts/data/orders.tbl
rename to hivesterix-core/src/test/resources/runtimefunctionts/data/orders.tbl
diff --git a/src/test/resources/runtimefunctionts/data/part.tbl b/hivesterix-core/src/test/resources/runtimefunctionts/data/part.tbl
similarity index 100%
rename from src/test/resources/runtimefunctionts/data/part.tbl
rename to hivesterix-core/src/test/resources/runtimefunctionts/data/part.tbl
diff --git a/src/test/resources/runtimefunctionts/data/partsupp.tbl b/hivesterix-core/src/test/resources/runtimefunctionts/data/partsupp.tbl
similarity index 100%
rename from src/test/resources/runtimefunctionts/data/partsupp.tbl
rename to hivesterix-core/src/test/resources/runtimefunctionts/data/partsupp.tbl
diff --git a/src/test/resources/runtimefunctionts/data/region.tbl b/hivesterix-core/src/test/resources/runtimefunctionts/data/region.tbl
similarity index 100%
rename from src/test/resources/runtimefunctionts/data/region.tbl
rename to hivesterix-core/src/test/resources/runtimefunctionts/data/region.tbl
diff --git a/src/test/resources/runtimefunctionts/data/supplier.tbl b/hivesterix-core/src/test/resources/runtimefunctionts/data/supplier.tbl
similarity index 100%
rename from src/test/resources/runtimefunctionts/data/supplier.tbl
rename to hivesterix-core/src/test/resources/runtimefunctionts/data/supplier.tbl
diff --git a/src/test/resources/runtimefunctionts/hadoop/conf/core-site.xml b/hivesterix-core/src/test/resources/runtimefunctionts/hadoop/conf/core-site.xml
similarity index 100%
rename from src/test/resources/runtimefunctionts/hadoop/conf/core-site.xml
rename to hivesterix-core/src/test/resources/runtimefunctionts/hadoop/conf/core-site.xml
diff --git a/src/test/resources/runtimefunctionts/hadoop/conf/core-site.xml.bak b/hivesterix-core/src/test/resources/runtimefunctionts/hadoop/conf/core-site.xml.bak
similarity index 100%
rename from src/test/resources/runtimefunctionts/hadoop/conf/core-site.xml.bak
rename to hivesterix-core/src/test/resources/runtimefunctionts/hadoop/conf/core-site.xml.bak
diff --git a/src/test/resources/runtimefunctionts/hadoop/conf/hdfs-site.xml b/hivesterix-core/src/test/resources/runtimefunctionts/hadoop/conf/hdfs-site.xml
similarity index 100%
rename from src/test/resources/runtimefunctionts/hadoop/conf/hdfs-site.xml
rename to hivesterix-core/src/test/resources/runtimefunctionts/hadoop/conf/hdfs-site.xml
diff --git a/src/test/resources/runtimefunctionts/hadoop/conf/hdfs-site.xml.bak b/hivesterix-core/src/test/resources/runtimefunctionts/hadoop/conf/hdfs-site.xml.bak
similarity index 100%
rename from src/test/resources/runtimefunctionts/hadoop/conf/hdfs-site.xml.bak
rename to hivesterix-core/src/test/resources/runtimefunctionts/hadoop/conf/hdfs-site.xml.bak
diff --git a/src/test/resources/runtimefunctionts/hadoop/conf/mapred-site.xml b/hivesterix-core/src/test/resources/runtimefunctionts/hadoop/conf/mapred-site.xml
similarity index 100%
rename from src/test/resources/runtimefunctionts/hadoop/conf/mapred-site.xml
rename to hivesterix-core/src/test/resources/runtimefunctionts/hadoop/conf/mapred-site.xml
diff --git a/src/test/resources/runtimefunctionts/hadoop/conf/mapred-site.xml.bak b/hivesterix-core/src/test/resources/runtimefunctionts/hadoop/conf/mapred-site.xml.bak
similarity index 100%
rename from src/test/resources/runtimefunctionts/hadoop/conf/mapred-site.xml.bak
rename to hivesterix-core/src/test/resources/runtimefunctionts/hadoop/conf/mapred-site.xml.bak
diff --git a/src/test/resources/runtimefunctionts/hive/conf/hive-default.xml b/hivesterix-core/src/test/resources/runtimefunctionts/hive/conf/hive-default.xml
similarity index 100%
rename from src/test/resources/runtimefunctionts/hive/conf/hive-default.xml
rename to hivesterix-core/src/test/resources/runtimefunctionts/hive/conf/hive-default.xml
diff --git a/src/test/resources/runtimefunctionts/hive/conf/topology.xml b/hivesterix-core/src/test/resources/runtimefunctionts/hive/conf/topology.xml
similarity index 100%
rename from src/test/resources/runtimefunctionts/hive/conf/topology.xml
rename to hivesterix-core/src/test/resources/runtimefunctionts/hive/conf/topology.xml
diff --git a/src/test/resources/runtimefunctionts/ignore.txt b/hivesterix-core/src/test/resources/runtimefunctionts/ignore.txt
similarity index 100%
rename from src/test/resources/runtimefunctionts/ignore.txt
rename to hivesterix-core/src/test/resources/runtimefunctionts/ignore.txt
diff --git a/src/test/resources/runtimefunctionts/logging.properties b/hivesterix-core/src/test/resources/runtimefunctionts/logging.properties
similarity index 100%
rename from src/test/resources/runtimefunctionts/logging.properties
rename to hivesterix-core/src/test/resources/runtimefunctionts/logging.properties
diff --git a/src/test/resources/runtimefunctionts/queries/q10_returned_item.hive b/hivesterix-core/src/test/resources/runtimefunctionts/queries/q10_returned_item.hive
similarity index 100%
rename from src/test/resources/runtimefunctionts/queries/q10_returned_item.hive
rename to hivesterix-core/src/test/resources/runtimefunctionts/queries/q10_returned_item.hive
diff --git a/src/test/resources/runtimefunctionts/queries/q11_important_stock.hive b/hivesterix-core/src/test/resources/runtimefunctionts/queries/q11_important_stock.hive
similarity index 100%
rename from src/test/resources/runtimefunctionts/queries/q11_important_stock.hive
rename to hivesterix-core/src/test/resources/runtimefunctionts/queries/q11_important_stock.hive
diff --git a/src/test/resources/runtimefunctionts/queries/q12_shipping.hive b/hivesterix-core/src/test/resources/runtimefunctionts/queries/q12_shipping.hive
similarity index 100%
rename from src/test/resources/runtimefunctionts/queries/q12_shipping.hive
rename to hivesterix-core/src/test/resources/runtimefunctionts/queries/q12_shipping.hive
diff --git a/src/test/resources/runtimefunctionts/queries/q13_customer_distribution.hive b/hivesterix-core/src/test/resources/runtimefunctionts/queries/q13_customer_distribution.hive
similarity index 100%
rename from src/test/resources/runtimefunctionts/queries/q13_customer_distribution.hive
rename to hivesterix-core/src/test/resources/runtimefunctionts/queries/q13_customer_distribution.hive
diff --git a/src/test/resources/runtimefunctionts/queries/q14_promotion_effect.hive b/hivesterix-core/src/test/resources/runtimefunctionts/queries/q14_promotion_effect.hive
similarity index 100%
rename from src/test/resources/runtimefunctionts/queries/q14_promotion_effect.hive
rename to hivesterix-core/src/test/resources/runtimefunctionts/queries/q14_promotion_effect.hive
diff --git a/src/test/resources/runtimefunctionts/queries/q15_top_supplier.hive b/hivesterix-core/src/test/resources/runtimefunctionts/queries/q15_top_supplier.hive
similarity index 100%
rename from src/test/resources/runtimefunctionts/queries/q15_top_supplier.hive
rename to hivesterix-core/src/test/resources/runtimefunctionts/queries/q15_top_supplier.hive
diff --git a/src/test/resources/runtimefunctionts/queries/q16_parts_supplier_relationship.hive b/hivesterix-core/src/test/resources/runtimefunctionts/queries/q16_parts_supplier_relationship.hive
similarity index 100%
rename from src/test/resources/runtimefunctionts/queries/q16_parts_supplier_relationship.hive
rename to hivesterix-core/src/test/resources/runtimefunctionts/queries/q16_parts_supplier_relationship.hive
diff --git a/src/test/resources/runtimefunctionts/queries/q17_small_quantity_order_revenue.hive b/hivesterix-core/src/test/resources/runtimefunctionts/queries/q17_small_quantity_order_revenue.hive
similarity index 100%
rename from src/test/resources/runtimefunctionts/queries/q17_small_quantity_order_revenue.hive
rename to hivesterix-core/src/test/resources/runtimefunctionts/queries/q17_small_quantity_order_revenue.hive
diff --git a/src/test/resources/runtimefunctionts/queries/q18_large_volume_customer.hive b/hivesterix-core/src/test/resources/runtimefunctionts/queries/q18_large_volume_customer.hive
similarity index 100%
rename from src/test/resources/runtimefunctionts/queries/q18_large_volume_customer.hive
rename to hivesterix-core/src/test/resources/runtimefunctionts/queries/q18_large_volume_customer.hive
diff --git a/src/test/resources/runtimefunctionts/queries/q19_discounted_revenue.hive b/hivesterix-core/src/test/resources/runtimefunctionts/queries/q19_discounted_revenue.hive
similarity index 100%
rename from src/test/resources/runtimefunctionts/queries/q19_discounted_revenue.hive
rename to hivesterix-core/src/test/resources/runtimefunctionts/queries/q19_discounted_revenue.hive
diff --git a/src/test/resources/runtimefunctionts/queries/q1_pricing_summary_report.hive b/hivesterix-core/src/test/resources/runtimefunctionts/queries/q1_pricing_summary_report.hive
similarity index 100%
rename from src/test/resources/runtimefunctionts/queries/q1_pricing_summary_report.hive
rename to hivesterix-core/src/test/resources/runtimefunctionts/queries/q1_pricing_summary_report.hive
diff --git a/src/test/resources/runtimefunctionts/queries/q20_potential_part_promotion.hive b/hivesterix-core/src/test/resources/runtimefunctionts/queries/q20_potential_part_promotion.hive
similarity index 100%
rename from src/test/resources/runtimefunctionts/queries/q20_potential_part_promotion.hive
rename to hivesterix-core/src/test/resources/runtimefunctionts/queries/q20_potential_part_promotion.hive
diff --git a/src/test/resources/runtimefunctionts/queries/q21_suppliers_who_kept_orders_waiting.hive b/hivesterix-core/src/test/resources/runtimefunctionts/queries/q21_suppliers_who_kept_orders_waiting.hive
similarity index 100%
rename from src/test/resources/runtimefunctionts/queries/q21_suppliers_who_kept_orders_waiting.hive
rename to hivesterix-core/src/test/resources/runtimefunctionts/queries/q21_suppliers_who_kept_orders_waiting.hive
diff --git a/src/test/resources/runtimefunctionts/queries/q22_global_sales_opportunity.hive b/hivesterix-core/src/test/resources/runtimefunctionts/queries/q22_global_sales_opportunity.hive
similarity index 100%
rename from src/test/resources/runtimefunctionts/queries/q22_global_sales_opportunity.hive
rename to hivesterix-core/src/test/resources/runtimefunctionts/queries/q22_global_sales_opportunity.hive
diff --git a/src/test/resources/runtimefunctionts/queries/q2_minimum_cost_supplier.hive b/hivesterix-core/src/test/resources/runtimefunctionts/queries/q2_minimum_cost_supplier.hive
similarity index 100%
rename from src/test/resources/runtimefunctionts/queries/q2_minimum_cost_supplier.hive
rename to hivesterix-core/src/test/resources/runtimefunctionts/queries/q2_minimum_cost_supplier.hive
diff --git a/src/test/resources/runtimefunctionts/queries/q3_shipping_priority.hive b/hivesterix-core/src/test/resources/runtimefunctionts/queries/q3_shipping_priority.hive
similarity index 100%
rename from src/test/resources/runtimefunctionts/queries/q3_shipping_priority.hive
rename to hivesterix-core/src/test/resources/runtimefunctionts/queries/q3_shipping_priority.hive
diff --git a/src/test/resources/runtimefunctionts/queries/q4_order_priority.hive b/hivesterix-core/src/test/resources/runtimefunctionts/queries/q4_order_priority.hive
similarity index 100%
rename from src/test/resources/runtimefunctionts/queries/q4_order_priority.hive
rename to hivesterix-core/src/test/resources/runtimefunctionts/queries/q4_order_priority.hive
diff --git a/src/test/resources/runtimefunctionts/queries/q5_local_supplier_volume.hive b/hivesterix-core/src/test/resources/runtimefunctionts/queries/q5_local_supplier_volume.hive
similarity index 100%
rename from src/test/resources/runtimefunctionts/queries/q5_local_supplier_volume.hive
rename to hivesterix-core/src/test/resources/runtimefunctionts/queries/q5_local_supplier_volume.hive
diff --git a/src/test/resources/runtimefunctionts/queries/q6_forecast_revenue_change.hive b/hivesterix-core/src/test/resources/runtimefunctionts/queries/q6_forecast_revenue_change.hive
similarity index 100%
rename from src/test/resources/runtimefunctionts/queries/q6_forecast_revenue_change.hive
rename to hivesterix-core/src/test/resources/runtimefunctionts/queries/q6_forecast_revenue_change.hive
diff --git a/src/test/resources/runtimefunctionts/queries/q7_volume_shipping.hive b/hivesterix-core/src/test/resources/runtimefunctionts/queries/q7_volume_shipping.hive
similarity index 100%
rename from src/test/resources/runtimefunctionts/queries/q7_volume_shipping.hive
rename to hivesterix-core/src/test/resources/runtimefunctionts/queries/q7_volume_shipping.hive
diff --git a/src/test/resources/runtimefunctionts/queries/q8_national_market_share.hive b/hivesterix-core/src/test/resources/runtimefunctionts/queries/q8_national_market_share.hive
similarity index 100%
rename from src/test/resources/runtimefunctionts/queries/q8_national_market_share.hive
rename to hivesterix-core/src/test/resources/runtimefunctionts/queries/q8_national_market_share.hive
diff --git a/src/test/resources/runtimefunctionts/queries/q9_product_type_profit.hive b/hivesterix-core/src/test/resources/runtimefunctionts/queries/q9_product_type_profit.hive
similarity index 100%
rename from src/test/resources/runtimefunctionts/queries/q9_product_type_profit.hive
rename to hivesterix-core/src/test/resources/runtimefunctionts/queries/q9_product_type_profit.hive
diff --git a/src/test/resources/runtimefunctionts/queries/u10_join.hive b/hivesterix-core/src/test/resources/runtimefunctionts/queries/u10_join.hive
similarity index 100%
rename from src/test/resources/runtimefunctionts/queries/u10_join.hive
rename to hivesterix-core/src/test/resources/runtimefunctionts/queries/u10_join.hive
diff --git a/src/test/resources/runtimefunctionts/queries/u10_nestedloop_join.hive b/hivesterix-core/src/test/resources/runtimefunctionts/queries/u10_nestedloop_join.hive
similarity index 100%
rename from src/test/resources/runtimefunctionts/queries/u10_nestedloop_join.hive
rename to hivesterix-core/src/test/resources/runtimefunctionts/queries/u10_nestedloop_join.hive
diff --git a/src/test/resources/runtimefunctionts/queries/u1_gby.hive b/hivesterix-core/src/test/resources/runtimefunctionts/queries/u1_gby.hive
similarity index 100%
rename from src/test/resources/runtimefunctionts/queries/u1_gby.hive
rename to hivesterix-core/src/test/resources/runtimefunctionts/queries/u1_gby.hive
diff --git a/src/test/resources/runtimefunctionts/queries/u2_gby_external.hive b/hivesterix-core/src/test/resources/runtimefunctionts/queries/u2_gby_external.hive
similarity index 100%
rename from src/test/resources/runtimefunctionts/queries/u2_gby_external.hive
rename to hivesterix-core/src/test/resources/runtimefunctionts/queries/u2_gby_external.hive
diff --git a/src/test/resources/runtimefunctionts/queries/u3_union.hive b/hivesterix-core/src/test/resources/runtimefunctionts/queries/u3_union.hive
similarity index 100%
rename from src/test/resources/runtimefunctionts/queries/u3_union.hive
rename to hivesterix-core/src/test/resources/runtimefunctionts/queries/u3_union.hive
diff --git a/src/test/resources/runtimefunctionts/queries/u4_gby_distinct.hive b/hivesterix-core/src/test/resources/runtimefunctionts/queries/u4_gby_distinct.hive
similarity index 100%
rename from src/test/resources/runtimefunctionts/queries/u4_gby_distinct.hive
rename to hivesterix-core/src/test/resources/runtimefunctionts/queries/u4_gby_distinct.hive
diff --git a/src/test/resources/runtimefunctionts/queries/u5_gby_global.hive b/hivesterix-core/src/test/resources/runtimefunctionts/queries/u5_gby_global.hive
similarity index 100%
rename from src/test/resources/runtimefunctionts/queries/u5_gby_global.hive
rename to hivesterix-core/src/test/resources/runtimefunctionts/queries/u5_gby_global.hive
diff --git a/src/test/resources/runtimefunctionts/queries/u6_large_card_join.hive b/hivesterix-core/src/test/resources/runtimefunctionts/queries/u6_large_card_join.hive
similarity index 100%
rename from src/test/resources/runtimefunctionts/queries/u6_large_card_join.hive
rename to hivesterix-core/src/test/resources/runtimefunctionts/queries/u6_large_card_join.hive
diff --git a/src/test/resources/runtimefunctionts/results/q10_returned_item.result b/hivesterix-core/src/test/resources/runtimefunctionts/results/q10_returned_item.result
similarity index 100%
rename from src/test/resources/runtimefunctionts/results/q10_returned_item.result
rename to hivesterix-core/src/test/resources/runtimefunctionts/results/q10_returned_item.result
diff --git a/src/test/resources/runtimefunctionts/results/q11_important_stock.result b/hivesterix-core/src/test/resources/runtimefunctionts/results/q11_important_stock.result
similarity index 100%
rename from src/test/resources/runtimefunctionts/results/q11_important_stock.result
rename to hivesterix-core/src/test/resources/runtimefunctionts/results/q11_important_stock.result
diff --git a/src/test/resources/runtimefunctionts/results/q12_shipping.result b/hivesterix-core/src/test/resources/runtimefunctionts/results/q12_shipping.result
similarity index 100%
rename from src/test/resources/runtimefunctionts/results/q12_shipping.result
rename to hivesterix-core/src/test/resources/runtimefunctionts/results/q12_shipping.result
diff --git a/src/test/resources/runtimefunctionts/results/q13_customer_distribution.result b/hivesterix-core/src/test/resources/runtimefunctionts/results/q13_customer_distribution.result
similarity index 100%
rename from src/test/resources/runtimefunctionts/results/q13_customer_distribution.result
rename to hivesterix-core/src/test/resources/runtimefunctionts/results/q13_customer_distribution.result
diff --git a/src/test/resources/runtimefunctionts/results/q14_promotion_effect.result b/hivesterix-core/src/test/resources/runtimefunctionts/results/q14_promotion_effect.result
similarity index 100%
rename from src/test/resources/runtimefunctionts/results/q14_promotion_effect.result
rename to hivesterix-core/src/test/resources/runtimefunctionts/results/q14_promotion_effect.result
diff --git a/src/test/resources/runtimefunctionts/results/q15_top_supplier.result b/hivesterix-core/src/test/resources/runtimefunctionts/results/q15_top_supplier.result
similarity index 100%
rename from src/test/resources/runtimefunctionts/results/q15_top_supplier.result
rename to hivesterix-core/src/test/resources/runtimefunctionts/results/q15_top_supplier.result
diff --git a/src/test/resources/runtimefunctionts/results/q16_parts_supplier_relationship.result b/hivesterix-core/src/test/resources/runtimefunctionts/results/q16_parts_supplier_relationship.result
similarity index 100%
rename from src/test/resources/runtimefunctionts/results/q16_parts_supplier_relationship.result
rename to hivesterix-core/src/test/resources/runtimefunctionts/results/q16_parts_supplier_relationship.result
diff --git a/src/test/resources/runtimefunctionts/results/q17_small_quantity_order_revenue.result b/hivesterix-core/src/test/resources/runtimefunctionts/results/q17_small_quantity_order_revenue.result
similarity index 100%
rename from src/test/resources/runtimefunctionts/results/q17_small_quantity_order_revenue.result
rename to hivesterix-core/src/test/resources/runtimefunctionts/results/q17_small_quantity_order_revenue.result
diff --git a/src/test/resources/runtimefunctionts/results/q18_large_volume_customer.result b/hivesterix-core/src/test/resources/runtimefunctionts/results/q18_large_volume_customer.result
similarity index 100%
rename from src/test/resources/runtimefunctionts/results/q18_large_volume_customer.result
rename to hivesterix-core/src/test/resources/runtimefunctionts/results/q18_large_volume_customer.result
diff --git a/src/test/resources/runtimefunctionts/results/q19_discounted_revenue.result b/hivesterix-core/src/test/resources/runtimefunctionts/results/q19_discounted_revenue.result
similarity index 100%
rename from src/test/resources/runtimefunctionts/results/q19_discounted_revenue.result
rename to hivesterix-core/src/test/resources/runtimefunctionts/results/q19_discounted_revenue.result
diff --git a/src/test/resources/runtimefunctionts/results/q1_pricing_summary_report.result b/hivesterix-core/src/test/resources/runtimefunctionts/results/q1_pricing_summary_report.result
similarity index 100%
rename from src/test/resources/runtimefunctionts/results/q1_pricing_summary_report.result
rename to hivesterix-core/src/test/resources/runtimefunctionts/results/q1_pricing_summary_report.result
diff --git a/src/test/resources/runtimefunctionts/results/q20_potential_part_promotion.result b/hivesterix-core/src/test/resources/runtimefunctionts/results/q20_potential_part_promotion.result
similarity index 100%
rename from src/test/resources/runtimefunctionts/results/q20_potential_part_promotion.result
rename to hivesterix-core/src/test/resources/runtimefunctionts/results/q20_potential_part_promotion.result
diff --git a/src/test/resources/runtimefunctionts/results/q21_suppliers_who_kept_orders_waiting.result b/hivesterix-core/src/test/resources/runtimefunctionts/results/q21_suppliers_who_kept_orders_waiting.result
similarity index 100%
rename from src/test/resources/runtimefunctionts/results/q21_suppliers_who_kept_orders_waiting.result
rename to hivesterix-core/src/test/resources/runtimefunctionts/results/q21_suppliers_who_kept_orders_waiting.result
diff --git a/src/test/resources/runtimefunctionts/results/q22_global_sales_opportunity.result b/hivesterix-core/src/test/resources/runtimefunctionts/results/q22_global_sales_opportunity.result
similarity index 100%
rename from src/test/resources/runtimefunctionts/results/q22_global_sales_opportunity.result
rename to hivesterix-core/src/test/resources/runtimefunctionts/results/q22_global_sales_opportunity.result
diff --git a/src/test/resources/runtimefunctionts/results/q2_minimum_cost_supplier.result b/hivesterix-core/src/test/resources/runtimefunctionts/results/q2_minimum_cost_supplier.result
similarity index 100%
rename from src/test/resources/runtimefunctionts/results/q2_minimum_cost_supplier.result
rename to hivesterix-core/src/test/resources/runtimefunctionts/results/q2_minimum_cost_supplier.result
diff --git a/src/test/resources/runtimefunctionts/results/q3_shipping_priority.result b/hivesterix-core/src/test/resources/runtimefunctionts/results/q3_shipping_priority.result
similarity index 100%
rename from src/test/resources/runtimefunctionts/results/q3_shipping_priority.result
rename to hivesterix-core/src/test/resources/runtimefunctionts/results/q3_shipping_priority.result
diff --git a/src/test/resources/runtimefunctionts/results/q4_order_priority.result b/hivesterix-core/src/test/resources/runtimefunctionts/results/q4_order_priority.result
similarity index 100%
rename from src/test/resources/runtimefunctionts/results/q4_order_priority.result
rename to hivesterix-core/src/test/resources/runtimefunctionts/results/q4_order_priority.result
diff --git a/src/test/resources/runtimefunctionts/results/q5_local_supplier_volume.result b/hivesterix-core/src/test/resources/runtimefunctionts/results/q5_local_supplier_volume.result
similarity index 100%
rename from src/test/resources/runtimefunctionts/results/q5_local_supplier_volume.result
rename to hivesterix-core/src/test/resources/runtimefunctionts/results/q5_local_supplier_volume.result
diff --git a/src/test/resources/runtimefunctionts/results/q6_forecast_revenue_change.result b/hivesterix-core/src/test/resources/runtimefunctionts/results/q6_forecast_revenue_change.result
similarity index 100%
rename from src/test/resources/runtimefunctionts/results/q6_forecast_revenue_change.result
rename to hivesterix-core/src/test/resources/runtimefunctionts/results/q6_forecast_revenue_change.result
diff --git a/src/test/resources/runtimefunctionts/results/q7_volume_shipping.result b/hivesterix-core/src/test/resources/runtimefunctionts/results/q7_volume_shipping.result
similarity index 100%
rename from src/test/resources/runtimefunctionts/results/q7_volume_shipping.result
rename to hivesterix-core/src/test/resources/runtimefunctionts/results/q7_volume_shipping.result
diff --git a/src/test/resources/runtimefunctionts/results/q8_national_market_share.result b/hivesterix-core/src/test/resources/runtimefunctionts/results/q8_national_market_share.result
similarity index 100%
rename from src/test/resources/runtimefunctionts/results/q8_national_market_share.result
rename to hivesterix-core/src/test/resources/runtimefunctionts/results/q8_national_market_share.result
diff --git a/src/test/resources/runtimefunctionts/results/q9_product_type_profit.result b/hivesterix-core/src/test/resources/runtimefunctionts/results/q9_product_type_profit.result
similarity index 100%
rename from src/test/resources/runtimefunctionts/results/q9_product_type_profit.result
rename to hivesterix-core/src/test/resources/runtimefunctionts/results/q9_product_type_profit.result
diff --git a/src/test/resources/runtimefunctionts/results/u10_join.result b/hivesterix-core/src/test/resources/runtimefunctionts/results/u10_join.result
similarity index 100%
rename from src/test/resources/runtimefunctionts/results/u10_join.result
rename to hivesterix-core/src/test/resources/runtimefunctionts/results/u10_join.result
diff --git a/src/test/resources/runtimefunctionts/results/u10_nestedloop_join.result b/hivesterix-core/src/test/resources/runtimefunctionts/results/u10_nestedloop_join.result
similarity index 100%
rename from src/test/resources/runtimefunctionts/results/u10_nestedloop_join.result
rename to hivesterix-core/src/test/resources/runtimefunctionts/results/u10_nestedloop_join.result
diff --git a/src/test/resources/runtimefunctionts/results/u1_gby.result b/hivesterix-core/src/test/resources/runtimefunctionts/results/u1_gby.result
similarity index 100%
rename from src/test/resources/runtimefunctionts/results/u1_gby.result
rename to hivesterix-core/src/test/resources/runtimefunctionts/results/u1_gby.result
diff --git a/src/test/resources/runtimefunctionts/results/u2_gby_external.result b/hivesterix-core/src/test/resources/runtimefunctionts/results/u2_gby_external.result
similarity index 100%
rename from src/test/resources/runtimefunctionts/results/u2_gby_external.result
rename to hivesterix-core/src/test/resources/runtimefunctionts/results/u2_gby_external.result
diff --git a/src/test/resources/runtimefunctionts/results/u3_union.result b/hivesterix-core/src/test/resources/runtimefunctionts/results/u3_union.result
similarity index 100%
rename from src/test/resources/runtimefunctionts/results/u3_union.result
rename to hivesterix-core/src/test/resources/runtimefunctionts/results/u3_union.result
diff --git a/src/test/resources/runtimefunctionts/results/u4_gby_distinct.result b/hivesterix-core/src/test/resources/runtimefunctionts/results/u4_gby_distinct.result
similarity index 100%
rename from src/test/resources/runtimefunctionts/results/u4_gby_distinct.result
rename to hivesterix-core/src/test/resources/runtimefunctionts/results/u4_gby_distinct.result
diff --git a/src/test/resources/runtimefunctionts/results/u5_gby_global.result b/hivesterix-core/src/test/resources/runtimefunctionts/results/u5_gby_global.result
similarity index 100%
rename from src/test/resources/runtimefunctionts/results/u5_gby_global.result
rename to hivesterix-core/src/test/resources/runtimefunctionts/results/u5_gby_global.result
diff --git a/src/test/resources/runtimefunctionts/results/u6_large_card_join.result b/hivesterix-core/src/test/resources/runtimefunctionts/results/u6_large_card_join.result
similarity index 100%
rename from src/test/resources/runtimefunctionts/results/u6_large_card_join.result
rename to hivesterix-core/src/test/resources/runtimefunctionts/results/u6_large_card_join.result
diff --git a/hivesterix-optimizer/pom.xml b/hivesterix-optimizer/pom.xml
new file mode 100644
index 0000000..4e6032e
--- /dev/null
+++ b/hivesterix-optimizer/pom.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>hivesterix</artifactId>
+		<groupId>edu.uci.ics.hyracks</groupId>
+		<version>0.2.3-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>hivesterix-optimizer</artifactId>
+	<name>hivesterix-optimizer</name>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.0.2</version>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+					<encoding>UTF-8</encoding>
+					<fork>true</fork>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+		<dependency>
+			<groupId>edu.uci.ics.hyracks</groupId>
+			<artifactId>hivesterix-common</artifactId>
+			<version>0.2.3-SNAPSHOT</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>edu.uci.ics.hyracks</groupId>
+			<artifactId>hivesterix-translator</artifactId>
+			<version>0.2.3-SNAPSHOT</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/src/main/java/edu/uci/ics/hivesterix/optimizer/rulecollections/HiveRuleCollections.java b/hivesterix-optimizer/src/main/java/edu/uci/ics/hivesterix/optimizer/rulecollections/HiveRuleCollections.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/optimizer/rulecollections/HiveRuleCollections.java
rename to hivesterix-optimizer/src/main/java/edu/uci/ics/hivesterix/optimizer/rulecollections/HiveRuleCollections.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/optimizer/rules/InsertProjectBeforeWriteRule.java b/hivesterix-optimizer/src/main/java/edu/uci/ics/hivesterix/optimizer/rules/InsertProjectBeforeWriteRule.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/optimizer/rules/InsertProjectBeforeWriteRule.java
rename to hivesterix-optimizer/src/main/java/edu/uci/ics/hivesterix/optimizer/rules/InsertProjectBeforeWriteRule.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/optimizer/rules/IntroduceEarlyProjectRule.java b/hivesterix-optimizer/src/main/java/edu/uci/ics/hivesterix/optimizer/rules/IntroduceEarlyProjectRule.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/optimizer/rules/IntroduceEarlyProjectRule.java
rename to hivesterix-optimizer/src/main/java/edu/uci/ics/hivesterix/optimizer/rules/IntroduceEarlyProjectRule.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/optimizer/rules/LocalGroupByRule.java b/hivesterix-optimizer/src/main/java/edu/uci/ics/hivesterix/optimizer/rules/LocalGroupByRule.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/optimizer/rules/LocalGroupByRule.java
rename to hivesterix-optimizer/src/main/java/edu/uci/ics/hivesterix/optimizer/rules/LocalGroupByRule.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/optimizer/rules/RemoveRedundantSelectRule.java b/hivesterix-optimizer/src/main/java/edu/uci/ics/hivesterix/optimizer/rules/RemoveRedundantSelectRule.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/optimizer/rules/RemoveRedundantSelectRule.java
rename to hivesterix-optimizer/src/main/java/edu/uci/ics/hivesterix/optimizer/rules/RemoveRedundantSelectRule.java
diff --git a/hivesterix-optimizer/src/test/java/edu/uci/ics/hyracks/AppTest.java b/hivesterix-optimizer/src/test/java/edu/uci/ics/hyracks/AppTest.java
new file mode 100644
index 0000000..0c701c8
--- /dev/null
+++ b/hivesterix-optimizer/src/test/java/edu/uci/ics/hyracks/AppTest.java
@@ -0,0 +1,38 @@
+package edu.uci.ics.hyracks;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest 
+    extends TestCase
+{
+    /**
+     * Create the test case
+     *
+     * @param testName name of the test case
+     */
+    public AppTest( String testName )
+    {
+        super( testName );
+    }
+
+    /**
+     * @return the suite of tests being tested
+     */
+    public static Test suite()
+    {
+        return new TestSuite( AppTest.class );
+    }
+
+    /**
+     * Rigourous Test :-)
+     */
+    public void testApp()
+    {
+        assertTrue( true );
+    }
+}
diff --git a/hivesterix-runtime/pom.xml b/hivesterix-runtime/pom.xml
new file mode 100644
index 0000000..77db0d4
--- /dev/null
+++ b/hivesterix-runtime/pom.xml
@@ -0,0 +1,383 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>edu.uci.ics.hyracks</groupId>
+	<artifactId>hivesterix-runtime</artifactId>
+	<version>0.2.3-SNAPSHOT</version>
+	<name>hivesterix-runtime</name>
+
+	<dependencies>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>2.5</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.8.1</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>args4j</groupId>
+			<artifactId>args4j</artifactId>
+			<version>2.0.12</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.json</groupId>
+			<artifactId>json</artifactId>
+			<version>20090211</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-server</artifactId>
+			<version>8.0.0.M1</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-servlet</artifactId>
+			<version>8.0.0.M1</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.hadoop</groupId>
+			<artifactId>hadoop-core</artifactId>
+			<version>0.20.2</version>
+		</dependency>
+		<dependency>
+			<groupId>jline</groupId>
+			<artifactId>jline</artifactId>
+			<version>0.9.94</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.datanucleus</groupId>
+			<artifactId>datanucleus-core</artifactId>
+			<version>2.0.3</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.datanucleus</groupId>
+			<artifactId>datanucleus-connectionpool</artifactId>
+			<version>2.0.3</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.datanucleus</groupId>
+			<artifactId>datanucleus-enhancer</artifactId>
+			<version>2.0.3</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.datanucleus</groupId>
+			<artifactId>datanucleus-rdbms</artifactId>
+			<version>2.0.3</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-dbcp</groupId>
+			<artifactId>commons-dbcp</artifactId>
+			<version>1.4</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-pool</groupId>
+			<artifactId>commons-pool</artifactId>
+			<version>1.5.4</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-collections</groupId>
+			<artifactId>commons-collections</artifactId>
+			<version>3.2.1</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>2.4</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax</groupId>
+			<artifactId>jdo2-api</artifactId>
+			<version>2.3-ec</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.facebook</groupId>
+			<artifactId>libfb303</artifactId>
+			<version>0.5.0</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.thrift</groupId>
+			<artifactId>libthrift</artifactId>
+			<version>0.5.0</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>cli</artifactId>
+			<version>1.2</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.15</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.antlr</groupId>
+			<artifactId>antlr-runtime</artifactId>
+			<version>3.0.1</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.hadoop.hive</groupId>
+			<artifactId>hive-cli</artifactId>
+			<version>0.7.0</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.hadoop.hive</groupId>
+			<artifactId>hive-common</artifactId>
+			<version>0.7.0</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.hadoop.hive</groupId>
+			<artifactId>hive-exec</artifactId>
+			<version>0.7.0</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.hadoop.hive</groupId>
+			<artifactId>hive-hwi</artifactId>
+			<version>0.7.0</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.hadoop.hive</groupId>
+			<artifactId>hive-jdbc</artifactId>
+			<version>0.7.0</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.hadoop.hive</groupId>
+			<artifactId>hive-metastore</artifactId>
+			<version>0.7.0</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.hadoop.hive</groupId>
+			<artifactId>hive-service</artifactId>
+			<version>0.7.0</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.hadoop.hive</groupId>
+			<artifactId>hive-shims</artifactId>
+			<version>0.7.0</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.hadoop.hive</groupId>
+			<artifactId>hive-serde</artifactId>
+			<version>0.7.0</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>1.6.1</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-cli</groupId>
+			<artifactId>commons-cli</artifactId>
+			<version>1.2</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<version>1.6.1</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.hadoop</groupId>
+			<artifactId>hadoop-test</artifactId>
+			<version>0.20.2</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.1.1</version>
+			<type>jar</type>
+			<classifier>api</classifier>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>r06</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.antlr</groupId>
+			<artifactId>stringtemplate</artifactId>
+			<version>3.2</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.derby</groupId>
+			<artifactId>derby</artifactId>
+			<version>10.8.1.2</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.hbase</groupId>
+			<artifactId>hbase</artifactId>
+			<version>0.90.3</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>edu.uci.ics.hyracks</groupId>
+			<artifactId>algebricks-compiler</artifactId>
+			<version>0.2.3-SNAPSHOT</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>edu.uci.ics.hyracks</groupId>
+			<artifactId>hyracks-control-cc</artifactId>
+			<version>0.2.3-SNAPSHOT</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>edu.uci.ics.hyracks</groupId>
+			<artifactId>hyracks-control-nc</artifactId>
+			<version>0.2.3-SNAPSHOT</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>edu.uci.ics.hyracks</groupId>
+			<artifactId>hivesterix-serde</artifactId>
+			<version>0.2.3-SNAPSHOT</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>edu.uci.ics.hyracks</groupId>
+			<artifactId>hivesterix-common</artifactId>
+			<version>0.2.3-SNAPSHOT</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.0.2</version>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+					<encoding>UTF-8</encoding>
+					<fork>true</fork>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>patch</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<phase>package</phase>
+						<configuration>
+							<classifier>patch</classifier>
+							<finalName>a-hive-rumtime</finalName>
+							<includes>
+								<include>**/org/apache/**</include>
+							</includes>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<repositories>
+		<repository>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+				<checksumPolicy>warn</checksumPolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+				<checksumPolicy>fail</checksumPolicy>
+			</snapshots>
+			<id>third-party</id>
+			<url>http://obelix.ics.uci.edu/nexus/content/repositories/third-party</url>
+		</repository>
+		<repository>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+				<checksumPolicy>warn</checksumPolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+				<checksumPolicy>fail</checksumPolicy>
+			</snapshots>
+			<id>hyracks-public-release</id>
+			<url>http://obelix.ics.uci.edu/nexus/content/repositories/hyracks-public-releases</url>
+		</repository>
+	</repositories>
+</project>
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/AbstractExpressionEvaluator.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/AbstractExpressionEvaluator.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/AbstractExpressionEvaluator.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/AbstractExpressionEvaluator.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/AggregationFunctionEvaluator.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/AggregationFunctionEvaluator.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/AggregationFunctionEvaluator.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/AggregationFunctionEvaluator.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/AggregatuibFunctionSerializableEvaluator.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/AggregatuibFunctionSerializableEvaluator.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/AggregatuibFunctionSerializableEvaluator.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/AggregatuibFunctionSerializableEvaluator.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/BufferSerDeUtil.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/BufferSerDeUtil.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/BufferSerDeUtil.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/BufferSerDeUtil.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/ColumnExpressionEvaluator.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/ColumnExpressionEvaluator.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/ColumnExpressionEvaluator.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/ColumnExpressionEvaluator.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/ConstantExpressionEvaluator.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/ConstantExpressionEvaluator.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/ConstantExpressionEvaluator.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/ConstantExpressionEvaluator.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/FieldExpressionEvaluator.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/FieldExpressionEvaluator.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/FieldExpressionEvaluator.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/FieldExpressionEvaluator.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/FunctionExpressionEvaluator.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/FunctionExpressionEvaluator.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/FunctionExpressionEvaluator.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/FunctionExpressionEvaluator.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/NullExpressionEvaluator.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/NullExpressionEvaluator.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/NullExpressionEvaluator.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/NullExpressionEvaluator.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/SerializableBuffer.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/SerializableBuffer.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/SerializableBuffer.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/SerializableBuffer.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/UDTFFunctionEvaluator.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/UDTFFunctionEvaluator.java
similarity index 98%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/UDTFFunctionEvaluator.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/UDTFFunctionEvaluator.java
index 284d3d2..2e78663 100644
--- a/src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/UDTFFunctionEvaluator.java
+++ b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/evaluator/UDTFFunctionEvaluator.java
@@ -12,7 +12,7 @@
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
 import org.apache.hadoop.io.BytesWritable;
 
-import edu.uci.ics.hivesterix.logical.expression.Schema;
+import edu.uci.ics.hivesterix.runtime.jobgen.Schema;
 import edu.uci.ics.hivesterix.serde.lazy.LazyColumnar;
 import edu.uci.ics.hivesterix.serde.lazy.LazyFactory;
 import edu.uci.ics.hivesterix.serde.lazy.LazyObject;
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveByteBinaryAscComparatorFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveByteBinaryAscComparatorFactory.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveByteBinaryAscComparatorFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveByteBinaryAscComparatorFactory.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveByteBinaryDescComparatorFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveByteBinaryDescComparatorFactory.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveByteBinaryDescComparatorFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveByteBinaryDescComparatorFactory.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveDoubleBinaryAscComparatorFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveDoubleBinaryAscComparatorFactory.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveDoubleBinaryAscComparatorFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveDoubleBinaryAscComparatorFactory.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveDoubleBinaryDescComparatorFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveDoubleBinaryDescComparatorFactory.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveDoubleBinaryDescComparatorFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveDoubleBinaryDescComparatorFactory.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveFloatBinaryAscComparatorFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveFloatBinaryAscComparatorFactory.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveFloatBinaryAscComparatorFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveFloatBinaryAscComparatorFactory.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveFloatBinaryDescComparatorFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveFloatBinaryDescComparatorFactory.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveFloatBinaryDescComparatorFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveFloatBinaryDescComparatorFactory.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveIntegerBinaryAscComparatorFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveIntegerBinaryAscComparatorFactory.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveIntegerBinaryAscComparatorFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveIntegerBinaryAscComparatorFactory.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveIntegerBinaryDescComparatorFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveIntegerBinaryDescComparatorFactory.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveIntegerBinaryDescComparatorFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveIntegerBinaryDescComparatorFactory.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveLongBinaryAscComparatorFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveLongBinaryAscComparatorFactory.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveLongBinaryAscComparatorFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveLongBinaryAscComparatorFactory.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveLongBinaryDescComparatorFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveLongBinaryDescComparatorFactory.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveLongBinaryDescComparatorFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveLongBinaryDescComparatorFactory.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveShortBinaryAscComparatorFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveShortBinaryAscComparatorFactory.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveShortBinaryAscComparatorFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveShortBinaryAscComparatorFactory.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveShortBinaryDescComparatorFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveShortBinaryDescComparatorFactory.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveShortBinaryDescComparatorFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveShortBinaryDescComparatorFactory.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveStringBinaryAscComparatorFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveStringBinaryAscComparatorFactory.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveStringBinaryAscComparatorFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveStringBinaryAscComparatorFactory.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveStringBinaryDescComparatorFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveStringBinaryDescComparatorFactory.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveStringBinaryDescComparatorFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/comparator/HiveStringBinaryDescComparatorFactory.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/AggregationFunctionFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/AggregationFunctionFactory.java
similarity index 98%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/AggregationFunctionFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/AggregationFunctionFactory.java
index 99cf758..d664341 100644
--- a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/AggregationFunctionFactory.java
+++ b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/AggregationFunctionFactory.java
@@ -19,9 +19,9 @@
 import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
 import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory;
 
-import edu.uci.ics.hivesterix.logical.expression.Schema;
+import edu.uci.ics.hivesterix.logical.expression.ExpressionTranslator;
 import edu.uci.ics.hivesterix.runtime.evaluator.AggregationFunctionEvaluator;
-import edu.uci.ics.hivesterix.runtime.evaluator.ExpressionTranslator;
+import edu.uci.ics.hivesterix.runtime.jobgen.Schema;
 import edu.uci.ics.hivesterix.serde.lazy.LazyFactory;
 import edu.uci.ics.hivesterix.serde.lazy.LazyObject;
 import edu.uci.ics.hivesterix.serde.lazy.LazySerDe;
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/AggregationFunctionSerializableFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/AggregationFunctionSerializableFactory.java
similarity index 98%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/AggregationFunctionSerializableFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/AggregationFunctionSerializableFactory.java
index 45cfb29..54a1155 100644
--- a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/AggregationFunctionSerializableFactory.java
+++ b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/AggregationFunctionSerializableFactory.java
@@ -19,9 +19,9 @@
 import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
 import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory;
 
-import edu.uci.ics.hivesterix.logical.expression.Schema;
+import edu.uci.ics.hivesterix.logical.expression.ExpressionTranslator;
 import edu.uci.ics.hivesterix.runtime.evaluator.AggregatuibFunctionSerializableEvaluator;
-import edu.uci.ics.hivesterix.runtime.evaluator.ExpressionTranslator;
+import edu.uci.ics.hivesterix.runtime.jobgen.Schema;
 import edu.uci.ics.hivesterix.serde.lazy.LazyFactory;
 import edu.uci.ics.hivesterix.serde.lazy.LazyObject;
 import edu.uci.ics.hivesterix.serde.lazy.LazySerDe;
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/ColumnExpressionEvaluatorFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/ColumnExpressionEvaluatorFactory.java
similarity index 92%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/ColumnExpressionEvaluatorFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/ColumnExpressionEvaluatorFactory.java
index dc21be7..6f51bfe 100644
--- a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/ColumnExpressionEvaluatorFactory.java
+++ b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/ColumnExpressionEvaluatorFactory.java
@@ -2,9 +2,9 @@
 
 import org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc;
 
-import edu.uci.ics.hivesterix.logical.expression.Schema;
+import edu.uci.ics.hivesterix.logical.expression.ExpressionTranslator;
 import edu.uci.ics.hivesterix.runtime.evaluator.ColumnExpressionEvaluator;
-import edu.uci.ics.hivesterix.runtime.evaluator.ExpressionTranslator;
+import edu.uci.ics.hivesterix.runtime.jobgen.Schema;
 import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
 import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
 import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IVariableTypeEnvironment;
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/ConstantExpressionEvaluatorFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/ConstantExpressionEvaluatorFactory.java
similarity index 92%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/ConstantExpressionEvaluatorFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/ConstantExpressionEvaluatorFactory.java
index 69e2171..4ecdb70 100644
--- a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/ConstantExpressionEvaluatorFactory.java
+++ b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/ConstantExpressionEvaluatorFactory.java
@@ -2,9 +2,9 @@
 
 import org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc;
 
-import edu.uci.ics.hivesterix.logical.expression.Schema;
+import edu.uci.ics.hivesterix.logical.expression.ExpressionTranslator;
 import edu.uci.ics.hivesterix.runtime.evaluator.ConstantExpressionEvaluator;
-import edu.uci.ics.hivesterix.runtime.evaluator.ExpressionTranslator;
+import edu.uci.ics.hivesterix.runtime.jobgen.Schema;
 import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
 import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
 import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IVariableTypeEnvironment;
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/FieldExpressionEvaluatorFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/FieldExpressionEvaluatorFactory.java
similarity index 92%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/FieldExpressionEvaluatorFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/FieldExpressionEvaluatorFactory.java
index eddfb9b..ef0c104 100644
--- a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/FieldExpressionEvaluatorFactory.java
+++ b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/FieldExpressionEvaluatorFactory.java
@@ -2,9 +2,9 @@
 
 import org.apache.hadoop.hive.ql.plan.ExprNodeFieldDesc;
 
-import edu.uci.ics.hivesterix.logical.expression.Schema;
-import edu.uci.ics.hivesterix.runtime.evaluator.ExpressionTranslator;
+import edu.uci.ics.hivesterix.logical.expression.ExpressionTranslator;
 import edu.uci.ics.hivesterix.runtime.evaluator.FieldExpressionEvaluator;
+import edu.uci.ics.hivesterix.runtime.jobgen.Schema;
 import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
 import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
 import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IVariableTypeEnvironment;
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/HiveExpressionRuntimeProvider.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/HiveExpressionRuntimeProvider.java
similarity index 99%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/HiveExpressionRuntimeProvider.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/HiveExpressionRuntimeProvider.java
index 842d96e..c3b4b17 100644
--- a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/HiveExpressionRuntimeProvider.java
+++ b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/HiveExpressionRuntimeProvider.java
@@ -7,7 +7,7 @@
 import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
 
 import edu.uci.ics.hivesterix.logical.expression.ExpressionConstant;
-import edu.uci.ics.hivesterix.logical.expression.Schema;
+import edu.uci.ics.hivesterix.runtime.jobgen.Schema;
 import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
 import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
 import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable;
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/NullExpressionEvaluatorFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/NullExpressionEvaluatorFactory.java
similarity index 92%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/NullExpressionEvaluatorFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/NullExpressionEvaluatorFactory.java
index 075ed91..f37b825 100644
--- a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/NullExpressionEvaluatorFactory.java
+++ b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/NullExpressionEvaluatorFactory.java
@@ -2,9 +2,9 @@
 
 import org.apache.hadoop.hive.ql.plan.ExprNodeNullDesc;
 
-import edu.uci.ics.hivesterix.logical.expression.Schema;
-import edu.uci.ics.hivesterix.runtime.evaluator.ExpressionTranslator;
+import edu.uci.ics.hivesterix.logical.expression.ExpressionTranslator;
 import edu.uci.ics.hivesterix.runtime.evaluator.NullExpressionEvaluator;
+import edu.uci.ics.hivesterix.runtime.jobgen.Schema;
 import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
 import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
 import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IVariableTypeEnvironment;
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/ScalarFunctionExpressionEvaluatorFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/ScalarFunctionExpressionEvaluatorFactory.java
similarity index 95%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/ScalarFunctionExpressionEvaluatorFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/ScalarFunctionExpressionEvaluatorFactory.java
index 9e10c6b..cbac10a 100644
--- a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/ScalarFunctionExpressionEvaluatorFactory.java
+++ b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/ScalarFunctionExpressionEvaluatorFactory.java
@@ -4,9 +4,9 @@
 import org.apache.hadoop.hive.ql.exec.Utilities;
 import org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc;
 
-import edu.uci.ics.hivesterix.logical.expression.Schema;
-import edu.uci.ics.hivesterix.runtime.evaluator.ExpressionTranslator;
+import edu.uci.ics.hivesterix.logical.expression.ExpressionTranslator;
 import edu.uci.ics.hivesterix.runtime.evaluator.FunctionExpressionEvaluator;
+import edu.uci.ics.hivesterix.runtime.jobgen.Schema;
 import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
 import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
 import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IVariableTypeEnvironment;
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/UnnestingFunctionFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/UnnestingFunctionFactory.java
similarity index 91%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/UnnestingFunctionFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/UnnestingFunctionFactory.java
index 4657ae1..3b22513 100644
--- a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/UnnestingFunctionFactory.java
+++ b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/evaluator/UnnestingFunctionFactory.java
@@ -2,9 +2,9 @@
 
 import org.apache.hadoop.hive.ql.plan.UDTFDesc;
 
-import edu.uci.ics.hivesterix.logical.expression.Schema;
-import edu.uci.ics.hivesterix.runtime.evaluator.ExpressionTranslator;
+import edu.uci.ics.hivesterix.logical.expression.ExpressionTranslator;
 import edu.uci.ics.hivesterix.runtime.evaluator.UDTFFunctionEvaluator;
+import edu.uci.ics.hivesterix.runtime.jobgen.Schema;
 import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
 import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
 import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IVariableTypeEnvironment;
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/hashfunction/HiveDoubleBinaryHashFunctionFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/hashfunction/HiveDoubleBinaryHashFunctionFactory.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/hashfunction/HiveDoubleBinaryHashFunctionFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/hashfunction/HiveDoubleBinaryHashFunctionFactory.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/hashfunction/HiveIntegerBinaryHashFunctionFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/hashfunction/HiveIntegerBinaryHashFunctionFactory.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/hashfunction/HiveIntegerBinaryHashFunctionFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/hashfunction/HiveIntegerBinaryHashFunctionFactory.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/hashfunction/HiveLongBinaryHashFunctionFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/hashfunction/HiveLongBinaryHashFunctionFactory.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/hashfunction/HiveLongBinaryHashFunctionFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/hashfunction/HiveLongBinaryHashFunctionFactory.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/hashfunction/HiveRawBinaryHashFunctionFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/hashfunction/HiveRawBinaryHashFunctionFactory.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/hashfunction/HiveRawBinaryHashFunctionFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/hashfunction/HiveRawBinaryHashFunctionFactory.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/hashfunction/HiveStingBinaryHashFunctionFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/hashfunction/HiveStingBinaryHashFunctionFactory.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/hashfunction/HiveStingBinaryHashFunctionFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/hashfunction/HiveStingBinaryHashFunctionFactory.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/hashfunction/MurmurHash3BinaryHashFunctionFamily.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/hashfunction/MurmurHash3BinaryHashFunctionFamily.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/hashfunction/MurmurHash3BinaryHashFunctionFamily.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/hashfunction/MurmurHash3BinaryHashFunctionFamily.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/normalize/HiveDoubleAscNormalizedKeyComputerFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/normalize/HiveDoubleAscNormalizedKeyComputerFactory.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/normalize/HiveDoubleAscNormalizedKeyComputerFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/normalize/HiveDoubleAscNormalizedKeyComputerFactory.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/normalize/HiveDoubleDescNormalizedKeyComputerFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/normalize/HiveDoubleDescNormalizedKeyComputerFactory.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/normalize/HiveDoubleDescNormalizedKeyComputerFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/normalize/HiveDoubleDescNormalizedKeyComputerFactory.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/normalize/HiveIntegerAscNormalizedKeyComputerFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/normalize/HiveIntegerAscNormalizedKeyComputerFactory.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/normalize/HiveIntegerAscNormalizedKeyComputerFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/normalize/HiveIntegerAscNormalizedKeyComputerFactory.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/normalize/HiveIntegerDescNormalizedKeyComputerFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/normalize/HiveIntegerDescNormalizedKeyComputerFactory.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/normalize/HiveIntegerDescNormalizedKeyComputerFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/normalize/HiveIntegerDescNormalizedKeyComputerFactory.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/normalize/HiveLongAscNormalizedKeyComputerFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/normalize/HiveLongAscNormalizedKeyComputerFactory.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/normalize/HiveLongAscNormalizedKeyComputerFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/normalize/HiveLongAscNormalizedKeyComputerFactory.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/normalize/HiveLongDescNormalizedKeyComputerFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/normalize/HiveLongDescNormalizedKeyComputerFactory.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/normalize/HiveLongDescNormalizedKeyComputerFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/normalize/HiveLongDescNormalizedKeyComputerFactory.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/normalize/HiveStringAscNormalizedKeyComputerFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/normalize/HiveStringAscNormalizedKeyComputerFactory.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/normalize/HiveStringAscNormalizedKeyComputerFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/normalize/HiveStringAscNormalizedKeyComputerFactory.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/normalize/HiveStringDescNormalizedKeyComputerFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/normalize/HiveStringDescNormalizedKeyComputerFactory.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/normalize/HiveStringDescNormalizedKeyComputerFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/normalize/HiveStringDescNormalizedKeyComputerFactory.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/factory/nullwriter/HiveNullWriterFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/nullwriter/HiveNullWriterFactory.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/factory/nullwriter/HiveNullWriterFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/factory/nullwriter/HiveNullWriterFactory.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/inspector/HiveBinaryBooleanInspector.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/inspector/HiveBinaryBooleanInspector.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/inspector/HiveBinaryBooleanInspector.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/inspector/HiveBinaryBooleanInspector.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/inspector/HiveBinaryBooleanInspectorFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/inspector/HiveBinaryBooleanInspectorFactory.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/inspector/HiveBinaryBooleanInspectorFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/inspector/HiveBinaryBooleanInspectorFactory.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/inspector/HiveBinaryIntegerInspector.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/inspector/HiveBinaryIntegerInspector.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/inspector/HiveBinaryIntegerInspector.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/inspector/HiveBinaryIntegerInspector.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/inspector/HiveBinaryIntegerInspectorFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/inspector/HiveBinaryIntegerInspectorFactory.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/inspector/HiveBinaryIntegerInspectorFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/inspector/HiveBinaryIntegerInspectorFactory.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveConnectorPolicyAssignmentPolicy.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveConnectorPolicyAssignmentPolicy.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveConnectorPolicyAssignmentPolicy.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveConnectorPolicyAssignmentPolicy.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveDataSink.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveDataSink.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveDataSink.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveDataSink.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveDataSource.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveDataSource.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveDataSource.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveDataSource.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveDataSourcePartitioningProvider.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveDataSourcePartitioningProvider.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveDataSourcePartitioningProvider.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveDataSourcePartitioningProvider.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveDomain.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveDomain.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveDomain.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveDomain.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveMetaDataProvider.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveMetaDataProvider.java
similarity index 97%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveMetaDataProvider.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveMetaDataProvider.java
index a6cdbe0..13526d8 100644
--- a/src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveMetaDataProvider.java
+++ b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveMetaDataProvider.java
@@ -8,7 +8,8 @@
 import org.apache.hadoop.hive.ql.plan.PartitionDesc;
 
 import edu.uci.ics.hivesterix.logical.expression.HiveFunctionInfo;
-import edu.uci.ics.hivesterix.logical.expression.Schema;
+import edu.uci.ics.hivesterix.runtime.jobgen.HiveScanRuntimeGenerator;
+import edu.uci.ics.hivesterix.runtime.jobgen.HiveWriteRuntimeGenerator;
 import edu.uci.ics.hyracks.algebricks.common.constraints.AlgebricksPartitionConstraint;
 import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
 import edu.uci.ics.hyracks.algebricks.common.utils.Pair;
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveOperatorSchema.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveOperatorSchema.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveOperatorSchema.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveOperatorSchema.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveScanRuntimeGenerator.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveScanRuntimeGenerator.java
similarity index 63%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveScanRuntimeGenerator.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveScanRuntimeGenerator.java
index 7bce2c2..f3af915 100644
--- a/src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveScanRuntimeGenerator.java
+++ b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveScanRuntimeGenerator.java
@@ -7,7 +7,7 @@
 import org.apache.hadoop.hive.ql.plan.PartitionDesc;
 import org.apache.hadoop.mapred.JobConf;
 
-import edu.uci.ics.hivesterix.runtime.config.ConfUtil;
+import edu.uci.ics.hivesterix.common.config.ConfUtil;
 import edu.uci.ics.hivesterix.runtime.operator.filescan.HiveFileScanOperatorDescriptor;
 import edu.uci.ics.hivesterix.runtime.operator.filescan.HiveFileSplitProvider;
 import edu.uci.ics.hivesterix.runtime.operator.filescan.HiveTupleParserFactory;
@@ -58,36 +58,40 @@
     public Pair<IOperatorDescriptor, AlgebricksPartitionConstraint> getRuntimeOperatorAndConstraint(
             IDataSource dataSource, List<LogicalVariable> scanVariables, List<LogicalVariable> projectVariables,
             boolean projectPushed, JobGenContext context, JobSpecification jobSpec) throws AlgebricksException {
-        // get the correct delimiter from Hive metastore or other data
-        // structures
-        IOperatorSchema propagatedSchema = new HiveOperatorSchema();
+        try {
+            // get the correct delimiter from Hive metastore or other data
+            // structures
+            IOperatorSchema propagatedSchema = new HiveOperatorSchema();
 
-        List<LogicalVariable> outputVariables = projectPushed ? projectVariables : scanVariables;
-        for (LogicalVariable var : outputVariables)
-            propagatedSchema.addVariable(var);
+            List<LogicalVariable> outputVariables = projectPushed ? projectVariables : scanVariables;
+            for (LogicalVariable var : outputVariables)
+                propagatedSchema.addVariable(var);
 
-        int[] outputColumnsOffset = new int[scanVariables.size()];
-        int i = 0;
-        for (LogicalVariable var : scanVariables)
-            if (outputVariables.contains(var)) {
-                int offset = outputVariables.indexOf(var);
-                outputColumnsOffset[i++] = offset;
-            } else
-                outputColumnsOffset[i++] = -1;
+            int[] outputColumnsOffset = new int[scanVariables.size()];
+            int i = 0;
+            for (LogicalVariable var : scanVariables)
+                if (outputVariables.contains(var)) {
+                    int offset = outputVariables.indexOf(var);
+                    outputColumnsOffset[i++] = offset;
+                } else
+                    outputColumnsOffset[i++] = -1;
 
-        Object[] schemaTypes = dataSource.getSchemaTypes();
-        // get record descriptor
-        RecordDescriptor recDescriptor = mkRecordDescriptor(propagatedSchema, schemaTypes, context);
+            Object[] schemaTypes = dataSource.getSchemaTypes();
+            // get record descriptor
+            RecordDescriptor recDescriptor = mkRecordDescriptor(propagatedSchema, schemaTypes, context);
 
-        // setup the run time operator
-        JobConf conf = ConfUtil.getJobConf(fileDesc.getInputFileFormatClass(), filePath);
-        int clusterSize = ConfUtil.getNCs().length;
-        IFileSplitProvider fsprovider = new HiveFileSplitProvider(conf, filePathName, clusterSize);
-        ITupleParserFactory tupleParserFactory = new HiveTupleParserFactory(fileDesc, conf, outputColumnsOffset);
-        HiveFileScanOperatorDescriptor opDesc = new HiveFileScanOperatorDescriptor(jobSpec, fsprovider,
-                tupleParserFactory, recDescriptor);
+            // setup the run time operator
+            JobConf conf = ConfUtil.getJobConf(fileDesc.getInputFileFormatClass(), filePath);
+            int clusterSize = ConfUtil.getNCs().length;
+            IFileSplitProvider fsprovider = new HiveFileSplitProvider(conf, filePathName, clusterSize);
+            ITupleParserFactory tupleParserFactory = new HiveTupleParserFactory(fileDesc, conf, outputColumnsOffset);
+            HiveFileScanOperatorDescriptor opDesc = new HiveFileScanOperatorDescriptor(jobSpec, fsprovider,
+                    tupleParserFactory, recDescriptor);
 
-        return new Pair<IOperatorDescriptor, AlgebricksPartitionConstraint>(opDesc, opDesc.getPartitionConstraint());
+            return new Pair<IOperatorDescriptor, AlgebricksPartitionConstraint>(opDesc, opDesc.getPartitionConstraint());
+        } catch (Exception e) {
+            throw new AlgebricksException(e);
+        }
     }
 
     private static RecordDescriptor mkRecordDescriptor(IOperatorSchema opSchema, Object[] types, JobGenContext context)
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveWriteRuntimeGenerator.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveWriteRuntimeGenerator.java
similarity index 92%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveWriteRuntimeGenerator.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveWriteRuntimeGenerator.java
index 90a7e64..7a577e8 100644
--- a/src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveWriteRuntimeGenerator.java
+++ b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/HiveWriteRuntimeGenerator.java
@@ -3,8 +3,7 @@
 import org.apache.hadoop.hive.ql.exec.FileSinkOperator;
 import org.apache.hadoop.mapred.JobConf;
 
-import edu.uci.ics.hivesterix.logical.expression.Schema;
-import edu.uci.ics.hivesterix.runtime.config.ConfUtil;
+import edu.uci.ics.hivesterix.common.config.ConfUtil;
 import edu.uci.ics.hivesterix.runtime.operator.filewrite.HivePushRuntimeFactory;
 import edu.uci.ics.hyracks.algebricks.common.constraints.AlgebricksPartitionConstraint;
 import edu.uci.ics.hyracks.algebricks.common.utils.Pair;
diff --git a/src/main/java/edu/uci/ics/hivesterix/logical/expression/Schema.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/Schema.java
similarity index 94%
rename from src/main/java/edu/uci/ics/hivesterix/logical/expression/Schema.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/Schema.java
index 3982d33..927c709 100644
--- a/src/main/java/edu/uci/ics/hivesterix/logical/expression/Schema.java
+++ b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/jobgen/Schema.java
@@ -1,4 +1,4 @@
-package edu.uci.ics.hivesterix.logical.expression;
+package edu.uci.ics.hivesterix.runtime.jobgen;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/operator/filescan/AbstractHiveFileSplitProvider.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/operator/filescan/AbstractHiveFileSplitProvider.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/operator/filescan/AbstractHiveFileSplitProvider.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/operator/filescan/AbstractHiveFileSplitProvider.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/operator/filescan/AbstractHiveTupleParser.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/operator/filescan/AbstractHiveTupleParser.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/operator/filescan/AbstractHiveTupleParser.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/operator/filescan/AbstractHiveTupleParser.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/operator/filescan/HiveFileScanOperatorDescriptor.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/operator/filescan/HiveFileScanOperatorDescriptor.java
similarity index 62%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/operator/filescan/HiveFileScanOperatorDescriptor.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/operator/filescan/HiveFileScanOperatorDescriptor.java
index cdf5795..a64d398 100644
--- a/src/main/java/edu/uci/ics/hivesterix/runtime/operator/filescan/HiveFileScanOperatorDescriptor.java
+++ b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/operator/filescan/HiveFileScanOperatorDescriptor.java
@@ -24,7 +24,7 @@
 
 import org.apache.hadoop.mapred.FileSplit;
 
-import edu.uci.ics.hivesterix.runtime.config.ConfUtil;
+import edu.uci.ics.hivesterix.common.config.ConfUtil;
 import edu.uci.ics.hyracks.algebricks.common.constraints.AlgebricksAbsolutePartitionConstraint;
 import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
 import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
@@ -90,55 +90,59 @@
      * partitions is obtained from HDFS name node
      */
     public AlgebricksAbsolutePartitionConstraint getPartitionConstraint() throws AlgebricksException {
-        FileSplit[] returnedSplits = ((AbstractHiveFileSplitProvider) fileSplitProvider).getFileSplitArray();
-        Random random = new Random(System.currentTimeMillis());
-        ncMapping = ConfUtil.getNCMapping();
-        NCs = ConfUtil.getNCs();
+        try {
+            FileSplit[] returnedSplits = ((AbstractHiveFileSplitProvider) fileSplitProvider).getFileSplitArray();
+            Random random = new Random(System.currentTimeMillis());
+            ncMapping = ConfUtil.getNCMapping();
+            NCs = ConfUtil.getNCs();
 
-        int size = 0;
-        for (FileSplit split : returnedSplits)
-            if (split != null)
-                size++;
+            int size = 0;
+            for (FileSplit split : returnedSplits)
+                if (split != null)
+                    size++;
 
-        FileSplit[] splits = new FileSplit[size];
-        for (int i = 0; i < returnedSplits.length; i++)
-            if (returnedSplits[i] != null)
-                splits[i] = returnedSplits[i];
+            FileSplit[] splits = new FileSplit[size];
+            for (int i = 0; i < returnedSplits.length; i++)
+                if (returnedSplits[i] != null)
+                    splits[i] = returnedSplits[i];
 
-        System.out.println("number of splits: " + splits.length);
-        constraintsByHostNames = new String[splits.length];
-        for (int i = 0; i < splits.length; i++) {
-            try {
-                String[] loc = splits[i].getLocations();
-                Collections.shuffle(Arrays.asList(loc), random);
-                if (loc.length > 0) {
-                    InetAddress[] allIps = InetAddress.getAllByName(loc[0]);
-                    for (InetAddress ip : allIps) {
-                        if (ncMapping.get(ip.getHostAddress()) != null) {
-                            List<String> ncs = ncMapping.get(ip.getHostAddress());
-                            int pos = random.nextInt(ncs.size());
-                            constraintsByHostNames[i] = ncs.get(pos);
-                        } else {
-                            int pos = random.nextInt(NCs.length);
-                            constraintsByHostNames[i] = NCs[pos];
+            System.out.println("number of splits: " + splits.length);
+            constraintsByHostNames = new String[splits.length];
+            for (int i = 0; i < splits.length; i++) {
+                try {
+                    String[] loc = splits[i].getLocations();
+                    Collections.shuffle(Arrays.asList(loc), random);
+                    if (loc.length > 0) {
+                        InetAddress[] allIps = InetAddress.getAllByName(loc[0]);
+                        for (InetAddress ip : allIps) {
+                            if (ncMapping.get(ip.getHostAddress()) != null) {
+                                List<String> ncs = ncMapping.get(ip.getHostAddress());
+                                int pos = random.nextInt(ncs.size());
+                                constraintsByHostNames[i] = ncs.get(pos);
+                            } else {
+                                int pos = random.nextInt(NCs.length);
+                                constraintsByHostNames[i] = NCs[pos];
+                            }
                         }
+                    } else {
+                        int pos = random.nextInt(NCs.length);
+                        constraintsByHostNames[i] = NCs[pos];
+                        if (splits[i].getLength() > 0)
+                            throw new IllegalStateException("non local scanner non locations!!");
                     }
-                } else {
-                    int pos = random.nextInt(NCs.length);
-                    constraintsByHostNames[i] = NCs[pos];
-                    if (splits[i].getLength() > 0)
-                        throw new IllegalStateException("non local scanner non locations!!");
+                } catch (IOException e) {
+                    throw new AlgebricksException(e);
                 }
-            } catch (IOException e) {
-                throw new AlgebricksException(e);
             }
-        }
 
-        parts = new Partition[splits.length];
-        for (int i = 0; i < splits.length; i++) {
-            parts[i] = new Partition(splits[i]);
+            parts = new Partition[splits.length];
+            for (int i = 0; i < splits.length; i++) {
+                parts[i] = new Partition(splits[i]);
+            }
+            return new AlgebricksAbsolutePartitionConstraint(constraintsByHostNames);
+        } catch (Exception e) {
+            throw new AlgebricksException(e);
         }
-        return new AlgebricksAbsolutePartitionConstraint(constraintsByHostNames);
     }
 
     @Override
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/operator/filescan/HiveFileSplitProvider.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/operator/filescan/HiveFileSplitProvider.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/operator/filescan/HiveFileSplitProvider.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/operator/filescan/HiveFileSplitProvider.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/operator/filescan/HiveTupleParser.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/operator/filescan/HiveTupleParser.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/operator/filescan/HiveTupleParser.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/operator/filescan/HiveTupleParser.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/operator/filescan/HiveTupleParserFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/operator/filescan/HiveTupleParserFactory.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/operator/filescan/HiveTupleParserFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/operator/filescan/HiveTupleParserFactory.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/operator/filescan/Partition.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/operator/filescan/Partition.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/operator/filescan/Partition.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/operator/filescan/Partition.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/operator/filewrite/HiveFileWritePushRuntime.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/operator/filewrite/HiveFileWritePushRuntime.java
similarity index 98%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/operator/filewrite/HiveFileWritePushRuntime.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/operator/filewrite/HiveFileWritePushRuntime.java
index 0d74f0b..3a62b2e 100644
--- a/src/main/java/edu/uci/ics/hivesterix/runtime/operator/filewrite/HiveFileWritePushRuntime.java
+++ b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/operator/filewrite/HiveFileWritePushRuntime.java
@@ -10,7 +10,7 @@
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
 import org.apache.hadoop.mapred.JobConf;
 
-import edu.uci.ics.hivesterix.logical.expression.Schema;
+import edu.uci.ics.hivesterix.runtime.jobgen.Schema;
 import edu.uci.ics.hivesterix.serde.lazy.LazyColumnar;
 import edu.uci.ics.hivesterix.serde.lazy.objectinspector.LazyColumnarObjectInspector;
 import edu.uci.ics.hyracks.algebricks.runtime.base.IPushRuntime;
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/operator/filewrite/HivePushRuntimeFactory.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/operator/filewrite/HivePushRuntimeFactory.java
similarity index 98%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/operator/filewrite/HivePushRuntimeFactory.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/operator/filewrite/HivePushRuntimeFactory.java
index 213bbca..6c18231 100644
--- a/src/main/java/edu/uci/ics/hivesterix/runtime/operator/filewrite/HivePushRuntimeFactory.java
+++ b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/operator/filewrite/HivePushRuntimeFactory.java
@@ -14,7 +14,7 @@
 import org.apache.hadoop.hive.ql.plan.FileSinkDesc;
 import org.apache.hadoop.mapred.JobConf;
 
-import edu.uci.ics.hivesterix.logical.expression.Schema;
+import edu.uci.ics.hivesterix.runtime.jobgen.Schema;
 import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
 import edu.uci.ics.hyracks.algebricks.runtime.base.IPushRuntime;
 import edu.uci.ics.hyracks.algebricks.runtime.base.IPushRuntimeFactory;
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/provider/HiveBinaryComparatorFactoryProvider.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/provider/HiveBinaryComparatorFactoryProvider.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/provider/HiveBinaryComparatorFactoryProvider.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/provider/HiveBinaryComparatorFactoryProvider.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/provider/HiveBinaryHashFunctionFactoryProvider.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/provider/HiveBinaryHashFunctionFactoryProvider.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/provider/HiveBinaryHashFunctionFactoryProvider.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/provider/HiveBinaryHashFunctionFactoryProvider.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/provider/HiveBinaryHashFunctionFamilyProvider.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/provider/HiveBinaryHashFunctionFamilyProvider.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/provider/HiveBinaryHashFunctionFamilyProvider.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/provider/HiveBinaryHashFunctionFamilyProvider.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/provider/HiveNormalizedKeyComputerFactoryProvider.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/provider/HiveNormalizedKeyComputerFactoryProvider.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/provider/HiveNormalizedKeyComputerFactoryProvider.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/provider/HiveNormalizedKeyComputerFactoryProvider.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/provider/HivePrinterFactoryProvider.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/provider/HivePrinterFactoryProvider.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/provider/HivePrinterFactoryProvider.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/provider/HivePrinterFactoryProvider.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/provider/HiveSerializerDeserializerProvider.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/provider/HiveSerializerDeserializerProvider.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/provider/HiveSerializerDeserializerProvider.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/provider/HiveSerializerDeserializerProvider.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/provider/HiveTypeTraitProvider.java b/hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/provider/HiveTypeTraitProvider.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/runtime/provider/HiveTypeTraitProvider.java
rename to hivesterix-runtime/src/main/java/edu/uci/ics/hivesterix/runtime/provider/HiveTypeTraitProvider.java
diff --git a/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFAverage.java b/hivesterix-runtime/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFAverage.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFAverage.java
rename to hivesterix-runtime/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFAverage.java
diff --git a/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFCorrelation.java b/hivesterix-runtime/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFCorrelation.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFCorrelation.java
rename to hivesterix-runtime/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFCorrelation.java
diff --git a/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFCount.java b/hivesterix-runtime/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFCount.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFCount.java
rename to hivesterix-runtime/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFCount.java
diff --git a/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFCovariance.java b/hivesterix-runtime/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFCovariance.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFCovariance.java
rename to hivesterix-runtime/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFCovariance.java
diff --git a/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFSum.java b/hivesterix-runtime/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFSum.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFSum.java
rename to hivesterix-runtime/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFSum.java
diff --git a/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFVariance.java b/hivesterix-runtime/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFVariance.java
similarity index 100%
rename from src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFVariance.java
rename to hivesterix-runtime/src/main/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFVariance.java
diff --git a/hivesterix-runtime/src/test/java/edu/uci/ics/hyracks/AppTest.java b/hivesterix-runtime/src/test/java/edu/uci/ics/hyracks/AppTest.java
new file mode 100644
index 0000000..0c701c8
--- /dev/null
+++ b/hivesterix-runtime/src/test/java/edu/uci/ics/hyracks/AppTest.java
@@ -0,0 +1,38 @@
+package edu.uci.ics.hyracks;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest 
+    extends TestCase
+{
+    /**
+     * Create the test case
+     *
+     * @param testName name of the test case
+     */
+    public AppTest( String testName )
+    {
+        super( testName );
+    }
+
+    /**
+     * @return the suite of tests being tested
+     */
+    public static Test suite()
+    {
+        return new TestSuite( AppTest.class );
+    }
+
+    /**
+     * Rigourous Test :-)
+     */
+    public void testApp()
+    {
+        assertTrue( true );
+    }
+}
diff --git a/hivesterix-serde/pom.xml b/hivesterix-serde/pom.xml
new file mode 100644
index 0000000..0ba73bd
--- /dev/null
+++ b/hivesterix-serde/pom.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>hivesterix</artifactId>
+		<groupId>edu.uci.ics.hyracks</groupId>
+		<version>0.2.3-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>hivesterix-serde</artifactId>
+	<name>hivesterix-serde</name>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.0.2</version>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+					<encoding>UTF-8</encoding>
+					<fork>true</fork>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.hadoop.hive</groupId>
+			<artifactId>hive-serde</artifactId>
+			<version>0.7.0</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.hadoop.hive</groupId>
+			<artifactId>hive-common</artifactId>
+			<version>0.7.0</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>edu.uci.ics.hyracks</groupId>
+			<artifactId>algebricks-compiler</artifactId>
+			<version>0.2.3-SNAPSHOT</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.hadoop</groupId>
+			<artifactId>hadoop-core</artifactId>
+			<version>0.20.2</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>3.8.1</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/lazy/ByteArrayRef.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/ByteArrayRef.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/lazy/ByteArrayRef.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/ByteArrayRef.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyArray.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyArray.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyArray.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyArray.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyBoolean.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyBoolean.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyBoolean.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyBoolean.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyByte.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyByte.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyByte.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyByte.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyColumnar.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyColumnar.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyColumnar.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyColumnar.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyDouble.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyDouble.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyDouble.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyDouble.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyFactory.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyFactory.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyFactory.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyFactory.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyFloat.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyFloat.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyFloat.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyFloat.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyInteger.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyInteger.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyInteger.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyInteger.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyLong.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyLong.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyLong.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyLong.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyMap.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyMap.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyMap.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyMap.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyNonPrimitive.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyNonPrimitive.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyNonPrimitive.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyNonPrimitive.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyObject.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyObject.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyObject.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyObject.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyPrimitive.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyPrimitive.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyPrimitive.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyPrimitive.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazySerDe.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazySerDe.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazySerDe.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazySerDe.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyShort.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyShort.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyShort.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyShort.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyString.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyString.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyString.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyString.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyStruct.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyStruct.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyStruct.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyStruct.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyUtils.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyUtils.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyUtils.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/LazyUtils.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/LazyColumnarObjectInspector.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/LazyColumnarObjectInspector.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/LazyColumnarObjectInspector.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/LazyColumnarObjectInspector.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/LazyListObjectInspector.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/LazyListObjectInspector.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/LazyListObjectInspector.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/LazyListObjectInspector.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/LazyMapObjectInspector.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/LazyMapObjectInspector.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/LazyMapObjectInspector.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/LazyMapObjectInspector.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/LazyObjectInspectorFactory.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/LazyObjectInspectorFactory.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/LazyObjectInspectorFactory.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/LazyObjectInspectorFactory.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/LazyStructObjectInspector.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/LazyStructObjectInspector.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/LazyStructObjectInspector.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/LazyStructObjectInspector.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/AbstractPrimitiveLazyObjectInspector.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/AbstractPrimitiveLazyObjectInspector.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/AbstractPrimitiveLazyObjectInspector.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/AbstractPrimitiveLazyObjectInspector.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyBooleanObjectInspector.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyBooleanObjectInspector.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyBooleanObjectInspector.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyBooleanObjectInspector.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyByteObjectInspector.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyByteObjectInspector.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyByteObjectInspector.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyByteObjectInspector.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyDoubleObjectInspector.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyDoubleObjectInspector.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyDoubleObjectInspector.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyDoubleObjectInspector.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyFloatObjectInspector.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyFloatObjectInspector.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyFloatObjectInspector.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyFloatObjectInspector.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyIntObjectInspector.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyIntObjectInspector.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyIntObjectInspector.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyIntObjectInspector.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyLongObjectInspector.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyLongObjectInspector.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyLongObjectInspector.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyLongObjectInspector.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyPrimitiveObjectInspectorFactory.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyPrimitiveObjectInspectorFactory.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyPrimitiveObjectInspectorFactory.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyPrimitiveObjectInspectorFactory.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyShortObjectInspector.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyShortObjectInspector.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyShortObjectInspector.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyShortObjectInspector.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyStringObjectInspector.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyStringObjectInspector.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyStringObjectInspector.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyStringObjectInspector.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyVoidObjectInspector.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyVoidObjectInspector.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyVoidObjectInspector.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/LazyVoidObjectInspector.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/PrimitiveObjectInspectorFactory.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/PrimitiveObjectInspectorFactory.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/PrimitiveObjectInspectorFactory.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/lazy/objectinspector/primitive/PrimitiveObjectInspectorFactory.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/parser/IHiveParser.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/parser/IHiveParser.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/parser/IHiveParser.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/parser/IHiveParser.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/serde/parser/TextToBinaryTupleParser.java b/hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/parser/TextToBinaryTupleParser.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/serde/parser/TextToBinaryTupleParser.java
rename to hivesterix-serde/src/main/java/edu/uci/ics/hivesterix/serde/parser/TextToBinaryTupleParser.java
diff --git a/hivesterix-serde/src/test/java/edu/uci/ics/hyracks/AppTest.java b/hivesterix-serde/src/test/java/edu/uci/ics/hyracks/AppTest.java
new file mode 100644
index 0000000..0c701c8
--- /dev/null
+++ b/hivesterix-serde/src/test/java/edu/uci/ics/hyracks/AppTest.java
@@ -0,0 +1,38 @@
+package edu.uci.ics.hyracks;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest 
+    extends TestCase
+{
+    /**
+     * Create the test case
+     *
+     * @param testName name of the test case
+     */
+    public AppTest( String testName )
+    {
+        super( testName );
+    }
+
+    /**
+     * @return the suite of tests being tested
+     */
+    public static Test suite()
+    {
+        return new TestSuite( AppTest.class );
+    }
+
+    /**
+     * Rigourous Test :-)
+     */
+    public void testApp()
+    {
+        assertTrue( true );
+    }
+}
diff --git a/hivesterix-translator/pom.xml b/hivesterix-translator/pom.xml
new file mode 100644
index 0000000..b99d652
--- /dev/null
+++ b/hivesterix-translator/pom.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>hivesterix-translator</artifactId>
+	<name>hivesterix-translator</name>
+
+	<parent>
+		<artifactId>hivesterix</artifactId>
+		<groupId>edu.uci.ics.hyracks</groupId>
+		<version>0.2.3-SNAPSHOT</version>
+	</parent>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.0.2</version>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+					<encoding>UTF-8</encoding>
+					<fork>true</fork>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.hadoop.hive</groupId>
+			<artifactId>hive-exec</artifactId>
+			<version>0.7.0</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>edu.uci.ics.hyracks</groupId>
+			<artifactId>algebricks-compiler</artifactId>
+			<version>0.2.3-SNAPSHOT</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>edu.uci.ics.hyracks</groupId>
+			<artifactId>hivesterix-common</artifactId>
+			<version>0.2.3-SNAPSHOT</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>edu.uci.ics.hyracks</groupId>
+			<artifactId>hivesterix-runtime</artifactId>
+			<version>0.2.3-SNAPSHOT</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/src/main/java/edu/uci/ics/hivesterix/logical/plan/HiveAlgebricksTranslator.java b/hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/HiveAlgebricksTranslator.java
similarity index 99%
rename from src/main/java/edu/uci/ics/hivesterix/logical/plan/HiveAlgebricksTranslator.java
rename to hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/HiveAlgebricksTranslator.java
index 409ace3..80b3fef 100644
--- a/src/main/java/edu/uci/ics/hivesterix/logical/plan/HiveAlgebricksTranslator.java
+++ b/hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/HiveAlgebricksTranslator.java
@@ -45,7 +45,6 @@
 import edu.uci.ics.hivesterix.logical.expression.HiveAlgebricksBuiltInFunctionMap;
 import edu.uci.ics.hivesterix.logical.expression.HiveFunctionInfo;
 import edu.uci.ics.hivesterix.logical.expression.HivesterixConstantValue;
-import edu.uci.ics.hivesterix.logical.expression.Schema;
 import edu.uci.ics.hivesterix.logical.plan.visitor.ExtractVisitor;
 import edu.uci.ics.hivesterix.logical.plan.visitor.FilterVisitor;
 import edu.uci.ics.hivesterix.logical.plan.visitor.GroupByVisitor;
@@ -59,6 +58,7 @@
 import edu.uci.ics.hivesterix.logical.plan.visitor.UnionVisitor;
 import edu.uci.ics.hivesterix.logical.plan.visitor.base.Translator;
 import edu.uci.ics.hivesterix.logical.plan.visitor.base.Visitor;
+import edu.uci.ics.hivesterix.runtime.jobgen.Schema;
 import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
 import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
 import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
diff --git a/src/main/java/edu/uci/ics/hivesterix/logical/plan/HiveLogicalPlanAndMetaData.java b/hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/HiveLogicalPlanAndMetaData.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/logical/plan/HiveLogicalPlanAndMetaData.java
rename to hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/HiveLogicalPlanAndMetaData.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/logical/plan/HiveOperatorAnnotations.java b/hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/HiveOperatorAnnotations.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/logical/plan/HiveOperatorAnnotations.java
rename to hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/HiveOperatorAnnotations.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/ExtractVisitor.java b/hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/ExtractVisitor.java
similarity index 94%
rename from src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/ExtractVisitor.java
rename to hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/ExtractVisitor.java
index 0266a60..1c67bae 100644
--- a/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/ExtractVisitor.java
+++ b/hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/ExtractVisitor.java
@@ -5,9 +5,9 @@
 import org.apache.commons.lang3.mutable.Mutable;
 import org.apache.hadoop.hive.ql.exec.ExtractOperator;
 
-import edu.uci.ics.hivesterix.logical.expression.Schema;
 import edu.uci.ics.hivesterix.logical.plan.visitor.base.DefaultVisitor;
 import edu.uci.ics.hivesterix.logical.plan.visitor.base.Translator;
+import edu.uci.ics.hivesterix.runtime.jobgen.Schema;
 import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
 import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable;
 
diff --git a/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/FilterVisitor.java b/hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/FilterVisitor.java
similarity index 96%
rename from src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/FilterVisitor.java
rename to hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/FilterVisitor.java
index 9541da8..9279144 100644
--- a/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/FilterVisitor.java
+++ b/hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/FilterVisitor.java
@@ -8,9 +8,9 @@
 import org.apache.hadoop.hive.ql.plan.ExprNodeDesc;
 import org.apache.hadoop.hive.ql.plan.FilterDesc;
 
-import edu.uci.ics.hivesterix.logical.expression.Schema;
 import edu.uci.ics.hivesterix.logical.plan.visitor.base.DefaultVisitor;
 import edu.uci.ics.hivesterix.logical.plan.visitor.base.Translator;
+import edu.uci.ics.hivesterix.runtime.jobgen.Schema;
 import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
 import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
 import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable;
diff --git a/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/GroupByVisitor.java b/hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/GroupByVisitor.java
similarity index 99%
rename from src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/GroupByVisitor.java
rename to hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/GroupByVisitor.java
index 8e7bfc6..b7d5779 100644
--- a/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/GroupByVisitor.java
+++ b/hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/GroupByVisitor.java
@@ -24,10 +24,10 @@
 import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
 import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory;
 
+import edu.uci.ics.hivesterix.common.config.ConfUtil;
 import edu.uci.ics.hivesterix.logical.plan.HiveOperatorAnnotations;
 import edu.uci.ics.hivesterix.logical.plan.visitor.base.DefaultVisitor;
 import edu.uci.ics.hivesterix.logical.plan.visitor.base.Translator;
-import edu.uci.ics.hivesterix.runtime.config.ConfUtil;
 import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
 import edu.uci.ics.hyracks.algebricks.common.utils.Pair;
 import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
diff --git a/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/JoinVisitor.java b/hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/JoinVisitor.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/JoinVisitor.java
rename to hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/JoinVisitor.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/LateralViewJoinVisitor.java b/hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/LateralViewJoinVisitor.java
similarity index 98%
rename from src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/LateralViewJoinVisitor.java
rename to hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/LateralViewJoinVisitor.java
index 5b6fde0..cc19364 100644
--- a/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/LateralViewJoinVisitor.java
+++ b/hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/LateralViewJoinVisitor.java
@@ -11,9 +11,9 @@
 import org.apache.hadoop.hive.ql.plan.UDTFDesc;
 import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory;
 
-import edu.uci.ics.hivesterix.logical.expression.Schema;
 import edu.uci.ics.hivesterix.logical.plan.visitor.base.DefaultVisitor;
 import edu.uci.ics.hivesterix.logical.plan.visitor.base.Translator;
+import edu.uci.ics.hivesterix.runtime.jobgen.Schema;
 import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
 import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
 import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
diff --git a/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/LimitVisitor.java b/hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/LimitVisitor.java
similarity index 96%
rename from src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/LimitVisitor.java
rename to hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/LimitVisitor.java
index 4ca3ddc..cc10f8f 100644
--- a/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/LimitVisitor.java
+++ b/hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/LimitVisitor.java
@@ -8,9 +8,9 @@
 import org.apache.hadoop.hive.ql.plan.LimitDesc;
 
 import edu.uci.ics.hivesterix.logical.expression.HivesterixConstantValue;
-import edu.uci.ics.hivesterix.logical.expression.Schema;
 import edu.uci.ics.hivesterix.logical.plan.visitor.base.DefaultVisitor;
 import edu.uci.ics.hivesterix.logical.plan.visitor.base.Translator;
+import edu.uci.ics.hivesterix.runtime.jobgen.Schema;
 import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
 import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
 import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable;
diff --git a/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/MapJoinVisitor.java b/hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/MapJoinVisitor.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/MapJoinVisitor.java
rename to hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/MapJoinVisitor.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/ProjectVisitor.java b/hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/ProjectVisitor.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/ProjectVisitor.java
rename to hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/ProjectVisitor.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/SortVisitor.java b/hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/SortVisitor.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/SortVisitor.java
rename to hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/SortVisitor.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/TableScanWriteVisitor.java b/hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/TableScanWriteVisitor.java
similarity index 98%
rename from src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/TableScanWriteVisitor.java
rename to hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/TableScanWriteVisitor.java
index fe5eac2..3af1832 100644
--- a/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/TableScanWriteVisitor.java
+++ b/hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/TableScanWriteVisitor.java
@@ -13,12 +13,12 @@
 import org.apache.hadoop.hive.ql.plan.TableScanDesc;
 import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
 
-import edu.uci.ics.hivesterix.logical.expression.Schema;
 import edu.uci.ics.hivesterix.logical.plan.visitor.base.DefaultVisitor;
 import edu.uci.ics.hivesterix.logical.plan.visitor.base.Translator;
 import edu.uci.ics.hivesterix.runtime.jobgen.HiveDataSink;
 import edu.uci.ics.hivesterix.runtime.jobgen.HiveDataSource;
 import edu.uci.ics.hivesterix.runtime.jobgen.HiveMetaDataProvider;
+import edu.uci.ics.hivesterix.runtime.jobgen.Schema;
 import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
 import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
 import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
diff --git a/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/UnionVisitor.java b/hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/UnionVisitor.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/UnionVisitor.java
rename to hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/UnionVisitor.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/base/DefaultVisitor.java b/hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/base/DefaultVisitor.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/base/DefaultVisitor.java
rename to hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/base/DefaultVisitor.java
diff --git a/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/base/Translator.java b/hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/base/Translator.java
similarity index 98%
rename from src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/base/Translator.java
rename to hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/base/Translator.java
index d9eb50c..8aa139a 100644
--- a/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/base/Translator.java
+++ b/hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/base/Translator.java
@@ -11,7 +11,7 @@
 import org.apache.hadoop.hive.ql.plan.UDTFDesc;
 import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
 
-import edu.uci.ics.hivesterix.logical.expression.Schema;
+import edu.uci.ics.hivesterix.runtime.jobgen.Schema;
 import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
 import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
 import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable;
diff --git a/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/base/Visitor.java b/hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/base/Visitor.java
similarity index 100%
rename from src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/base/Visitor.java
rename to hivesterix-translator/src/main/java/edu/uci/ics/hivesterix/logical/plan/visitor/base/Visitor.java
diff --git a/pom.xml b/pom.xml
index 1553a2b..db79d9a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,578 +1,139 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>edu.uci.ics.hivesterix</groupId>
-	<artifactId>hivesterix</artifactId>
-	<version>0.2.3-SNAPSHOT</version>
-	<name>hivesterix</name>
-	<dependencies>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.5</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.8.1</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>args4j</groupId>
-			<artifactId>args4j</artifactId>
-			<version>2.0.12</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.json</groupId>
-			<artifactId>json</artifactId>
-			<version>20090211</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-server</artifactId>
-			<version>8.0.0.M1</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-servlet</artifactId>
-			<version>8.0.0.M1</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.hadoop</groupId>
-			<artifactId>hadoop-core</artifactId>
-			<version>0.20.2</version>
-		</dependency>
-		<dependency>
-			<groupId>jline</groupId>
-			<artifactId>jline</artifactId>
-			<version>0.9.94</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.datanucleus</groupId>
-			<artifactId>datanucleus-core</artifactId>
-			<version>2.0.3</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.datanucleus</groupId>
-			<artifactId>datanucleus-connectionpool</artifactId>
-			<version>2.0.3</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.datanucleus</groupId>
-			<artifactId>datanucleus-enhancer</artifactId>
-			<version>2.0.3</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.datanucleus</groupId>
-			<artifactId>datanucleus-rdbms</artifactId>
-			<version>2.0.3</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>commons-dbcp</groupId>
-			<artifactId>commons-dbcp</artifactId>
-			<version>1.4</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>commons-pool</groupId>
-			<artifactId>commons-pool</artifactId>
-			<version>1.5.4</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>commons-collections</groupId>
-			<artifactId>commons-collections</artifactId>
-			<version>3.2.1</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>commons-lang</groupId>
-			<artifactId>commons-lang</artifactId>
-			<version>2.4</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax</groupId>
-			<artifactId>jdo2-api</artifactId>
-			<version>2.3-ec</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.facebook</groupId>
-			<artifactId>libfb303</artifactId>
-			<version>0.5.0</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.thrift</groupId>
-			<artifactId>libthrift</artifactId>
-			<version>0.5.0</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>cli</artifactId>
-			<version>1.2</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.15</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.antlr</groupId>
-			<artifactId>antlr-runtime</artifactId>
-			<version>3.0.1</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.hadoop.hive</groupId>
-			<artifactId>hive-cli</artifactId>
-			<version>0.7.0</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.hadoop.hive</groupId>
-			<artifactId>hive-common</artifactId>
-			<version>0.7.0</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.hadoop.hive</groupId>
-			<artifactId>hive-exec</artifactId>
-			<version>0.7.0</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.hadoop.hive</groupId>
-			<artifactId>hive-hwi</artifactId>
-			<version>0.7.0</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.hadoop.hive</groupId>
-			<artifactId>hive-jdbc</artifactId>
-			<version>0.7.0</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.hadoop.hive</groupId>
-			<artifactId>hive-metastore</artifactId>
-			<version>0.7.0</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.hadoop.hive</groupId>
-			<artifactId>hive-service</artifactId>
-			<version>0.7.0</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.hadoop.hive</groupId>
-			<artifactId>hive-shims</artifactId>
-			<version>0.7.0</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.hadoop.hive</groupId>
-			<artifactId>hive-serde</artifactId>
-			<version>0.7.0</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>1.6.1</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>commons-cli</groupId>
-			<artifactId>commons-cli</artifactId>
-			<version>1.2</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-			<version>1.6.1</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.hadoop</groupId>
-			<artifactId>hadoop-test</artifactId>
-			<version>0.20.2</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.1.1</version>
-			<type>jar</type>
-			<classifier>api</classifier>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>r06</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.antlr</groupId>
-			<artifactId>stringtemplate</artifactId>
-			<version>3.2</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.derby</groupId>
-			<artifactId>derby</artifactId>
-			<version>10.8.1.2</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.hbase</groupId>
-			<artifactId>hbase</artifactId>
-			<version>0.90.3</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>edu.uci.ics.hyracks</groupId>
-			<artifactId>algebricks-compiler</artifactId>
-			<version>0.2.3-SNAPSHOT</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>edu.uci.ics.hyracks</groupId>
-			<artifactId>hyracks-control-cc</artifactId>
-			<version>0.2.3-SNAPSHOT</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>edu.uci.ics.hyracks</groupId>
-			<artifactId>hyracks-control-nc</artifactId>
-			<version>0.2.3-SNAPSHOT</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.0.2</version>
-				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
-					<encoding>UTF-8</encoding>
-					<fork>true</fork>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>patch</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-						<phase>package</phase>
-						<configuration>
-							<classifier>patch</classifier>
-							<finalName>a-hive</finalName>
-							<includes>
-								<include>**/org/apache/**</include>
-							</includes>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>appassembler-maven-plugin</artifactId>
-				<version>1.3</version>
-				<executions>
-					<execution>
-						<configuration>
-							<programs>
-								<program>
-									<mainClass>edu.uci.ics.asterix.hive.cli.CliDriver</mainClass>
-									<name>algebricks-hivesterix-cmd</name>
-								</program>
-							</programs>
-							<repositoryLayout>flat</repositoryLayout>
-							<repositoryName>lib</repositoryName>
-						</configuration>
-						<phase>package</phase>
-						<goals>
-							<goal>assemble</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<version>2.2-beta-5</version>
-				<executions>
-					<execution>
-						<configuration>
-							<descriptors>
-								<descriptor>src/main/assembly/binary-assembly.xml</descriptor>
-							</descriptors>
-						</configuration>
-						<phase>package</phase>
-						<goals>
-							<goal>attached</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.13</version>
-				<configuration>
-					<forkMode>pertest</forkMode>
-					<argLine>-enableassertions -Xmx2047m -Dfile.encoding=UTF-8
-						-Djava.util.logging.config.file=src/test/resources/logging.properties</argLine>
-					<includes>
-						<include>**/test/optimizer/*TestSuite.java</include>
-						<include>**/test/optimizer/*Test.java</include>
-						<include>**/test/runtimefunction/*TestSuite.java</include>
-						<include>**/test/runtimefunction/*Test.java</include>
-					</includes>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.5</version>
-				<executions>
-					<execution>
-						<id>copy-resources</id>
-						<!-- here the phase you need -->
-						<phase>package</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>target/appassembler/bin</outputDirectory>
-							<resources>
-								<resource>
-									<directory>resource/bin</directory>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-					<execution>
-						<id>copy-conf</id>
-						<!-- here the phase you need -->
-						<phase>package</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>target/appassembler/conf</outputDirectory>
-							<resources>
-								<resource>
-									<directory>conf</directory>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-					<execution>
-						<id>copy-asterix</id>
-						<!-- here the phase you need -->
-						<phase>package</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>target/appassembler/asterix</outputDirectory>
-							<resources>
-								<resource>
-									<directory>resource/asterix</directory>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-					<execution>
-						<id>copy-asterix-dbg</id>
-						<!-- here the phase you need -->
-						<phase>package</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>target/appassembler/asterix_dbg</outputDirectory>
-							<resources>
-								<resource>
-									<directory>resource/asterix_dbg</directory>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-					<execution>
-						<id>copy-hivesterix</id>
-						<!-- here the phase you need -->
-						<phase>package</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>target/appassembler/hivesterix</outputDirectory>
-							<resources>
-								<resource>
-									<directory>resource/hivesterix</directory>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-					<execution>
-						<id>copy-conf2</id>
-						<!-- here the phase you need -->
-						<phase>package</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>target/appassembler/hivesterix/conf</outputDirectory>
-							<resources>
-								<resource>
-									<directory>conf</directory>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-					<execution>
-						<id>copy-data</id>
-						<!-- here the phase you need -->
-						<phase>package</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>data</outputDirectory>
-							<resources>
-								<resource>
-									<directory>resource/data</directory>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-clean-plugin</artifactId>
-				<version>2.5</version>
-				<configuration>
-					<filesets>
-						<fileset>
-							<directory>.</directory>
-							<includes>
-								<include>metastore*</include>
-								<include>hadoop*</include>
-								<include>edu*</include>
-								<include>tmp*</include>
-								<include>build*</include>
-								<include>target*</include>
-								<include>log*</include>
-								<include>derby.log</include>
-								<include>ClusterController*</include>
-							</includes>
-						</fileset>
-					</filesets>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-	<repositories>
-		<repository>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-				<checksumPolicy>warn</checksumPolicy>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</snapshots>
-			<id>third-party</id>
-			<url>http://obelix.ics.uci.edu/nexus/content/repositories/third-party</url>
-		</repository>
-		<repository>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-				<checksumPolicy>warn</checksumPolicy>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</snapshots>
-			<id>hyracks-public-release</id>
-			<url>http://obelix.ics.uci.edu/nexus/content/repositories/hyracks-public-releases</url>
-		</repository>
-	</repositories>
-	<distributionManagement>
-		<!-- use the following if you're not using a snapshot version. -->
-		<repository>
-			<id>hivesterix</id>
-			<name>hivesterix</name>
-			<url>scp://obelix.ics.uci.edu/nexus/content/groups/hivesterix-public</url>
-		</repository>
-		<!-- use the following if you ARE using a snapshot version. -->
-		<snapshotRepository>
-			<id>hivesterix</id>
-			<name>Repository Name</name>
-			<url>scp://obelix.ics.uci.edu/nexus/content/groups/hivesterix-public</url>
-		</snapshotRepository>
-	</distributionManagement>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>edu.uci.ics.hyracks</groupId>
+	<artifactId>hivesterix</artifactId>
+	<version>0.2.3-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	<name>hivesterix</name>
+
+	<properties>
+		<jvm.extraargs />
+	</properties>
+
+	<profiles>
+		<profile>
+			<id>macosx</id>
+			<activation>
+				<os>
+					<name>mac os x</name>
+				</os>
+				<jdk>1.7</jdk>
+			</activation>
+			<properties>
+				<jvm.extraargs>-Djava.nio.channels.spi.SelectorProvider=sun.nio.ch.KQueueSelectorProvider</jvm.extraargs>
+			</properties>
+		</profile>
+	</profiles>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-release-plugin</artifactId>
+				<version>2.0</version>
+				<configuration>
+					<goals>package source:jar javadoc:jar deploy:deploy</goals>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>versions-maven-plugin</artifactId>
+				<version>1.2</version>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.13</version>
+				<configuration>
+					<forkMode>pertest</forkMode>
+					<argLine>-enableassertions
+						-Djava.util.logging.config.file=${user.home}/logging.properties
+						-Xdebug
+						-Xrunjdwp:transport=dt_socket,server=y,address=8000,suspend=n
+						${jvm.extraargs}</argLine>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-changelog-plugin</artifactId>
+				<version>2.2</version>
+			</plugin>
+		</plugins>
+	</reporting>
+
+	<distributionManagement>
+		<repository>
+			<id>hyracks-releases</id>
+			<url>http://obelix.ics.uci.edu/nexus/content/repositories/hyracks-releases/</url>
+		</repository>
+		<snapshotRepository>
+			<id>hyracks-snapshots</id>
+			<url>http://obelix.ics.uci.edu/nexus/content/repositories/hyracks-snapshots/</url>
+		</snapshotRepository>
+	</distributionManagement>
+
+	<repositories>
+		<repository>
+			<id>hyracks-public</id>
+			<url>http://obelix.ics.uci.edu/nexus/content/groups/hyracks-public/</url>
+		</repository>
+		<repository>
+			<id>jboss-public</id>
+			<url>https://repository.jboss.org/nexus/content/groups/public/</url>
+		</repository>
+		<repository>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+				<checksumPolicy>warn</checksumPolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+				<checksumPolicy>fail</checksumPolicy>
+			</snapshots>
+			<id>third-party</id>
+			<url>http://obelix.ics.uci.edu/nexus/content/repositories/third-party</url>
+		</repository>
+		<repository>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+				<checksumPolicy>warn</checksumPolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+				<checksumPolicy>fail</checksumPolicy>
+			</snapshots>
+			<id>hyracks-public-release</id>
+			<url>http://obelix.ics.uci.edu/nexus/content/repositories/hyracks-public-releases</url>
+		</repository>
+	</repositories>
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>hyracks-public</id>
+			<url>http://obelix.ics.uci.edu/nexus/content/groups/hyracks-public/</url>
+			<releases>
+				<updatePolicy>always</updatePolicy>
+			</releases>
+		</pluginRepository>
+	</pluginRepositories>
+
+	<modules>
+		<module>hivesterix-runtime</module>
+		<module>hivesterix-translator</module>
+		<module>hivesterix-optimizer</module>
+		<module>hivesterix-serde</module>
+		<module>hivesterix-core</module>
+		<module>hivesterix-common</module>
+	</modules>
+</project>
\ No newline at end of file
diff --git a/src/main/java/edu/uci/ics/hivesterix/runtime/exec/HyracksExecutionEngine.java b/src/main/java/edu/uci/ics/hivesterix/runtime/exec/HyracksExecutionEngine.java
deleted file mode 100644
index ed5ab70..0000000
--- a/src/main/java/edu/uci/ics/hivesterix/runtime/exec/HyracksExecutionEngine.java
+++ /dev/null
@@ -1,551 +0,0 @@
-package edu.uci.ics.hivesterix.runtime.exec;
-
-import java.io.PrintWriter;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.hive.conf.HiveConf;
-import org.apache.hadoop.hive.ql.exec.ConditionalTask;
-import org.apache.hadoop.hive.ql.exec.FileSinkOperator;
-import org.apache.hadoop.hive.ql.exec.MapRedTask;
-import org.apache.hadoop.hive.ql.exec.Operator;
-import org.apache.hadoop.hive.ql.exec.TableScanOperator;
-import org.apache.hadoop.hive.ql.exec.Task;
-import org.apache.hadoop.hive.ql.plan.DynamicPartitionCtx;
-import org.apache.hadoop.hive.ql.plan.FetchWork;
-import org.apache.hadoop.hive.ql.plan.FileSinkDesc;
-import org.apache.hadoop.hive.ql.plan.MapredLocalWork;
-import org.apache.hadoop.hive.ql.plan.MapredWork;
-import org.apache.hadoop.hive.ql.plan.PartitionDesc;
-import org.apache.hadoop.hive.ql.plan.TableScanDesc;
-
-import edu.uci.ics.hivesterix.logical.expression.HiveExpressionTypeComputer;
-import edu.uci.ics.hivesterix.logical.expression.HiveMergeAggregationExpressionFactory;
-import edu.uci.ics.hivesterix.logical.expression.HiveNullableTypeComputer;
-import edu.uci.ics.hivesterix.logical.expression.HivePartialAggregationTypeComputer;
-import edu.uci.ics.hivesterix.logical.plan.HiveAlgebricksTranslator;
-import edu.uci.ics.hivesterix.logical.plan.HiveLogicalPlanAndMetaData;
-import edu.uci.ics.hivesterix.optimizer.rulecollections.HiveRuleCollections;
-import edu.uci.ics.hivesterix.runtime.config.ConfUtil;
-import edu.uci.ics.hivesterix.runtime.factory.evaluator.HiveExpressionRuntimeProvider;
-import edu.uci.ics.hivesterix.runtime.factory.nullwriter.HiveNullWriterFactory;
-import edu.uci.ics.hivesterix.runtime.inspector.HiveBinaryBooleanInspectorFactory;
-import edu.uci.ics.hivesterix.runtime.inspector.HiveBinaryIntegerInspectorFactory;
-import edu.uci.ics.hivesterix.runtime.jobgen.HiveConnectorPolicyAssignmentPolicy;
-import edu.uci.ics.hivesterix.runtime.jobgen.HiveConnectorPolicyAssignmentPolicy.Policy;
-import edu.uci.ics.hivesterix.runtime.provider.HiveBinaryComparatorFactoryProvider;
-import edu.uci.ics.hivesterix.runtime.provider.HiveBinaryHashFunctionFactoryProvider;
-import edu.uci.ics.hivesterix.runtime.provider.HiveBinaryHashFunctionFamilyProvider;
-import edu.uci.ics.hivesterix.runtime.provider.HiveNormalizedKeyComputerFactoryProvider;
-import edu.uci.ics.hivesterix.runtime.provider.HivePrinterFactoryProvider;
-import edu.uci.ics.hivesterix.runtime.provider.HiveSerializerDeserializerProvider;
-import edu.uci.ics.hivesterix.runtime.provider.HiveTypeTraitProvider;
-import edu.uci.ics.hyracks.algebricks.common.constraints.AlgebricksAbsolutePartitionConstraint;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.common.utils.Pair;
-import edu.uci.ics.hyracks.algebricks.compiler.api.HeuristicCompilerFactoryBuilder;
-import edu.uci.ics.hyracks.algebricks.compiler.api.HeuristicCompilerFactoryBuilder.DefaultOptimizationContextFactory;
-import edu.uci.ics.hyracks.algebricks.compiler.api.ICompiler;
-import edu.uci.ics.hyracks.algebricks.compiler.api.ICompilerFactory;
-import edu.uci.ics.hyracks.algebricks.compiler.rewriter.rulecontrollers.SequentialFixpointRuleController;
-import edu.uci.ics.hyracks.algebricks.compiler.rewriter.rulecontrollers.SequentialOnceRuleController;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalPlan;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalPlanAndMetadata;
-import edu.uci.ics.hyracks.algebricks.core.algebra.prettyprint.LogicalOperatorPrettyPrintVisitor;
-import edu.uci.ics.hyracks.algebricks.core.algebra.prettyprint.PlanPrettyPrinter;
-import edu.uci.ics.hyracks.algebricks.core.rewriter.base.AbstractRuleController;
-import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
-import edu.uci.ics.hyracks.algebricks.core.rewriter.base.PhysicalOptimizationConfig;
-import edu.uci.ics.hyracks.api.client.HyracksConnection;
-import edu.uci.ics.hyracks.api.client.IHyracksClientConnection;
-import edu.uci.ics.hyracks.api.job.JobId;
-import edu.uci.ics.hyracks.api.job.JobSpecification;
-
-@SuppressWarnings({ "rawtypes", "unchecked" })
-public class HyracksExecutionEngine implements IExecutionEngine {
-
-    private static final Log LOG = LogFactory.getLog(HyracksExecutionEngine.class.getName());
-
-    private static List<Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>> DEFAULT_LOGICAL_REWRITES = new ArrayList<Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>>();
-    private static List<Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>> DEFAULT_PHYSICAL_REWRITES = new ArrayList<Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>>();
-    static {
-        SequentialFixpointRuleController seqCtrlNoDfs = new SequentialFixpointRuleController(false);
-        SequentialFixpointRuleController seqCtrlFullDfs = new SequentialFixpointRuleController(true);
-        SequentialOnceRuleController seqOnceCtrl = new SequentialOnceRuleController(true);
-        DEFAULT_LOGICAL_REWRITES.add(new Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>(seqCtrlFullDfs,
-                HiveRuleCollections.NORMALIZATION));
-        DEFAULT_LOGICAL_REWRITES.add(new Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>(seqCtrlNoDfs,
-                HiveRuleCollections.COND_PUSHDOWN_AND_JOIN_INFERENCE));
-        DEFAULT_LOGICAL_REWRITES.add(new Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>(seqCtrlFullDfs,
-                HiveRuleCollections.LOAD_FIELDS));
-        DEFAULT_LOGICAL_REWRITES.add(new Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>(seqCtrlNoDfs,
-                HiveRuleCollections.OP_PUSHDOWN));
-        DEFAULT_LOGICAL_REWRITES.add(new Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>(seqOnceCtrl,
-                HiveRuleCollections.DATA_EXCHANGE));
-        DEFAULT_LOGICAL_REWRITES.add(new Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>(seqCtrlNoDfs,
-                HiveRuleCollections.CONSOLIDATION));
-
-        DEFAULT_PHYSICAL_REWRITES.add(new Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>(seqOnceCtrl,
-                HiveRuleCollections.PHYSICAL_PLAN_REWRITES));
-        DEFAULT_PHYSICAL_REWRITES.add(new Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>(seqOnceCtrl,
-                HiveRuleCollections.prepareJobGenRules));
-    }
-
-    /**
-     * static configurations for compiler
-     */
-    private HeuristicCompilerFactoryBuilder builder;
-
-    /**
-     * compiler
-     */
-    private ICompiler compiler;
-
-    /**
-     * physical optimization config
-     */
-    private PhysicalOptimizationConfig physicalOptimizationConfig;
-
-    /**
-     * final ending operators
-     */
-    private List<Operator> leaveOps = new ArrayList<Operator>();
-
-    /**
-     * tasks that are already visited
-     */
-    private Map<Task<? extends Serializable>, Boolean> tasksVisited = new HashMap<Task<? extends Serializable>, Boolean>();
-
-    /**
-     * hyracks job spec
-     */
-    private JobSpecification jobSpec;
-
-    /**
-     * hive configuration
-     */
-    private HiveConf conf;
-
-    /**
-     * plan printer
-     */
-    private PrintWriter planPrinter;
-
-    public HyracksExecutionEngine(HiveConf conf) {
-        this.conf = conf;
-        init(conf);
-    }
-
-    public HyracksExecutionEngine(HiveConf conf, PrintWriter planPrinter) {
-        this.conf = conf;
-        this.planPrinter = planPrinter;
-        init(conf);
-    }
-
-    private void init(HiveConf conf) {
-        builder = new HeuristicCompilerFactoryBuilder(DefaultOptimizationContextFactory.INSTANCE);
-        builder.setLogicalRewrites(DEFAULT_LOGICAL_REWRITES);
-        builder.setPhysicalRewrites(DEFAULT_PHYSICAL_REWRITES);
-        builder.setIMergeAggregationExpressionFactory(HiveMergeAggregationExpressionFactory.INSTANCE);
-        builder.setExpressionTypeComputer(HiveExpressionTypeComputer.INSTANCE);
-        builder.setNullableTypeComputer(HiveNullableTypeComputer.INSTANCE);
-
-        long memSizeExternalGby = conf.getLong("hive.algebricks.groupby.external.memory", 268435456);
-        long memSizeExternalSort = conf.getLong("hive.algebricks.sort.memory", 536870912);
-        int frameSize = conf.getInt("hive.algebricks.framesize", 32768);
-
-        physicalOptimizationConfig = new PhysicalOptimizationConfig();
-        int frameLimitExtGby = (int) (memSizeExternalGby / frameSize);
-        physicalOptimizationConfig.setMaxFramesExternalGroupBy(frameLimitExtGby);
-        int frameLimitExtSort = (int) (memSizeExternalSort / frameSize);
-        physicalOptimizationConfig.setMaxFramesExternalSort(frameLimitExtSort);
-        builder.setPhysicalOptimizationConfig(physicalOptimizationConfig);
-    }
-
-    @Override
-    public int compileJob(List<Task<? extends Serializable>> rootTasks) {
-        // clean up
-        leaveOps.clear();
-        tasksVisited.clear();
-        jobSpec = null;
-
-        HashMap<String, PartitionDesc> aliasToPath = new HashMap<String, PartitionDesc>();
-        List<Operator> rootOps = generateRootOperatorDAG(rootTasks, aliasToPath);
-
-        // get all leave Ops
-        getLeaves(rootOps, leaveOps);
-
-        HiveAlgebricksTranslator translator = new HiveAlgebricksTranslator();
-        try {
-            translator.translate(rootOps, null, aliasToPath);
-
-            ILogicalPlan plan = translator.genLogicalPlan();
-
-            if (plan.getRoots() != null && plan.getRoots().size() > 0 && plan.getRoots().get(0).getValue() != null) {
-                translator.printOperators();
-                ILogicalPlanAndMetadata planAndMetadata = new HiveLogicalPlanAndMetaData(plan,
-                        translator.getMetadataProvider());
-
-                ICompilerFactory compilerFactory = builder.create();
-                compiler = compilerFactory.createCompiler(planAndMetadata.getPlan(),
-                        planAndMetadata.getMetadataProvider(), translator.getVariableCounter());
-
-                // run optimization and re-writing rules for Hive plan
-                compiler.optimize();
-
-                // print optimized plan
-                LogicalOperatorPrettyPrintVisitor pvisitor = new LogicalOperatorPrettyPrintVisitor();
-                StringBuilder buffer = new StringBuilder();
-                PlanPrettyPrinter.printPlan(plan, buffer, pvisitor, 0);
-                String planStr = buffer.toString();
-                System.out.println(planStr);
-
-                if (planPrinter != null)
-                    planPrinter.print(planStr);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            return 1;
-        }
-
-        return 0;
-    }
-
-    private void codeGen() throws AlgebricksException {
-        // number of cpu cores in the cluster
-        builder.setClusterLocations(new AlgebricksAbsolutePartitionConstraint(ConfUtil.getNCs()));
-        // builder.setClusterTopology(ConfUtil.getClusterTopology());
-        builder.setBinaryBooleanInspectorFactory(HiveBinaryBooleanInspectorFactory.INSTANCE);
-        builder.setBinaryIntegerInspectorFactory(HiveBinaryIntegerInspectorFactory.INSTANCE);
-        builder.setComparatorFactoryProvider(HiveBinaryComparatorFactoryProvider.INSTANCE);
-        builder.setExpressionRuntimeProvider(HiveExpressionRuntimeProvider.INSTANCE);
-        builder.setHashFunctionFactoryProvider(HiveBinaryHashFunctionFactoryProvider.INSTANCE);
-        builder.setPrinterProvider(HivePrinterFactoryProvider.INSTANCE);
-        builder.setSerializerDeserializerProvider(HiveSerializerDeserializerProvider.INSTANCE);
-        builder.setNullWriterFactory(HiveNullWriterFactory.INSTANCE);
-        builder.setNormalizedKeyComputerFactoryProvider(HiveNormalizedKeyComputerFactoryProvider.INSTANCE);
-        builder.setPartialAggregationTypeComputer(HivePartialAggregationTypeComputer.INSTANCE);
-        builder.setTypeTraitProvider(HiveTypeTraitProvider.INSTANCE);
-        builder.setHashFunctionFamilyProvider(HiveBinaryHashFunctionFamilyProvider.INSTANCE);
-
-        jobSpec = compiler.createJob(null);
-
-        // set the policy
-        String policyStr = conf.get("hive.hyracks.connectorpolicy");
-        if (policyStr == null)
-            policyStr = "PIPELINING";
-        Policy policyValue = Policy.valueOf(policyStr);
-        jobSpec.setConnectorPolicyAssignmentPolicy(new HiveConnectorPolicyAssignmentPolicy(policyValue));
-        jobSpec.setUseConnectorPolicyForScheduling(false);
-    }
-
-    @Override
-    public int executeJob() {
-        try {
-            codeGen();
-            executeHyraxJob(jobSpec);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return 1;
-        }
-        return 0;
-    }
-
-    private List<Operator> generateRootOperatorDAG(List<Task<? extends Serializable>> rootTasks,
-            HashMap<String, PartitionDesc> aliasToPath) {
-
-        List<Operator> rootOps = new ArrayList<Operator>();
-        List<Task<? extends Serializable>> toDelete = new ArrayList<Task<? extends Serializable>>();
-        tasksVisited.clear();
-
-        for (int i = rootTasks.size() - 1; i >= 0; i--) {
-            /**
-             * list of map-reduce tasks
-             */
-            Task<? extends Serializable> task = rootTasks.get(i);
-
-            if (task instanceof MapRedTask) {
-                List<Operator> mapRootOps = articulateMapReduceOperators(task, rootOps, aliasToPath, rootTasks);
-                if (i == 0)
-                    rootOps.addAll(mapRootOps);
-                else {
-                    List<Operator> leaves = new ArrayList<Operator>();
-                    getLeaves(rootOps, leaves);
-
-                    List<Operator> mapChildren = new ArrayList<Operator>();
-                    for (Operator childMap : mapRootOps) {
-                        if (childMap instanceof TableScanOperator) {
-                            TableScanDesc topDesc = (TableScanDesc) childMap.getConf();
-                            if (topDesc == null)
-                                mapChildren.add(childMap);
-                            else {
-                                rootOps.add(childMap);
-                            }
-                        } else
-                            mapChildren.add(childMap);
-                    }
-
-                    if (mapChildren.size() > 0) {
-                        for (Operator leaf : leaves)
-                            leaf.setChildOperators(mapChildren);
-                        for (Operator child : mapChildren)
-                            child.setParentOperators(leaves);
-                    }
-                }
-
-                MapredWork mr = (MapredWork) task.getWork();
-                HashMap<String, PartitionDesc> map = mr.getAliasToPartnInfo();
-
-                addAliasToPartition(aliasToPath, map);
-                toDelete.add(task);
-            }
-        }
-
-        for (Task<? extends Serializable> task : toDelete)
-            rootTasks.remove(task);
-
-        return rootOps;
-    }
-
-    private void addAliasToPartition(HashMap<String, PartitionDesc> aliasToPath, HashMap<String, PartitionDesc> map) {
-        Iterator<String> keys = map.keySet().iterator();
-        while (keys.hasNext()) {
-            String key = keys.next();
-            PartitionDesc part = map.get(key);
-            String[] names = key.split(":");
-            for (String name : names) {
-                aliasToPath.put(name, part);
-            }
-        }
-    }
-
-    private List<Operator> articulateMapReduceOperators(Task task, List<Operator> rootOps,
-            HashMap<String, PartitionDesc> aliasToPath, List<Task<? extends Serializable>> rootTasks) {
-        // System.out.println("!"+task.getName());
-        if (!(task instanceof MapRedTask)) {
-            if (!(task instanceof ConditionalTask)) {
-                rootTasks.add(task);
-                return null;
-            } else {
-                // remove map-reduce branches in condition task
-                ConditionalTask condition = (ConditionalTask) task;
-                List<Task<? extends Serializable>> branches = condition.getListTasks();
-                for (int i = branches.size() - 1; i >= 0; i--) {
-                    Task branch = branches.get(i);
-                    if (branch instanceof MapRedTask) {
-                        return articulateMapReduceOperators(branch, rootOps, aliasToPath, rootTasks);
-                    }
-                }
-                rootTasks.add(task);
-                return null;
-            }
-        }
-
-        MapredWork mr = (MapredWork) task.getWork();
-        HashMap<String, PartitionDesc> map = mr.getAliasToPartnInfo();
-
-        // put all aliasToParitionDesc mapping into the map
-        addAliasToPartition(aliasToPath, map);
-
-        MapRedTask mrtask = (MapRedTask) task;
-        MapredWork work = (MapredWork) mrtask.getWork();
-        HashMap<String, Operator<? extends Serializable>> operators = work.getAliasToWork();
-
-        Set entries = operators.entrySet();
-        Iterator<Entry<String, Operator>> iterator = entries.iterator();
-        List<Operator> mapRootOps = new ArrayList<Operator>();
-
-        // get map root operators
-        while (iterator.hasNext()) {
-            Operator next = iterator.next().getValue();
-            if (!mapRootOps.contains(next)) {
-                // clear that only for the case of union
-                mapRootOps.add(next);
-            }
-        }
-
-        // get map local work
-        MapredLocalWork localWork = work.getMapLocalWork();
-        if (localWork != null) {
-            HashMap<String, Operator<? extends Serializable>> localOperators = localWork.getAliasToWork();
-
-            Set localEntries = localOperators.entrySet();
-            Iterator<Entry<String, Operator>> localIterator = localEntries.iterator();
-            while (localIterator.hasNext()) {
-                mapRootOps.add(localIterator.next().getValue());
-            }
-
-            HashMap<String, FetchWork> localFetch = localWork.getAliasToFetchWork();
-            Set localFetchEntries = localFetch.entrySet();
-            Iterator<Entry<String, FetchWork>> localFetchIterator = localFetchEntries.iterator();
-            while (localFetchIterator.hasNext()) {
-                Entry<String, FetchWork> fetchMap = localFetchIterator.next();
-                FetchWork fetch = fetchMap.getValue();
-                String alias = fetchMap.getKey();
-                List<PartitionDesc> dirPart = fetch.getPartDesc();
-
-                // temporary hack: put the first partitionDesc into the map
-                aliasToPath.put(alias, dirPart.get(0));
-            }
-        }
-
-        Boolean visited = tasksVisited.get(task);
-        if (visited != null && visited.booleanValue() == true) {
-            return mapRootOps;
-        }
-
-        // do that only for union operator
-        for (Operator op : mapRootOps)
-            if (op.getParentOperators() != null)
-                op.getParentOperators().clear();
-
-        List<Operator> mapLeaves = new ArrayList<Operator>();
-        downToLeaves(mapRootOps, mapLeaves);
-        List<Operator> reduceOps = new ArrayList<Operator>();
-
-        if (work.getReducer() != null)
-            reduceOps.add(work.getReducer());
-
-        for (Operator mapLeaf : mapLeaves) {
-            mapLeaf.setChildOperators(reduceOps);
-        }
-
-        for (Operator reduceOp : reduceOps) {
-            if (reduceOp != null)
-                reduceOp.setParentOperators(mapLeaves);
-        }
-
-        List<Operator> leafs = new ArrayList<Operator>();
-        if (reduceOps.size() > 0) {
-            downToLeaves(reduceOps, leafs);
-        } else {
-            leafs = mapLeaves;
-        }
-
-        List<Operator> mapChildren = new ArrayList<Operator>();
-        if (task.getChildTasks() != null && task.getChildTasks().size() > 0) {
-            for (Object child : task.getChildTasks()) {
-                List<Operator> childMapOps = articulateMapReduceOperators((Task) child, rootOps, aliasToPath, rootTasks);
-                if (childMapOps == null)
-                    continue;
-
-                for (Operator childMap : childMapOps) {
-                    if (childMap instanceof TableScanOperator) {
-                        TableScanDesc topDesc = (TableScanDesc) childMap.getConf();
-                        if (topDesc == null)
-                            mapChildren.add(childMap);
-                        else {
-                            rootOps.add(childMap);
-                        }
-                    } else {
-                        // if not table scan, add the child
-                        mapChildren.add(childMap);
-                    }
-                }
-            }
-
-            if (mapChildren.size() > 0) {
-                int i = 0;
-                for (Operator leaf : leafs) {
-                    if (leaf.getChildOperators() == null || leaf.getChildOperators().size() == 0)
-                        leaf.setChildOperators(new ArrayList<Operator>());
-                    leaf.getChildOperators().add(mapChildren.get(i));
-                    i++;
-                }
-                i = 0;
-                for (Operator child : mapChildren) {
-                    if (child.getParentOperators() == null || child.getParentOperators().size() == 0)
-                        child.setParentOperators(new ArrayList<Operator>());
-                    child.getParentOperators().add(leafs.get(i));
-                    i++;
-                }
-            }
-        }
-
-        // mark this task as visited
-        this.tasksVisited.put(task, true);
-        return mapRootOps;
-    }
-
-    /**
-     * down to leaf nodes
-     * 
-     * @param ops
-     * @param leaves
-     */
-    private void downToLeaves(List<Operator> ops, List<Operator> leaves) {
-
-        // Operator currentOp;
-        for (Operator op : ops) {
-            if (op != null && op.getChildOperators() != null && op.getChildOperators().size() > 0) {
-                downToLeaves(op.getChildOperators(), leaves);
-            } else {
-                if (op != null && leaves.indexOf(op) < 0)
-                    leaves.add(op);
-            }
-        }
-    }
-
-    private void getLeaves(List<Operator> roots, List<Operator> currentLeaves) {
-        for (Operator op : roots) {
-            List<Operator> children = op.getChildOperators();
-            if (children == null || children.size() <= 0) {
-                currentLeaves.add(op);
-            } else {
-                getLeaves(children, currentLeaves);
-            }
-        }
-    }
-
-    private void executeHyraxJob(JobSpecification job) throws Exception {
-        String ipAddress = conf.get("hive.hyracks.host");
-        int port = Integer.parseInt(conf.get("hive.hyracks.port"));
-        String applicationName = conf.get("hive.hyracks.app");
-        //System.out.println("connect to " + ipAddress + " " + port);
-
-        IHyracksClientConnection hcc = new HyracksConnection(ipAddress, port);
-
-        //System.out.println("get connected");
-        long start = System.currentTimeMillis();
-        JobId jobId = hcc.startJob(applicationName, job);
-        hcc.waitForCompletion(jobId);
-
-        //System.out.println("job finished: " + jobId.toString());
-        // call all leave nodes to end
-        for (Operator leaf : leaveOps) {
-            jobClose(leaf);
-        }
-
-        long end = System.currentTimeMillis();
-        System.err.println(start + " " + end + " " + (end - start));
-    }
-
-    /**
-     * mv to final directory on hdfs (not real final)
-     * 
-     * @param leaf
-     * @throws Exception
-     */
-    private void jobClose(Operator leaf) throws Exception {
-        FileSinkOperator fsOp = (FileSinkOperator) leaf;
-        FileSinkDesc desc = fsOp.getConf();
-        boolean isNativeTable = !desc.getTableInfo().isNonNative();
-        if ((conf != null) && isNativeTable) {
-            String specPath = desc.getDirName();
-            DynamicPartitionCtx dpCtx = desc.getDynPartCtx();
-            // for 0.7.0
-            fsOp.mvFileToFinalPath(specPath, conf, true, LOG, dpCtx);
-            // for 0.8.0
-            // Utilities.mvFileToFinalPath(specPath, conf, true, LOG, dpCtx,
-            // desc);
-        }
-    }
-}