diff --git a/weboob/tools/application/qt/Makefile b/weboob/tools/application/qt/Makefile
new file mode 100644
index 00000000..f0db5154
--- /dev/null
+++ b/weboob/tools/application/qt/Makefile
@@ -0,0 +1,13 @@
+UI_FILES = $(wildcard *.ui)
+UI_PY_FILES = $(UI_FILES:%.ui=%_ui.py)
+PYUIC = pyuic4
+
+all: $(UI_PY_FILES)
+
+%_ui.py: %.ui
+	$(PYUIC) -o $@ $^
+
+clean:
+	rm -f *.pyc
+	rm -f $(UI_PY_FILES)
+
diff --git a/weboob/tools/application/qt/__init__.py b/weboob/tools/application/qt/__init__.py
new file mode 100644
index 00000000..b11c2508
--- /dev/null
+++ b/weboob/tools/application/qt/__init__.py
@@ -0,0 +1 @@
+from .qt import QtApplication
diff --git a/weboob/tools/application/qt.py b/weboob/tools/application/qt/qt.py
similarity index 70%
rename from weboob/tools/application/qt.py
rename to weboob/tools/application/qt/qt.py
index 2d6bca4d..be155cdb 100644
--- a/weboob/tools/application/qt.py
+++ b/weboob/tools/application/qt/qt.py
@@ -1,22 +1,19 @@
 # -*- coding: utf-8 -*-
 
-"""
-Copyright(C) 2010  Romain Bignon
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 3 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-"""
+# Copyright(C) 2010  Romain Bignon
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 3 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 import sys
 from PyQt4.QtCore import QTimer, SIGNAL