diff --git a/__init__.py b/__init__.py
deleted file mode 100644
index 8d17c21..0000000
--- a/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-__import__('pkg_resources').declare_namespace(__name__)
-
diff --git a/qurator/__init__.py b/qurator/__init__.py
deleted file mode 100644
index b0d6433..0000000
--- a/qurator/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__import__('pkg_resources').declare_namespace(__name__)
\ No newline at end of file
diff --git a/qurator/wikidata/__init__.py b/qurator/wikidata/__init__.py
index b0d6433..e69de29 100644
--- a/qurator/wikidata/__init__.py
+++ b/qurator/wikidata/__init__.py
@@ -1 +0,0 @@
-__import__('pkg_resources').declare_namespace(__name__)
\ No newline at end of file
diff --git a/qurator/wikipedia/__init__.py b/qurator/wikipedia/__init__.py
index de40ea7..e69de29 100644
--- a/qurator/wikipedia/__init__.py
+++ b/qurator/wikipedia/__init__.py
@@ -1 +0,0 @@
-__import__('pkg_resources').declare_namespace(__name__)
diff --git a/setup.py b/setup.py
index 668d752..7881203 100644
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,5 @@
 from io import open
-from setuptools import find_packages, setup
+from setuptools import find_namespace_packages, setup
 
 with open('requirements.txt') as fp:
     install_requires = fp.read()
@@ -15,8 +15,7 @@
     keywords='Qurator',
     license='Apache',
     url="https://github.com/qurator-spk/sbb_knowledge-base",
-    packages=find_packages(exclude=["*.tests", "*.tests.*",
-                                    "tests.*", "tests"]),
+    packages=find_namespace_packages(include=['qurator']),
     install_requires=install_requires,
     entry_points={
       'console_scripts': [