diff --git a/.gitignore b/.gitignore
index 11bebac..7de2cd3 100644
--- a/.gitignore
+++ b/.gitignore

diff --git a/Makefile b/Makefile
index 1eae41c..d93ac2b 100644
--- a/Makefile
+++ b/Makefile

diff --git a/UI/Qt/ApplicationTest/ApplicationTest.pro b/Swift/QtUI/ApplicationTest/ApplicationTest.pro
index 9222aec..9222aec 100644
--- a/UI/Qt/ApplicationTest/ApplicationTest.pro
+++ b/Swift/QtUI/ApplicationTest/ApplicationTest.pro

diff --git a/UI/Qt/ApplicationTest/main.cpp b/Swift/QtUI/ApplicationTest/main.cpp
index 7ddb76d..7ddb76d 100644
--- a/UI/Qt/ApplicationTest/main.cpp
+++ b/Swift/QtUI/ApplicationTest/main.cpp

diff --git a/UI/Qt/ChatSnippet.cpp b/Swift/QtUI/ChatSnippet.cpp
index 7e8326c..7e8326c 100644
--- a/UI/Qt/ChatSnippet.cpp
+++ b/Swift/QtUI/ChatSnippet.cpp

diff --git a/UI/Qt/ChatSnippet.h b/Swift/QtUI/ChatSnippet.h
index 5d4b6eb..5d4b6eb 100644
--- a/UI/Qt/ChatSnippet.h
+++ b/Swift/QtUI/ChatSnippet.h

diff --git a/UI/Qt/ChatView/ChatView.pro b/Swift/QtUI/ChatView/ChatView.pro
index 3017d35..3017d35 100644
--- a/UI/Qt/ChatView/ChatView.pro
+++ b/Swift/QtUI/ChatView/ChatView.pro

diff --git a/UI/Qt/ChatView/main.cpp b/Swift/QtUI/ChatView/main.cpp
index 9345f16..9345f16 100644
--- a/UI/Qt/ChatView/main.cpp
+++ b/Swift/QtUI/ChatView/main.cpp

diff --git a/Swift/QtUI/Makefile.inc b/Swift/QtUI/Makefile.inc
new file mode 100644
index 0000000..8b0ab30
--- /dev/null
+++ b/Swift/QtUI/Makefile.inc

diff --git a/UI/Qt/MessageSnippet.cpp b/Swift/QtUI/MessageSnippet.cpp
index 0529a23..0529a23 100644
--- a/UI/Qt/MessageSnippet.cpp
+++ b/Swift/QtUI/MessageSnippet.cpp

diff --git a/UI/Qt/MessageSnippet.h b/Swift/QtUI/MessageSnippet.h
index b24c4f9..b24c4f9 100644
--- a/UI/Qt/MessageSnippet.h
+++ b/Swift/QtUI/MessageSnippet.h

diff --git a/UI/Qt/NotifierTest/NotifierTest.cpp b/Swift/QtUI/NotifierTest/NotifierTest.cpp
index 8a0fb22..8a0fb22 100644
--- a/UI/Qt/NotifierTest/NotifierTest.cpp
+++ b/Swift/QtUI/NotifierTest/NotifierTest.cpp

diff --git a/UI/Qt/NotifierTest/NotifierTest.pro b/Swift/QtUI/NotifierTest/NotifierTest.pro
index fb15f13..fb15f13 100644
--- a/UI/Qt/NotifierTest/NotifierTest.pro
+++ b/Swift/QtUI/NotifierTest/NotifierTest.pro

diff --git a/UI/Qt/QtChatView.cpp b/Swift/QtUI/QtChatView.cpp
index ab093db..ab093db 100644
--- a/UI/Qt/QtChatView.cpp
+++ b/Swift/QtUI/QtChatView.cpp

diff --git a/UI/Qt/QtChatView.h b/Swift/QtUI/QtChatView.h
index 2a50129..2a50129 100644
--- a/UI/Qt/QtChatView.h
+++ b/Swift/QtUI/QtChatView.h

diff --git a/UI/Qt/QtChatWindow.cpp b/Swift/QtUI/QtChatWindow.cpp
index 1db8dae..1db8dae 100644
--- a/UI/Qt/QtChatWindow.cpp
+++ b/Swift/QtUI/QtChatWindow.cpp

diff --git a/UI/Qt/QtChatWindow.h b/Swift/QtUI/QtChatWindow.h
index ef091e3..ef091e3 100644
--- a/UI/Qt/QtChatWindow.h
+++ b/Swift/QtUI/QtChatWindow.h

diff --git a/UI/Qt/QtChatWindowFactory.cpp b/Swift/QtUI/QtChatWindowFactory.cpp
index b0b3679..b0b3679 100644
--- a/UI/Qt/QtChatWindowFactory.cpp
+++ b/Swift/QtUI/QtChatWindowFactory.cpp

diff --git a/UI/Qt/QtChatWindowFactory.h b/Swift/QtUI/QtChatWindowFactory.h
index 9e5004e..9e5004e 100644
--- a/UI/Qt/QtChatWindowFactory.h
+++ b/Swift/QtUI/QtChatWindowFactory.h

diff --git a/UI/Qt/QtJoinMUCDialog.cpp b/Swift/QtUI/QtJoinMUCDialog.cpp
index b6f5814..b6f5814 100644
--- a/UI/Qt/QtJoinMUCDialog.cpp
+++ b/Swift/QtUI/QtJoinMUCDialog.cpp

diff --git a/UI/Qt/QtJoinMUCDialog.h b/Swift/QtUI/QtJoinMUCDialog.h
index 9f1781d..9f1781d 100644
--- a/UI/Qt/QtJoinMUCDialog.h
+++ b/Swift/QtUI/QtJoinMUCDialog.h

diff --git a/UI/Qt/QtJoinMUCDialog.ui b/Swift/QtUI/QtJoinMUCDialog.ui
index 3b67c68..3b67c68 100644
--- a/UI/Qt/QtJoinMUCDialog.ui
+++ b/Swift/QtUI/QtJoinMUCDialog.ui

diff --git a/UI/Qt/QtLoginWindow.cpp b/Swift/QtUI/QtLoginWindow.cpp
index a05d3bf..a05d3bf 100644
--- a/UI/Qt/QtLoginWindow.cpp
+++ b/Swift/QtUI/QtLoginWindow.cpp

diff --git a/UI/Qt/QtLoginWindow.h b/Swift/QtUI/QtLoginWindow.h
index 5a14202..5a14202 100644
--- a/UI/Qt/QtLoginWindow.h
+++ b/Swift/QtUI/QtLoginWindow.h

diff --git a/UI/Qt/QtLoginWindowFactory.cpp b/Swift/QtUI/QtLoginWindowFactory.cpp
index 4874828..4874828 100644
--- a/UI/Qt/QtLoginWindowFactory.cpp
+++ b/Swift/QtUI/QtLoginWindowFactory.cpp

diff --git a/UI/Qt/QtLoginWindowFactory.h b/Swift/QtUI/QtLoginWindowFactory.h
index 52f92c8..52f92c8 100644
--- a/UI/Qt/QtLoginWindowFactory.h
+++ b/Swift/QtUI/QtLoginWindowFactory.h

diff --git a/UI/Qt/QtMainEventLoop.h b/Swift/QtUI/QtMainEventLoop.h
index 678ea04..678ea04 100644
--- a/UI/Qt/QtMainEventLoop.h
+++ b/Swift/QtUI/QtMainEventLoop.h

diff --git a/UI/Qt/QtMainWindow.cpp b/Swift/QtUI/QtMainWindow.cpp
index a9ffc51..a9ffc51 100644
--- a/UI/Qt/QtMainWindow.cpp
+++ b/Swift/QtUI/QtMainWindow.cpp

diff --git a/UI/Qt/QtMainWindow.h b/Swift/QtUI/QtMainWindow.h
index fe5c8b4..fe5c8b4 100644
--- a/UI/Qt/QtMainWindow.h
+++ b/Swift/QtUI/QtMainWindow.h

diff --git a/UI/Qt/QtMainWindowFactory.cpp b/Swift/QtUI/QtMainWindowFactory.cpp
index 1fa7d75..1fa7d75 100644
--- a/UI/Qt/QtMainWindowFactory.cpp
+++ b/Swift/QtUI/QtMainWindowFactory.cpp

diff --git a/UI/Qt/QtMainWindowFactory.h b/Swift/QtUI/QtMainWindowFactory.h
index 86fc02f..86fc02f 100644
--- a/UI/Qt/QtMainWindowFactory.h
+++ b/Swift/QtUI/QtMainWindowFactory.h

diff --git a/UI/Qt/QtSettingsProvider.cpp b/Swift/QtUI/QtSettingsProvider.cpp
index 42540c1..42540c1 100644
--- a/UI/Qt/QtSettingsProvider.cpp
+++ b/Swift/QtUI/QtSettingsProvider.cpp

diff --git a/UI/Qt/QtSettingsProvider.h b/Swift/QtUI/QtSettingsProvider.h
index 4739f60..4739f60 100644
--- a/UI/Qt/QtSettingsProvider.h
+++ b/Swift/QtUI/QtSettingsProvider.h

diff --git a/UI/Qt/QtStatusWidget.cpp b/Swift/QtUI/QtStatusWidget.cpp
index 53f93b5..53f93b5 100644
--- a/UI/Qt/QtStatusWidget.cpp
+++ b/Swift/QtUI/QtStatusWidget.cpp

diff --git a/UI/Qt/QtStatusWidget.h b/Swift/QtUI/QtStatusWidget.h
index abd352f..abd352f 100644
--- a/UI/Qt/QtStatusWidget.h
+++ b/Swift/QtUI/QtStatusWidget.h

diff --git a/UI/Qt/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp
index e7d4152..e7d4152 100644
--- a/UI/Qt/QtSwift.cpp
+++ b/Swift/QtUI/QtSwift.cpp

diff --git a/UI/Qt/QtSwift.h b/Swift/QtUI/QtSwift.h
index 5bfd62c..5bfd62c 100644
--- a/UI/Qt/QtSwift.h
+++ b/Swift/QtUI/QtSwift.h

diff --git a/UI/Qt/QtSwiftUtil.h b/Swift/QtUI/QtSwiftUtil.h
index 9a3feca..9a3feca 100644
--- a/UI/Qt/QtSwiftUtil.h
+++ b/Swift/QtUI/QtSwiftUtil.h

diff --git a/UI/Qt/QtTreeWidget.cpp b/Swift/QtUI/QtTreeWidget.cpp
index 66c653e..66c653e 100644
--- a/UI/Qt/QtTreeWidget.cpp
+++ b/Swift/QtUI/QtTreeWidget.cpp

diff --git a/UI/Qt/QtTreeWidget.h b/Swift/QtUI/QtTreeWidget.h
index 288ed99..e1d83de 100644
--- a/UI/Qt/QtTreeWidget.h
+++ b/Swift/QtUI/QtTreeWidget.h

diff --git a/UI/Qt/QtTreeWidgetFactory.cpp b/Swift/QtUI/QtTreeWidgetFactory.cpp
index e69de29..e69de29 100644
--- a/UI/Qt/QtTreeWidgetFactory.cpp
+++ b/Swift/QtUI/QtTreeWidgetFactory.cpp

diff --git a/UI/Qt/QtTreeWidgetFactory.h b/Swift/QtUI/QtTreeWidgetFactory.h
index 61e4993..e0140d2 100644
--- a/UI/Qt/QtTreeWidgetFactory.h
+++ b/Swift/QtUI/QtTreeWidgetFactory.h

diff --git a/UI/Qt/QtTreeWidgetItem.cpp b/Swift/QtUI/QtTreeWidgetItem.cpp
index e69de29..e69de29 100644
--- a/UI/Qt/QtTreeWidgetItem.cpp
+++ b/Swift/QtUI/QtTreeWidgetItem.cpp

diff --git a/UI/Qt/QtTreeWidgetItem.h b/Swift/QtUI/QtTreeWidgetItem.h
index 2a662a9..34ad93c 100644
--- a/UI/Qt/QtTreeWidgetItem.h
+++ b/Swift/QtUI/QtTreeWidgetItem.h

diff --git a/UI/Qt/Swift.pro b/Swift/QtUI/Swift.pro
index 16db0d1..16db0d1 100644
--- a/UI/Qt/Swift.pro
+++ b/Swift/QtUI/Swift.pro

diff --git a/UI/Qt/Swift.qrc b/Swift/QtUI/Swift.qrc
index 2db382e..2db382e 100644
--- a/UI/Qt/Swift.qrc
+++ b/Swift/QtUI/Swift.qrc

diff --git a/UI/Qt/SystemMessageSnippet.cpp b/Swift/QtUI/SystemMessageSnippet.cpp
index d8feddc..d8feddc 100644
--- a/UI/Qt/SystemMessageSnippet.cpp
+++ b/Swift/QtUI/SystemMessageSnippet.cpp

diff --git a/UI/Qt/SystemMessageSnippet.h b/Swift/QtUI/SystemMessageSnippet.h
index 34cd780..34cd780 100644
--- a/UI/Qt/SystemMessageSnippet.h
+++ b/Swift/QtUI/SystemMessageSnippet.h

diff --git a/UI/Qt/main.cpp b/Swift/QtUI/main.cpp
index 7a438fd..7a438fd 100644
--- a/UI/Qt/main.cpp
+++ b/Swift/QtUI/main.cpp

diff --git a/UI/Qt/qmakeish.py b/Swift/QtUI/qmakeish.py
index 573e828..72a5f62 100755
--- a/UI/Qt/qmakeish.py
+++ b/Swift/QtUI/qmakeish.py

diff --git a/UI/Qt/Makefile.inc b/UI/Qt/Makefile.inc
deleted file mode 100644
index 570e631..0000000
--- a/UI/Qt/Makefile.inc
+++ /dev/null