diff --git a/lib/galaxy/datatypes/converters/maf_to_fasta_converter.py b/lib/galaxy/datatypes/converters/maf_to_fasta_converter.py
index 98e6af16c01..1b893f1ab5d 100644
--- a/lib/galaxy/datatypes/converters/maf_to_fasta_converter.py
+++ b/lib/galaxy/datatypes/converters/maf_to_fasta_converter.py
@@ -6,7 +6,7 @@ import sys
 
 import bx.align.maf
 
-from galaxy.tools.util import maf_utilities
+from galaxy.datatypes.util import maf_utilities
 
 assert sys.version_info[:2] >= (2, 6)
 
diff --git a/lib/galaxy/datatypes/converters/maf_to_interval_converter.py b/lib/galaxy/datatypes/converters/maf_to_interval_converter.py
index 51049ed54c6..a19ab25cabb 100644
--- a/lib/galaxy/datatypes/converters/maf_to_interval_converter.py
+++ b/lib/galaxy/datatypes/converters/maf_to_interval_converter.py
@@ -6,7 +6,7 @@ import sys
 
 import bx.align.maf
 
-from galaxy.tools.util import maf_utilities
+from galaxy.datatypes.util import maf_utilities
 
 assert sys.version_info[:2] >= (2, 6)
 
diff --git a/lib/galaxy/datatypes/test/temp2.txt b/lib/galaxy/datatypes/test/temp2.txt
new file mode 100644
index 00000000000..2c3f803432c
--- /dev/null
+++ b/lib/galaxy/datatypes/test/temp2.txt
@@ -0,0 +1,2 @@
+1 2
+3 4
diff --git a/lib/galaxy/tools/util/maf_utilities.py b/lib/galaxy/datatypes/util/maf_utilities.py
similarity index 100%
rename from lib/galaxy/tools/util/maf_utilities.py
rename to lib/galaxy/datatypes/util/maf_utilities.py
diff --git a/lib/galaxy/model/migrate/check.py b/lib/galaxy/model/migrate/check.py
index 3fe5f987446..e90576434e6 100644
--- a/lib/galaxy/model/migrate/check.py
+++ b/lib/galaxy/model/migrate/check.py
@@ -1,6 +1,5 @@
 import logging
 import os.path
-import sys
 
 from migrate.versioning import repository, schema
 from sqlalchemy import (
diff --git a/lib/galaxy/model/tool_shed_install/__init__.py b/lib/galaxy/model/tool_shed_install/__init__.py
index 4aef91b43b7..668943720a5 100644
--- a/lib/galaxy/model/tool_shed_install/__init__.py
+++ b/lib/galaxy/model/tool_shed_install/__init__.py
@@ -4,7 +4,7 @@ import os
 from galaxy.util import asbool
 from galaxy.util.bunch import Bunch
 from galaxy.util.dictifiable import Dictifiable
-from tool_shed.util import common_util
+from galaxy.util.tool_shed import common_util
 
 log = logging.getLogger(__name__)
 
diff --git a/lib/galaxy/util/tool_shed/__init__.py b/lib/galaxy/util/tool_shed/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/lib/tool_shed/util/common_util.py b/lib/galaxy/util/tool_shed/common_util.py
similarity index 99%
rename from lib/tool_shed/util/common_util.py
rename to lib/galaxy/util/tool_shed/common_util.py
index 8f5686197a2..84bb1182489 100644
--- a/lib/tool_shed/util/common_util.py
+++ b/lib/galaxy/util/tool_shed/common_util.py
@@ -1,13 +1,15 @@
 import json
 import logging
 import os
+import sys
+
+from routes import url_for
 
 from six.moves.urllib.parse import urljoin
 
 from galaxy import util
 from galaxy.util.odict import odict
-from galaxy.web import url_for
-from tool_shed.util import encoding_util, xml_util
+from galaxy.util.tool_shed import encoding_util, xml_util
 
 log = logging.getLogger(__name__)
 
diff --git a/lib/tool_shed/util/encoding_util.py b/lib/galaxy/util/tool_shed/encoding_util.py
similarity index 95%
rename from lib/tool_shed/util/encoding_util.py
rename to lib/galaxy/util/tool_shed/encoding_util.py
index f5bb2ff6441..57c1a11c8a7 100644
--- a/lib/tool_shed/util/encoding_util.py
+++ b/lib/galaxy/util/tool_shed/encoding_util.py
@@ -1,6 +1,5 @@
 import binascii
 import json
-import logging
 
 from galaxy.util import (
     smart_str,
@@ -8,7 +7,6 @@ from galaxy.util import (
 )
 from galaxy.util.hash_util import hmac_new
 
-log = logging.getLogger(__name__)
 
 encoding_sep = '__esep__'
 encoding_sep2 = '__esepii__'
diff --git a/lib/tool_shed/util/xml_util.py b/lib/galaxy/util/tool_shed/xml_util.py
similarity index 100%
rename from lib/tool_shed/util/xml_util.py
rename to lib/galaxy/util/tool_shed/xml_util.py
diff --git a/packages/data/requirements.txt b/packages/data/requirements.txt
index f2b5c80f06e..c053000ed2e 100644
--- a/packages/data/requirements.txt
+++ b/packages/data/requirements.txt
@@ -1,13 +1,16 @@
 galaxy-objectstore
+galaxy-sequence-utils==1.1.3
 galaxy-util
 bdbag
 bx-python
 h5py
 isa-rwval
 numpy
+parsley
 pycryptodome
 pysam
 social_auth_core
 SQLAlchemy==1.2
 sqlalchemy-migrate
+sqlalchemy-utils
 WebOb
diff --git a/packages/data/tests/unittest_utils/__init__.py b/packages/data/tests/unittest_utils/__init__.py
index 2115ad35783..290bb9ee29b 120000
--- a/packages/data/tests/unittest_utils/__init__.py
+++ b/packages/data/tests/unittest_utils/__init__.py
@@ -1 +1 @@
-../../test/unit/unittest_utils/__init__.py
\ No newline at end of file
+../../../../test/unit/unittest_utils/__init__.py
\ No newline at end of file
diff --git a/packages/data/tests/unittest_utils/tempfilecache.py b/packages/data/tests/unittest_utils/tempfilecache.py
index 93fb83f1df7..588f6eec7d8 120000
--- a/packages/data/tests/unittest_utils/tempfilecache.py
+++ b/packages/data/tests/unittest_utils/tempfilecache.py
@@ -1 +1 @@
-../../test/unit/unittest_utils/tempfilecache.py
\ No newline at end of file
+../../../../test/unit/unittest_utils/tempfilecache.py
\ No newline at end of file
diff --git a/packages/data/tests/unittest_utils/utility.py b/packages/data/tests/unittest_utils/utility.py
index 54dd4ca7a3b..3c69a8fd67e 120000
--- a/packages/data/tests/unittest_utils/utility.py
+++ b/packages/data/tests/unittest_utils/utility.py
@@ -1 +1 @@
-../../test/unit/unittest_utils/utility.py
\ No newline at end of file
+../../../../test/unit/unittest_utils/utility.py
\ No newline at end of file
diff --git a/packages/util/requirements.txt b/packages/util/requirements.txt
index e15e5db251e..01367630095 100644
--- a/packages/util/requirements.txt
+++ b/packages/util/requirements.txt
@@ -2,7 +2,9 @@ bleach
 boltons
 bz2file; python_version < '3.3'
 docutils
+logging
 markupsafe
 packaging
 pyyaml
+routes
 six>=1.9.0