diff --git a/hyracks/hyracks-runtime/.classpath b/hyracks/hyracks-control-nc/.classpath
similarity index 100%
rename from hyracks/hyracks-runtime/.classpath
rename to hyracks/hyracks-control-nc/.classpath
diff --git a/hyracks/hyracks-runtime/.project b/hyracks/hyracks-control-nc/.project
similarity index 93%
rename from hyracks/hyracks-runtime/.project
rename to hyracks/hyracks-control-nc/.project
index 48ac49b..83d4a09 100644
--- a/hyracks/hyracks-runtime/.project
+++ b/hyracks/hyracks-control-nc/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>hyracks-runtime</name>
+	<name>hyracks-control-nc</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/hyracks/hyracks-runtime/pom.xml b/hyracks/hyracks-control-nc/pom.xml
similarity index 97%
rename from hyracks/hyracks-runtime/pom.xml
rename to hyracks/hyracks-control-nc/pom.xml
index 5091865..0a59c1f 100644
--- a/hyracks/hyracks-runtime/pom.xml
+++ b/hyracks/hyracks-control-nc/pom.xml
@@ -1,7 +1,7 @@
 <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-runtime</artifactId>
+  <artifactId>hyracks-control-nc</artifactId>
   <version>0.1.0</version>
   <build>
     <plugins>
diff --git a/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/control/nc/Joblet.java b/hyracks/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/Joblet.java
similarity index 100%
rename from hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/control/nc/Joblet.java
rename to hyracks/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/Joblet.java
diff --git a/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/control/nc/NCDriver.java b/hyracks/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/NCDriver.java
similarity index 100%
rename from hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/control/nc/NCDriver.java
rename to hyracks/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/NCDriver.java
diff --git a/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/control/nc/NodeControllerService.java b/hyracks/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/NodeControllerService.java
similarity index 100%
rename from hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/control/nc/NodeControllerService.java
rename to hyracks/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/NodeControllerService.java
diff --git a/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/control/nc/Stagelet.java b/hyracks/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/Stagelet.java
similarity index 100%
rename from hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/control/nc/Stagelet.java
rename to hyracks/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/Stagelet.java
diff --git a/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/control/nc/comm/ConnectionEntry.java b/hyracks/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/comm/ConnectionEntry.java
similarity index 100%
rename from hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/control/nc/comm/ConnectionEntry.java
rename to hyracks/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/comm/ConnectionEntry.java
diff --git a/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/control/nc/comm/ConnectionManager.java b/hyracks/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/comm/ConnectionManager.java
similarity index 100%
rename from hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/control/nc/comm/ConnectionManager.java
rename to hyracks/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/comm/ConnectionManager.java
diff --git a/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/control/nc/comm/DemuxDataReceiveListenerFactory.java b/hyracks/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/comm/DemuxDataReceiveListenerFactory.java
similarity index 100%
rename from hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/control/nc/comm/DemuxDataReceiveListenerFactory.java
rename to hyracks/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/comm/DemuxDataReceiveListenerFactory.java
diff --git a/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/control/nc/runtime/HyracksContext.java b/hyracks/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/runtime/HyracksContext.java
similarity index 100%
rename from hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/control/nc/runtime/HyracksContext.java
rename to hyracks/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/runtime/HyracksContext.java
diff --git a/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/control/nc/runtime/OperatorRunnable.java b/hyracks/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/runtime/OperatorRunnable.java
similarity index 100%
rename from hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/control/nc/runtime/OperatorRunnable.java
rename to hyracks/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/runtime/OperatorRunnable.java
diff --git a/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/control/nc/runtime/ResourceManager.java b/hyracks/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/runtime/ResourceManager.java
similarity index 100%
rename from hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/control/nc/runtime/ResourceManager.java
rename to hyracks/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/runtime/ResourceManager.java
diff --git a/hyracks/hyracks-runtime/src/main/resources/edu/uci/ics/hyracks/control/cc/scheduler.olg b/hyracks/hyracks-control-nc/src/main/resources/edu/uci/ics/hyracks/control/cc/scheduler.olg
similarity index 100%
rename from hyracks/hyracks-runtime/src/main/resources/edu/uci/ics/hyracks/control/cc/scheduler.olg
rename to hyracks/hyracks-control-nc/src/main/resources/edu/uci/ics/hyracks/control/cc/scheduler.olg
diff --git a/hyracks/hyracks-server/pom.xml b/hyracks/hyracks-server/pom.xml
index 213da7f..abcaeb0 100644
--- a/hyracks/hyracks-server/pom.xml
+++ b/hyracks/hyracks-server/pom.xml
@@ -84,14 +84,14 @@
   	</dependency>
   	<dependency>
   		<groupId>edu.uci.ics.hyracks</groupId>
-  		<artifactId>hyracks-runtime</artifactId>
+  		<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-cc</artifactId>
+  		<artifactId>hyracks-control-nc</artifactId>
   		<version>0.1.0</version>
   		<type>jar</type>
   		<scope>compile</scope>
diff --git a/hyracks/pom.xml b/hyracks/pom.xml
index 2020cb6..f6742d1 100644
--- a/hyracks/pom.xml
+++ b/hyracks/pom.xml
@@ -10,7 +10,8 @@
     <module>hyracks-dataflow-common</module>
     <module>hyracks-dataflow-std</module>
     <module>hyracks-control-common</module>
-    <module>hyracks-runtime</module>
+    <module>hyracks-control-cc</module>
+    <module>hyracks-control-nc</module>
     <module>hyracks-server</module>
   </modules>
 </project>