diff --git a/lib/galaxy/jobs/datasets.py b/lib/galaxy/job_execution/datasets.py
similarity index 100%
rename from lib/galaxy/jobs/datasets.py
rename to lib/galaxy/job_execution/datasets.py
diff --git a/lib/galaxy/jobs/__init__.py b/lib/galaxy/jobs/__init__.py
index 96f557ef29e..e69f8cb30d2 100644
--- a/lib/galaxy/jobs/__init__.py
+++ b/lib/galaxy/jobs/__init__.py
@@ -26,6 +26,12 @@ import galaxy
 from galaxy import model, util
 from galaxy.datatypes import sniff
 from galaxy.exceptions import ObjectInvalid, ObjectNotFound
+from galaxy.job_execution.datasets import (
+    DatasetPath,
+    NullDatasetPathRewriter,
+    OutputsToWorkingDirectoryPathRewriter,
+    TaskPathRewriter
+)
 from galaxy.job_execution.output_collect import collect_extra_files
 from galaxy.jobs.actions.post import ActionBox
 from galaxy.jobs.mapper import JobMappingException, JobRunnerMapper
@@ -39,8 +45,6 @@ from galaxy.util.bunch import Bunch
 from galaxy.util.expressions import ExpressionContext
 from galaxy.util.xml_macros import load
 from galaxy.web.stack.handlers import ConfiguresHandlers
-from .datasets import (DatasetPath, NullDatasetPathRewriter,
-    OutputsToWorkingDirectoryPathRewriter, TaskPathRewriter)
 
 log = logging.getLogger(__name__)
 
diff --git a/lib/galaxy/tools/actions/metadata.py b/lib/galaxy/tools/actions/metadata.py
index f82206a8249..da5ec68af9f 100644
--- a/lib/galaxy/tools/actions/metadata.py
+++ b/lib/galaxy/tools/actions/metadata.py
@@ -2,7 +2,7 @@ import logging
 import os
 from json import dumps
 
-from galaxy.jobs.datasets import DatasetPath
+from galaxy.job_execution.datasets import DatasetPath
 from galaxy.metadata import get_metadata_compute_strategy
 from galaxy.util.odict import odict
 from . import ToolAction
diff --git a/lib/galaxy/tools/evaluation.py b/lib/galaxy/tools/evaluation.py
index 01d25922a9b..9d95987e8cf 100644
--- a/lib/galaxy/tools/evaluation.py
+++ b/lib/galaxy/tools/evaluation.py
@@ -7,7 +7,7 @@ import tempfile
 from six import string_types
 
 from galaxy import model
-from galaxy.jobs.datasets import dataset_path_rewrites
+from galaxy.job_execution.datasets import dataset_path_rewrites
 from galaxy.model.none_like import NoneDataset
 from galaxy.tools import global_tool_errors
 from galaxy.tools.parameters import (
diff --git a/packages/job_execution/tests/test_datasets.py b/packages/job_execution/tests/test_datasets.py
new file mode 120000
index 00000000000..8b6edf2669d
--- /dev/null
+++ b/packages/job_execution/tests/test_datasets.py
@@ -0,0 +1 @@
+../../../test/unit/jobs/test_datasets.py
\ No newline at end of file
diff --git a/test/unit/jobs/test_datasets.py b/test/unit/jobs/test_datasets.py
index a12dd7ce603..1a920d83bfa 100644
--- a/test/unit/jobs/test_datasets.py
+++ b/test/unit/jobs/test_datasets.py
@@ -1,4 +1,4 @@
-from galaxy.jobs.datasets import DatasetPath
+from galaxy.job_execution.datasets import DatasetPath
 
 
 def test_dataset_path():
diff --git a/test/unit/tools/test_evaluation.py b/test/unit/tools/test_evaluation.py
index 93345de7215..37243fbfdbf 100644
--- a/test/unit/tools/test_evaluation.py
+++ b/test/unit/tools/test_evaluation.py
@@ -2,8 +2,8 @@ import os
 from unittest import TestCase
 from xml.etree.ElementTree import XML
 
+from galaxy.job_execution.datasets import DatasetPath
 from galaxy.jobs import SimpleComputeEnvironment
-from galaxy.jobs.datasets import DatasetPath
 from galaxy.model import (
     Dataset,
     History,
diff --git a/test/unit/tools/test_metadata.py b/test/unit/tools/test_metadata.py
index 2c7e2e99fd0..e707877fced 100644
--- a/test/unit/tools/test_metadata.py
+++ b/test/unit/tools/test_metadata.py
@@ -3,7 +3,7 @@ import subprocess
 import unittest
 
 from galaxy import model
-from galaxy.jobs.datasets import DatasetPath
+from galaxy.job_execution.datasets import DatasetPath
 from galaxy.metadata import get_metadata_compute_strategy
 from galaxy.objectstore import ObjectStorePopulator
 from .. import tools_support
diff --git a/test/unit/tools/test_wrappers.py b/test/unit/tools/test_wrappers.py
index 4f58df39bef..57248754e06 100644
--- a/test/unit/tools/test_wrappers.py
+++ b/test/unit/tools/test_wrappers.py
@@ -3,7 +3,7 @@ import tempfile
 from xml.etree.ElementTree import XML
 
 from galaxy.datatypes.metadata import MetadataSpecCollection
-from galaxy.jobs.datasets import DatasetPath
+from galaxy.job_execution.datasets import DatasetPath
 from galaxy.tools.parameters.basic import (
     DrillDownSelectToolParameter,
     IntegerToolParameter,