diff --git a/src/gui/qt/aboutpokerthimpl.cpp b/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp
similarity index 100%
rename from src/gui/qt/aboutpokerthimpl.cpp
rename to src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp
diff --git a/src/gui/qt/aboutpokerthimpl.h b/src/gui/qt/aboutpokerth/aboutpokerthimpl.h
similarity index 100%
rename from src/gui/qt/aboutpokerthimpl.h
rename to src/gui/qt/aboutpokerth/aboutpokerthimpl.h
diff --git a/src/gui/qt/log.cpp b/src/gui/qt/log/log.cpp
similarity index 100%
rename from src/gui/qt/log.cpp
rename to src/gui/qt/log/log.cpp
diff --git a/src/gui/qt/log.h b/src/gui/qt/log/log.h
similarity index 100%
rename from src/gui/qt/log.h
rename to src/gui/qt/log/log.h
diff --git a/src/gui/qt/netdialog.ui b/src/gui/qt/netdialog.ui
deleted file mode 100644
index e2d1e580..00000000
--- a/src/gui/qt/netdialog.ui
+++ /dev/null
@@ -1,131 +0,0 @@
-<ui version="4.0" >
- <class>netDialog</class>
- <widget class="QDialog" name="netDialog" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>231</width>
-    <height>213</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>Net-Dialog</string>
-  </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item row="0" column="0" >
-    <widget class="QTabWidget" name="tabWidget" >
-     <property name="currentIndex" >
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="tab" >
-      <attribute name="title" >
-       <string>Internet</string>
-      </attribute>
-      <layout class="QGridLayout" >
-       <property name="margin" >
-        <number>9</number>
-       </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
-       <item row="3" column="0" colspan="2" >
-        <widget class="QCheckBox" name="checkBox" >
-         <property name="text" >
-          <string>use IPv6</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="0" >
-        <widget class="QLabel" name="label_3" >
-         <property name="text" >
-          <string>Port:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="1" >
-        <widget class="QSpinBox" name="spinBox" />
-       </item>
-       <item row="0" column="1" >
-        <widget class="QLineEdit" name="lineEdit" />
-       </item>
-       <item row="1" column="1" >
-        <widget class="QLineEdit" name="lineEdit_2" />
-       </item>
-       <item row="1" column="0" >
-        <widget class="QLabel" name="label_2" >
-         <property name="text" >
-          <string>Domainname:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="0" >
-        <widget class="QLabel" name="label" >
-         <property name="text" >
-          <string>Address:</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="tab_2" >
-      <attribute name="title" >
-       <string>LAN</string>
-      </attribute>
-     </widget>
-    </widget>
-   </item>
-   <item row="1" column="0" >
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons" >
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>netDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>248</x>
-     <y>254</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>netDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>316</x>
-     <y>260</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
diff --git a/src/gui/qt/newgamedialogimpl.cpp b/src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp
similarity index 100%
rename from src/gui/qt/newgamedialogimpl.cpp
rename to src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp
diff --git a/src/gui/qt/newgamedialogimpl.h b/src/gui/qt/newlocalgamedialog/newgamedialogimpl.h
similarity index 100%
rename from src/gui/qt/newgamedialogimpl.h
rename to src/gui/qt/newlocalgamedialog/newgamedialogimpl.h
diff --git a/src/gui/qt/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
similarity index 100%
rename from src/gui/qt/settingsdialogimpl.cpp
rename to src/gui/qt/settingsdialog/settingsdialogimpl.cpp
diff --git a/src/gui/qt/settingsdialogimpl.h b/src/gui/qt/settingsdialog/settingsdialogimpl.h
similarity index 100%
rename from src/gui/qt/settingsdialogimpl.h
rename to src/gui/qt/settingsdialog/settingsdialogimpl.h