diff --git a/desktop/__init__.py b/pym/desktop/__init__.py
similarity index 100%
rename from desktop/__init__.py
rename to pym/desktop/__init__.py
diff --git a/desktop/datavars.py b/pym/desktop/datavars.py
similarity index 100%
rename from desktop/datavars.py
rename to pym/desktop/datavars.py
diff --git a/desktop/desktop.py b/pym/desktop/desktop.py
similarity index 100%
rename from desktop/desktop.py
rename to pym/desktop/desktop.py
diff --git a/desktop/utils/__init__.py b/pym/desktop/utils/__init__.py
similarity index 100%
rename from desktop/utils/__init__.py
rename to pym/desktop/utils/__init__.py
diff --git a/desktop/utils/cl_desktop.py b/pym/desktop/utils/cl_desktop.py
similarity index 100%
rename from desktop/utils/cl_desktop.py
rename to pym/desktop/utils/cl_desktop.py
diff --git a/desktop/variables/__init__.py b/pym/desktop/variables/__init__.py
similarity index 100%
rename from desktop/variables/__init__.py
rename to pym/desktop/variables/__init__.py
diff --git a/desktop/variables/action.py b/pym/desktop/variables/action.py
similarity index 100%
rename from desktop/variables/action.py
rename to pym/desktop/variables/action.py
diff --git a/desktop/variables/desktop.py b/pym/desktop/variables/desktop.py
similarity index 100%
rename from desktop/variables/desktop.py
rename to pym/desktop/variables/desktop.py
diff --git a/desktop/wsdl_desktop.py b/pym/desktop/wsdl_desktop.py
similarity index 100%
rename from desktop/wsdl_desktop.py
rename to pym/desktop/wsdl_desktop.py
diff --git a/setup.py b/setup.py
index 122027f..4b1663f 100755
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@
 #  limitations under the License.
 
 __app__ = "calculate-desktop"
-__version__ = "3.1.8"
+__version__ = "3.2.2"
 
 import os
 import stat
@@ -39,6 +39,12 @@ data_files = [('/usr/share/calculate/xdm', [('data/cmd_login', 0755),
                                              'data/logout.d/95syncface',
                                              'data/logout.d/98umount'])]
 
+packages = [
+    "calculate."+str('.'.join(root.split(os.sep)[1:]))
+    for root, dirs, files in os.walk('pym/desktop')
+    if '__init__.py' in files
+]
+
 setup(
     name = __app__,
     version = __version__,
@@ -47,11 +53,12 @@ setup(
     author_email = "support@calculate.ru",
     url = "http://calculate-linux.org",
     license = "http://www.apache.org/licenses/LICENSE-2.0",
-    package_dir = {'calculate.desktop': "desktop"},
-    packages = ['calculate.desktop','calculate.desktop.utils','calculate.desktop.variables'],
+    package_dir = {'calculate.desktop': "pym/desktop"},
+    packages = packages,
     data_files = data_files,
     ext_modules = [Extension('calculate.desktop._cl_keys',
                              library_dirs = ['/usr/lib'],
                              libraries = ['keyutils'],
                              sources = ['./lib/cl_keys.i', './lib/cl_keys.c'])],
     cmdclass={'install_data': install_data})
+