diff --git a/hyracks/hyracks-server/.classpath b/hyracks/hyracks-examples/hyracks-integration-tests/.classpath
similarity index 100%
rename from hyracks/hyracks-server/.classpath
rename to hyracks/hyracks-examples/hyracks-integration-tests/.classpath
diff --git a/hyracks/hyracks-server/.project b/hyracks/hyracks-examples/hyracks-integration-tests/.project
similarity index 92%
rename from hyracks/hyracks-server/.project
rename to hyracks/hyracks-examples/hyracks-integration-tests/.project
index 89dd035..91bbbe6 100644
--- a/hyracks/hyracks-server/.project
+++ b/hyracks/hyracks-examples/hyracks-integration-tests/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>hyracks-server</name>
+	<name>hyracks-integration-tests</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/hyracks/hyracks-server/.settings/org.eclipse.jdt.core.prefs b/hyracks/hyracks-examples/hyracks-integration-tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from hyracks/hyracks-server/.settings/org.eclipse.jdt.core.prefs
rename to hyracks/hyracks-examples/hyracks-integration-tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/hyracks/hyracks-server/.settings/org.maven.ide.eclipse.prefs b/hyracks/hyracks-examples/hyracks-integration-tests/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from hyracks/hyracks-server/.settings/org.maven.ide.eclipse.prefs
rename to hyracks/hyracks-examples/hyracks-integration-tests/.settings/org.maven.ide.eclipse.prefs
diff --git a/hyracks/hyracks-server/data/dblp.txt b/hyracks/hyracks-examples/hyracks-integration-tests/data/dblp.txt
similarity index 100%
rename from hyracks/hyracks-server/data/dblp.txt
rename to hyracks/hyracks-examples/hyracks-integration-tests/data/dblp.txt
diff --git a/hyracks/hyracks-server/data/tpch0.001/customer-part1.tbl b/hyracks/hyracks-examples/hyracks-integration-tests/data/tpch0.001/customer-part1.tbl
similarity index 100%
rename from hyracks/hyracks-server/data/tpch0.001/customer-part1.tbl
rename to hyracks/hyracks-examples/hyracks-integration-tests/data/tpch0.001/customer-part1.tbl
diff --git a/hyracks/hyracks-server/data/tpch0.001/customer-part2.tbl b/hyracks/hyracks-examples/hyracks-integration-tests/data/tpch0.001/customer-part2.tbl
similarity index 100%
rename from hyracks/hyracks-server/data/tpch0.001/customer-part2.tbl
rename to hyracks/hyracks-examples/hyracks-integration-tests/data/tpch0.001/customer-part2.tbl
diff --git a/hyracks/hyracks-server/data/tpch0.001/customer.tbl b/hyracks/hyracks-examples/hyracks-integration-tests/data/tpch0.001/customer.tbl
similarity index 100%
rename from hyracks/hyracks-server/data/tpch0.001/customer.tbl
rename to hyracks/hyracks-examples/hyracks-integration-tests/data/tpch0.001/customer.tbl
diff --git a/hyracks/hyracks-server/data/tpch0.001/lineitem.tbl b/hyracks/hyracks-examples/hyracks-integration-tests/data/tpch0.001/lineitem.tbl
similarity index 100%
rename from hyracks/hyracks-server/data/tpch0.001/lineitem.tbl
rename to hyracks/hyracks-examples/hyracks-integration-tests/data/tpch0.001/lineitem.tbl
diff --git a/hyracks/hyracks-server/data/tpch0.001/nation.tbl b/hyracks/hyracks-examples/hyracks-integration-tests/data/tpch0.001/nation.tbl
similarity index 100%
rename from hyracks/hyracks-server/data/tpch0.001/nation.tbl
rename to hyracks/hyracks-examples/hyracks-integration-tests/data/tpch0.001/nation.tbl
diff --git a/hyracks/hyracks-server/data/tpch0.001/orders-part1.tbl b/hyracks/hyracks-examples/hyracks-integration-tests/data/tpch0.001/orders-part1.tbl
similarity index 100%
rename from hyracks/hyracks-server/data/tpch0.001/orders-part1.tbl
rename to hyracks/hyracks-examples/hyracks-integration-tests/data/tpch0.001/orders-part1.tbl
diff --git a/hyracks/hyracks-server/data/tpch0.001/orders-part2.tbl b/hyracks/hyracks-examples/hyracks-integration-tests/data/tpch0.001/orders-part2.tbl
similarity index 100%
rename from hyracks/hyracks-server/data/tpch0.001/orders-part2.tbl
rename to hyracks/hyracks-examples/hyracks-integration-tests/data/tpch0.001/orders-part2.tbl
diff --git a/hyracks/hyracks-server/data/tpch0.001/orders.tbl b/hyracks/hyracks-examples/hyracks-integration-tests/data/tpch0.001/orders.tbl
similarity index 100%
rename from hyracks/hyracks-server/data/tpch0.001/orders.tbl
rename to hyracks/hyracks-examples/hyracks-integration-tests/data/tpch0.001/orders.tbl
diff --git a/hyracks/hyracks-server/data/tpch0.001/part.tbl b/hyracks/hyracks-examples/hyracks-integration-tests/data/tpch0.001/part.tbl
similarity index 100%
rename from hyracks/hyracks-server/data/tpch0.001/part.tbl
rename to hyracks/hyracks-examples/hyracks-integration-tests/data/tpch0.001/part.tbl
diff --git a/hyracks/hyracks-server/data/tpch0.001/partsupp.tbl b/hyracks/hyracks-examples/hyracks-integration-tests/data/tpch0.001/partsupp.tbl
similarity index 100%
rename from hyracks/hyracks-server/data/tpch0.001/partsupp.tbl
rename to hyracks/hyracks-examples/hyracks-integration-tests/data/tpch0.001/partsupp.tbl
diff --git a/hyracks/hyracks-server/data/tpch0.001/region.tbl b/hyracks/hyracks-examples/hyracks-integration-tests/data/tpch0.001/region.tbl
similarity index 100%
rename from hyracks/hyracks-server/data/tpch0.001/region.tbl
rename to hyracks/hyracks-examples/hyracks-integration-tests/data/tpch0.001/region.tbl
diff --git a/hyracks/hyracks-server/data/tpch0.001/supplier.tbl b/hyracks/hyracks-examples/hyracks-integration-tests/data/tpch0.001/supplier.tbl
similarity index 100%
rename from hyracks/hyracks-server/data/tpch0.001/supplier.tbl
rename to hyracks/hyracks-examples/hyracks-integration-tests/data/tpch0.001/supplier.tbl
diff --git a/hyracks/hyracks-server/data/tpch0.001/tpch.ddl b/hyracks/hyracks-examples/hyracks-integration-tests/data/tpch0.001/tpch.ddl
similarity index 100%
rename from hyracks/hyracks-server/data/tpch0.001/tpch.ddl
rename to hyracks/hyracks-examples/hyracks-integration-tests/data/tpch0.001/tpch.ddl
diff --git a/hyracks/hyracks-server/data/words.txt b/hyracks/hyracks-examples/hyracks-integration-tests/data/words.txt
similarity index 100%
rename from hyracks/hyracks-server/data/words.txt
rename to hyracks/hyracks-examples/hyracks-integration-tests/data/words.txt
diff --git a/hyracks/hyracks-server/docs/README b/hyracks/hyracks-examples/hyracks-integration-tests/docs/README
similarity index 100%
rename from hyracks/hyracks-server/docs/README
rename to hyracks/hyracks-examples/hyracks-integration-tests/docs/README
diff --git a/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml b/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml
new file mode 100644
index 0000000..503dc72
--- /dev/null
+++ b/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml
@@ -0,0 +1,57 @@
+<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>hyracks-server</artifactId>
+  <version>0.1.0</version>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.0.2</version>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <forkMode>pertest</forkMode>
+          <argLine>-enableassertions</argLine>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+  	<dependency>
+  		<groupId>junit</groupId>
+  		<artifactId>junit</artifactId>
+  		<version>4.8.1</version>
+  		<type>jar</type>
+  		<scope>test</scope>
+  	</dependency>
+  	<dependency>
+  		<groupId>edu.uci.ics.hyracks</groupId>
+  		<artifactId>hyracks-dataflow-std</artifactId>
+  		<version>0.1.0</version>
+  		<type>jar</type>
+  		<scope>compile</scope>
+  	</dependency>
+  	<dependency>
+  		<groupId>edu.uci.ics.hyracks</groupId>
+  		<artifactId>hyracks-control-cc</artifactId>
+  		<version>0.1.0</version>
+  		<type>jar</type>
+  		<scope>compile</scope>
+  	</dependency>
+  	<dependency>
+  		<groupId>edu.uci.ics.hyracks</groupId>
+  		<artifactId>hyracks-control-nc</artifactId>
+  		<version>0.1.0</version>
+  		<type>jar</type>
+  		<scope>compile</scope>
+  	</dependency>
+  </dependencies>
+</project>
diff --git a/hyracks/hyracks-server/src/main/assembly/binary-assembly.xml b/hyracks/hyracks-examples/hyracks-integration-tests/src/main/assembly/binary-assembly.xml
similarity index 100%
rename from hyracks/hyracks-server/src/main/assembly/binary-assembly.xml
rename to hyracks/hyracks-examples/hyracks-integration-tests/src/main/assembly/binary-assembly.xml
diff --git a/hyracks/hyracks-server/src/test/java/edu/uci/ics/hyracks/tests/comm/SerializationDeserializationTest.java b/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/edu/uci/ics/hyracks/tests/comm/SerializationDeserializationTest.java
similarity index 100%
rename from hyracks/hyracks-server/src/test/java/edu/uci/ics/hyracks/tests/comm/SerializationDeserializationTest.java
rename to hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/edu/uci/ics/hyracks/tests/comm/SerializationDeserializationTest.java
diff --git a/hyracks/hyracks-server/src/test/java/edu/uci/ics/hyracks/tests/integration/AbstractIntegrationTest.java b/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/edu/uci/ics/hyracks/tests/integration/AbstractIntegrationTest.java
similarity index 100%
rename from hyracks/hyracks-server/src/test/java/edu/uci/ics/hyracks/tests/integration/AbstractIntegrationTest.java
rename to hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/edu/uci/ics/hyracks/tests/integration/AbstractIntegrationTest.java
diff --git a/hyracks/hyracks-server/src/test/java/edu/uci/ics/hyracks/tests/integration/CountOfCountsTest.java b/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/edu/uci/ics/hyracks/tests/integration/CountOfCountsTest.java
similarity index 100%
rename from hyracks/hyracks-server/src/test/java/edu/uci/ics/hyracks/tests/integration/CountOfCountsTest.java
rename to hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/edu/uci/ics/hyracks/tests/integration/CountOfCountsTest.java
diff --git a/hyracks/hyracks-server/src/test/java/edu/uci/ics/hyracks/tests/integration/ScanPrintTest.java b/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/edu/uci/ics/hyracks/tests/integration/ScanPrintTest.java
similarity index 100%
rename from hyracks/hyracks-server/src/test/java/edu/uci/ics/hyracks/tests/integration/ScanPrintTest.java
rename to hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/edu/uci/ics/hyracks/tests/integration/ScanPrintTest.java
diff --git a/hyracks/hyracks-server/src/test/java/edu/uci/ics/hyracks/tests/integration/SortMergeTest.java b/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/edu/uci/ics/hyracks/tests/integration/SortMergeTest.java
similarity index 100%
rename from hyracks/hyracks-server/src/test/java/edu/uci/ics/hyracks/tests/integration/SortMergeTest.java
rename to hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/edu/uci/ics/hyracks/tests/integration/SortMergeTest.java
diff --git a/hyracks/hyracks-server/src/test/java/edu/uci/ics/hyracks/tests/integration/TPCHCustomerOrderHashJoinTest.java b/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/edu/uci/ics/hyracks/tests/integration/TPCHCustomerOrderHashJoinTest.java
similarity index 100%
rename from hyracks/hyracks-server/src/test/java/edu/uci/ics/hyracks/tests/integration/TPCHCustomerOrderHashJoinTest.java
rename to hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/edu/uci/ics/hyracks/tests/integration/TPCHCustomerOrderHashJoinTest.java
diff --git a/hyracks/hyracks-examples/pom.xml b/hyracks/hyracks-examples/pom.xml
index 54ab6ff..37ac6be 100644
--- a/hyracks/hyracks-examples/pom.xml
+++ b/hyracks/hyracks-examples/pom.xml
@@ -7,5 +7,6 @@
 
   <modules>
     <module>tpch-example</module>
+    <module>hyracks-integration-tests</module>
   </modules>
 </project>
diff --git a/hyracks/hyracks-server/pom.xml b/hyracks/hyracks-server/pom.xml
deleted file mode 100644
index aff2f03..0000000
--- a/hyracks/hyracks-server/pom.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<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>hyracks-server</artifactId>
-  <version>0.1.0</version>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <forkMode>pertest</forkMode>
-          <argLine>-enableassertions</argLine>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>appassembler-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <configuration>
-              <programs>
-                <program>
-                  <mainClass>edu.uci.ics.hyracks.control.cc.CCDriver</mainClass>
-                  <name>hyrackscc</name>
-                </program>
-                <program>
-                  <mainClass>edu.uci.ics.hyracks.control.nc.NCDriver</mainClass>
-                  <name>hyracksnc</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>
-    </plugins>
-  </build>
-  <dependencies>
-  	<dependency>
-  		<groupId>junit</groupId>
-  		<artifactId>junit</artifactId>
-  		<version>4.8.1</version>
-  		<type>jar</type>
-  		<scope>test</scope>
-  	</dependency>
-  	<dependency>
-  		<groupId>edu.uci.ics.hyracks</groupId>
-  		<artifactId>hyracks-dataflow-std</artifactId>
-  		<version>0.1.0</version>
-  		<type>jar</type>
-  		<scope>compile</scope>
-  	</dependency>
-  	<dependency>
-  		<groupId>edu.uci.ics.hyracks</groupId>
-  		<artifactId>hyracks-control-cc</artifactId>
-  		<version>0.1.0</version>
-  		<type>jar</type>
-  		<scope>compile</scope>
-  	</dependency>
-  	<dependency>
-  		<groupId>edu.uci.ics.hyracks</groupId>
-  		<artifactId>hyracks-control-nc</artifactId>
-  		<version>0.1.0</version>
-  		<type>jar</type>
-  		<scope>compile</scope>
-  	</dependency>
-  </dependencies>
-</project>
diff --git a/hyracks/pom.xml b/hyracks/pom.xml
index 736e654..8ac8f62 100644
--- a/hyracks/pom.xml
+++ b/hyracks/pom.xml
@@ -13,7 +13,6 @@
     <module>hyracks-control-common</module>
     <module>hyracks-control-cc</module>
     <module>hyracks-control-nc</module>
-    <module>hyracks-server</module>
     <module>hyracks-cli</module>
     <module>hyracks-examples</module>
   </modules>