diff --git a/galaxy/api/tools.py b/galaxy/tools.py
similarity index 100%
rename from galaxy/api/tools.py
rename to galaxy/tools.py
diff --git a/galaxy/unittest/__init__.py b/galaxy/unittest/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/galaxy/api/mock.py b/galaxy/unittest/mock.py
similarity index 100%
rename from galaxy/api/mock.py
rename to galaxy/unittest/mock.py
diff --git a/tests/async_mock.py b/tests/async_mock.py
deleted file mode 100644
index ecf4b30..0000000
--- a/tests/async_mock.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from unittest.mock import MagicMock
-
-class AsyncMock(MagicMock):
-    async def __call__(self, *args, **kwargs):
-        # pylint: disable=useless-super-delegation
-        return super(AsyncMock, self).__call__(*args, **kwargs)