diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4dc2476c7c..9602272cae 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,16 +16,6 @@ endif (Nepomuk_FOUND)
 ########### next target ###############
 
 set(dolphinprivate_LIB_SRCS
-    additionalinfoaccessor.cpp
-    dolphindirlister.cpp
-    dolphinmodel.cpp
-    dolphinnewmenuobserver.cpp
-    dolphinsortfilterproxymodel.cpp
-    dolphinviewactionhandler.cpp
-    dolphinremoteencoding.cpp
-    draganddrophelper.cpp
-    folderexpander.cpp
-    renamedialog.cpp
     settings/additionalinfodialog.cpp
     settings/applyviewpropsjob.cpp
     settings/dolphinsettings.cpp
@@ -37,8 +27,9 @@ set(dolphinprivate_LIB_SRCS
     versioncontrol/pendingthreadsmaintainer.cpp
     versioncontrol/updateitemstatesthread.cpp
     versioncontrol/versioncontrolobserver.cpp
-    viewproperties.cpp
+    views/additionalinfoaccessor.cpp
     views/dolphincategorydrawer.cpp
+    views/dolphindirlister.cpp
     views/dolphinview.cpp
     views/dolphindetailsview.cpp
     views/dolphindetailsviewexpander.cpp
@@ -46,12 +37,21 @@ set(dolphinprivate_LIB_SRCS
     views/dolphiniconsview.cpp
     views/dolphincolumnview.cpp
     views/dolphincolumnviewcontainer.cpp
+    views/dolphinmodel.cpp
+    views/dolphinnewmenuobserver.cpp
+    views/dolphinremoteencoding.cpp
+    views/dolphinsortfilterproxymodel.cpp
+    views/dolphinviewactionhandler.cpp
     views/dolphinviewautoscroller.cpp
     views/dolphinviewcontroller.cpp
+    views/draganddrophelper.cpp
+    views/folderexpander.cpp
     views/selectiontoggle.cpp
     views/selectionmanager.cpp
+    views/renamedialog.cpp
     views/viewextensionsfactory.cpp
     views/viewmodecontroller.cpp
+    views/viewproperties.cpp
     views/zoomlevelinfo.cpp
 )
 
@@ -99,7 +99,6 @@ set(dolphin_SRCS
     dolphinmainwindow.cpp
     dolphinnewmenu.cpp
     dolphinviewcontainer.cpp
-    dolphindirlister.cpp
     dolphincontextmenu.cpp
     filterbar/filterbar.cpp
     main.cpp
@@ -135,6 +134,7 @@ set(dolphin_SRCS
     statusbar/dolphinstatusbar.cpp
     statusbar/statusbarspaceinfo.cpp
     statusbar/statusbarmessagelabel.cpp
+    views/dolphindirlister.cpp
     views/zoomlevelinfo.cpp
 )
 
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index e5a9bd621f..bc0f9d6513 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -20,23 +20,24 @@
  ***************************************************************************/
 
 #include "dolphinmainwindow.h"
-#include "dolphinviewactionhandler.h"
-#include "dolphinremoteencoding.h"
 
 #include <config-nepomuk.h>
 
 #include "dolphinapplication.h"
 #include "dolphincontextmenu.h"
 #include "dolphinnewmenu.h"
-#include "settings/dolphinsettings.h"
-#include "settings/dolphinsettingsdialog.h"
 #include "dolphinviewcontainer.h"
+#include "mainwindowadaptor.h"
 #include "panels/folders/folderspanel.h"
 #include "panels/places/placespanel.h"
 #include "panels/information/informationpanel.h"
-#include "mainwindowadaptor.h"
+#include "settings/dolphinsettings.h"
+#include "settings/dolphinsettingsdialog.h"
 #include "statusbar/dolphinstatusbar.h"
-#include "viewproperties.h"
+#include "views/dolphinviewactionhandler.h"
+#include "views/dolphinremoteencoding.h"
+#include "views/draganddrophelper.h"
+#include "views/viewproperties.h"
 
 #ifndef Q_OS_WIN
 #include "panels/terminal/terminalpanel.h"
@@ -44,7 +45,6 @@
 
 #include "dolphin_generalsettings.h"
 #include "dolphin_iconsmodesettings.h"
-#include "draganddrophelper.h"
 
 #include <kaction.h>
 #include <kactioncollection.h>
diff --git a/src/dolphinnewmenu.cpp b/src/dolphinnewmenu.cpp
index 5769e28adf..a6dec150e7 100644
--- a/src/dolphinnewmenu.cpp
+++ b/src/dolphinnewmenu.cpp
@@ -21,9 +21,9 @@
 #include "dolphinnewmenu.h"
 
 #include "dolphinmainwindow.h"
-#include "dolphinnewmenuobserver.h"
 #include "dolphinviewcontainer.h"
 #include "statusbar/dolphinstatusbar.h"
+#include "views/dolphinnewmenuobserver.h"
 #include "views/dolphinview.h"
 
 #include <kactioncollection.h>
diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 18ace8df54..a8254552ee 100644
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -18,11 +18,6 @@
 */
 
 #include "dolphinpart.h"
-#include "dolphinviewactionhandler.h"
-#include "dolphinsortfilterproxymodel.h"
-#include "dolphinmodel.h"
-#include "dolphinnewmenuobserver.h"
-#include "dolphinremoteencoding.h"
 
 #include <kfileitemlistproperties.h>
 #include <konq_operations.h>
@@ -47,6 +42,11 @@
 
 #include "settings/dolphinsettings.h"
 #include "views/dolphinview.h"
+#include "views/dolphinviewactionhandler.h"
+#include "views/dolphinsortfilterproxymodel.h"
+#include "views/dolphinmodel.h"
+#include "views/dolphinnewmenuobserver.h"
+#include "views/dolphinremoteencoding.h"
 
 #include <QActionGroup>
 #include <QApplication>
diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 24ab432725..2fb7565f16 100644
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -48,21 +48,21 @@
 #include <krun.h>
 
 #include "dolphin_generalsettings.h"
-#include "dolphinmodel.h"
 #include "dolphinmainwindow.h"
-#include "dolphindirlister.h"
-#include "dolphinsortfilterproxymodel.h"
-#include "draganddrophelper.h"
 #include "filterbar/filterbar.h"
 #include "search/dolphinsearchbox.h"
 #include "settings/dolphinsettings.h"
 #include "statusbar/dolphinstatusbar.h"
-#include "viewproperties.h"
 #include "views/dolphincolumnview.h"
 #include "views/dolphindetailsview.h"
+#include "views/dolphindirlister.h"
+#include "views/dolphinsortfilterproxymodel.h"
+#include "views/draganddrophelper.h"
 #include "views/dolphiniconsview.h"
+#include "views/dolphinmodel.h"
 #include "views/dolphinviewcontroller.h"
 #include "views/viewmodecontroller.h"
+#include "views/viewproperties.h"
 
 DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
     QWidget(parent),
diff --git a/src/panels/folders/folderspanel.cpp b/src/panels/folders/folderspanel.cpp
index fb1b84fa7f..729dac3727 100644
--- a/src/panels/folders/folderspanel.cpp
+++ b/src/panels/folders/folderspanel.cpp
@@ -19,14 +19,9 @@
 
 #include "folderspanel.h"
 
-#include "dolphinmodel.h"
-#include "dolphinsortfilterproxymodel.h"
 #include "settings/dolphinsettings.h"
 #include "dolphin_folderspanelsettings.h"
 #include "dolphin_generalsettings.h"
-#include "draganddrophelper.h"
-#include "folderexpander.h"
-#include "renamedialog.h"
 #include "paneltreeview.h"
 #include "treeviewcontextmenu.h"
 
@@ -43,7 +38,12 @@
 #include <QScrollBar>
 #include <QTimer>
 
-#include "views/dolphinview.h"
+#include <views/draganddrophelper.h>
+#include <views/dolphinmodel.h>
+#include <views/dolphinsortfilterproxymodel.h>
+#include <views/dolphinview.h>
+#include <views/folderexpander.h>
+#include <views/renamedialog.h>
 
 FoldersPanel::FoldersPanel(QWidget* parent) :
     Panel(parent),
diff --git a/src/panels/folders/paneltreeview.cpp b/src/panels/folders/paneltreeview.cpp
index 69cf46cd62..70cfdeb1d3 100644
--- a/src/panels/folders/paneltreeview.cpp
+++ b/src/panels/folders/paneltreeview.cpp
@@ -19,9 +19,6 @@
 
 #include "paneltreeview.h"
 
-#include "dolphinmodel.h"
-#include "draganddrophelper.h"
-
 #include <kfileitemdelegate.h>
 #include <QListView>
 #include <QKeyEvent>
@@ -29,6 +26,9 @@
 #include <QHeaderView>
 #include <QScrollBar>
 
+#include <views/dolphinmodel.h>
+#include <views/draganddrophelper.h>
+
 PanelTreeView::PanelTreeView(QWidget* parent) :
     KTreeView(parent)
 {
diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp
index 0da932154b..1ca9bf59a1 100644
--- a/src/panels/places/placespanel.cpp
+++ b/src/panels/places/placespanel.cpp
@@ -21,10 +21,10 @@
 #include "placespanel.h"
 
 #include "dolphin_generalsettings.h"
-#include "draganddrophelper.h"
 #include <kfileitem.h>
 #include <konq_operations.h>
 #include "settings/dolphinsettings.h"
+#include "views/draganddrophelper.h"
 
 PlacesPanel::PlacesPanel(QWidget* parent) :
     KFilePlacesView(parent),
diff --git a/src/settings/additionalinfodialog.cpp b/src/settings/additionalinfodialog.cpp
index 8899c4861c..9a56c2bca0 100644
--- a/src/settings/additionalinfodialog.cpp
+++ b/src/settings/additionalinfodialog.cpp
@@ -19,13 +19,14 @@
 
 #include "additionalinfodialog.h"
 
-#include "additionalinfoaccessor.h"
 #include <klocale.h>
 
 #include <QCheckBox>
 #include <QLabel>
 #include <QVBoxLayout>
 
+#include "views/additionalinfoaccessor.h"
+
 AdditionalInfoDialog::AdditionalInfoDialog(QWidget* parent,
                                            KFileItemDelegate::InformationList infoList) :
     KDialog(parent),
diff --git a/src/settings/applyviewpropsjob.cpp b/src/settings/applyviewpropsjob.cpp
index 9250226e9d..252ac588df 100644
--- a/src/settings/applyviewpropsjob.cpp
+++ b/src/settings/applyviewpropsjob.cpp
@@ -21,7 +21,7 @@
  ***************************************************************************/
 
 #include "applyviewpropsjob.h"
-#include "viewproperties.h"
+#include <views/viewproperties.h>
 
 ApplyViewPropsJob::ApplyViewPropsJob(const KUrl& dir,
                                      const ViewProperties& viewProps) :
diff --git a/src/settings/general/behaviorsettingspage.cpp b/src/settings/general/behaviorsettingspage.cpp
index 0d7a4a0ab3..f1f05b8bd5 100644
--- a/src/settings/general/behaviorsettingspage.cpp
+++ b/src/settings/general/behaviorsettingspage.cpp
@@ -23,7 +23,6 @@
 #include "dolphin_generalsettings.h"
 #include <settings/filemetadataconfigurationdialog.h>
 #include <settings/dolphinsettings.h>
-#include <viewproperties.h>
 
 #include <kdialog.h>
 #include <klocale.h>
@@ -35,6 +34,8 @@
 #include <QRadioButton>
 #include <QVBoxLayout>
 
+#include <views/viewproperties.h>
+
 const bool CONFIRM_TRASH = false;
 const bool CONFIRM_DELETE = true;
 
diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp
index 6e4efab1b7..7830616d0c 100644
--- a/src/settings/viewpropertiesdialog.cpp
+++ b/src/settings/viewpropertiesdialog.cpp
@@ -23,10 +23,8 @@
 #include "additionalinfodialog.h"
 #include "views/dolphinview.h"
 #include "settings/dolphinsettings.h"
-#include "dolphinsortfilterproxymodel.h"
 #include "dolphin_generalsettings.h"
 #include "dolphin_iconsmodesettings.h"
-#include "viewproperties.h"
 #include "viewpropsprogressinfo.h"
 
 #include <config-nepomuk.h>
@@ -54,6 +52,9 @@
 #include <QRadioButton>
 #include <QBoxLayout>
 
+#include <views/dolphinsortfilterproxymodel.h>
+#include <views/viewproperties.h>
+
 ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     KDialog(dolphinView),
     m_isDirty(false),
diff --git a/src/settings/viewpropsprogressinfo.cpp b/src/settings/viewpropsprogressinfo.cpp
index c073d3d468..436dcdef6b 100644
--- a/src/settings/viewpropsprogressinfo.cpp
+++ b/src/settings/viewpropsprogressinfo.cpp
@@ -20,17 +20,17 @@
 
 #include "viewpropsprogressinfo.h"
 #include "applyviewpropsjob.h"
-#include "viewproperties.h"
 
 #include <QtGui/QLabel>
 #include <QtGui/QProgressBar>
 #include <QtCore/QTimer>
 #include <QtGui/QBoxLayout>
 
-#include <assert.h>
 #include <klocale.h>
 #include <kio/jobclasses.h>
 
+#include <views/viewproperties.h>
+
 ViewPropsProgressInfo::ViewPropsProgressInfo(QWidget* parent,
                                              const KUrl& dir,
                                              const ViewProperties& viewProps) :
diff --git a/src/tooltips/tooltipmanager.cpp b/src/tooltips/tooltipmanager.cpp
index f44adf2ad4..726aed9f3d 100644
--- a/src/tooltips/tooltipmanager.cpp
+++ b/src/tooltips/tooltipmanager.cpp
@@ -19,9 +19,6 @@
 
 #include "tooltipmanager.h"
 
-#include "dolphinmodel.h"
-#include "dolphinsortfilterproxymodel.h"
-
 #include "filemetadatatooltip.h"
 #include <kicon.h>
 #include <kio/previewjob.h>
@@ -33,6 +30,9 @@
 #include <QScrollBar>
 #include <QTimer>
 
+#include <views/dolphinmodel.h>
+#include <views/dolphinsortfilterproxymodel.h>
+
 ToolTipManager::ToolTipManager(QAbstractItemView* parent,
                                DolphinSortFilterProxyModel* model) :
     QObject(parent),
diff --git a/src/versioncontrol/versioncontrolobserver.cpp b/src/versioncontrol/versioncontrolobserver.cpp
index 744d81f4ff..51337e097a 100644
--- a/src/versioncontrol/versioncontrolobserver.cpp
+++ b/src/versioncontrol/versioncontrolobserver.cpp
@@ -19,7 +19,6 @@
 
 #include "versioncontrolobserver.h"
 
-#include <dolphinmodel.h>
 #include "dolphin_versioncontrolsettings.h"
 
 #include <kdirlister.h>
@@ -36,6 +35,8 @@
 #include <QMutexLocker>
 #include <QTimer>
 
+#include <views/dolphinmodel.h>
+
 VersionControlObserver::VersionControlObserver(QAbstractItemView* view) :
     QObject(view),
     m_pendingItemStatesUpdate(false),
diff --git a/src/additionalinfoaccessor.cpp b/src/views/additionalinfoaccessor.cpp
similarity index 100%
rename from src/additionalinfoaccessor.cpp
rename to src/views/additionalinfoaccessor.cpp
diff --git a/src/additionalinfoaccessor.h b/src/views/additionalinfoaccessor.h
similarity index 100%
rename from src/additionalinfoaccessor.h
rename to src/views/additionalinfoaccessor.h
diff --git a/src/dolphindirlister.cpp b/src/views/dolphindirlister.cpp
similarity index 100%
rename from src/dolphindirlister.cpp
rename to src/views/dolphindirlister.cpp
diff --git a/src/dolphindirlister.h b/src/views/dolphindirlister.h
similarity index 100%
rename from src/dolphindirlister.h
rename to src/views/dolphindirlister.h
diff --git a/src/views/dolphinfileitemdelegate.cpp b/src/views/dolphinfileitemdelegate.cpp
index 17447d8cb4..6b706c88b2 100644
--- a/src/views/dolphinfileitemdelegate.cpp
+++ b/src/views/dolphinfileitemdelegate.cpp
@@ -19,7 +19,7 @@
 
 #include "dolphinfileitemdelegate.h"
 
-#include <dolphinmodel.h>
+#include "dolphinmodel.h"
 #include <kfileitem.h>
 #include <kicon.h>
 #include <kiconloader.h>
diff --git a/src/views/dolphinfileitemdelegate.h b/src/views/dolphinfileitemdelegate.h
index 405f24916f..0777571f75 100644
--- a/src/views/dolphinfileitemdelegate.h
+++ b/src/views/dolphinfileitemdelegate.h
@@ -20,8 +20,8 @@
 #ifndef DOLPHINFILEITEMDELEGATE_H
 #define DOLPHINFILEITEMDELEGATE_H
 
-#include <dolphinmodel.h>
 #include <kfileitemdelegate.h>
+#include <views/dolphinmodel.h>
 
 class QAbstractProxyModel;
 
diff --git a/src/dolphinmodel.cpp b/src/views/dolphinmodel.cpp
similarity index 100%
rename from src/dolphinmodel.cpp
rename to src/views/dolphinmodel.cpp
diff --git a/src/dolphinmodel.h b/src/views/dolphinmodel.h
similarity index 100%
rename from src/dolphinmodel.h
rename to src/views/dolphinmodel.h
diff --git a/src/dolphinnewmenuobserver.cpp b/src/views/dolphinnewmenuobserver.cpp
similarity index 100%
rename from src/dolphinnewmenuobserver.cpp
rename to src/views/dolphinnewmenuobserver.cpp
diff --git a/src/dolphinnewmenuobserver.h b/src/views/dolphinnewmenuobserver.h
similarity index 100%
rename from src/dolphinnewmenuobserver.h
rename to src/views/dolphinnewmenuobserver.h
diff --git a/src/dolphinremoteencoding.cpp b/src/views/dolphinremoteencoding.cpp
similarity index 100%
rename from src/dolphinremoteencoding.cpp
rename to src/views/dolphinremoteencoding.cpp
diff --git a/src/dolphinremoteencoding.h b/src/views/dolphinremoteencoding.h
similarity index 100%
rename from src/dolphinremoteencoding.h
rename to src/views/dolphinremoteencoding.h
diff --git a/src/dolphinsortfilterproxymodel.cpp b/src/views/dolphinsortfilterproxymodel.cpp
similarity index 100%
rename from src/dolphinsortfilterproxymodel.cpp
rename to src/views/dolphinsortfilterproxymodel.cpp
diff --git a/src/dolphinsortfilterproxymodel.h b/src/views/dolphinsortfilterproxymodel.h
similarity index 100%
rename from src/dolphinsortfilterproxymodel.h
rename to src/views/dolphinsortfilterproxymodel.h
diff --git a/src/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp
similarity index 100%
rename from src/dolphinviewactionhandler.cpp
rename to src/views/dolphinviewactionhandler.cpp
diff --git a/src/dolphinviewactionhandler.h b/src/views/dolphinviewactionhandler.h
similarity index 100%
rename from src/dolphinviewactionhandler.h
rename to src/views/dolphinviewactionhandler.h
diff --git a/src/draganddrophelper.cpp b/src/views/draganddrophelper.cpp
similarity index 100%
rename from src/draganddrophelper.cpp
rename to src/views/draganddrophelper.cpp
diff --git a/src/draganddrophelper.h b/src/views/draganddrophelper.h
similarity index 100%
rename from src/draganddrophelper.h
rename to src/views/draganddrophelper.h
diff --git a/src/folderexpander.cpp b/src/views/folderexpander.cpp
similarity index 100%
rename from src/folderexpander.cpp
rename to src/views/folderexpander.cpp
diff --git a/src/folderexpander.h b/src/views/folderexpander.h
similarity index 100%
rename from src/folderexpander.h
rename to src/views/folderexpander.h
diff --git a/src/renamedialog.cpp b/src/views/renamedialog.cpp
similarity index 100%
rename from src/renamedialog.cpp
rename to src/views/renamedialog.cpp
diff --git a/src/renamedialog.h b/src/views/renamedialog.h
similarity index 100%
rename from src/renamedialog.h
rename to src/views/renamedialog.h
diff --git a/src/viewproperties.cpp b/src/views/viewproperties.cpp
similarity index 100%
rename from src/viewproperties.cpp
rename to src/views/viewproperties.cpp
diff --git a/src/viewproperties.h b/src/views/viewproperties.h
similarity index 100%
rename from src/viewproperties.h
rename to src/views/viewproperties.h