Stage 3

diff --git a/src/qtgui/bufferview.cpp b/src/qtui/bufferview.cpp
similarity index 100%
rename from src/qtgui/bufferview.cpp
rename to src/qtui/bufferview.cpp

diff --git a/src/qtgui/bufferview.h b/src/qtui/bufferview.h
similarity index 100%
rename from src/qtgui/bufferview.h
rename to src/qtui/bufferview.h

diff --git a/src/qtgui/bufferviewfilter.cpp b/src/qtui/bufferviewfilter.cpp
similarity index 100%
rename from src/qtgui/bufferviewfilter.cpp
rename to src/qtui/bufferviewfilter.cpp

diff --git a/src/qtgui/bufferviewfilter.h b/src/qtui/bufferviewfilter.h
similarity index 100%
rename from src/qtgui/bufferviewfilter.h
rename to src/qtui/bufferviewfilter.h

diff --git a/src/qtgui/bufferwidget.cpp b/src/qtui/bufferwidget.cpp
similarity index 100%
rename from src/qtgui/bufferwidget.cpp
rename to src/qtui/bufferwidget.cpp

diff --git a/src/qtgui/bufferwidget.h b/src/qtui/bufferwidget.h
similarity index 100%
rename from src/qtgui/bufferwidget.h
rename to src/qtui/bufferwidget.h

diff --git a/src/qtgui/channelwidgetinput.cpp b/src/qtui/channelwidgetinput.cpp
similarity index 100%
rename from src/qtgui/channelwidgetinput.cpp
rename to src/qtui/channelwidgetinput.cpp

diff --git a/src/qtgui/channelwidgetinput.h b/src/qtui/channelwidgetinput.h
similarity index 100%
rename from src/qtgui/channelwidgetinput.h
rename to src/qtui/channelwidgetinput.h

diff --git a/src/qtgui/chatline.cpp b/src/qtui/chatline.cpp
similarity index 100%
rename from src/qtgui/chatline.cpp
rename to src/qtui/chatline.cpp

diff --git a/src/qtgui/chatline.h b/src/qtui/chatline.h
similarity index 100%
rename from src/qtgui/chatline.h
rename to src/qtui/chatline.h

diff --git a/src/qtgui/chatwidget.cpp b/src/qtui/chatwidget.cpp
similarity index 100%
rename from src/qtgui/chatwidget.cpp
rename to src/qtui/chatwidget.cpp

diff --git a/src/qtgui/chatwidget.h b/src/qtui/chatwidget.h
similarity index 100%
rename from src/qtgui/chatwidget.h
rename to src/qtui/chatwidget.h

diff --git a/src/qtgui/coreconnectdlg.cpp b/src/qtui/coreconnectdlg.cpp
similarity index 100%
rename from src/qtgui/coreconnectdlg.cpp
rename to src/qtui/coreconnectdlg.cpp

diff --git a/src/qtgui/coreconnectdlg.h b/src/qtui/coreconnectdlg.h
similarity index 100%
rename from src/qtgui/coreconnectdlg.h
rename to src/qtui/coreconnectdlg.h

diff --git a/src/qtgui/guisettings.cpp b/src/qtui/guisettings.cpp
similarity index 100%
rename from src/qtgui/guisettings.cpp
rename to src/qtui/guisettings.cpp

diff --git a/src/qtgui/guisettings.h b/src/qtui/guisettings.h
similarity index 100%
rename from src/qtgui/guisettings.h
rename to src/qtui/guisettings.h

diff --git a/src/qtgui/identities.cpp b/src/qtui/identities.cpp
similarity index 100%
rename from src/qtgui/identities.cpp
rename to src/qtui/identities.cpp

diff --git a/src/qtgui/identities.h b/src/qtui/identities.h
similarity index 100%
rename from src/qtgui/identities.h
rename to src/qtui/identities.h

diff --git a/src/qtgui/mainwin.cpp b/src/qtui/mainwin.cpp
similarity index 100%
rename from src/qtgui/mainwin.cpp
rename to src/qtui/mainwin.cpp

diff --git a/src/qtgui/mainwin.h b/src/qtui/mainwin.h
similarity index 100%
rename from src/qtgui/mainwin.h
rename to src/qtui/mainwin.h

diff --git a/src/qtgui/qtui.cpp b/src/qtui/qtui.cpp
similarity index 100%
rename from src/qtgui/qtui.cpp
rename to src/qtui/qtui.cpp

diff --git a/src/qtgui/qtui.h b/src/qtui/qtui.h
similarity index 100%
rename from src/qtgui/qtui.h
rename to src/qtui/qtui.h

diff --git a/src/qtgui/qtui.pri b/src/qtui/qtui.pri
similarity index 100%
rename from src/qtgui/qtui.pri
rename to src/qtui/qtui.pri

diff --git a/src/qtgui/serverlist.cpp b/src/qtui/serverlist.cpp
similarity index 100%
rename from src/qtgui/serverlist.cpp
rename to src/qtui/serverlist.cpp

diff --git a/src/qtgui/serverlist.h b/src/qtui/serverlist.h
similarity index 100%
rename from src/qtgui/serverlist.h
rename to src/qtui/serverlist.h

diff --git a/src/qtgui/settingsdlg.cpp b/src/qtui/settingsdlg.cpp
similarity index 100%
rename from src/qtgui/settingsdlg.cpp
rename to src/qtui/settingsdlg.cpp

diff --git a/src/qtgui/settingsdlg.h b/src/qtui/settingsdlg.h
similarity index 100%
rename from src/qtgui/settingsdlg.h
rename to src/qtui/settingsdlg.h

diff --git a/src/qtgui/settingspage.h b/src/qtui/settingspage.h
similarity index 100%
rename from src/qtgui/settingspage.h
rename to src/qtui/settingspage.h

diff --git a/src/qtgui/settingspages.cpp b/src/qtui/settingspages.cpp
similarity index 100%
rename from src/qtgui/settingspages.cpp
rename to src/qtui/settingspages.cpp

diff --git a/src/qtgui/settingspages.h b/src/qtui/settingspages.h
similarity index 100%
rename from src/qtgui/settingspages.h
rename to src/qtui/settingspages.h

diff --git a/src/qtgui/style.cpp b/src/qtui/style.cpp
similarity index 100%
rename from src/qtgui/style.cpp
rename to src/qtui/style.cpp

diff --git a/src/qtgui/style.h b/src/qtui/style.h
similarity index 100%
rename from src/qtgui/style.h
rename to src/qtui/style.h

diff --git a/src/qtgui/tabcompleter.cpp b/src/qtui/tabcompleter.cpp
similarity index 100%
rename from src/qtgui/tabcompleter.cpp
rename to src/qtui/tabcompleter.cpp

diff --git a/src/qtgui/tabcompleter.h b/src/qtui/tabcompleter.h
similarity index 100%
rename from src/qtgui/tabcompleter.h
rename to src/qtui/tabcompleter.h

diff --git a/src/qtgui/topicwidget.cpp b/src/qtui/topicwidget.cpp
similarity index 100%
rename from src/qtgui/topicwidget.cpp
rename to src/qtui/topicwidget.cpp

diff --git a/src/qtgui/topicwidget.h b/src/qtui/topicwidget.h
similarity index 100%
rename from src/qtgui/topicwidget.h
rename to src/qtui/topicwidget.h

diff --git a/src/qtgui/ui/aboutdlg.ui b/src/qtui/ui/aboutdlg.ui
similarity index 100%
rename from src/qtgui/ui/aboutdlg.ui
rename to src/qtui/ui/aboutdlg.ui

diff --git a/src/qtgui/ui/buffermgmtpage.ui b/src/qtui/ui/buffermgmtpage.ui
similarity index 100%
rename from src/qtgui/ui/buffermgmtpage.ui
rename to src/qtui/ui/buffermgmtpage.ui

diff --git a/src/qtgui/ui/bufferviewwidget.ui b/src/qtui/ui/bufferviewwidget.ui
similarity index 100%
rename from src/qtgui/ui/bufferviewwidget.ui
rename to src/qtui/ui/bufferviewwidget.ui

diff --git a/src/qtgui/ui/bufferwidget.ui b/src/qtui/ui/bufferwidget.ui
similarity index 100%
rename from src/qtgui/ui/bufferwidget.ui
rename to src/qtui/ui/bufferwidget.ui

diff --git a/src/qtgui/ui/channelwidget.ui b/src/qtui/ui/channelwidget.ui
similarity index 100%
rename from src/qtgui/ui/channelwidget.ui
rename to src/qtui/ui/channelwidget.ui

diff --git a/src/qtgui/ui/connectionpage.ui b/src/qtui/ui/connectionpage.ui
similarity index 100%
rename from src/qtgui/ui/connectionpage.ui
rename to src/qtui/ui/connectionpage.ui

diff --git a/src/qtgui/ui/coreconnectdlg.ui b/src/qtui/ui/coreconnectdlg.ui
similarity index 100%
rename from src/qtgui/ui/coreconnectdlg.ui
rename to src/qtui/ui/coreconnectdlg.ui

diff --git a/src/qtgui/ui/coresettingspage.ui b/src/qtui/ui/coresettingspage.ui
similarity index 100%
rename from src/qtgui/ui/coresettingspage.ui
rename to src/qtui/ui/coresettingspage.ui

diff --git a/src/qtgui/ui/identitiesdlg.ui b/src/qtui/ui/identitiesdlg.ui
similarity index 100%
rename from src/qtgui/ui/identitiesdlg.ui
rename to src/qtui/ui/identitiesdlg.ui

diff --git a/src/qtgui/ui/identitieseditdlg.ui b/src/qtui/ui/identitieseditdlg.ui
similarity index 100%
rename from src/qtgui/ui/identitieseditdlg.ui
rename to src/qtui/ui/identitieseditdlg.ui

diff --git a/src/qtgui/ui/mainwin.ui b/src/qtui/ui/mainwin.ui
similarity index 100%
rename from src/qtgui/ui/mainwin.ui
rename to src/qtui/ui/mainwin.ui

diff --git a/src/qtgui/ui/networkeditdlg.ui b/src/qtui/ui/networkeditdlg.ui
similarity index 100%
rename from src/qtgui/ui/networkeditdlg.ui
rename to src/qtui/ui/networkeditdlg.ui

diff --git a/src/qtgui/ui/nickeditdlg.ui b/src/qtui/ui/nickeditdlg.ui
similarity index 100%
rename from src/qtgui/ui/nickeditdlg.ui
rename to src/qtui/ui/nickeditdlg.ui

diff --git a/src/qtgui/ui/servereditdlg.ui b/src/qtui/ui/servereditdlg.ui
similarity index 100%
rename from src/qtgui/ui/servereditdlg.ui
rename to src/qtui/ui/servereditdlg.ui

diff --git a/src/qtgui/ui/serverlistdlg.ui b/src/qtui/ui/serverlistdlg.ui
similarity index 100%
rename from src/qtgui/ui/serverlistdlg.ui
rename to src/qtui/ui/serverlistdlg.ui

diff --git a/src/qtgui/ui/settingsdlg.ui b/src/qtui/ui/settingsdlg.ui
similarity index 100%
rename from src/qtgui/ui/settingsdlg.ui
rename to src/qtui/ui/settingsdlg.ui

diff --git a/src/qtgui/ui/topicwidget.ui b/src/qtui/ui/topicwidget.ui
similarity index 100%
rename from src/qtgui/ui/topicwidget.ui
rename to src/qtui/ui/topicwidget.ui

diff --git a/src/qtgui/ui/usermgmtpage.ui b/src/qtui/ui/usermgmtpage.ui
similarity index 100%
rename from src/qtgui/ui/usermgmtpage.ui
rename to src/qtui/ui/usermgmtpage.ui