diff --git a/tools/packaging/MANIFEST.in.d/backends-bank b/tools/packaging/MANIFEST.in.d/backends-bank
index ea11e623..878ccf52 100644
--- a/tools/packaging/MANIFEST.in.d/backends-bank
+++ b/tools/packaging/MANIFEST.in.d/backends-bank
@@ -1 +1 @@
-include share/pyshared/weboob/backends/aum/data/*
+include weboob/backends/bnporc/data/*
diff --git a/tools/packaging/MANIFEST.in.d/backends-dating b/tools/packaging/MANIFEST.in.d/backends-dating
index 79d7930a..092769aa 100644
--- a/tools/packaging/MANIFEST.in.d/backends-dating
+++ b/tools/packaging/MANIFEST.in.d/backends-dating
@@ -1 +1 @@
-include share/pyshared/weboob/backends/bnporc/data/*
+include weboob/backends/aum/data/*
diff --git a/tools/packaging/MANIFEST.in.d/core-qt b/tools/packaging/MANIFEST.in.d/core-qt
deleted file mode 100644
index b9b2b417..00000000
--- a/tools/packaging/MANIFEST.in.d/core-qt
+++ /dev/null
@@ -1,2 +0,0 @@
-include weboob/tools/__init__.py
-include weboob/tools/application/__init__.py
diff --git a/tools/packaging/MANIFEST.in.d/core-webkit-formatter b/tools/packaging/MANIFEST.in.d/core-webkit-formatter
deleted file mode 100644
index 0ad3a7d9..00000000
--- a/tools/packaging/MANIFEST.in.d/core-webkit-formatter
+++ /dev/null
@@ -1,3 +0,0 @@
-include weboob/tools/__init__.py
-include weboob/tools/application/__init__.py
-include weboob/tools/application/formatters/__init__.py
diff --git a/tools/packaging/create_debian_package.sh b/tools/packaging/create_debian_package.sh
index 30743a4e..ff88c69e 100755
--- a/tools/packaging/create_debian_package.sh
+++ b/tools/packaging/create_debian_package.sh
@@ -12,6 +12,7 @@
 
 FILEPATH="$1"
 
+DEB_DIRPATH="$PWD/deb"
 DIST_DIRPATH="$PWD/dist"
 SCRIPT_DIRPATH=$(dirname $(readlink -f "$0"))
 
@@ -23,10 +24,12 @@ README=$SCRIPT_DIRPATH/README.d/$PKGNAME
 [ -f $README ] && mv README README.old && ln -s $README README
 python $FILEPATH sdist
 cd $DIST_DIRPATH
-TARGZ=$(ls weboob-$PKGNAME-*.tar.gz)
+TARGZ=$(find -maxdepth 1 -regex ".*$PKGNAME-[0-9]\.[0-9]\.tar\.gz")
+[ ! -f $TARGZ ] && echo "$TARGZ not found" && exit
 tar xf $TARGZ
 TARGZ_DIRPATH=$(basename $TARGZ .tar.gz)
 [ ! -d $TARGZ_DIRPATH ] && echo "$TARGZ_DIRPATH not found" && exit
+rm -f $TARGZ
 cd $TARGZ_DIRPATH
 ln -s $FILEPATH setup.py
 [ -f $MANIFEST_IN ] && ln -sf $MANIFEST_IN MANIFEST.in
diff --git a/tools/packaging/create_debian_packages.sh b/tools/packaging/create_debian_packages.sh
index f0afe49d..09760180 100755
--- a/tools/packaging/create_debian_packages.sh
+++ b/tools/packaging/create_debian_packages.sh
@@ -49,9 +49,7 @@ mkdir $DEB_DIRPATH
 for filepath in $SETUP_PY_LIST
 do
     echo "========== Creating Debian package for $filepath"
-    exec $SCRIPT_DIRPATH/create_debian_package.sh $filepath
-    pwd
-    # break
+    $SCRIPT_DIRPATH/create_debian_package.sh $filepath
 done
 
 rm -rf $DIST_DIRPATH MANIFEST.in *.egg-info
diff --git a/tools/packaging/setup.py.d/core-qt.py b/tools/packaging/setup.py.d/core-qt.py
index 562f67e4..54905bbb 100755
--- a/tools/packaging/setup.py.d/core-qt.py
+++ b/tools/packaging/setup.py.d/core-qt.py
@@ -46,10 +46,6 @@ setup(
         'weboob.applications.qweboobcfg',
         'weboob.tools.application.qt',
         ],
-    # data_files=[
-        # ('weboob/tools', ['weboob/tools/__init__.py']),
-        # ('weboob/tools/application', ['weboob/tools/application/__init__.py']),
-        # ],
     scripts=[
         'scripts/weboob-config-qt',
         ],
diff --git a/tools/packaging/setup.py.d/core-webkit-formatter.py b/tools/packaging/setup.py.d/core-webkit-formatter.py
index a3bd8aad..88a9037e 100755
--- a/tools/packaging/setup.py.d/core-webkit-formatter.py
+++ b/tools/packaging/setup.py.d/core-webkit-formatter.py
@@ -49,16 +49,11 @@ setup(
         'weboob',
         'weboob.tools.application.formatters.webkit',
         ],
-    data_files=[
-        ('weboob/tools', ['weboob/tools/__init__.py']),
-        ('weboob/tools/application', ['weboob/tools/application/__init__.py']),
-        ('weboob/tools/application/formatters', ['weboob/tools/application/formatters/__init__.py']),
-        ],
     install_requires=[
         'weboob-core', # python-weboob-core
         # not Pypi packages:
         # Depends
-        # python-gtk
+        # python-gtk2
         # python-webkit
         ],
 )
diff --git a/tools/packaging/stdeb.cfg b/tools/packaging/stdeb.cfg
index d08af623..8dba38fe 100644
--- a/tools/packaging/stdeb.cfg
+++ b/tools/packaging/stdeb.cfg
@@ -9,7 +9,7 @@ Suggests = python-clientform, python-nose, ipython, python-pysqlite2
 Depends = python-weboob-core, python-qt4
 
 [weboob-core-webkit-formatter]
-Depends = python-weboob-core, python-gtk, python-webkit
+Depends = python-weboob-core, python-gtk2, python-webkit
 
 
 # backends