diff --git a/qurator/__init__.py b/qurator/__init__.py
deleted file mode 100644
index 5284146..0000000
--- a/qurator/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__import__("pkg_resources").declare_namespace(__name__)
diff --git a/qurator/eynollah/__init__.py b/qurator/eynollah/__init__.py
index 8b13789..e69de29 100644
--- a/qurator/eynollah/__init__.py
+++ b/qurator/eynollah/__init__.py
@@ -1 +0,0 @@
-
diff --git a/setup.py b/setup.py
index 9abf158..af8a321 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-from setuptools import setup, find_packages
+from setuptools import setup, find_namespace_packages
 from json import load
 
 install_requires = open('requirements.txt').read().split('\n')
@@ -13,8 +13,7 @@ setup(
     author='Vahid Rezanezhad',
     url='https://github.com/qurator-spk/eynollah',
     license='Apache License 2.0',
-    namespace_packages=['qurator'],
-    packages=find_packages(exclude=['tests']),
+    packages=find_namespace_packages(include=['qurator']),
     install_requires=install_requires,
     package_data={
         '': ['*.json']