13 files changed, 8 insertions, 8 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0cbe663ac..fe6b13ac3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -197,8 +197,8 @@ install(TARGETS dolphin ${INSTALL_TARGETS_DEFAULT_ARGS})
 ##########################################
 
 set(kcm_dolphinviewmodes_PART_SRCS
-    kcm/kcmdolphinviewmodes.cpp
     pixmapviewer.cpp
+    settings/kcm/kcmdolphinviewmodes.cpp
     settings/viewmodes/columnviewsettingspage.cpp
     settings/viewmodes/detailsviewsettingspage.cpp
     settings/viewmodes/dolphinfontrequester.cpp
@@ -208,17 +208,17 @@ set(kcm_dolphinviewmodes_PART_SRCS
     zoomlevelinfo.cpp)
 
 set(kcm_dolphinnavigation_PART_SRCS
-    kcm/kcmdolphinnavigation.cpp
+    settings/kcm/kcmdolphinnavigation.cpp
     settings/navigation/navigationsettingspage.cpp
     settings/settingspagebase.cpp)
 
 set(kcm_dolphinservices_PART_SRCS
-    kcm/kcmdolphinservices.cpp
+    settings/kcm/kcmdolphinservices.cpp
     settings/services/servicessettingspage.cpp
     settings/settingspagebase.cpp)
 
 set(kcm_dolphingeneral_PART_SRCS
-    kcm/kcmdolphingeneral.cpp
+    settings/kcm/kcmdolphingeneral.cpp
     settings/general/behaviorsettingspage.cpp
     settings/general/previewssettingspage.cpp
     settings/general/contextmenusettingspage.cpp
@@ -284,11 +284,11 @@ install( FILES settings/dolphin_directoryviewpropertysettings.kcfg
          DESTINATION ${KCFG_INSTALL_DIR} )
 install( FILES dolphinui.rc DESTINATION ${DATA_INSTALL_DIR}/dolphin )
 install( FILES search/filenamesearch.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kcm/kcmdolphinviewmodes.desktop DESTINATION
+install( FILES settings/kcm/kcmdolphinviewmodes.desktop DESTINATION
 ${SERVICES_INSTALL_DIR} )
-install( FILES kcm/kcmdolphinnavigation.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kcm/kcmdolphinservices.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kcm/kcmdolphingeneral.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES settings/kcm/kcmdolphinnavigation.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES settings/kcm/kcmdolphinservices.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES settings/kcm/kcmdolphingeneral.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 install( FILES khns/servicemenu.knsrc DESTINATION ${CONFIG_INSTALL_DIR} )
 install( PROGRAMS khns/servicemenuinstallation DESTINATION ${BIN_INSTALL_DIR} )
 install( PROGRAMS khns/servicemenudeinstallation DESTINATION ${BIN_INSTALL_DIR} )
diff --git a/src/kcm/kcmdolphingeneral.cpp b/src/settings/kcm/kcmdolphingeneral.cpp
index fb4a643ea..fb4a643ea 100644
--- a/src/kcm/kcmdolphingeneral.cpp
+++ b/src/settings/kcm/kcmdolphingeneral.cpp
diff --git a/src/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop
index 638edca0c..638edca0c 100644
--- a/src/kcm/kcmdolphingeneral.desktop
+++ b/src/settings/kcm/kcmdolphingeneral.desktop
diff --git a/src/kcm/kcmdolphingeneral.h b/src/settings/kcm/kcmdolphingeneral.h
index 9208803e2..9208803e2 100644
--- a/src/kcm/kcmdolphingeneral.h
+++ b/src/settings/kcm/kcmdolphingeneral.h
diff --git a/src/kcm/kcmdolphinnavigation.cpp b/src/settings/kcm/kcmdolphinnavigation.cpp
index fdf9de550..fdf9de550 100644
--- a/src/kcm/kcmdolphinnavigation.cpp
+++ b/src/settings/kcm/kcmdolphinnavigation.cpp
diff --git a/src/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop
index 3596971c9..3596971c9 100644
--- a/src/kcm/kcmdolphinnavigation.desktop
+++ b/src/settings/kcm/kcmdolphinnavigation.desktop
diff --git a/src/kcm/kcmdolphinnavigation.h b/src/settings/kcm/kcmdolphinnavigation.h
index 71715bbd3..71715bbd3 100644
--- a/src/kcm/kcmdolphinnavigation.h
+++ b/src/settings/kcm/kcmdolphinnavigation.h
diff --git a/src/kcm/kcmdolphinservices.cpp b/src/settings/kcm/kcmdolphinservices.cpp
index 22e4e32cc..22e4e32cc 100644
--- a/src/kcm/kcmdolphinservices.cpp
+++ b/src/settings/kcm/kcmdolphinservices.cpp
diff --git a/src/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop
index 304c5a308..304c5a308 100644
--- a/src/kcm/kcmdolphinservices.desktop
+++ b/src/settings/kcm/kcmdolphinservices.desktop
diff --git a/src/kcm/kcmdolphinservices.h b/src/settings/kcm/kcmdolphinservices.h
index 8f07d0313..8f07d0313 100644
--- a/src/kcm/kcmdolphinservices.h
+++ b/src/settings/kcm/kcmdolphinservices.h
diff --git a/src/kcm/kcmdolphinviewmodes.cpp b/src/settings/kcm/kcmdolphinviewmodes.cpp
index e24d549e0..e24d549e0 100644
--- a/src/kcm/kcmdolphinviewmodes.cpp
+++ b/src/settings/kcm/kcmdolphinviewmodes.cpp
diff --git a/src/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop
index d3bd05c1f..d3bd05c1f 100644
--- a/src/kcm/kcmdolphinviewmodes.desktop
+++ b/src/settings/kcm/kcmdolphinviewmodes.desktop
diff --git a/src/kcm/kcmdolphinviewmodes.h b/src/settings/kcm/kcmdolphinviewmodes.h
index fb246d0af..fb246d0af 100644
--- a/src/kcm/kcmdolphinviewmodes.h
+++ b/src/settings/kcm/kcmdolphinviewmodes.h