diff --git a/src/mainwindow/maindisplay.cpp b/src/mainwindow/maindisplay.cpp
index 9fd42ca..b3fc0b7 100644
--- a/src/mainwindow/maindisplay.cpp
+++ b/src/mainwindow/maindisplay.cpp
@@ -24,8 +24,8 @@
 
 #include "pixmapbutton.h"
 #include "pixmapslider.h"
-#include "TitleBar.h"
-#include "TextBar.h"
+#include "titlebar.h"
+#include "textbar.h"
 #include "timedisplay.h"
 #include "Skin.h"
 #include "pixmapnumberdisplay.h"
diff --git a/src/mainwindow/maindisplay.h b/src/mainwindow/maindisplay.h
index bd205f2..77ad1f0 100644
--- a/src/mainwindow/maindisplay.h
+++ b/src/mainwindow/maindisplay.h
@@ -32,7 +32,7 @@ class MainDisplay;
 #include <QHash>
 #include <QVariant>
 
-#include "Display.h"
+#include "skindisplay.h"
 
 typedef QHash<QString, QVariant> QVariantHash;
 
diff --git a/src/mainwindow/mainwindow.pri b/src/mainwindow/mainwindow.pri
index ee928da..d62239b 100644
--- a/src/mainwindow/mainwindow.pri
+++ b/src/mainwindow/mainwindow.pri
@@ -4,8 +4,11 @@ HEADERS += clutterbar.h \
 		   playstatus.h \
 		   posbar.h \
 		   shadeddisplay.h \
+		   skindisplay.h \
 		   stereomono.h \
-		   timedisplay.h
+		   textbar.h \
+		   timedisplay.h \
+		   titlebar.h
 
 SOURCES += clutterbar.cpp \
 		   mainwindow.cpp \
@@ -13,8 +16,11 @@ SOURCES += clutterbar.cpp \
 		   playstatus.cpp \
 		   posbar.cpp \
 		   shadeddisplay.cpp \
+		   skindisplay.cpp \
 		   stereomono.cpp \
-		   timedisplay.cpp
+		   textbar.cpp \
+		   timedisplay.cpp \
+		   titlebar.cpp
 
 INCLUDEPATH += $$PWD
 DEPENDPATH += $$PWD
diff --git a/src/mainwindow/shadeddisplay.cpp b/src/mainwindow/shadeddisplay.cpp
index 2dabc6c..7508e05 100644
--- a/src/mainwindow/shadeddisplay.cpp
+++ b/src/mainwindow/shadeddisplay.cpp
@@ -19,11 +19,11 @@
 #include "xplayback.h"
 
 #include "shadeddisplay.h"
-#include "TitleBar.h"
+#include "titlebar.h"
 #include "pixmapbutton.h"
 
 #include "timedisplay.h"
-#include "TextBar.h"
+#include "textbar.h"
 #include "Skin.h"
 #include "mainwindow.h"
 
diff --git a/src/mainwindow/shadeddisplay.h b/src/mainwindow/shadeddisplay.h
index 2543fd2..fe2dd63 100644
--- a/src/mainwindow/shadeddisplay.h
+++ b/src/mainwindow/shadeddisplay.h
@@ -19,7 +19,7 @@
 class ShadedDisplay;
 
 #include <xmmsclient/xmmsclient++.h>
-#include "Display.h"
+#include "skindisplay.h"
 #include <QHash>
 #include <QVariant>
 
diff --git a/src/Display.cpp b/src/mainwindow/skindisplay.cpp
similarity index 97%
rename from src/Display.cpp
rename to src/mainwindow/skindisplay.cpp
index ccd63ef..7aaa7df 100644
--- a/src/Display.cpp
+++ b/src/mainwindow/skindisplay.cpp
@@ -17,10 +17,10 @@
 #include "xcollection.h"
 
 #include "mainwindow.h"
-#include "Display.h"
+#include "skindisplay.h"
 #include "Skin.h"
 
-#include "TitleBar.h"
+#include "titlebar.h"
 #include "FileDialog.h"
 
 #include <QPainter>
diff --git a/src/Display.h b/src/mainwindow/skindisplay.h
similarity index 100%
rename from src/Display.h
rename to src/mainwindow/skindisplay.h
diff --git a/src/TextBar.cpp b/src/mainwindow/textbar.cpp
similarity index 99%
rename from src/TextBar.cpp
rename to src/mainwindow/textbar.cpp
index 06d8561..61b0b23 100644
--- a/src/TextBar.cpp
+++ b/src/mainwindow/textbar.cpp
@@ -13,8 +13,8 @@
  *  GNU General Public License for more details.
  */
 
-#include "Display.h"
-#include "TextBar.h"
+#include "skindisplay.h"
+#include "textbar.h"
 #include "Skin.h"
 
 #include <QBrush>
diff --git a/src/TextBar.h b/src/mainwindow/textbar.h
similarity index 100%
rename from src/TextBar.h
rename to src/mainwindow/textbar.h
diff --git a/src/TitleBar.cpp b/src/mainwindow/titlebar.cpp
similarity index 99%
rename from src/TitleBar.cpp
rename to src/mainwindow/titlebar.cpp
index 144f3ef..3d983bc 100644
--- a/src/TitleBar.cpp
+++ b/src/mainwindow/titlebar.cpp
@@ -16,8 +16,8 @@
 #include "XMMSHandler.h"
 
 #include "mainwindow.h"
-#include "TitleBar.h"
-#include "Display.h"
+#include "titlebar.h"
+#include "skindisplay.h"
 #include "SkinChooser.h"
 // #include "MedialibWindow.h"
 #include "settingsdialog.h"
diff --git a/src/TitleBar.h b/src/mainwindow/titlebar.h
similarity index 100%
rename from src/TitleBar.h
rename to src/mainwindow/titlebar.h
diff --git a/src/src.pri b/src/src.pri
index a8f14a0..991c576 100644
--- a/src/src.pri
+++ b/src/src.pri
@@ -6,9 +6,6 @@ include($$PWD/dialogs/dialogs.pri)
 
 HEADERS += PixWidget.h \
            Skin.h \
-           Display.h \
-           TitleBar.h \
-           TextBar.h \
            XMMSHandler.h \
            SkinChooser.h \
            settingsdialog.h \
@@ -20,9 +17,6 @@ HEADERS += PixWidget.h \
 SOURCES += main.cpp \
 		   PixWidget.cpp \
            Skin.cpp \
-           Display.cpp \
-           TitleBar.cpp \
-           TextBar.cpp \
            XMMSHandler.cpp \
            SkinChooser.cpp \
            settingsdialog.cpp \