diff --git a/hyracks-core/src/main/java/edu/uci/ics/hyracks/controller/clustercontroller/JobPlanner.java b/hyracks-core/src/main/java/edu/uci/ics/hyracks/controller/clustercontroller/JobPlanner.java
index 816570e..314c600 100644
--- a/hyracks-core/src/main/java/edu/uci/ics/hyracks/controller/clustercontroller/JobPlanner.java
+++ b/hyracks-core/src/main/java/edu/uci/ics/hyracks/controller/clustercontroller/JobPlanner.java
@@ -31,10 +31,10 @@
 import edu.uci.ics.hyracks.api.job.JobFlag;
 import edu.uci.ics.hyracks.api.job.JobSpecification;
 import edu.uci.ics.hyracks.api.util.Pair;
-import edu.uci.ics.hyracks.dataflow.base.IOperatorDescriptorVisitor;
-import edu.uci.ics.hyracks.dataflow.util.PlanUtils;
+import edu.uci.ics.hyracks.job.IOperatorDescriptorVisitor;
 import edu.uci.ics.hyracks.job.JobPlan;
 import edu.uci.ics.hyracks.job.JobStage;
+import edu.uci.ics.hyracks.job.PlanUtils;
 
 public class JobPlanner {
     private static final Logger LOGGER = Logger.getLogger(JobPlanner.class.getName());
diff --git a/hyracks-core/src/main/java/edu/uci/ics/hyracks/dataflow/base/IOperatorDescriptorVisitor.java b/hyracks-core/src/main/java/edu/uci/ics/hyracks/job/IOperatorDescriptorVisitor.java
similarity index 94%
rename from hyracks-core/src/main/java/edu/uci/ics/hyracks/dataflow/base/IOperatorDescriptorVisitor.java
rename to hyracks-core/src/main/java/edu/uci/ics/hyracks/job/IOperatorDescriptorVisitor.java
index c01d183..0e63c94 100644
--- a/hyracks-core/src/main/java/edu/uci/ics/hyracks/dataflow/base/IOperatorDescriptorVisitor.java
+++ b/hyracks-core/src/main/java/edu/uci/ics/hyracks/job/IOperatorDescriptorVisitor.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.hyracks.dataflow.base;
+package edu.uci.ics.hyracks.job;
 
 import edu.uci.ics.hyracks.api.dataflow.IOperatorDescriptor;
 
diff --git a/hyracks-core/src/main/java/edu/uci/ics/hyracks/dataflow/util/PlanUtils.java b/hyracks-core/src/main/java/edu/uci/ics/hyracks/job/PlanUtils.java
similarity index 92%
rename from hyracks-core/src/main/java/edu/uci/ics/hyracks/dataflow/util/PlanUtils.java
rename to hyracks-core/src/main/java/edu/uci/ics/hyracks/job/PlanUtils.java
index e22c60b..e2337f7 100644
--- a/hyracks-core/src/main/java/edu/uci/ics/hyracks/dataflow/util/PlanUtils.java
+++ b/hyracks-core/src/main/java/edu/uci/ics/hyracks/job/PlanUtils.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.hyracks.dataflow.util;
+package edu.uci.ics.hyracks.job;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -20,7 +20,6 @@
 import edu.uci.ics.hyracks.api.dataflow.IOperatorDescriptor;
 import edu.uci.ics.hyracks.api.dataflow.OperatorDescriptorId;
 import edu.uci.ics.hyracks.api.job.JobSpecification;
-import edu.uci.ics.hyracks.dataflow.base.IOperatorDescriptorVisitor;
 
 public class PlanUtils {
     public static void visit(JobSpecification spec, IOperatorDescriptorVisitor visitor) throws Exception {