diff --git a/hyracks/hyracks-core/.classpath b/hyracks/hyracks-runtime/.classpath
similarity index 100%
rename from hyracks/hyracks-core/.classpath
rename to hyracks/hyracks-runtime/.classpath
diff --git a/hyracks/hyracks-core/.project b/hyracks/hyracks-runtime/.project
similarity index 94%
rename from hyracks/hyracks-core/.project
rename to hyracks/hyracks-runtime/.project
index edbc443..48ac49b 100644
--- a/hyracks/hyracks-core/.project
+++ b/hyracks/hyracks-runtime/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>hyracks-core</name>
+	<name>hyracks-runtime</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/hyracks/hyracks-core/pom.xml b/hyracks/hyracks-runtime/pom.xml
similarity index 97%
rename from hyracks/hyracks-core/pom.xml
rename to hyracks/hyracks-runtime/pom.xml
index e54a093..c779372 100644
--- a/hyracks/hyracks-core/pom.xml
+++ b/hyracks/hyracks-runtime/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-core</artifactId>
+  <artifactId>hyracks-runtime</artifactId>
   <version>0.1.0</version>
   <build>
     <plugins>
diff --git a/hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/comm/ConnectionEntry.java b/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/comm/ConnectionEntry.java
similarity index 100%
rename from hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/comm/ConnectionEntry.java
rename to hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/comm/ConnectionEntry.java
diff --git a/hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/comm/ConnectionManager.java b/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/comm/ConnectionManager.java
similarity index 100%
rename from hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/comm/ConnectionManager.java
rename to hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/comm/ConnectionManager.java
diff --git a/hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/comm/DemuxDataReceiveListenerFactory.java b/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/comm/DemuxDataReceiveListenerFactory.java
similarity index 100%
rename from hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/comm/DemuxDataReceiveListenerFactory.java
rename to hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/comm/DemuxDataReceiveListenerFactory.java
diff --git a/hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/comm/Endpoint.java b/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/comm/Endpoint.java
similarity index 100%
rename from hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/comm/Endpoint.java
rename to hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/comm/Endpoint.java
diff --git a/hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/comm/IReceiverProtocolStack.java b/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/comm/IReceiverProtocolStack.java
similarity index 100%
rename from hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/comm/IReceiverProtocolStack.java
rename to hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/comm/IReceiverProtocolStack.java
diff --git a/hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/comm/ISenderProtocolStack.java b/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/comm/ISenderProtocolStack.java
similarity index 100%
rename from hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/comm/ISenderProtocolStack.java
rename to hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/comm/ISenderProtocolStack.java
diff --git a/hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/comm/NetworkAddress.java b/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/comm/NetworkAddress.java
similarity index 100%
rename from hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/comm/NetworkAddress.java
rename to hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/comm/NetworkAddress.java
diff --git a/hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/config/CCConfig.java b/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/config/CCConfig.java
similarity index 100%
rename from hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/config/CCConfig.java
rename to hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/config/CCConfig.java
diff --git a/hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/config/NCConfig.java b/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/config/NCConfig.java
similarity index 100%
rename from hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/config/NCConfig.java
rename to hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/config/NCConfig.java
diff --git a/hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/context/HyracksContext.java b/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/context/HyracksContext.java
similarity index 100%
rename from hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/context/HyracksContext.java
rename to hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/context/HyracksContext.java
diff --git a/hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/controller/AbstractRemoteService.java b/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/controller/AbstractRemoteService.java
similarity index 100%
rename from hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/controller/AbstractRemoteService.java
rename to hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/controller/AbstractRemoteService.java
diff --git a/hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/controller/NodeCapability.java b/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/controller/NodeCapability.java
similarity index 100%
rename from hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/controller/NodeCapability.java
rename to hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/controller/NodeCapability.java
diff --git a/hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/controller/NodeParameters.java b/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/controller/NodeParameters.java
similarity index 100%
rename from hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/controller/NodeParameters.java
rename to hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/controller/NodeParameters.java
diff --git a/hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/controller/clustercontroller/ClusterControllerService.java b/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/controller/clustercontroller/ClusterControllerService.java
similarity index 100%
rename from hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/controller/clustercontroller/ClusterControllerService.java
rename to hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/controller/clustercontroller/ClusterControllerService.java
diff --git a/hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/controller/clustercontroller/IClusterController.java b/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/controller/clustercontroller/IClusterController.java
similarity index 100%
rename from hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/controller/clustercontroller/IClusterController.java
rename to hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/controller/clustercontroller/IClusterController.java
diff --git a/hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/controller/clustercontroller/IJobManager.java b/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/controller/clustercontroller/IJobManager.java
similarity index 100%
rename from hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/controller/clustercontroller/IJobManager.java
rename to hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/controller/clustercontroller/IJobManager.java
diff --git a/hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/controller/clustercontroller/JOLJobManagerImpl.java b/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/controller/clustercontroller/JOLJobManagerImpl.java
similarity index 100%
rename from hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/controller/clustercontroller/JOLJobManagerImpl.java
rename to hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/controller/clustercontroller/JOLJobManagerImpl.java
diff --git a/hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/controller/clustercontroller/JobPlanBuilder.java b/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/controller/clustercontroller/JobPlanBuilder.java
similarity index 100%
rename from hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/controller/clustercontroller/JobPlanBuilder.java
rename to hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/controller/clustercontroller/JobPlanBuilder.java
diff --git a/hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/controller/clustercontroller/JobPlanner.java b/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/controller/clustercontroller/JobPlanner.java
similarity index 100%
rename from hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/controller/clustercontroller/JobPlanner.java
rename to hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/controller/clustercontroller/JobPlanner.java
diff --git a/hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/controller/clustercontroller/NodeControllerState.java b/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/controller/clustercontroller/NodeControllerState.java
similarity index 100%
rename from hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/controller/clustercontroller/NodeControllerState.java
rename to hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/controller/clustercontroller/NodeControllerState.java
diff --git a/hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/controller/clustercontroller/StageProgress.java b/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/controller/clustercontroller/StageProgress.java
similarity index 100%
rename from hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/controller/clustercontroller/StageProgress.java
rename to hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/controller/clustercontroller/StageProgress.java
diff --git a/hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/controller/nodecontroller/INodeController.java b/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/controller/nodecontroller/INodeController.java
similarity index 100%
rename from hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/controller/nodecontroller/INodeController.java
rename to hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/controller/nodecontroller/INodeController.java
diff --git a/hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/controller/nodecontroller/Joblet.java b/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/controller/nodecontroller/Joblet.java
similarity index 100%
rename from hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/controller/nodecontroller/Joblet.java
rename to hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/controller/nodecontroller/Joblet.java
diff --git a/hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/controller/nodecontroller/NodeControllerService.java b/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/controller/nodecontroller/NodeControllerService.java
similarity index 100%
rename from hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/controller/nodecontroller/NodeControllerService.java
rename to hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/controller/nodecontroller/NodeControllerService.java
diff --git a/hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/controller/nodecontroller/Stagelet.java b/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/controller/nodecontroller/Stagelet.java
similarity index 100%
rename from hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/controller/nodecontroller/Stagelet.java
rename to hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/controller/nodecontroller/Stagelet.java
diff --git a/hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/driver/CCDriver.java b/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/driver/CCDriver.java
similarity index 100%
rename from hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/driver/CCDriver.java
rename to hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/driver/CCDriver.java
diff --git a/hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/driver/NCDriver.java b/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/driver/NCDriver.java
similarity index 100%
rename from hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/driver/NCDriver.java
rename to hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/driver/NCDriver.java
diff --git a/hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/job/IOperatorDescriptorVisitor.java b/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/job/IOperatorDescriptorVisitor.java
similarity index 100%
rename from hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/job/IOperatorDescriptorVisitor.java
rename to hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/job/IOperatorDescriptorVisitor.java
diff --git a/hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/job/JobPlan.java b/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/job/JobPlan.java
similarity index 100%
rename from hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/job/JobPlan.java
rename to hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/job/JobPlan.java
diff --git a/hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/job/JobStage.java b/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/job/JobStage.java
similarity index 100%
rename from hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/job/JobStage.java
rename to hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/job/JobStage.java
diff --git a/hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/job/PlanUtils.java b/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/job/PlanUtils.java
similarity index 100%
rename from hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/job/PlanUtils.java
rename to hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/job/PlanUtils.java
diff --git a/hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/resources/ResourceManager.java b/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/resources/ResourceManager.java
similarity index 100%
rename from hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/resources/ResourceManager.java
rename to hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/resources/ResourceManager.java
diff --git a/hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/runtime/OperatorRunnable.java b/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/runtime/OperatorRunnable.java
similarity index 100%
rename from hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/runtime/OperatorRunnable.java
rename to hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/runtime/OperatorRunnable.java
diff --git a/hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/service/AbstractService.java b/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/service/AbstractService.java
similarity index 100%
rename from hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/service/AbstractService.java
rename to hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/service/AbstractService.java
diff --git a/hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/service/ILifeCycle.java b/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/service/ILifeCycle.java
similarity index 100%
rename from hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/service/ILifeCycle.java
rename to hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/service/ILifeCycle.java
diff --git a/hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/service/IService.java b/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/service/IService.java
similarity index 100%
rename from hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/service/IService.java
rename to hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/service/IService.java
diff --git a/hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/web/WebServer.java b/hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/web/WebServer.java
similarity index 100%
rename from hyracks/hyracks-core/src/main/java/edu/uci/ics/hyracks/web/WebServer.java
rename to hyracks/hyracks-runtime/src/main/java/edu/uci/ics/hyracks/web/WebServer.java
diff --git a/hyracks/hyracks-core/src/main/resources/edu/uci/ics/hyracks/controller/clustercontroller/scheduler.olg b/hyracks/hyracks-runtime/src/main/resources/edu/uci/ics/hyracks/controller/clustercontroller/scheduler.olg
similarity index 100%
rename from hyracks/hyracks-core/src/main/resources/edu/uci/ics/hyracks/controller/clustercontroller/scheduler.olg
rename to hyracks/hyracks-runtime/src/main/resources/edu/uci/ics/hyracks/controller/clustercontroller/scheduler.olg
diff --git a/hyracks/hyracks-server/pom.xml b/hyracks/hyracks-server/pom.xml
index 0cdd030..ffb03c5 100644
--- a/hyracks/hyracks-server/pom.xml
+++ b/hyracks/hyracks-server/pom.xml
@@ -85,7 +85,7 @@
   	</dependency>
   	<dependency>
   		<groupId>edu.uci.ics.hyracks</groupId>
-  		<artifactId>hyracks-core</artifactId>
+  		<artifactId>hyracks-runtime</artifactId>
   		<version>0.1.0</version>
   		<type>jar</type>
   		<scope>compile</scope>
diff --git a/hyracks/pom.xml b/hyracks/pom.xml
index f251ebc..188fad6 100644
--- a/hyracks/pom.xml
+++ b/hyracks/pom.xml
@@ -9,7 +9,7 @@
     <module>hyracks-api</module>
     <module>hyracks-dataflow-common</module>
     <module>hyracks-dataflow-std</module>
-    <module>hyracks-core</module>
+    <module>hyracks-runtime</module>
     <module>hyracks-server</module>
   </modules>
 </project>