diff --git a/qurator/modstool/__init__.py b/qurator/modstool/__init__.py
index de40ea7..eabaacd 100644
--- a/qurator/modstool/__init__.py
+++ b/qurator/modstool/__init__.py
@@ -1 +1 @@
-__import__('pkg_resources').declare_namespace(__name__)
+from .modstool import *
diff --git a/qurator/modstool/tests/test_modstool.py b/qurator/modstool/tests/test_modstool.py
index 87a0b94..8fb0864 100644
--- a/qurator/modstool/tests/test_modstool.py
+++ b/qurator/modstool/tests/test_modstool.py
@@ -1,8 +1,10 @@
-from qurator.modstool.modstool import mods_to_dict, flatten
 import pytest
 import xml.etree.ElementTree as ET
 
 
+from .. import mods_to_dict, flatten
+
+
 def dict_fromstring(x):
    """Helper function to parse a MODS XML string to a flattened dict"""
    return flatten(mods_to_dict(ET.fromstring(x)))
diff --git a/setup.py b/setup.py
index b5e673b..3048dd5 100644
--- a/setup.py
+++ b/setup.py
@@ -13,8 +13,8 @@ setup(
     long_description_content_type='text/markdown',
     keywords='qurator mets mots library',
     license='Apache',
-    packages=find_packages(exclude=['*.tests', '*.tests.*',
-                                    'tests.*', 'tests']),
+    namespace_packages=['qurator'],
+    packages=find_packages(exclude=['*.tests', '*.tests.*', 'tests.*', 'tests']),
     install_requires=install_requires,
     entry_points={
       'console_scripts': [