diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index dacd3bb4e..558845902 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -72,12 +72,10 @@ opencs_units_noqt (view/tools
     subviews
     )
 
-opencs_units (settings
+opencs_units (view/settings
     customblock
     proxyblock
-    settingcontainer
     groupbox
-    settingsitem
     abstractblock
     settingwidget
     itemblock
@@ -90,7 +88,12 @@ opencs_units (settings
     editorpage
     )
 
-opencs_units_noqt (settings
+opencs_units (model/settings
+    settingcontainer
+    settingsitem
+    )
+
+opencs_units_noqt (model/settings
     support
     usersettings
     )
diff --git a/apps/opencs/settings/settingcontainer.cpp b/apps/opencs/model/settings/settingcontainer.cpp
similarity index 100%
rename from apps/opencs/settings/settingcontainer.cpp
rename to apps/opencs/model/settings/settingcontainer.cpp
diff --git a/apps/opencs/settings/settingcontainer.hpp b/apps/opencs/model/settings/settingcontainer.hpp
similarity index 100%
rename from apps/opencs/settings/settingcontainer.hpp
rename to apps/opencs/model/settings/settingcontainer.hpp
diff --git a/apps/opencs/settings/settingsitem.cpp b/apps/opencs/model/settings/settingsitem.cpp
similarity index 100%
rename from apps/opencs/settings/settingsitem.cpp
rename to apps/opencs/model/settings/settingsitem.cpp
diff --git a/apps/opencs/settings/settingsitem.hpp b/apps/opencs/model/settings/settingsitem.hpp
similarity index 100%
rename from apps/opencs/settings/settingsitem.hpp
rename to apps/opencs/model/settings/settingsitem.hpp
diff --git a/apps/opencs/settings/support.cpp b/apps/opencs/model/settings/support.cpp
similarity index 100%
rename from apps/opencs/settings/support.cpp
rename to apps/opencs/model/settings/support.cpp
diff --git a/apps/opencs/settings/support.hpp b/apps/opencs/model/settings/support.hpp
similarity index 100%
rename from apps/opencs/settings/support.hpp
rename to apps/opencs/model/settings/support.hpp
diff --git a/apps/opencs/settings/usersettings.cpp b/apps/opencs/model/settings/usersettings.cpp
similarity index 100%
rename from apps/opencs/settings/usersettings.cpp
rename to apps/opencs/model/settings/usersettings.cpp
diff --git a/apps/opencs/settings/usersettings.hpp b/apps/opencs/model/settings/usersettings.hpp
similarity index 100%
rename from apps/opencs/settings/usersettings.hpp
rename to apps/opencs/model/settings/usersettings.hpp
diff --git a/apps/opencs/settings/usersettingsdialog.ui b/apps/opencs/settings/usersettingsdialog.ui
deleted file mode 100644
index 4cd9dd113..000000000
--- a/apps/opencs/settings/usersettingsdialog.ui
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>UserSettingsDialog</class>
- <widget class="QDialog" name="UserSettingsDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>638</width>
-    <height>478</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Dialog</string>
-  </property>
-  <widget class="QDialogButtonBox" name="buttonBox">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>440</y>
-     <width>621</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="orientation">
-    <enum>Qt::Horizontal</enum>
-   </property>
-   <property name="standardButtons">
-    <set>QDialogButtonBox::Close</set>
-   </property>
-  </widget>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>UserSettingsDialog</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>UserSettingsDialog</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/apps/opencs/view/doc/view.cpp b/apps/opencs/view/doc/view.cpp
index 85821833b..665ca2b3a 100644
--- a/apps/opencs/view/doc/view.cpp
+++ b/apps/opencs/view/doc/view.cpp
@@ -11,7 +11,7 @@
 #include "../../model/doc/document.hpp"
 #include "../world/subviews.hpp"
 #include "../tools/subviews.hpp"
-#include "../../settings/usersettingsdialog.hpp"
+#include "../settings/usersettingsdialog.hpp"
 #include "viewmanager.hpp"
 #include "operations.hpp"
 #include "subview.hpp"
diff --git a/apps/opencs/settings/abstractblock.cpp b/apps/opencs/view/settings/abstractblock.cpp
similarity index 100%
rename from apps/opencs/settings/abstractblock.cpp
rename to apps/opencs/view/settings/abstractblock.cpp
diff --git a/apps/opencs/settings/abstractblock.hpp b/apps/opencs/view/settings/abstractblock.hpp
similarity index 97%
rename from apps/opencs/settings/abstractblock.hpp
rename to apps/opencs/view/settings/abstractblock.hpp
index aa57d4fcb..31c093283 100644
--- a/apps/opencs/settings/abstractblock.hpp
+++ b/apps/opencs/view/settings/abstractblock.hpp
@@ -5,7 +5,7 @@
 #include <QList>
 
 #include "settingwidget.hpp"
-#include "settingsitem.hpp"
+#include "../../model/settings/settingsitem.hpp"
 #include "groupbox.hpp"
 
 namespace CsSettings
diff --git a/apps/opencs/settings/abstractpage.cpp b/apps/opencs/view/settings/abstractpage.cpp
similarity index 100%
rename from apps/opencs/settings/abstractpage.cpp
rename to apps/opencs/view/settings/abstractpage.cpp
diff --git a/apps/opencs/settings/abstractpage.hpp b/apps/opencs/view/settings/abstractpage.hpp
similarity index 100%
rename from apps/opencs/settings/abstractpage.hpp
rename to apps/opencs/view/settings/abstractpage.hpp
diff --git a/apps/opencs/settings/abstractwidget.cpp b/apps/opencs/view/settings/abstractwidget.cpp
similarity index 100%
rename from apps/opencs/settings/abstractwidget.cpp
rename to apps/opencs/view/settings/abstractwidget.cpp
diff --git a/apps/opencs/settings/abstractwidget.hpp b/apps/opencs/view/settings/abstractwidget.hpp
similarity index 97%
rename from apps/opencs/settings/abstractwidget.hpp
rename to apps/opencs/view/settings/abstractwidget.hpp
index 1adf8e84f..b5c646754 100644
--- a/apps/opencs/settings/abstractwidget.hpp
+++ b/apps/opencs/view/settings/abstractwidget.hpp
@@ -2,7 +2,7 @@
 #define ABSTRACTWIDGET_HPP
 
 #include <QWidget>
-#include "support.hpp"
+#include "../../model/settings/support.hpp"
 
 class QLayout;
 
diff --git a/apps/opencs/settings/blankpage.cpp b/apps/opencs/view/settings/blankpage.cpp
similarity index 96%
rename from apps/opencs/settings/blankpage.cpp
rename to apps/opencs/view/settings/blankpage.cpp
index 1e2ab9c0f..deb77e057 100644
--- a/apps/opencs/settings/blankpage.cpp
+++ b/apps/opencs/view/settings/blankpage.cpp
@@ -13,7 +13,7 @@
 #include <QPlastiqueStyle>
 #endif
 
-#include "usersettings.hpp"
+#include "../../model/settings/usersettings.hpp"
 #include "groupblock.hpp"
 #include "toggleblock.hpp"
 
diff --git a/apps/opencs/settings/blankpage.hpp b/apps/opencs/view/settings/blankpage.hpp
similarity index 100%
rename from apps/opencs/settings/blankpage.hpp
rename to apps/opencs/view/settings/blankpage.hpp
diff --git a/apps/opencs/settings/customblock.cpp b/apps/opencs/view/settings/customblock.cpp
similarity index 100%
rename from apps/opencs/settings/customblock.cpp
rename to apps/opencs/view/settings/customblock.cpp
diff --git a/apps/opencs/settings/customblock.hpp b/apps/opencs/view/settings/customblock.hpp
similarity index 100%
rename from apps/opencs/settings/customblock.hpp
rename to apps/opencs/view/settings/customblock.hpp
diff --git a/apps/opencs/settings/editorpage.cpp b/apps/opencs/view/settings/editorpage.cpp
similarity index 99%
rename from apps/opencs/settings/editorpage.cpp
rename to apps/opencs/view/settings/editorpage.cpp
index eb6b58ef9..2a9bf0aab 100644
--- a/apps/opencs/settings/editorpage.cpp
+++ b/apps/opencs/view/settings/editorpage.cpp
@@ -13,7 +13,7 @@
 #include <QPlastiqueStyle>
 #endif
 
-#include "usersettings.hpp"
+#include "../../model/settings/usersettings.hpp"
 #include "groupblock.hpp"
 #include "toggleblock.hpp"
 
diff --git a/apps/opencs/settings/editorpage.hpp b/apps/opencs/view/settings/editorpage.hpp
similarity index 100%
rename from apps/opencs/settings/editorpage.hpp
rename to apps/opencs/view/settings/editorpage.hpp
diff --git a/apps/opencs/settings/groupblock.cpp b/apps/opencs/view/settings/groupblock.cpp
similarity index 100%
rename from apps/opencs/settings/groupblock.cpp
rename to apps/opencs/view/settings/groupblock.cpp
diff --git a/apps/opencs/settings/groupblock.hpp b/apps/opencs/view/settings/groupblock.hpp
similarity index 100%
rename from apps/opencs/settings/groupblock.hpp
rename to apps/opencs/view/settings/groupblock.hpp
diff --git a/apps/opencs/settings/groupbox.cpp b/apps/opencs/view/settings/groupbox.cpp
similarity index 100%
rename from apps/opencs/settings/groupbox.cpp
rename to apps/opencs/view/settings/groupbox.cpp
diff --git a/apps/opencs/settings/groupbox.hpp b/apps/opencs/view/settings/groupbox.hpp
similarity index 100%
rename from apps/opencs/settings/groupbox.hpp
rename to apps/opencs/view/settings/groupbox.hpp
diff --git a/apps/opencs/settings/itemblock.cpp b/apps/opencs/view/settings/itemblock.cpp
similarity index 100%
rename from apps/opencs/settings/itemblock.cpp
rename to apps/opencs/view/settings/itemblock.cpp
diff --git a/apps/opencs/settings/itemblock.hpp b/apps/opencs/view/settings/itemblock.hpp
similarity index 100%
rename from apps/opencs/settings/itemblock.hpp
rename to apps/opencs/view/settings/itemblock.hpp
diff --git a/apps/opencs/settings/proxyblock.cpp b/apps/opencs/view/settings/proxyblock.cpp
similarity index 100%
rename from apps/opencs/settings/proxyblock.cpp
rename to apps/opencs/view/settings/proxyblock.cpp
diff --git a/apps/opencs/settings/proxyblock.hpp b/apps/opencs/view/settings/proxyblock.hpp
similarity index 100%
rename from apps/opencs/settings/proxyblock.hpp
rename to apps/opencs/view/settings/proxyblock.hpp
diff --git a/apps/opencs/settings/settingwidget.cpp b/apps/opencs/view/settings/settingwidget.cpp
similarity index 100%
rename from apps/opencs/settings/settingwidget.cpp
rename to apps/opencs/view/settings/settingwidget.cpp
diff --git a/apps/opencs/settings/settingwidget.hpp b/apps/opencs/view/settings/settingwidget.hpp
similarity index 100%
rename from apps/opencs/settings/settingwidget.hpp
rename to apps/opencs/view/settings/settingwidget.hpp
diff --git a/apps/opencs/settings/toggleblock.cpp b/apps/opencs/view/settings/toggleblock.cpp
similarity index 100%
rename from apps/opencs/settings/toggleblock.cpp
rename to apps/opencs/view/settings/toggleblock.cpp
diff --git a/apps/opencs/settings/toggleblock.hpp b/apps/opencs/view/settings/toggleblock.hpp
similarity index 100%
rename from apps/opencs/settings/toggleblock.hpp
rename to apps/opencs/view/settings/toggleblock.hpp
diff --git a/apps/opencs/settings/usersettingsdialog.cpp b/apps/opencs/view/settings/usersettingsdialog.cpp
similarity index 99%
rename from apps/opencs/settings/usersettingsdialog.cpp
rename to apps/opencs/view/settings/usersettingsdialog.cpp
index 9777573ae..19c81fde9 100644
--- a/apps/opencs/settings/usersettingsdialog.cpp
+++ b/apps/opencs/view/settings/usersettingsdialog.cpp
@@ -12,7 +12,7 @@
 
 #include "blankpage.hpp"
 #include "editorpage.hpp"
-#include "support.hpp"
+#include "../../model/settings/support.hpp"
 
 #include "settingwidget.hpp"
 #include <QDebug>
diff --git a/apps/opencs/settings/usersettingsdialog.hpp b/apps/opencs/view/settings/usersettingsdialog.hpp
similarity index 95%
rename from apps/opencs/settings/usersettingsdialog.hpp
rename to apps/opencs/view/settings/usersettingsdialog.hpp
index 3b968e549..9836fa5d9 100644
--- a/apps/opencs/settings/usersettingsdialog.hpp
+++ b/apps/opencs/view/settings/usersettingsdialog.hpp
@@ -5,8 +5,8 @@
 #include <QStackedWidget>
 
 #include <components/files/configurationmanager.hpp>
-#include "usersettings.hpp"
-#include "support.hpp"
+#include "../../model/settings/usersettings.hpp"
+#include "../../model/settings/support.hpp"
 
 class QHBoxLayout;
 class AbstractWidget;