106 files changed, 121 insertions, 123 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9cd091045..708271d00 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -18,8 +18,8 @@ endif (Nepomuk_FOUND)
 ########### next target ###############
 
 set(dolphinprivate_LIB_SRCS
-    additionalinfodialog.cpp
-    applyviewpropsjob.cpp
+    settings/additionalinfodialog.cpp
+    settings/applyviewpropsjob.cpp
     dolphincontroller.cpp
     dolphindetailsview.cpp
     dolphiniconsview.cpp
@@ -28,33 +28,33 @@ set(dolphinprivate_LIB_SRCS
     dolphindirlister.cpp
     dolphinfileitemdelegate.cpp
     dolphinmodel.cpp
-    dolphinsettings.cpp
+    settings/dolphinsettings.cpp
     dolphinsortfilterproxymodel.cpp
-    dolphintooltip.cpp
+    tooltips/dolphintooltip.cpp
     dolphincategorydrawer.cpp
     dolphinview.cpp
     dolphinviewactionhandler.cpp
     dolphinviewautoscroller.cpp
     draganddrophelper.cpp
     folderexpander.cpp
-    ktooltip.cpp
-    kformattedballoontipdelegate.cpp
+    tooltips/ktooltip.cpp
+    tooltips/kformattedballoontipdelegate.cpp
     renamedialog.cpp
     selectiontoggle.cpp
     selectionmanager.cpp
-    tooltipmanager.cpp
+    tooltips/tooltipmanager.cpp
     viewproperties.cpp
-    viewpropertiesdialog.cpp
-    viewpropsprogressinfo.cpp
+    settings/viewpropertiesdialog.cpp
+    settings/viewpropsprogressinfo.cpp
     zoomlevelinfo.cpp
     )
 
 kde4_add_kcfg_files(dolphinprivate_LIB_SRCS
-    dolphin_columnmodesettings.kcfgc
-    dolphin_directoryviewpropertysettings.kcfgc
-    dolphin_detailsmodesettings.kcfgc
-    dolphin_iconsmodesettings.kcfgc
-    dolphin_generalsettings.kcfgc)
+    settings/dolphin_columnmodesettings.kcfgc
+    settings/dolphin_directoryviewpropertysettings.kcfgc
+    settings/dolphin_detailsmodesettings.kcfgc
+    settings/dolphin_iconsmodesettings.kcfgc
+    settings/dolphin_generalsettings.kcfgc)
 
 kde4_add_library(dolphinprivate SHARED ${dolphinprivate_LIB_SRCS})
 
@@ -90,62 +90,62 @@ install(FILES dolphinpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 ##########################################
 
 set(dolphin_SRCS
-    columnviewsettingspage.cpp
-    commentwidget.cpp
-    commenteditwidget.cpp
-    detailsviewsettingspage.cpp
+    settings/columnviewsettingspage.cpp
+    panels/information/commentwidget.cpp
+    panels/information/commenteditwidget.cpp
+    settings/detailsviewsettingspage.cpp
     dolphinapplication.cpp
-    dolphinfontrequester.cpp
+    settings/dolphinfontrequester.cpp
     dolphinmainwindow.cpp
     dolphinnewmenu.cpp
     dolphinviewcontainer.cpp
     dolphinstatusbar.cpp
     dolphindirlister.cpp
     dolphincontextmenu.cpp
-    dolphinfileplacesview.cpp
-    dolphinsettingsdialog.cpp
+    panels/places/dolphinfileplacesview.cpp
+    settings/dolphinsettingsdialog.cpp
     filterbar.cpp
-    generalsettingspage.cpp
-    generalviewsettingspage.cpp
-    iconsizegroupbox.cpp
-    iconsviewsettingspage.cpp
-    infosidebarpage.cpp
-    ktreeview.cpp
+    settings/generalsettingspage.cpp
+    settings/generalviewsettingspage.cpp
+    settings/iconsizegroupbox.cpp
+    settings/iconsviewsettingspage.cpp
+    panels/information/infosidebarpage.cpp
+    panels/folders/ktreeview.cpp
     main.cpp
-    metadatawidget.cpp
-    metatextlabel.cpp
+    panels/information/metadatawidget.cpp
+    panels/information/metatextlabel.cpp
     pixmapviewer.cpp
-    settingspagebase.cpp
-    sidebarpage.cpp
-    startupsettingspage.cpp
+    settings/settingspagebase.cpp
+    panels/sidebarpage.cpp
+    settings/startupsettingspage.cpp
     statusbarspaceinfo.cpp
     statusbarmessagelabel.cpp
-    treeviewcontextmenu.cpp
-    treeviewsidebarpage.cpp
-    sidebartreeview.cpp
-    viewsettingspage.cpp
-    viewsettingspagebase.cpp
+    panels/folders/treeviewcontextmenu.cpp
+    panels/folders/treeviewsidebarpage.cpp
+    panels/folders/sidebartreeview.cpp
+    settings/viewsettingspage.cpp
+    settings/viewsettingspagebase.cpp
     zoomlevelinfo.cpp
     )
 
 kde4_add_kcfg_files(dolphin_SRCS
-    dolphin_folderspanelsettings.kcfgc)
+    panels/folders/dolphin_folderspanelsettings.kcfgc)
 
 if(Nepomuk_FOUND)
 set(dolphin_SRCS
   ${dolphin_SRCS}
-  nepomukmassupdatejob.cpp
-  tagcloud/tagcloud.cpp
-  tagcloud/resourcetaggingwidget.cpp
-  tagcloud/taggingpopup.cpp
-  tagcloud/newtagdialog.cpp
+  panels/information/nepomukmassupdatejob.cpp
+  panels/information/tagcloud.cpp
+  panels/information/resourcetaggingwidget.cpp
+  panels/information/taggingpopup.cpp
+  panels/information/newtagdialog.cpp
 )
-kde4_add_ui_files(dolphin_SRCS tagcloud/newtagdialog.ui)
+kde4_add_ui_files(dolphin_SRCS panels/information/newtagdialog.ui)
 
 endif(Nepomuk_FOUND)
 
 if(NOT WIN32)
-   set(dolphin_SRCS ${dolphin_SRCS} terminalsidebarpage.cpp)
+   set(dolphin_SRCS ${dolphin_SRCS} panels/terminal/terminalsidebarpage.cpp)
 endif(NOT WIN32)
 
 qt4_add_dbus_adaptor(dolphin_SRCS
@@ -171,25 +171,23 @@ install(TARGETS dolphin ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 set(kcm_dolphin_PART_SRCS
     kcmdolphin.cpp
-    columnviewsettingspage.cpp
-    detailsviewsettingspage.cpp
-    dolphinfontrequester.cpp
-#    dolphinsettings.cpp
-    generalviewsettingspage.cpp
-    iconsizegroupbox.cpp
-    iconsviewsettingspage.cpp
+    settings/columnviewsettingspage.cpp
+    settings/detailsviewsettingspage.cpp
+    settings/dolphinfontrequester.cpp
+    settings/generalviewsettingspage.cpp
+    settings/iconsizegroupbox.cpp
+    settings/iconsviewsettingspage.cpp
     pixmapviewer.cpp
-    viewsettingspagebase.cpp
-#    viewproperties.cpp
+    settings/viewsettingspagebase.cpp
     zoomlevelinfo.cpp
 )
 
 kde4_add_kcfg_files(kcm_dolphin_PART_SRCS
-    dolphin_columnmodesettings.kcfgc
-    dolphin_directoryviewpropertysettings.kcfgc
-    dolphin_detailsmodesettings.kcfgc
-    dolphin_iconsmodesettings.kcfgc
-    dolphin_generalsettings.kcfgc)
+    settings/dolphin_columnmodesettings.kcfgc
+    settings/dolphin_directoryviewpropertysettings.kcfgc
+    settings/dolphin_detailsmodesettings.kcfgc
+    settings/dolphin_iconsmodesettings.kcfgc
+    settings/dolphin_generalsettings.kcfgc)
 
 kde4_add_plugin(kcm_dolphin ${kcm_dolphin_PART_SRCS})
 
@@ -203,6 +201,6 @@ install(TARGETS kcm_dolphin DESTINATION ${PLUGIN_INSTALL_DIR} )
 ########### install files ###############
 
 install( FILES  dolphin.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-install( FILES  dolphin_directoryviewpropertysettings.kcfg dolphin_generalsettings.kcfg dolphin_columnmodesettings.kcfg dolphin_iconsmodesettings.kcfg dolphin_detailsmodesettings.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
+install( FILES  settings/dolphin_directoryviewpropertysettings.kcfg settings/dolphin_generalsettings.kcfg settings/dolphin_columnmodesettings.kcfg settings/dolphin_iconsmodesettings.kcfg settings/dolphin_detailsmodesettings.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 install( FILES  dolphinui.rc DESTINATION ${DATA_INSTALL_DIR}/dolphin )
 install( FILES kcmdolphin.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index 05c33d7dd..bc488b8ae 100644
--- a/src/dolphincolumnview.cpp
+++ b/src/dolphincolumnview.cpp
@@ -21,7 +21,7 @@
 
 #include "dolphincolumnwidget.h"
 #include "dolphincontroller.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "zoomlevelinfo.h"
 
 #include "dolphin_columnmodesettings.h"
diff --git a/src/dolphincolumnwidget.cpp b/src/dolphincolumnwidget.cpp
index d7d8bb500..b86cd7269 100644
--- a/src/dolphincolumnwidget.cpp
+++ b/src/dolphincolumnwidget.cpp
@@ -24,14 +24,14 @@
 #include "dolphincontroller.h"
 #include "dolphindirlister.h"
 #include "dolphinsortfilterproxymodel.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphinviewautoscroller.h"
 #include "dolphin_columnmodesettings.h"
 #include "dolphin_generalsettings.h"
 #include "draganddrophelper.h"
 #include "folderexpander.h"
 #include "selectionmanager.h"
-#include "tooltipmanager.h"
+#include "tooltips/tooltipmanager.h"
 
 #include <kcolorscheme.h>
 #include <kdirlister.h>
diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 99735ea9e..a7f7df36c 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -22,7 +22,7 @@
 
 #include "dolphinmainwindow.h"
 #include "dolphinnewmenu.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphinview.h"
 #include "dolphinviewcontainer.h"
 #include "dolphin_generalsettings.h"
diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index 2d18c8e18..acfff6a65 100644
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -23,7 +23,7 @@
 #include "dolphinmodel.h"
 #include "dolphincontroller.h"
 #include "dolphinfileitemdelegate.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphinviewautoscroller.h"
 #include "draganddrophelper.h"
diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index f32ecbd3d..885a49101 100644
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -21,7 +21,7 @@
 
 #include "dolphincategorydrawer.h"
 #include "dolphincontroller.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphinviewautoscroller.h"
 #include "dolphin_iconsmodesettings.h"
 #include "dolphin_generalsettings.h"
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 9c55a40f4..c4d263bfd 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -25,20 +25,20 @@
 #include <config-nepomuk.h>
 
 #include "dolphinapplication.h"
-#include "dolphinfileplacesview.h"
+#include "panels/places/dolphinfileplacesview.h"
 #include "dolphinnewmenu.h"
-#include "dolphinsettings.h"
-#include "dolphinsettingsdialog.h"
+#include "settings/dolphinsettings.h"
+#include "settings/dolphinsettingsdialog.h"
 #include "dolphinstatusbar.h"
 #include "dolphinviewcontainer.h"
-#include "infosidebarpage.h"
-#include "metadatawidget.h"
+#include "panels/information/infosidebarpage.h"
+#include "panels/information/metadatawidget.h"
 #include "mainwindowadaptor.h"
-#include "treeviewsidebarpage.h"
+#include "panels/folders/treeviewsidebarpage.h"
 #include "viewproperties.h"
 
 #ifndef Q_OS_WIN
-#include "terminalsidebarpage.h"
+#include "panels/terminal/terminalsidebarpage.h"
 #endif
 
 #include "dolphin_generalsettings.h"
diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 4220e825f..b1e1ea5d0 100644
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -23,7 +23,7 @@
 #define DOLPHIN_MAINWINDOW_H
 
 #include "dolphinview.h"
-#include "sidebarpage.h"
+#include "panels/sidebarpage.h"
 
 #include <config-nepomuk.h>
 
diff --git a/src/dolphinstatusbar.cpp b/src/dolphinstatusbar.cpp
index caa784049..7a9b5dc8a 100644
--- a/src/dolphinstatusbar.cpp
+++ b/src/dolphinstatusbar.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include "dolphinstatusbar.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphinview.h"
 #include "dolphin_generalsettings.h"
 #include "statusbarmessagelabel.h"
diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 0bd24ecb3..6681fe189 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -57,12 +57,12 @@
 #include "dolphindetailsview.h"
 #include "dolphin_detailsmodesettings.h"
 #include "dolphiniconsview.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphin_generalsettings.h"
 #include "draganddrophelper.h"
 #include "folderexpander.h"
 #include "renamedialog.h"
-#include "tooltipmanager.h"
+#include "tooltips/tooltipmanager.h"
 #include "viewproperties.h"
 #include "zoomlevelinfo.h"
 
diff --git a/src/dolphinviewactionhandler.cpp b/src/dolphinviewactionhandler.cpp
index d563b3dd2..45603c286 100644
--- a/src/dolphinviewactionhandler.cpp
+++ b/src/dolphinviewactionhandler.cpp
@@ -19,7 +19,7 @@
 
 #include "dolphinviewactionhandler.h"
 
-#include "viewpropertiesdialog.h"
+#include "settings/viewpropertiesdialog.h"
 #include "dolphinview.h"
 #include "zoomlevelinfo.h"
 
diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 3cd6b34f2..f09d3d1c9 100644
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -58,7 +58,7 @@
 #include "filterbar.h"
 #include "kurlnavigator.h"
 #include "viewproperties.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphin_generalsettings.h"
 
 DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
diff --git a/src/folderexpander.cpp b/src/folderexpander.cpp
index 50f2bcf91..091cd0c2c 100644
--- a/src/folderexpander.cpp
+++ b/src/folderexpander.cpp
@@ -20,7 +20,7 @@
 #include "folderexpander.h"
 #include "dolphinview.h"
 
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphin_generalsettings.h"
 
 #include <QtCore/QTimer>
diff --git a/src/kcmdolphin.cpp b/src/kcmdolphin.cpp
index f980fa502..21883e76a 100644
--- a/src/kcmdolphin.cpp
+++ b/src/kcmdolphin.cpp
@@ -19,10 +19,10 @@
 
 #include "kcmdolphin.h"
 
-#include "columnviewsettingspage.h"
-#include "detailsviewsettingspage.h"
-#include "generalviewsettingspage.h"
-#include "iconsviewsettingspage.h"
+#include "settings/columnviewsettingspage.h"
+#include "settings/detailsviewsettingspage.h"
+#include "settings/generalviewsettingspage.h"
+#include "settings/iconsviewsettingspage.h"
 
 #include <ktabwidget.h>
 #include <kdialog.h>
diff --git a/src/dolphin_folderspanelsettings.kcfg b/src/panels/folders/dolphin_folderspanelsettings.kcfg
index 816d783c8..816d783c8 100644
--- a/src/dolphin_folderspanelsettings.kcfg
+++ b/src/panels/folders/dolphin_folderspanelsettings.kcfg
diff --git a/src/dolphin_folderspanelsettings.kcfgc b/src/panels/folders/dolphin_folderspanelsettings.kcfgc
index f73e8807d..f73e8807d 100644
--- a/src/dolphin_folderspanelsettings.kcfgc
+++ b/src/panels/folders/dolphin_folderspanelsettings.kcfgc
diff --git a/src/ktreeview.cpp b/src/panels/folders/ktreeview.cpp
index 7c30fad33..7c30fad33 100644
--- a/src/ktreeview.cpp
+++ b/src/panels/folders/ktreeview.cpp
diff --git a/src/ktreeview.h b/src/panels/folders/ktreeview.h
index 6bc6ea56a..6bc6ea56a 100644
--- a/src/ktreeview.h
+++ b/src/panels/folders/ktreeview.h
diff --git a/src/ktreeview_p.h b/src/panels/folders/ktreeview_p.h
index 1cfa463cd..1cfa463cd 100644
--- a/src/ktreeview_p.h
+++ b/src/panels/folders/ktreeview_p.h
diff --git a/src/sidebartreeview.cpp b/src/panels/folders/sidebartreeview.cpp
index a876ee6c3..a876ee6c3 100644
--- a/src/sidebartreeview.cpp
+++ b/src/panels/folders/sidebartreeview.cpp
diff --git a/src/sidebartreeview.h b/src/panels/folders/sidebartreeview.h
index 93bcbae2e..a5e8b63ce 100644
--- a/src/sidebartreeview.h
+++ b/src/panels/folders/sidebartreeview.h
@@ -21,7 +21,7 @@
 #define SIDEBARTREEVIEW_H
 
 #include <kurl.h>
-#include <ktreeview.h>
+#include <panels/folders/ktreeview.h>
 
 /**
  * @brief Tree view widget which is used for the sidebar panel.
diff --git a/src/treeviewcontextmenu.cpp b/src/panels/folders/treeviewcontextmenu.cpp
index 9e8638002..9e8638002 100644
--- a/src/treeviewcontextmenu.cpp
+++ b/src/panels/folders/treeviewcontextmenu.cpp
diff --git a/src/treeviewcontextmenu.h b/src/panels/folders/treeviewcontextmenu.h
index 20a603573..20a603573 100644
--- a/src/treeviewcontextmenu.h
+++ b/src/panels/folders/treeviewcontextmenu.h
diff --git a/src/treeviewsidebarpage.cpp b/src/panels/folders/treeviewsidebarpage.cpp
index d8387aea2..7801a97cc 100644
--- a/src/treeviewsidebarpage.cpp
+++ b/src/panels/folders/treeviewsidebarpage.cpp
@@ -22,7 +22,7 @@
 #include "dolphinmodel.h"
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphinview.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphin_folderspanelsettings.h"
 #include "dolphin_generalsettings.h"
 #include "draganddrophelper.h"
diff --git a/src/treeviewsidebarpage.h b/src/panels/folders/treeviewsidebarpage.h
index 84a9386ec..39f2323ad 100644
--- a/src/treeviewsidebarpage.h
+++ b/src/panels/folders/treeviewsidebarpage.h
@@ -21,7 +21,7 @@
 #define TREEVIEWSIDEBARPAGE_H
 
 #include <kurl.h>
-#include <sidebarpage.h>
+#include <panels/sidebarpage.h>
 
 class KDirLister;
 class DolphinModel;
diff --git a/src/commenteditwidget.cpp b/src/panels/information/commenteditwidget.cpp
index a55adbea4..a55adbea4 100644
--- a/src/commenteditwidget.cpp
+++ b/src/panels/information/commenteditwidget.cpp
diff --git a/src/commenteditwidget.h b/src/panels/information/commenteditwidget.h
index 18ab8d7b2..18ab8d7b2 100644
--- a/src/commenteditwidget.h
+++ b/src/panels/information/commenteditwidget.h
diff --git a/src/commentwidget.cpp b/src/panels/information/commentwidget.cpp
index 586be63aa..586be63aa 100644
--- a/src/commentwidget.cpp
+++ b/src/panels/information/commentwidget.cpp
diff --git a/src/commentwidget.h b/src/panels/information/commentwidget.h
index 8c588518c..8c588518c 100644
--- a/src/commentwidget.h
+++ b/src/panels/information/commentwidget.h
diff --git a/src/infosidebarpage.cpp b/src/panels/information/infosidebarpage.cpp
index aa8b20553..9eb35bc8d 100644
--- a/src/infosidebarpage.cpp
+++ b/src/panels/information/infosidebarpage.cpp
@@ -45,7 +45,7 @@
 #include <QTimer>
 #include <QVBoxLayout>
 
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "metadatawidget.h"
 #include "metatextlabel.h"
 #include "pixmapviewer.h"
diff --git a/src/infosidebarpage.h b/src/panels/information/infosidebarpage.h
index e6f511714..879a245ad 100644
--- a/src/infosidebarpage.h
+++ b/src/panels/information/infosidebarpage.h
@@ -20,7 +20,7 @@
 #ifndef INFOSIDEBARPAGE_H
 #define INFOSIDEBARPAGE_H
 
-#include <sidebarpage.h>
+#include <panels/sidebarpage.h>
 
 #include <QtGui/QPushButton>
 #include <QtGui/QPixmap>
diff --git a/src/metadatawidget.cpp b/src/panels/information/metadatawidget.cpp
index 218a6d1ce..44a4c029f 100644
--- a/src/metadatawidget.cpp
+++ b/src/panels/information/metadatawidget.cpp
@@ -43,7 +43,7 @@
 #include <nepomuk/variant.h>
 #include <nepomuk/kratingwidget.h>
 #include <Soprano/Vocabulary/Xesam>
-#include "tagcloud/resourcetaggingwidget.h"
+#include "resourcetaggingwidget.h"
 #endif
 
 
@@ -66,7 +66,7 @@ public:
     CommentWidget* editComment;
     KRatingWidget* ratingWidget;
     Nepomuk::ResourceTaggingWidget* tagWidget;
-    
+
     // shared data between the GUI-thread and
     // the loader-thread (see LoadFilesThread):
     QMutex mutex;
@@ -77,7 +77,7 @@ public:
         QList<Nepomuk::Resource> fileRes;
         QMap<KUrl, Nepomuk::Resource> files;
     } sharedData;
-    
+
     /**
      * Loads the meta data of files and writes
      * the result into a shared data pool that
@@ -89,13 +89,13 @@ public:
         LoadFilesThread(SharedData* sharedData, QMutex* mutex);
         void setFiles(const KUrl::List& urls);
         virtual void run();
-        
+
     private:
         SharedData* m_sharedData;
         QMutex* m_mutex;
         KUrl::List m_urls;
     };
-    
+
     LoadFilesThread* loadFilesThread;
 #endif
 };
@@ -126,7 +126,7 @@ void MetaDataWidget::Private::LoadFilesThread::run()
     QMutexLocker locker( m_mutex );
     const KUrl::List urls = m_urls;
     locker.unlock();
-    
+
     bool first = true;
     QList<Nepomuk::Resource> fileRes;
     QMap<KUrl, Nepomuk::Resource> files;
@@ -152,7 +152,7 @@ void MetaDataWidget::Private::LoadFilesThread::run()
         }
         first = false;
     }
-    
+
     locker.relock();
     m_sharedData->rating = rating;
     m_sharedData->comment = comment;
@@ -174,7 +174,7 @@ MetaDataWidget::MetaDataWidget(QWidget* parent) :
     connect(d->ratingWidget, SIGNAL(ratingChanged(unsigned int)), this, SLOT(slotRatingChanged(unsigned int)));
     connect(d->editComment, SIGNAL(commentChanged(const QString&)), this, SLOT(slotCommentChanged(const QString&)));
     connect( d->tagWidget, SIGNAL( tagClicked( const Nepomuk::Tag& ) ), this, SLOT( slotTagClicked( const Nepomuk::Tag& ) ) );
-    
+
     d->sharedData.rating = 0;
     d->loadFilesThread = new Private::LoadFilesThread(&d->sharedData, &d->mutex);
     connect(d->loadFilesThread, SIGNAL(finished()), this, SLOT(slotLoadingFinished()));
diff --git a/src/metadatawidget.h b/src/panels/information/metadatawidget.h
index 881c23c42..881c23c42 100644
--- a/src/metadatawidget.h
+++ b/src/panels/information/metadatawidget.h
diff --git a/src/metatextlabel.cpp b/src/panels/information/metatextlabel.cpp
index 66f12db90..66f12db90 100644
--- a/src/metatextlabel.cpp
+++ b/src/panels/information/metatextlabel.cpp
diff --git a/src/metatextlabel.h b/src/panels/information/metatextlabel.h
index f70d29d8e..f70d29d8e 100644
--- a/src/metatextlabel.h
+++ b/src/panels/information/metatextlabel.h
diff --git a/src/nepomukmassupdatejob.cpp b/src/panels/information/nepomukmassupdatejob.cpp
index 5c883fd4b..5c883fd4b 100644
--- a/src/nepomukmassupdatejob.cpp
+++ b/src/panels/information/nepomukmassupdatejob.cpp
diff --git a/src/nepomukmassupdatejob.h b/src/panels/information/nepomukmassupdatejob.h
index a19fa5ff9..a19fa5ff9 100644
--- a/src/nepomukmassupdatejob.h
+++ b/src/panels/information/nepomukmassupdatejob.h
diff --git a/src/tagcloud/newtagdialog.cpp b/src/panels/information/newtagdialog.cpp
index 8785d578c..8785d578c 100644
--- a/src/tagcloud/newtagdialog.cpp
+++ b/src/panels/information/newtagdialog.cpp
diff --git a/src/tagcloud/newtagdialog.h b/src/panels/information/newtagdialog.h
index b11cd1611..b11cd1611 100644
--- a/src/tagcloud/newtagdialog.h
+++ b/src/panels/information/newtagdialog.h
diff --git a/src/tagcloud/newtagdialog.ui b/src/panels/information/newtagdialog.ui
index d9bd666b5..d9bd666b5 100644
--- a/src/tagcloud/newtagdialog.ui
+++ b/src/panels/information/newtagdialog.ui
diff --git a/src/tagcloud/resourcetaggingwidget.cpp b/src/panels/information/resourcetaggingwidget.cpp
index 1e3fffe8f..3a4da3ea9 100644
--- a/src/tagcloud/resourcetaggingwidget.cpp
+++ b/src/panels/information/resourcetaggingwidget.cpp
@@ -20,7 +20,7 @@
 #include "resourcetaggingwidget.h"
 #include "tagcloud.h"
 #include "taggingpopup.h"
-#include "../nepomukmassupdatejob.h"
+#include "nepomukmassupdatejob.h"
 
 #include <QtGui/QVBoxLayout>
 #include <QtGui/QContextMenuEvent>
diff --git a/src/tagcloud/resourcetaggingwidget.h b/src/panels/information/resourcetaggingwidget.h
index 4ddcea881..4ddcea881 100644
--- a/src/tagcloud/resourcetaggingwidget.h
+++ b/src/panels/information/resourcetaggingwidget.h
diff --git a/src/tagcloud/tagcloud.cpp b/src/panels/information/tagcloud.cpp
index 0074d1796..0074d1796 100644
--- a/src/tagcloud/tagcloud.cpp
+++ b/src/panels/information/tagcloud.cpp
diff --git a/src/tagcloud/tagcloud.h b/src/panels/information/tagcloud.h
index 9710ca9b7..9710ca9b7 100644
--- a/src/tagcloud/tagcloud.h
+++ b/src/panels/information/tagcloud.h
diff --git a/src/tagcloud/taggingpopup.cpp b/src/panels/information/taggingpopup.cpp
index 3e59c80d1..3e59c80d1 100644
--- a/src/tagcloud/taggingpopup.cpp
+++ b/src/panels/information/taggingpopup.cpp
diff --git a/src/tagcloud/taggingpopup.h b/src/panels/information/taggingpopup.h
index 99cee701c..99cee701c 100644
--- a/src/tagcloud/taggingpopup.h
+++ b/src/panels/information/taggingpopup.h
diff --git a/src/dolphinfileplacesview.cpp b/src/panels/places/dolphinfileplacesview.cpp
index df3e6fd87..df3e6fd87 100644
--- a/src/dolphinfileplacesview.cpp
+++ b/src/panels/places/dolphinfileplacesview.cpp
diff --git a/src/dolphinfileplacesview.h b/src/panels/places/dolphinfileplacesview.h
index 46d574606..46d574606 100644
--- a/src/dolphinfileplacesview.h
+++ b/src/panels/places/dolphinfileplacesview.h
diff --git a/src/sidebarpage.cpp b/src/panels/sidebarpage.cpp
index 594f59f24..594f59f24 100644
--- a/src/sidebarpage.cpp
+++ b/src/panels/sidebarpage.cpp
diff --git a/src/sidebarpage.h b/src/panels/sidebarpage.h
index 20a44758e..20a44758e 100644
--- a/src/sidebarpage.h
+++ b/src/panels/sidebarpage.h
diff --git a/src/terminalsidebarpage.cpp b/src/panels/terminal/terminalsidebarpage.cpp
index 4749e7714..4749e7714 100644
--- a/src/terminalsidebarpage.cpp
+++ b/src/panels/terminal/terminalsidebarpage.cpp
diff --git a/src/terminalsidebarpage.h b/src/panels/terminal/terminalsidebarpage.h
index 875a6b706..4e8c40593 100644
--- a/src/terminalsidebarpage.h
+++ b/src/panels/terminal/terminalsidebarpage.h
@@ -20,7 +20,7 @@
 #ifndef TERMINALSIDEBARPAGE_H
 #define TERMINALSIDEBARPAGE_H
 
-#include <sidebarpage.h>
+#include <panels/sidebarpage.h>
 
 class TerminalInterface;
 class QVBoxLayout;
diff --git a/src/additionalinfodialog.cpp b/src/settings/additionalinfodialog.cpp
index 2f735fffe..2f735fffe 100644
--- a/src/additionalinfodialog.cpp
+++ b/src/settings/additionalinfodialog.cpp
diff --git a/src/additionalinfodialog.h b/src/settings/additionalinfodialog.h
index 9771960f0..9771960f0 100644
--- a/src/additionalinfodialog.h
+++ b/src/settings/additionalinfodialog.h
diff --git a/src/applyviewpropsjob.cpp b/src/settings/applyviewpropsjob.cpp
index 9250226e9..9250226e9 100644
--- a/src/applyviewpropsjob.cpp
+++ b/src/settings/applyviewpropsjob.cpp
diff --git a/src/applyviewpropsjob.h b/src/settings/applyviewpropsjob.h
index da18af966..da18af966 100644
--- a/src/applyviewpropsjob.h
+++ b/src/settings/applyviewpropsjob.h
diff --git a/src/columnviewsettingspage.cpp b/src/settings/columnviewsettingspage.cpp
index 5918eaf92..5918eaf92 100644
--- a/src/columnviewsettingspage.cpp
+++ b/src/settings/columnviewsettingspage.cpp
diff --git a/src/columnviewsettingspage.h b/src/settings/columnviewsettingspage.h
index 5e16dc67b..c723ed635 100644
--- a/src/columnviewsettingspage.h
+++ b/src/settings/columnviewsettingspage.h
@@ -20,7 +20,7 @@
 #ifndef COLUMNVIEWSETTINGSPAGE_H
 #define COLUMNVIEWSETTINGSPAGE_H
 
-#include <viewsettingspagebase.h>
+#include <settings/viewsettingspagebase.h>
 
 class DolphinMainWindow;
 class DolphinFontRequester;
diff --git a/src/detailsviewsettingspage.cpp b/src/settings/detailsviewsettingspage.cpp
index 4a439ab1d..0c47caf24 100644
--- a/src/detailsviewsettingspage.cpp
+++ b/src/settings/detailsviewsettingspage.cpp
@@ -20,12 +20,12 @@
 #include "detailsviewsettingspage.h"
 
 #include "iconsizegroupbox.h"
+#include "dolphinfontrequester.h"
 #include "dolphinsettings.h"
 #include "dolphin_detailsmodesettings.h"
 #include "zoomlevelinfo.h"
 
 #include <kdialog.h>
-#include <dolphinfontrequester.h>
 #include <klocale.h>
 
 #include <QButtonGroup>
diff --git a/src/detailsviewsettingspage.h b/src/settings/detailsviewsettingspage.h
index 587d42244..58e3fd905 100644
--- a/src/detailsviewsettingspage.h
+++ b/src/settings/detailsviewsettingspage.h
@@ -20,7 +20,7 @@
 #ifndef DETAILSVIEWSETTINGSPAGE_H
 #define DETAILSVIEWSETTINGSPAGE_H
 
-#include <viewsettingspagebase.h>
+#include <settings/viewsettingspagebase.h>
 
 class DolphinFontRequester;
 class IconSizeGroupBox;
diff --git a/src/dolphin_columnmodesettings.kcfg b/src/settings/dolphin_columnmodesettings.kcfg
index 4fd5ecc6e..4fd5ecc6e 100644
--- a/src/dolphin_columnmodesettings.kcfg
+++ b/src/settings/dolphin_columnmodesettings.kcfg
diff --git a/src/dolphin_columnmodesettings.kcfgc b/src/settings/dolphin_columnmodesettings.kcfgc
index 55134335a..55134335a 100644
--- a/src/dolphin_columnmodesettings.kcfgc
+++ b/src/settings/dolphin_columnmodesettings.kcfgc
diff --git a/src/dolphin_detailsmodesettings.kcfg b/src/settings/dolphin_detailsmodesettings.kcfg
index 780d70540..780d70540 100644
--- a/src/dolphin_detailsmodesettings.kcfg
+++ b/src/settings/dolphin_detailsmodesettings.kcfg
diff --git a/src/dolphin_detailsmodesettings.kcfgc b/src/settings/dolphin_detailsmodesettings.kcfgc
index 06da2e9e0..06da2e9e0 100644
--- a/src/dolphin_detailsmodesettings.kcfgc
+++ b/src/settings/dolphin_detailsmodesettings.kcfgc
diff --git a/src/dolphin_directoryviewpropertysettings.kcfg b/src/settings/dolphin_directoryviewpropertysettings.kcfg
index ead1325de..ead1325de 100644
--- a/src/dolphin_directoryviewpropertysettings.kcfg
+++ b/src/settings/dolphin_directoryviewpropertysettings.kcfg
diff --git a/src/dolphin_directoryviewpropertysettings.kcfgc b/src/settings/dolphin_directoryviewpropertysettings.kcfgc
index 753642f8c..753642f8c 100644
--- a/src/dolphin_directoryviewpropertysettings.kcfgc
+++ b/src/settings/dolphin_directoryviewpropertysettings.kcfgc
diff --git a/src/dolphin_generalsettings.kcfg b/src/settings/dolphin_generalsettings.kcfg
index 2f4defa92..2f4defa92 100644
--- a/src/dolphin_generalsettings.kcfg
+++ b/src/settings/dolphin_generalsettings.kcfg
diff --git a/src/dolphin_generalsettings.kcfgc b/src/settings/dolphin_generalsettings.kcfgc
index 91b1fee46..91b1fee46 100644
--- a/src/dolphin_generalsettings.kcfgc
+++ b/src/settings/dolphin_generalsettings.kcfgc
diff --git a/src/dolphin_iconsmodesettings.kcfg b/src/settings/dolphin_iconsmodesettings.kcfg
index 1311f6d20..1311f6d20 100644
--- a/src/dolphin_iconsmodesettings.kcfg
+++ b/src/settings/dolphin_iconsmodesettings.kcfg
diff --git a/src/dolphin_iconsmodesettings.kcfgc b/src/settings/dolphin_iconsmodesettings.kcfgc
index 9987ce938..9987ce938 100644
--- a/src/dolphin_iconsmodesettings.kcfgc
+++ b/src/settings/dolphin_iconsmodesettings.kcfgc
diff --git a/src/dolphinfontrequester.cpp b/src/settings/dolphinfontrequester.cpp
index 2fc444029..2fc444029 100644
--- a/src/dolphinfontrequester.cpp
+++ b/src/settings/dolphinfontrequester.cpp
diff --git a/src/dolphinfontrequester.h b/src/settings/dolphinfontrequester.h
index 03a062b2e..03a062b2e 100644
--- a/src/dolphinfontrequester.h
+++ b/src/settings/dolphinfontrequester.h
diff --git a/src/dolphinsettings.cpp b/src/settings/dolphinsettings.cpp
index 5b91001ef..5b91001ef 100644
--- a/src/dolphinsettings.cpp
+++ b/src/settings/dolphinsettings.cpp
diff --git a/src/dolphinsettings.h b/src/settings/dolphinsettings.h
index 55fa327ef..55fa327ef 100644
--- a/src/dolphinsettings.h
+++ b/src/settings/dolphinsettings.h
diff --git a/src/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
index 7b1e23266..54ac74bde 100644
--- a/src/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -20,8 +20,8 @@
 
 #include "dolphinsettingsdialog.h"
 
-#include "dolphinapplication.h"
-#include "dolphinmainwindow.h"
+#include <dolphinapplication.h>
+#include <dolphinmainwindow.h>
 #include "generalsettingspage.h"
 #include "startupsettingspage.h"
 #include "viewsettingspage.h"
diff --git a/src/dolphinsettingsdialog.h b/src/settings/dolphinsettingsdialog.h
index fc17b3774..fc17b3774 100644
--- a/src/dolphinsettingsdialog.h
+++ b/src/settings/dolphinsettingsdialog.h
diff --git a/src/generalsettingspage.cpp b/src/settings/generalsettingspage.cpp
index 68193b4e4..86b6f1939 100644
--- a/src/generalsettingspage.cpp
+++ b/src/settings/generalsettingspage.cpp
@@ -20,7 +20,7 @@
 
 #include "generalsettingspage.h"
 
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 
 #include "dolphin_generalsettings.h"
 
diff --git a/src/generalsettingspage.h b/src/settings/generalsettingspage.h
index da7e72f0f..4059dc3c6 100644
--- a/src/generalsettingspage.h
+++ b/src/settings/generalsettingspage.h
@@ -20,7 +20,7 @@
 #ifndef GENERALSETTINGSPAGE_H
 #define GENERALSETTINGSPAGE_H
 
-#include <settingspagebase.h>
+#include <settings/settingspagebase.h>
 
 class DolphinMainWindow;
 class QLineEdit;
diff --git a/src/generalviewsettingspage.cpp b/src/settings/generalviewsettingspage.cpp
index 9ef2ee97e..acea9649c 100644
--- a/src/generalviewsettingspage.cpp
+++ b/src/settings/generalviewsettingspage.cpp
@@ -19,7 +19,7 @@
 
 #include "generalviewsettingspage.h"
 #include "dolphinmainwindow.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphinviewcontainer.h"
 #include "viewproperties.h"
 
diff --git a/src/generalviewsettingspage.h b/src/settings/generalviewsettingspage.h
index 904622348..b0bd7e005 100644
--- a/src/generalviewsettingspage.h
+++ b/src/settings/generalviewsettingspage.h
@@ -21,7 +21,7 @@
 #define GENERALVIEWSETTINGSPAGE_H
 
 #include <kurl.h>
-#include <viewsettingspagebase.h>
+#include <settings/viewsettingspagebase.h>
 
 class DolphinMainWindow;
 class QCheckBox;
diff --git a/src/iconsizegroupbox.cpp b/src/settings/iconsizegroupbox.cpp
index 82698e7b7..82698e7b7 100644
--- a/src/iconsizegroupbox.cpp
+++ b/src/settings/iconsizegroupbox.cpp
diff --git a/src/iconsizegroupbox.h b/src/settings/iconsizegroupbox.h
index 3ec51c3a5..3ec51c3a5 100644
--- a/src/iconsizegroupbox.h
+++ b/src/settings/iconsizegroupbox.h
diff --git a/src/iconsviewsettingspage.cpp b/src/settings/iconsviewsettingspage.cpp
index ca43841b8..2acb4cd60 100644
--- a/src/iconsviewsettingspage.cpp
+++ b/src/settings/iconsviewsettingspage.cpp
@@ -20,7 +20,7 @@
 #include "iconsviewsettingspage.h"
 
 #include "dolphinfontrequester.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "iconsizegroupbox.h"
 #include "zoomlevelinfo.h"
 
diff --git a/src/iconsviewsettingspage.h b/src/settings/iconsviewsettingspage.h
index 75db81e53..c30ade673 100644
--- a/src/iconsviewsettingspage.h
+++ b/src/settings/iconsviewsettingspage.h
@@ -21,7 +21,7 @@
 #define ICONSVIEWSETTINGSPAGE_H
 
 #include <dolphiniconsview.h>
-#include <viewsettingspagebase.h>
+#include <settings/viewsettingspagebase.h>
 
 class DolphinFontRequester;
 class IconSizeGroupBox;
diff --git a/src/settingspagebase.cpp b/src/settings/settingspagebase.cpp
index 6f8dcbfb6..6f8dcbfb6 100644
--- a/src/settingspagebase.cpp
+++ b/src/settings/settingspagebase.cpp
diff --git a/src/settingspagebase.h b/src/settings/settingspagebase.h
index 19d4cf1f0..19d4cf1f0 100644
--- a/src/settingspagebase.h
+++ b/src/settings/settingspagebase.h
diff --git a/src/startupsettingspage.cpp b/src/settings/startupsettingspage.cpp
index 35fc47a57..767fcab66 100644
--- a/src/startupsettingspage.cpp
+++ b/src/settings/startupsettingspage.cpp
@@ -19,7 +19,7 @@
 
 #include "startupsettingspage.h"
 
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphinmainwindow.h"
 #include "dolphinview.h"
 #include "dolphinviewcontainer.h"
diff --git a/src/startupsettingspage.h b/src/settings/startupsettingspage.h
index a56869cd4..04844f00c 100644
--- a/src/startupsettingspage.h
+++ b/src/settings/startupsettingspage.h
@@ -19,7 +19,7 @@
 #ifndef STARTUPSETTINGSPAGE_H
 #define STARTUPSETTINGSPAGE_H
 
-#include <settingspagebase.h>
+#include <settings/settingspagebase.h>
 
 class DolphinMainWindow;
 class KLineEdit;
diff --git a/src/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp
index 9302ba138..700bdb90b 100644
--- a/src/viewpropertiesdialog.cpp
+++ b/src/settings/viewpropertiesdialog.cpp
@@ -22,7 +22,7 @@
 
 #include "additionalinfodialog.h"
 #include "dolphinview.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphin_generalsettings.h"
 #include "dolphin_iconsmodesettings.h"
diff --git a/src/viewpropertiesdialog.h b/src/settings/viewpropertiesdialog.h
index 320f8f115..320f8f115 100644
--- a/src/viewpropertiesdialog.h
+++ b/src/settings/viewpropertiesdialog.h
diff --git a/src/viewpropsprogressinfo.cpp b/src/settings/viewpropsprogressinfo.cpp
index c073d3d46..c073d3d46 100644
--- a/src/viewpropsprogressinfo.cpp
+++ b/src/settings/viewpropsprogressinfo.cpp
diff --git a/src/viewpropsprogressinfo.h b/src/settings/viewpropsprogressinfo.h
index d07d16d67..d07d16d67 100644
--- a/src/viewpropsprogressinfo.h
+++ b/src/settings/viewpropsprogressinfo.h
diff --git a/src/viewsettingspage.cpp b/src/settings/viewsettingspage.cpp
index bef05f58f..44d32af81 100644
--- a/src/viewsettingspage.cpp
+++ b/src/settings/viewsettingspage.cpp
@@ -20,12 +20,12 @@
 
 #include "viewsettingspage.h"
 
-#include "columnviewsettingspage.h"
-#include "detailsviewsettingspage.h"
+#include "settings/columnviewsettingspage.h"
+#include "settings/detailsviewsettingspage.h"
 #include "dolphinmainwindow.h"
 #include "dolphinviewcontainer.h"
-#include "generalviewsettingspage.h"
-#include "iconsviewsettingspage.h"
+#include "settings/generalviewsettingspage.h"
+#include "settings/iconsviewsettingspage.h"
 
 #include <QtGui/QBoxLayout>
 #include <QtGui/QLayout>
diff --git a/src/viewsettingspage.h b/src/settings/viewsettingspage.h
index 21ce40039..5e76b30d1 100644
--- a/src/viewsettingspage.h
+++ b/src/settings/viewsettingspage.h
@@ -21,7 +21,7 @@
 #define VIEWSETTINGSPAGE_H
 
 #include <QtGui/QWidget>
-#include <settingspagebase.h>
+#include <settings/settingspagebase.h>
 
 class ViewSettingsPageBase;
 class DolphinMainWindow;
diff --git a/src/viewsettingspagebase.cpp b/src/settings/viewsettingspagebase.cpp
index b610bb0f5..b610bb0f5 100644
--- a/src/viewsettingspagebase.cpp
+++ b/src/settings/viewsettingspagebase.cpp
diff --git a/src/viewsettingspagebase.h b/src/settings/viewsettingspagebase.h
index 3e85e25cb..3e85e25cb 100644
--- a/src/viewsettingspagebase.h
+++ b/src/settings/viewsettingspagebase.h
diff --git a/src/dolphintooltip.cpp b/src/tooltips/dolphintooltip.cpp
index bc3be33aa..bc3be33aa 100644
--- a/src/dolphintooltip.cpp
+++ b/src/tooltips/dolphintooltip.cpp
diff --git a/src/dolphintooltip.h b/src/tooltips/dolphintooltip.h
index cfc438831..5c0682171 100644
--- a/src/dolphintooltip.h
+++ b/src/tooltips/dolphintooltip.h
@@ -22,8 +22,8 @@
 #ifndef DOLPHINTOOLTIP_H
 #define DOLPHINTOOLTIP_H
 
-#include "ktooltip.h"
-#include "kformattedballoontipdelegate.h"
+#include <tooltips/ktooltip.h>
+#include <tooltips/kformattedballoontipdelegate.h>
 
 #include <kio/previewjob.h>
 #include <QtCore/QObject>
diff --git a/src/kformattedballoontipdelegate.cpp b/src/tooltips/kformattedballoontipdelegate.cpp
index 140c90ef4..140c90ef4 100644
--- a/src/kformattedballoontipdelegate.cpp
+++ b/src/tooltips/kformattedballoontipdelegate.cpp
diff --git a/src/kformattedballoontipdelegate.h b/src/tooltips/kformattedballoontipdelegate.h
index 452b38a69..117d6eec7 100644
--- a/src/kformattedballoontipdelegate.h
+++ b/src/tooltips/kformattedballoontipdelegate.h
@@ -21,7 +21,7 @@
 #ifndef KFORMATTEDBALLOONTIPDELEGATE_H
 #define KFORMATTEDBALLOONTIPDELEGATE_H
 
-#include "ktooltip.h"
+#include <tooltips/ktooltip.h>
 #include <QPainter>
 
 class KFormattedBalloonTipDelegate : public KToolTipDelegate
diff --git a/src/ktooltip.cpp b/src/tooltips/ktooltip.cpp
index a0126fbff..a0126fbff 100644
--- a/src/ktooltip.cpp
+++ b/src/tooltips/ktooltip.cpp
diff --git a/src/ktooltip.h b/src/tooltips/ktooltip.h
index d59f1bf17..d59f1bf17 100644
--- a/src/ktooltip.h
+++ b/src/tooltips/ktooltip.h
diff --git a/src/ktooltip_p.h b/src/tooltips/ktooltip_p.h
index 332df4854..332df4854 100644
--- a/src/ktooltip_p.h
+++ b/src/tooltips/ktooltip_p.h
diff --git a/src/tooltipmanager.cpp b/src/tooltips/tooltipmanager.cpp
index aefa846e9..36a008f33 100644
--- a/src/tooltipmanager.cpp
+++ b/src/tooltips/tooltipmanager.cpp
@@ -24,7 +24,7 @@
 #include "dolphinsortfilterproxymodel.h"
 
 #include <kicon.h>
-#include <ktooltip.h>
+#include <tooltips/ktooltip.h>
 #include <kio/previewjob.h>
 
 #include <QApplication>
diff --git a/src/tooltipmanager.h b/src/tooltips/tooltipmanager.h
index 96df4819e..96df4819e 100644
--- a/src/tooltipmanager.h
+++ b/src/tooltips/tooltipmanager.h
diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp
index 9b173d1c4..62898e670 100644
--- a/src/viewproperties.cpp
+++ b/src/viewproperties.cpp
@@ -20,7 +20,7 @@
 
 #include "viewproperties.h"
 
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphin_directoryviewpropertysettings.h"
 #include "dolphin_generalsettings.h"