diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 38489fcebd..4da9a66285 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -99,7 +99,6 @@ set(dolphin_SRCS
     dolphinnewmenu.cpp
     dolphinviewcontainer.cpp
     dolphinsearchbox.cpp
-    dolphinstatusbar.cpp
     dolphindirlister.cpp
     dolphincontextmenu.cpp
     filterbar.cpp
@@ -135,8 +134,9 @@ set(dolphin_SRCS
     settings/trashsettingspage.cpp
     settings/viewsettingspage.cpp
     settings/viewsettingspagebase.cpp
-    statusbarspaceinfo.cpp
-    statusbarmessagelabel.cpp
+    statusbar/dolphinstatusbar.cpp
+    statusbar/statusbarspaceinfo.cpp
+    statusbar/statusbarmessagelabel.cpp
     zoomlevelinfo.cpp
     )
 
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index a95b5a0d29..bf39db15d8 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -30,13 +30,13 @@
 #include "settings/dolphinsettings.h"
 #include "settings/dolphinsettingsdialog.h"
 #include "dolphinsearchbox.h"
-#include "dolphinstatusbar.h"
 #include "dolphinviewcontainer.h"
 #include "panels/folders/folderspanel.h"
 #include "panels/places/placespanel.h"
 #include "panels/information/informationpanel.h"
 #include "panels/information/metadatawidget.h"
 #include "mainwindowadaptor.h"
+#include "statusbar/dolphinstatusbar.h"
 #include "viewproperties.h"
 
 #ifndef Q_OS_WIN
diff --git a/src/dolphinnewmenu.cpp b/src/dolphinnewmenu.cpp
index 4b905734ec..464d945d66 100644
--- a/src/dolphinnewmenu.cpp
+++ b/src/dolphinnewmenu.cpp
@@ -22,9 +22,9 @@
 
 #include "dolphinmainwindow.h"
 #include "dolphinnewmenuobserver.h"
-#include "dolphinstatusbar.h"
 #include "dolphinview.h"
 #include "dolphinviewcontainer.h"
+#include "statusbar/dolphinstatusbar.h"
 
 #include <kactioncollection.h>
 #include <kio/job.h>
diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 475b002e2d..e9417e1bc8 100644
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -44,12 +44,12 @@
 #include <kshell.h>
 #include <kurl.h>
 #include <kurlcombobox.h>
+#include <kurlnavigator.h>
 #include <krun.h>
 
 #include "dolphinmodel.h"
 #include "dolphincolumnview.h"
 #include "dolphincontroller.h"
-#include "dolphinstatusbar.h"
 #include "dolphinmainwindow.h"
 #include "dolphindirlister.h"
 #include "dolphinsortfilterproxymodel.h"
@@ -58,7 +58,7 @@
 #include "dolphincontextmenu.h"
 #include "draganddrophelper.h"
 #include "filterbar.h"
-#include "kurlnavigator.h"
+#include "statusbar/dolphinstatusbar.h"
 #include "viewproperties.h"
 #include "settings/dolphinsettings.h"
 #include "dolphin_generalsettings.h"
diff --git a/src/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp
similarity index 100%
rename from src/dolphinstatusbar.cpp
rename to src/statusbar/dolphinstatusbar.cpp
diff --git a/src/dolphinstatusbar.h b/src/statusbar/dolphinstatusbar.h
similarity index 100%
rename from src/dolphinstatusbar.h
rename to src/statusbar/dolphinstatusbar.h
diff --git a/src/statusbarmessagelabel.cpp b/src/statusbar/statusbarmessagelabel.cpp
similarity index 100%
rename from src/statusbarmessagelabel.cpp
rename to src/statusbar/statusbarmessagelabel.cpp
diff --git a/src/statusbarmessagelabel.h b/src/statusbar/statusbarmessagelabel.h
similarity index 99%
rename from src/statusbarmessagelabel.h
rename to src/statusbar/statusbarmessagelabel.h
index 264a3538de..a5c72b4037 100644
--- a/src/statusbarmessagelabel.h
+++ b/src/statusbar/statusbarmessagelabel.h
@@ -21,7 +21,7 @@
 #ifndef STATUSBARMESSAGELABEL_H
 #define STATUSBARMESSAGELABEL_H
 
-#include <dolphinstatusbar.h>
+#include <statusbar/dolphinstatusbar.h>
 
 #include <QtCore/QList>
 #include <QtGui/QPixmap>
diff --git a/src/statusbarspaceinfo.cpp b/src/statusbar/statusbarspaceinfo.cpp
similarity index 100%
rename from src/statusbarspaceinfo.cpp
rename to src/statusbar/statusbarspaceinfo.cpp
diff --git a/src/statusbarspaceinfo.h b/src/statusbar/statusbarspaceinfo.h
similarity index 100%
rename from src/statusbarspaceinfo.h
rename to src/statusbar/statusbarspaceinfo.h