diff --git a/share/scripts/yaypm/setup.py b/share/scripts/yaypm/setup.py
index a71346b6..2406a698 100644
--- a/share/scripts/yaypm/setup.py
+++ b/share/scripts/yaypm/setup.py
@@ -32,10 +32,9 @@ setup(
     author = 'Maciek Kaminski',
     author_email = 'maciejka@tiger.com.pl',
     url = 'http://yate.null.ro/pmwiki/index.php?n=Main.YAYPM',
-    package_dir = {'': '..'},
     packages = ['yaypm',
                 'yaypm.utils',
                 'yaypm.utils.resources',
                 'yaypm.utils.tester',
-                'yaypm.examples'],
+                'yaypm.examples']
 )
diff --git a/share/scripts/yaypm/__init__.py b/share/scripts/yaypm/yaypm/__init__.py
similarity index 100%
rename from share/scripts/yaypm/__init__.py
rename to share/scripts/yaypm/yaypm/__init__.py
diff --git a/share/scripts/yaypm/utils/__init__.py b/share/scripts/yaypm/yaypm/utils/__init__.py
similarity index 100%
rename from share/scripts/yaypm/utils/__init__.py
rename to share/scripts/yaypm/yaypm/utils/__init__.py
diff --git a/share/scripts/yaypm/utils/answer.py b/share/scripts/yaypm/yaypm/utils/answer.py
similarity index 100%
rename from share/scripts/yaypm/utils/answer.py
rename to share/scripts/yaypm/yaypm/utils/answer.py
diff --git a/share/scripts/yaypm/utils/resources/__init__.py b/share/scripts/yaypm/yaypm/utils/resources/__init__.py
similarity index 100%
rename from share/scripts/yaypm/utils/resources/__init__.py
rename to share/scripts/yaypm/yaypm/utils/resources/__init__.py
diff --git a/share/scripts/yaypm/utils/srcmon.py b/share/scripts/yaypm/yaypm/utils/srcmon.py
similarity index 100%
rename from share/scripts/yaypm/utils/srcmon.py
rename to share/scripts/yaypm/yaypm/utils/srcmon.py
diff --git a/share/scripts/yaypm/utils/tester/__init__.py b/share/scripts/yaypm/yaypm/utils/tester/__init__.py
similarity index 100%
rename from share/scripts/yaypm/utils/tester/__init__.py
rename to share/scripts/yaypm/yaypm/utils/tester/__init__.py
diff --git a/share/scripts/yaypm/utils/tester/dtmfetc.py b/share/scripts/yaypm/yaypm/utils/tester/dtmfetc.py
similarity index 100%
rename from share/scripts/yaypm/utils/tester/dtmfetc.py
rename to share/scripts/yaypm/yaypm/utils/tester/dtmfetc.py