diff --git a/replaygain/queue.h b/3rdparty/ebur128/queue.h
similarity index 100%
rename from replaygain/queue.h
rename to 3rdparty/ebur128/queue.h
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f706c8d2..b9c577fba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -268,11 +268,7 @@ endif (NOT ENABLE_QT5 AND NOT WIN32 AND NOT APPLE)
 
 find_package(ZLIB REQUIRED)
 
-include_directories(${CMAKE_SOURCE_DIR}/gui ${CMAKE_SOURCE_DIR}/mpd ${CMAKE_SOURCE_DIR}/models ${CMAKE_SOURCE_DIR}/widgets
-                    ${CMAKE_SOURCE_DIR}/network ${CMAKE_SOURCE_DIR}/dbus ${CMAKE_SOURCE_DIR}/http
-                    ${CMAKE_SOURCE_DIR}/devices ${CMAKE_SOURCE_DIR}/dynamic ${CMAKE_SOURCE_DIR}/support ${CMAKE_SOURCE_DIR}/streams
-                    ${CMAKE_SOURCE_DIR}/tags ${CMAKE_SOURCE_DIR}/online ${CMAKE_SOURCE_DIR}/context ${CMAKE_BINARY_DIR}/support
-                    ${CMAKE_SOURCE_DIR}/3rdparty ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/3rdparty ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
 # QJSon and MusicBrainz require exceptions to be enabled!
 if (CMAKE_COMPILER_IS_GNUCXX)
@@ -460,7 +456,6 @@ if (TAGLIB_FOUND)
     set(CANTATA_UIS ${CANTATA_UIS} tags/tageditor.ui tags/trackorganiser.ui devices/filenameschemedialog.ui)
 
     if (FFMPEG_FOUND OR MPG123_FOUND)
-        include_directories(${CMAKE_SOURCE_DIR}/replaygain)
         set(CANTATA_SRCS ${CANTATA_SRCS} replaygain/albumscanner.cpp replaygain/rgdialog.cpp replaygain/tagreader.cpp replaygain/jobcontroller.cpp)
         set(CANTATA_MOC_HDRS ${CANTATA_MOC_HDRS} replaygain/albumscanner.h replaygain/rgdialog.h replaygain/tagreader.h replaygain/jobcontroller.h)
         set(ENABLE_REPLAYGAIN_SUPPORT 1)
@@ -606,7 +601,6 @@ else (ENABLE_KDE)
     if (WIN32 OR (NOT APPLE AND NOT ENABLE_QT5))
         add_definitions(-DQXT_STATIC)
         add_subdirectory(3rdparty/qxt)
-        include_directories(${CMAKE_SOURCE_DIR}/3rdparty/qxt)
         set(CANTATA_SRCS ${CANTATA_SRCS} gui/qxtmediakeys.cpp)
     endif (WIN32 OR (NOT APPLE AND NOT ENABLE_QT5))
 
diff --git a/context/albumview.cpp b/context/albumview.cpp
index ddaadd167..cb7a67a88 100644
--- a/context/albumview.cpp
+++ b/context/albumview.cpp
@@ -23,15 +23,15 @@
 
 #include "albumview.h"
 #include "artistview.h"
-#include "localize.h"
-#include "covers.h"
-#include "networkaccessmanager.h"
-#include "utils.h"
+#include "support/localize.h"
+#include "gui/covers.h"
+#include "network/networkaccessmanager.h"
+#include "support/utils.h"
 #include "qtiocompressor/qtiocompressor.h"
-#include "musiclibrarymodel.h"
+#include "models/musiclibrarymodel.h"
 #include "contextengine.h"
-#include "textbrowser.h"
-#include "actioncollection.h"
+#include "widgets/textbrowser.h"
+#include "support/actioncollection.h"
 #include <QScrollBar>
 #include <QFile>
 #include <QUrl>
diff --git a/context/artistview.cpp b/context/artistview.cpp
index 27a2749f1..38cabb7ba 100644
--- a/context/artistview.cpp
+++ b/context/artistview.cpp
@@ -22,16 +22,16 @@
  */
 
 #include "artistview.h"
-#include "localize.h"
-#include "covers.h"
-#include "utils.h"
-#include "musiclibrarymodel.h"
-#include "networkaccessmanager.h"
+#include "support/localize.h"
+#include "gui/covers.h"
+#include "support/utils.h"
+#include "models/musiclibrarymodel.h"
+#include "network/networkaccessmanager.h"
 #include "qtiocompressor/qtiocompressor.h"
-#include "textbrowser.h"
+#include "widgets/textbrowser.h"
 #include "contextengine.h"
-#include "actioncollection.h"
-#include "musiclibrarymodel.h"
+#include "support/actioncollection.h"
+#include "models/musiclibrarymodel.h"
 #include <QApplication>
 #include <QTextStream>
 #include <QLayout>
diff --git a/context/artistview.h b/context/artistview.h
index 130021ad5..a981db598 100644
--- a/context/artistview.h
+++ b/context/artistview.h
@@ -25,7 +25,7 @@
 #define ARTIST_VIEW_H
 
 #include "view.h"
-#include "song.h"
+#include "mpd/song.h"
 #include <QMap>
 
 class ComboBox;
diff --git a/context/backdropcreator.cpp b/context/backdropcreator.cpp
index e3fab0d89..f94a39743 100644
--- a/context/backdropcreator.cpp
+++ b/context/backdropcreator.cpp
@@ -22,9 +22,9 @@
  */
 
 #include "backdropcreator.h"
-#include "covers.h"
-#include "thread.h"
-#include "utils.h"
+#include "gui/covers.h"
+#include "support/thread.h"
+#include "support/utils.h"
 #include <QApplication>
 #include <QPainter>
 
diff --git a/context/backdropcreator.h b/context/backdropcreator.h
index b8ea8f3c8..301c84007 100644
--- a/context/backdropcreator.h
+++ b/context/backdropcreator.h
@@ -26,7 +26,7 @@
 
 #include <QObject>
 #include <QSet>
-#include "song.h"
+#include "mpd/song.h"
 
 class Thread;
 class QImage;
diff --git a/context/contextengine.cpp b/context/contextengine.cpp
index c98ffebdf..d9052a11c 100644
--- a/context/contextengine.cpp
+++ b/context/contextengine.cpp
@@ -24,7 +24,7 @@
 #include "contextengine.h"
 #include "metaengine.h"
 #include "wikipediaengine.h"
-#include "networkaccessmanager.h"
+#include "network/networkaccessmanager.h"
 
 ContextEngine * ContextEngine::create(QObject *parent)
 {
diff --git a/context/contextsettings.cpp b/context/contextsettings.cpp
index 878c1966d..8fec1578c 100644
--- a/context/contextsettings.cpp
+++ b/context/contextsettings.cpp
@@ -25,7 +25,7 @@
 #include "wikipediasettings.h"
 #include "lyricsettings.h"
 #include "othersettings.h"
-#include "localize.h"
+#include "support/localize.h"
 
 ContextSettings::ContextSettings(QWidget *p)
     : QTabWidget(p)
diff --git a/context/contextwidget.cpp b/context/contextwidget.cpp
index 735fdef5b..d1f1bdd06 100644
--- a/context/contextwidget.cpp
+++ b/context/contextwidget.cpp
@@ -28,19 +28,19 @@
 #ifdef ENABLE_ONLINE_SERVICES
 #include "onlineview.h"
 #endif
-#include "song.h"
-#include "utils.h"
-#include "covers.h"
-#include "networkaccessmanager.h"
-#include "settings.h"
+#include "mpd/song.h"
+#include "support/utils.h"
+#include "gui/covers.h"
+#include "network/networkaccessmanager.h"
+#include "gui/settings.h"
 #include "wikipediaengine.h"
-#include "localize.h"
+#include "support/localize.h"
 #include "backdropcreator.h"
-#include "gtkstyle.h"
+#include "support/gtkstyle.h"
 #include "qjson/parser.h"
-#include "playqueueview.h"
-#include "treeview.h"
-#include "thinsplitterhandle.h"
+#include "widgets/playqueueview.h"
+#include "widgets/treeview.h"
+#include "widgets/thinsplitterhandle.h"
 #include <QHBoxLayout>
 #include <QGridLayout>
 #include <QSpacerItem>
diff --git a/context/contextwidget.h b/context/contextwidget.h
index 978daf515..c7f662cdc 100644
--- a/context/contextwidget.h
+++ b/context/contextwidget.h
@@ -29,7 +29,7 @@
 #include <QColor>
 #include <QPropertyAnimation>
 #include <QSplitter>
-#include "song.h"
+#include "mpd/song.h"
 
 #ifndef SCALE_CONTEXT_BGND
 #define SCALE_CONTEXT_BGND
diff --git a/context/lastfmengine.cpp b/context/lastfmengine.cpp
index a6d214dd9..cc74ce875 100644
--- a/context/lastfmengine.cpp
+++ b/context/lastfmengine.cpp
@@ -22,9 +22,9 @@
  */
 
 #include "lastfmengine.h"
-#include "networkaccessmanager.h"
-#include "localize.h"
-#include "covers.h"
+#include "network/networkaccessmanager.h"
+#include "support/localize.h"
+#include "gui/covers.h"
 #include "config.h"
 #if QT_VERSION >= 0x050000
 #include <QUrlQuery>
diff --git a/context/lyricsdialog.cpp b/context/lyricsdialog.cpp
index 288038f6c..53c26f5d5 100644
--- a/context/lyricsdialog.cpp
+++ b/context/lyricsdialog.cpp
@@ -23,9 +23,9 @@
 
 #include <QFormLayout>
 #include <QLabel>
-#include "icon.h"
+#include "support/icon.h"
 #include "lyricsdialog.h"
-#include "localize.h"
+#include "support/localize.h"
 
 LyricsDialog::LyricsDialog(const Song &s, QWidget *parent)
     : Dialog(parent)
diff --git a/context/lyricsdialog.h b/context/lyricsdialog.h
index 516451b99..0c6cff052 100644
--- a/context/lyricsdialog.h
+++ b/context/lyricsdialog.h
@@ -24,9 +24,9 @@
 #ifndef LYRICSDIALOG_H
 #define LYRICSDIALOG_H
 
-#include "dialog.h"
-#include "lineedit.h"
-#include "song.h"
+#include "support/dialog.h"
+#include "support/lineedit.h"
+#include "mpd/song.h"
 
 class LyricsDialog : public Dialog
 {
diff --git a/context/lyricsettings.cpp b/context/lyricsettings.cpp
index 8c27560e0..f6bdcbb4c 100644
--- a/context/lyricsettings.cpp
+++ b/context/lyricsettings.cpp
@@ -24,9 +24,9 @@
 #include "lyricsettings.h"
 #include "ultimatelyricsprovider.h"
 #include "ultimatelyrics.h"
-#include "localize.h"
+#include "support/localize.h"
 #include "config.h"
-#include "settings.h"
+#include "gui/settings.h"
 
 LyricSettings::LyricSettings(QWidget *p)
     : ToggleList(p)
diff --git a/context/onlineview.cpp b/context/onlineview.cpp
index 522ced47e..9b0d7ddcb 100644
--- a/context/onlineview.cpp
+++ b/context/onlineview.cpp
@@ -22,8 +22,8 @@
  */
 
 #include "onlineview.h"
-#include "onlineservicesmodel.h"
-#include "localize.h"
+#include "models/onlineservicesmodel.h"
+#include "support/localize.h"
 
 OnlineView::OnlineView(QWidget *p)
     : View(p)
diff --git a/context/othersettings.cpp b/context/othersettings.cpp
index 3d45a5c5d..925cc1635 100644
--- a/context/othersettings.cpp
+++ b/context/othersettings.cpp
@@ -22,10 +22,10 @@
  */
 
 #include "othersettings.h"
-#include "settings.h"
-#include "pathrequester.h"
-#include "playqueueview.h"
-#include "localize.h"
+#include "gui/settings.h"
+#include "support/pathrequester.h"
+#include "widgets/playqueueview.h"
+#include "support/localize.h"
 
 static const char *constValueProperty="value";
 
diff --git a/context/othersettings.ui b/context/othersettings.ui
index db82ca557..9258260f4 100644
--- a/context/othersettings.ui
+++ b/context/othersettings.ui
@@ -274,17 +274,17 @@
  <customwidget>
   <class>BuddyLabel</class>
   <extends>QLabel</extends>
-  <header>buddylabel.h</header>
+  <header>support/buddylabel.h</header>
  </customwidget>
   <customwidget>
    <class>StateLabel</class>
    <extends>QLabel</extends>
-   <header>statelabel.h</header>
+   <header>widgets/statelabel.h</header>
   </customwidget>
   <customwidget>
    <class>PathRequester</class>
    <extends>QLineEdit</extends>
-   <header>pathrequester.h</header>
+   <header>support/pathrequester.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/context/songview.cpp b/context/songview.cpp
index 266444e86..60f1d06ba 100644
--- a/context/songview.cpp
+++ b/context/songview.cpp
@@ -25,22 +25,22 @@
 #include "lyricsdialog.h"
 #include "ultimatelyricsprovider.h"
 #include "ultimatelyrics.h"
-#include "settings.h"
-#include "squeezedtextlabel.h"
-#include "utils.h"
-#include "messagebox.h"
-#include "localize.h"
+#include "gui/settings.h"
+#include "support/squeezedtextlabel.h"
+#include "support/utils.h"
+#include "support/messagebox.h"
+#include "support/localize.h"
 #ifdef TAGLIB_FOUND
-#include "tags.h"
+#include "tags/tags.h"
 #endif
-#include "icons.h"
-#include "utils.h"
-#include "action.h"
-#include "actioncollection.h"
-#include "networkaccessmanager.h"
-#include "textbrowser.h"
-#include "stdactions.h"
-#include "mpdstatus.h"
+#include "widgets/icons.h"
+#include "support/utils.h"
+#include "support/action.h"
+#include "support/actioncollection.h"
+#include "network/networkaccessmanager.h"
+#include "widgets/textbrowser.h"
+#include "gui/stdactions.h"
+#include "mpd/mpdstatus.h"
 #include <QFile>
 #include <QDir>
 #include <QFileInfo>
diff --git a/context/togglelist.cpp b/context/togglelist.cpp
index f4ed2438d..22b2d02f4 100644
--- a/context/togglelist.cpp
+++ b/context/togglelist.cpp
@@ -22,12 +22,12 @@
  */
 
 #include "togglelist.h"
-#include "localize.h"
-#include "icon.h"
-#include "settings.h"
-#include "basicitemdelegate.h"
-#include "flickcharm.h"
-#include "utils.h"
+#include "support/localize.h"
+#include "support/icon.h"
+#include "gui/settings.h"
+#include "widgets/basicitemdelegate.h"
+#include "support/flickcharm.h"
+#include "support/utils.h"
 
 ToggleList::ToggleList(QWidget *p)
     : QWidget(p)
diff --git a/context/ultimatelyrics.cpp b/context/ultimatelyrics.cpp
index 9b11aefb5..a135b80ee 100644
--- a/context/ultimatelyrics.cpp
+++ b/context/ultimatelyrics.cpp
@@ -23,8 +23,8 @@
 
 #include "ultimatelyrics.h"
 #include "ultimatelyricsprovider.h"
-#include "settings.h"
-#include "globalstatic.h"
+#include "gui/settings.h"
+#include "support/globalstatic.h"
 #include <QDir>
 #include <QFile>
 #include <QFileInfoList>
diff --git a/context/ultimatelyricsprovider.cpp b/context/ultimatelyricsprovider.cpp
index 9ea0e3dae..5a80aaf4b 100644
--- a/context/ultimatelyricsprovider.cpp
+++ b/context/ultimatelyricsprovider.cpp
@@ -22,8 +22,8 @@
 */
 
 #include "ultimatelyricsprovider.h"
-#include "networkaccessmanager.h"
-#include "localize.h"
+#include "network/networkaccessmanager.h"
+#include "support/localize.h"
 #include <QTextCodec>
 #include <QXmlStreamReader>
 #include <QUrl>
diff --git a/context/ultimatelyricsprovider.h b/context/ultimatelyricsprovider.h
index 89f1c62ef..fbc02cc94 100644
--- a/context/ultimatelyricsprovider.h
+++ b/context/ultimatelyricsprovider.h
@@ -24,7 +24,7 @@
 #ifndef ULTIMATELYRICSPROVIDER_H
 #define ULTIMATELYRICSPROVIDER_H
 
-#include "song.h"
+#include "mpd/song.h"
 #include <QObject>
 #include <QPair>
 #include <QStringList>
diff --git a/context/view.cpp b/context/view.cpp
index 16df601cf..a5a3ead1f 100644
--- a/context/view.cpp
+++ b/context/view.cpp
@@ -22,15 +22,15 @@
  */
  
 #include "view.h"
-#include "spinner.h"
-#include "networkaccessmanager.h"
-#include "settings.h"
-#include "textbrowser.h"
-#include "gtkstyle.h"
-#include "actioncollection.h"
-#include "action.h"
-#include "icons.h"
-#include "localize.h"
+#include "support/spinner.h"
+#include "network/networkaccessmanager.h"
+#include "gui/settings.h"
+#include "widgets/textbrowser.h"
+#include "support/gtkstyle.h"
+#include "support/actioncollection.h"
+#include "support/action.h"
+#include "widgets/icons.h"
+#include "support/localize.h"
 #include <QLabel>
 #include <QScrollBar>
 #include <QImage>
diff --git a/context/view.h b/context/view.h
index c49811331..472204c2c 100644
--- a/context/view.h
+++ b/context/view.h
@@ -26,7 +26,7 @@
 
 #include <QWidget>
 #include <QSize>
-#include "song.h"
+#include "mpd/song.h"
 
 class QImage;
 class QLabel;
diff --git a/context/wikipediaengine.cpp b/context/wikipediaengine.cpp
index 746ee49ee..9536b854d 100644
--- a/context/wikipediaengine.cpp
+++ b/context/wikipediaengine.cpp
@@ -22,9 +22,9 @@
  */
 
 #include "wikipediaengine.h"
-#include "networkaccessmanager.h"
-#include "localize.h"
-#include "settings.h"
+#include "network/networkaccessmanager.h"
+#include "support/localize.h"
+#include "gui/settings.h"
 #include "config.h"
 #if QT_VERSION >= 0x050000
 #include <QUrlQuery>
diff --git a/context/wikipediasettings.cpp b/context/wikipediasettings.cpp
index d15d40e42..ee02cca50 100644
--- a/context/wikipediasettings.cpp
+++ b/context/wikipediasettings.cpp
@@ -23,15 +23,15 @@
 
 #include "wikipediasettings.h"
 #include "wikipediaengine.h"
-#include "networkaccessmanager.h"
-#include "localize.h"
-#include "icon.h"
-#include "spinner.h"
-#include "settings.h"
+#include "network/networkaccessmanager.h"
+#include "support/localize.h"
+#include "support/icon.h"
+#include "support/spinner.h"
+#include "gui/settings.h"
 #include "qtiocompressor/qtiocompressor.h"
-#include "utils.h"
-#include "action.h"
-#include "thread.h"
+#include "support/utils.h"
+#include "support/action.h"
+#include "support/thread.h"
 #if QT_VERSION >= 0x050000
 #include <QUrlQuery>
 #endif
diff --git a/dbus/gnomemediakeys.h b/dbus/gnomemediakeys.h
index 715c0789a..6fdb8e6a4 100644
--- a/dbus/gnomemediakeys.h
+++ b/dbus/gnomemediakeys.h
@@ -24,7 +24,7 @@
 #ifndef GNOME_MEDIA_KEYS_H
 #define GNOME_MEDIA_KEYS_H
 
-#include "multimediakeysinterface.h"
+#include "gui/multimediakeysinterface.h"
 
 class OrgGnomeSettingsDaemonInterface;
 class OrgGnomeSettingsDaemonMediaKeysInterface;
diff --git a/dbus/mpris.cpp b/dbus/mpris.cpp
index d0ab49994..34e709b6e 100644
--- a/dbus/mpris.cpp
+++ b/dbus/mpris.cpp
@@ -22,12 +22,12 @@
  */
 
 #include "mpris.h"
-#include "mpdconnection.h"
+#include "mpd/mpdconnection.h"
 #include "playeradaptor.h"
 #include "rootadaptor.h"
 #include "config.h"
-#include "currentcover.h"
-#include "mainwindow.h"
+#include "gui/currentcover.h"
+#include "gui/mainwindow.h"
 
 static inline qlonglong convertTime(int t)
 {
diff --git a/dbus/mpris.h b/dbus/mpris.h
index f4b0a87f1..2205525fa 100644
--- a/dbus/mpris.h
+++ b/dbus/mpris.h
@@ -28,9 +28,9 @@
 #include <QStringList>
 #include <QVariantMap>
 #include <QApplication>
-#include "song.h"
-#include "mpdstatus.h"
-#include "stdactions.h"
+#include "mpd/song.h"
+#include "mpd/mpdstatus.h"
+#include "gui/stdactions.h"
 
 class QDBusObjectPath;
 
diff --git a/dbus/powermanagement.cpp b/dbus/powermanagement.cpp
index 0730d6171..1c711b313 100644
--- a/dbus/powermanagement.cpp
+++ b/dbus/powermanagement.cpp
@@ -22,7 +22,7 @@
  */
 
 #include "powermanagement.h"
-#include "globalstatic.h"
+#include "support/globalstatic.h"
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/Solid/PowerManagement>
 #include <kdeversion.h>
@@ -31,8 +31,8 @@
 #include "policyagentinterface.h"
 #include "upowerinterface.h"
 #endif
-#include "localize.h"
-#include "mpdstatus.h"
+#include "support/localize.h"
+#include "mpd/mpdstatus.h"
 
 GLOBAL_STATIC(PowerManagement, instance)
 
diff --git a/devices/actiondialog.cpp b/devices/actiondialog.cpp
index e5eb92c36..898a8b031 100644
--- a/devices/actiondialog.cpp
+++ b/devices/actiondialog.cpp
@@ -22,32 +22,32 @@
  */
 
 #include "actiondialog.h"
-#include "devicesmodel.h"
+#include "models/devicesmodel.h"
 #include "device.h"
-#include "utils.h"
+#include "support/utils.h"
 #include "devicepropertiesdialog.h"
 #include "devicepropertieswidget.h"
-#include "settings.h"
-#include "musiclibrarymodel.h"
-#include "musiclibraryproxymodel.h"
-#include "dirviewmodel.h"
-#include "albumsmodel.h"
-#include "mpdparseutils.h"
-#include "mpdconnection.h"
+#include "gui/settings.h"
+#include "models/musiclibrarymodel.h"
+#include "models/musiclibraryproxymodel.h"
+#include "models/dirviewmodel.h"
+#include "models/albumsmodel.h"
+#include "mpd/mpdparseutils.h"
+#include "mpd/mpdconnection.h"
 #include "encoders.h"
-#include "localize.h"
-#include "messagebox.h"
+#include "support/localize.h"
+#include "support/messagebox.h"
 #include "filejob.h"
 #include "freespaceinfo.h"
-#include "icons.h"
+#include "widgets/icons.h"
 #include "config.h"
-#include "tags.h"
-#include "treeview.h"
+#include "tags/tags.h"
+#include "widgets/treeview.h"
 #ifdef ENABLE_ONLINE_SERVICES
-#include "onlineservicesmodel.h"
+#include "models/onlineservicesmodel.h"
 #endif
 #ifdef ENABLE_REPLAYGAIN_SUPPORT
-#include "rgdialog.h"
+#include "replaygain/rgdialog.h"
 #endif
 #include <QFile>
 #include <QDebug>
diff --git a/devices/actiondialog.h b/devices/actiondialog.h
index fbabef76b..a2398940b 100644
--- a/devices/actiondialog.h
+++ b/devices/actiondialog.h
@@ -24,8 +24,8 @@
 #ifndef ACTION_DIALOG_H
 #define ACTION_DIALOG_H
 
-#include "dialog.h"
-#include "song.h"
+#include "support/dialog.h"
+#include "mpd/song.h"
 #include "device.h"
 #include "config.h"
 #include "ui_actiondialog.h"
diff --git a/devices/actiondialog.ui b/devices/actiondialog.ui
index fdfe7ed88..02674030f 100644
--- a/devices/actiondialog.ui
+++ b/devices/actiondialog.ui
@@ -352,22 +352,22 @@
   <customwidget>
    <class>CapacityBar</class>
    <extends>QProgressBar</extends>
-   <header>capacitybar.h</header>
+   <header>support/capacitybar.h</header>
   </customwidget>
   <customwidget>
    <class>ActionLabel</class>
    <extends>QLabel</extends>
-   <header>actionlabel.h</header>
+   <header>widgets/actionlabel.h</header>
   </customwidget>
   <customwidget>
    <class>UrlLabel</class>
    <extends>QLabel</extends>
-   <header>urllabel.h</header>
+   <header>support/urllabel.h</header>
   </customwidget>
   <customwidget>
    <class>SplitLabelWidget</class>
    <extends>QLabel</extends>
-   <header>splitlabelwidget.h</header>
+   <header>devices/splitlabelwidget.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/devices/albumdetails.ui b/devices/albumdetails.ui
index 82a3ae579..23dd78519 100644
--- a/devices/albumdetails.ui
+++ b/devices/albumdetails.ui
@@ -179,17 +179,17 @@
   <customwidget>
    <class>BuddyLabel</class>
    <extends>QLabel</extends>
-   <header>buddylabel.h</header>
+   <header>support/buddylabel.h</header>
   </customwidget>
   <customwidget>
    <class>CompletionCombo</class>
    <extends>QComboBox</extends>
-   <header>completioncombo.h</header>
+   <header>widgets/completioncombo.h</header>
   </customwidget>
   <customwidget>
    <class>EmnptySpinBox</class>
    <extends>QSpinBox</extends>
-   <header>emptyspinbox.h</header>
+   <header>widgets/emptyspinbox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/devices/albumdetailsdialog.cpp b/devices/albumdetailsdialog.cpp
index 30becbcc5..fd244d410 100644
--- a/devices/albumdetailsdialog.cpp
+++ b/devices/albumdetailsdialog.cpp
@@ -22,18 +22,18 @@
  */
 
 #include "albumdetailsdialog.h"
-#include "localize.h"
+#include "support/localize.h"
 #include "audiocddevice.h"
-#include "musiclibrarymodel.h"
-#include "musiclibraryitemsong.h"
-#include "messagebox.h"
-#include "inputdialog.h"
-#include "devicesmodel.h"
+#include "models/musiclibrarymodel.h"
+#include "models/musiclibraryitemsong.h"
+#include "support/messagebox.h"
+#include "support/inputdialog.h"
+#include "models/devicesmodel.h"
 #include "cdalbum.h"
-#include "icons.h"
-#include "coverdialog.h"
-#include "basicitemdelegate.h"
-#include "lineedit.h"
+#include "widgets/icons.h"
+#include "gui/coverdialog.h"
+#include "widgets/basicitemdelegate.h"
+#include "support/lineedit.h"
 #include <QMenu>
 #include <QStyledItemDelegate>
 #include <QMouseEvent>
diff --git a/devices/albumdetailsdialog.h b/devices/albumdetailsdialog.h
index 18d2c5ace..cd2b33587 100644
--- a/devices/albumdetailsdialog.h
+++ b/devices/albumdetailsdialog.h
@@ -25,9 +25,9 @@
 #define ALBUMDETAILSDIALOG_H
 
 #include "ui_albumdetails.h"
-#include "dialog.h"
-#include "song.h"
-#include "covers.h"
+#include "support/dialog.h"
+#include "mpd/song.h"
+#include "gui/covers.h"
 
 class AudioCdDevice;
 class QTreeWidgetItem;
diff --git a/devices/audiocddevice.cpp b/devices/audiocddevice.cpp
index 8f74f165b..27135f3fb 100644
--- a/devices/audiocddevice.cpp
+++ b/devices/audiocddevice.cpp
@@ -28,16 +28,16 @@
 #ifdef MUSICBRAINZ5_FOUND
 #include "musicbrainz.h"
 #endif
-#include "localize.h"
-#include "plurals.h"
-#include "musiclibraryitemsong.h"
-#include "musiclibrarymodel.h"
-#include "dirviewmodel.h"
-#include "utils.h"
+#include "support/localize.h"
+#include "gui/plurals.h"
+#include "models/musiclibraryitemsong.h"
+#include "models/musiclibrarymodel.h"
+#include "models/dirviewmodel.h"
+#include "support/utils.h"
 #include "extractjob.h"
-#include "mpdconnection.h"
-#include "covers.h"
-#include "settings.h"
+#include "mpd/mpdconnection.h"
+#include "gui/covers.h"
+#include "gui/settings.h"
 #include <QDir>
 #include <QUrl>
 #if QT_VERSION >= 0x050000
diff --git a/devices/audiocddevice.h b/devices/audiocddevice.h
index a80cdfec3..8b40a59e3 100644
--- a/devices/audiocddevice.h
+++ b/devices/audiocddevice.h
@@ -25,8 +25,8 @@
 #define AUDIOCDDEVICE_H
 
 #include "device.h"
-#include "covers.h"
-#include "httpserver.h"
+#include "gui/covers.h"
+#include "http/httpserver.h"
 #ifdef ENABLE_KDE_SUPPORT
 #include <solid/opticaldrive.h>
 #else
diff --git a/devices/audiocdsettings.cpp b/devices/audiocdsettings.cpp
index 04ab0ffa8..5e1fe1b9a 100644
--- a/devices/audiocdsettings.cpp
+++ b/devices/audiocdsettings.cpp
@@ -22,8 +22,8 @@
  */
 
 #include "audiocdsettings.h"
-#include "settings.h"
-#include "localize.h"
+#include "gui/settings.h"
+#include "support/localize.h"
 
 #define REMOVE(w) \
     w->setVisible(false); \
diff --git a/devices/audiocdsettings.ui b/devices/audiocdsettings.ui
index 1c3779e7e..90b5cdbb2 100644
--- a/devices/audiocdsettings.ui
+++ b/devices/audiocdsettings.ui
@@ -130,12 +130,12 @@
   <customwidget>
    <class>BuddyLabel</class>
    <extends>QLabel</extends>
-   <header>buddylabel.h</header>
+   <header>support/buddylabel.h</header>
   </customwidget>
   <customwidget>
    <class>LineEdit</class>
    <extends>QLineEdit</extends>
-   <header>lineedit.h</header>
+   <header>support/lineedit.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/devices/cdalbum.h b/devices/cdalbum.h
index 0ae48ef3f..5155be800 100644
--- a/devices/cdalbum.h
+++ b/devices/cdalbum.h
@@ -26,7 +26,7 @@
 
 #include <QString>
 #include <QList>
-#include "song.h"
+#include "mpd/song.h"
 
 struct CdAlbum {
     CdAlbum() : isDefault(false), year(0), disc(0)  { }
diff --git a/devices/cddbinterface.cpp b/devices/cddbinterface.cpp
index 17b12e3cf..d822295d0 100644
--- a/devices/cddbinterface.cpp
+++ b/devices/cddbinterface.cpp
@@ -22,10 +22,10 @@
  */
 
 #include "cddbinterface.h"
-#include "settings.h"
-#include "networkproxyfactory.h"
-#include "localize.h"
-#include "thread.h"
+#include "gui/settings.h"
+#include "network/networkproxyfactory.h"
+#include "support/localize.h"
+#include "support/thread.h"
 #include <QNetworkProxy>
 #include <QSet>
 #include <cddb/cddb.h>
diff --git a/devices/cddbselectiondialog.cpp b/devices/cddbselectiondialog.cpp
index 4f802d8e2..aa8877472 100644
--- a/devices/cddbselectiondialog.cpp
+++ b/devices/cddbselectiondialog.cpp
@@ -22,7 +22,7 @@
  */
 
 #include "cddbselectiondialog.h"
-#include "localize.h"
+#include "support/localize.h"
 #include <QVBoxLayout>
 #include <QLabel>
 #include <QComboBox>
diff --git a/devices/cddbselectiondialog.h b/devices/cddbselectiondialog.h
index 91fdb7d57..57cfd76fb 100644
--- a/devices/cddbselectiondialog.h
+++ b/devices/cddbselectiondialog.h
@@ -24,7 +24,7 @@
 #ifndef CDDBSELECTIONDIALOG_H
 #define CDDBSELECTIONDIALOG_H
 
-#include "dialog.h"
+#include "support/dialog.h"
 #include "cdalbum.h"
 #include <QList>
 
diff --git a/devices/device.cpp b/devices/device.cpp
index 74965c124..81851eec0 100644
--- a/devices/device.cpp
+++ b/devices/device.cpp
@@ -23,15 +23,15 @@
 
 #include "config.h"
 #include "device.h"
-#include "covers.h"
-#include "utils.h"
-#include "mpdconnection.h"
+#include "gui/covers.h"
+#include "support/utils.h"
+#include "mpd/mpdconnection.h"
 #include <QBuffer>
 #include <QDir>
 #include <QTemporaryFile>
 #include <QTimer>
 #ifdef ENABLE_DEVICES_SUPPORT
-#include "devicesmodel.h"
+#include "models/devicesmodel.h"
 #include "umsdevice.h"
 #ifdef MTP_FOUND
 #include "mtpdevice.h"
@@ -40,13 +40,13 @@
 #include "audiocddevice.h"
 #endif // defined CDDB_FOUND || defined MUSICBRAINZ5_FOUND
 #include "encoders.h"
-#include "tags.h"
-#include "song.h"
-#include "mpdparseutils.h"
-#include "musiclibraryitemartist.h"
-#include "musiclibraryitemalbum.h"
-#include "musiclibraryitemsong.h"
-#include "localize.h"
+#include "tags/tags.h"
+#include "mpd/song.h"
+#include "mpd/mpdparseutils.h"
+#include "models/musiclibraryitemartist.h"
+#include "models/musiclibraryitemalbum.h"
+#include "models/musiclibraryitemsong.h"
+#include "support/localize.h"
 #ifdef ENABLE_KDE_SUPPORT
 #include <solid/portablemediaplayer.h>
 #include <solid/storageaccess.h>
diff --git a/devices/device.h b/devices/device.h
index 1714f17c9..f77003c3e 100644
--- a/devices/device.h
+++ b/devices/device.h
@@ -24,8 +24,8 @@
 #ifndef DEVICE_H
 #define DEVICE_H
 
-#include "musiclibraryitemroot.h"
-#include "song.h"
+#include "models/musiclibraryitemroot.h"
+#include "mpd/song.h"
 #ifdef ENABLE_DEVICES_SUPPORT
 #include "deviceoptions.h"
 #ifdef ENABLE_KDE_SUPPORT
diff --git a/devices/deviceoptions.cpp b/devices/deviceoptions.cpp
index 22d59b14d..8535d4bf3 100644
--- a/devices/deviceoptions.cpp
+++ b/devices/deviceoptions.cpp
@@ -22,9 +22,9 @@
  */
 
 #include "deviceoptions.h"
-#include "song.h"
-#include "localize.h"
-#include "configuration.h"
+#include "mpd/song.h"
+#include "support/localize.h"
+#include "support/configuration.h"
 #include <QDir>
 #include <QUrl>
 #include <unistd.h>
diff --git a/devices/devicepropertiesdialog.cpp b/devices/devicepropertiesdialog.cpp
index 026e7d0e4..d7948b809 100644
--- a/devices/devicepropertiesdialog.cpp
+++ b/devices/devicepropertiesdialog.cpp
@@ -23,7 +23,7 @@
 
 #include "devicepropertiesdialog.h"
 #include "devicepropertieswidget.h"
-#include "localize.h"
+#include "support/localize.h"
 
 DevicePropertiesDialog::DevicePropertiesDialog(QWidget *parent)
     : Dialog(parent)
diff --git a/devices/devicepropertiesdialog.h b/devices/devicepropertiesdialog.h
index f1a950995..6ea0b36df 100644
--- a/devices/devicepropertiesdialog.h
+++ b/devices/devicepropertiesdialog.h
@@ -24,7 +24,7 @@
 #ifndef DEVICEPROPERTIESDIALOG_H
 #define DEVICEPROPERTIESDIALOG_H
 
-#include "dialog.h"
+#include "support/dialog.h"
 #include "device.h"
 
 class FilenameSchemeDialog;
diff --git a/devices/devicepropertieswidget.cpp b/devices/devicepropertieswidget.cpp
index 9cdecdd6c..bf3133e23 100644
--- a/devices/devicepropertieswidget.cpp
+++ b/devices/devicepropertieswidget.cpp
@@ -23,10 +23,10 @@
 
 #include "devicepropertieswidget.h"
 #include "filenameschemedialog.h"
-#include "covers.h"
-#include "localize.h"
-#include "icons.h"
-#include "utils.h"
+#include "gui/covers.h"
+#include "support/localize.h"
+#include "widgets/icons.h"
+#include "support/utils.h"
 #include <QValidator>
 #include <QTabWidget>
 
diff --git a/devices/devicepropertieswidget.h b/devices/devicepropertieswidget.h
index f365d6cb0..557486345 100644
--- a/devices/devicepropertieswidget.h
+++ b/devices/devicepropertieswidget.h
@@ -26,7 +26,7 @@
 
 #include "ui_devicepropertieswidget.h"
 #include "device.h"
-#include "utils.h"
+#include "support/utils.h"
 
 class FilenameSchemeDialog;
 class DevicePropertiesWidget : public QWidget, Ui::DevicePropertiesWidget
diff --git a/devices/devicepropertieswidget.ui b/devices/devicepropertieswidget.ui
index 90b2bb318..3ac79438d 100644
--- a/devices/devicepropertieswidget.ui
+++ b/devices/devicepropertieswidget.ui
@@ -243,23 +243,23 @@
   <customwidget>
    <class>LineEdit</class>
    <extends>QLineEdit</extends>
-   <header>lineedit.h</header>
+   <header>support/lineedit.h</header>
   </customwidget>
   <customwidget>
    <class>BuddyLabel</class>
    <extends>QLabel</extends>
-   <header>buddylabel.h</header>
+   <header>support/buddylabel.h</header>
   </customwidget>
   <customwidget>
    <class>PathRequester</class>
    <extends>QLineEdit</extends>
-   <header>pathrequester.h</header>
+   <header>support/pathrequester.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>ValueSlider</class>
    <extends>QSlider</extends>
-   <header>valueslider.h</header>
+   <header>devices/valueslider.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/devices/devicespage.cpp b/devices/devicespage.cpp
index 44dca038a..c76538a80 100644
--- a/devices/devicespage.cpp
+++ b/devices/devicespage.cpp
@@ -22,32 +22,32 @@
  */
 
 #include "devicespage.h"
-#include "musiclibraryitemroot.h"
-#include "musiclibraryitemartist.h"
-#include "musiclibraryitemalbum.h"
-#include "musiclibraryitemsong.h"
-#include "devicesmodel.h"
-#include "settings.h"
-#include "messagebox.h"
-#include "localize.h"
-#include "icons.h"
-#include "action.h"
-#include "actioncollection.h"
-#include "stdactions.h"
+#include "models/musiclibraryitemroot.h"
+#include "models/musiclibraryitemartist.h"
+#include "models/musiclibraryitemalbum.h"
+#include "models/musiclibraryitemsong.h"
+#include "models/devicesmodel.h"
+#include "gui/settings.h"
+#include "support/messagebox.h"
+#include "support/localize.h"
+#include "widgets/icons.h"
+#include "support/action.h"
+#include "support/actioncollection.h"
+#include "gui/stdactions.h"
 #ifdef ENABLE_REMOTE_DEVICES
 #include "remotedevicepropertiesdialog.h"
 #include "devicepropertieswidget.h"
 #endif
 #include "syncdialog.h"
 #ifdef ENABLE_REPLAYGAIN_SUPPORT
-#include "rgdialog.h"
+#include "replaygain/rgdialog.h"
 #endif
-#include "tageditor.h"
+#include "tags/tageditor.h"
 #include "actiondialog.h"
-#include "trackorganiser.h"
-#include "preferencesdialog.h"
-#include "coverdialog.h"
-#include "mpdconnection.h"
+#include "tags/trackorganiser.h"
+#include "gui/preferencesdialog.h"
+#include "gui/coverdialog.h"
+#include "mpd/mpdconnection.h"
 #if defined CDDB_FOUND || defined MUSICBRAINZ5_FOUND
 #include "audiocddevice.h"
 #include "albumdetailsdialog.h"
diff --git a/devices/devicespage.h b/devices/devicespage.h
index 534b8b43b..c73c6a0d4 100644
--- a/devices/devicespage.h
+++ b/devices/devicespage.h
@@ -26,12 +26,12 @@
 
 #include "ui_devicespage.h"
 #include "device.h"
-#include "page.h"
+#include "gui/page.h"
 #ifdef ENABLE_REMOTE_DEVICES
 #include "remotefsdevice.h"
 #endif
 #include "cdalbum.h"
-#include "musiclibraryproxymodel.h"
+#include "models/musiclibraryproxymodel.h"
 
 class Action;
 
diff --git a/devices/devicespage.ui b/devices/devicespage.ui
index 9518b22b9..c4a44a2ef 100644
--- a/devices/devicespage.ui
+++ b/devices/devicespage.ui
@@ -48,27 +48,27 @@
   <customwidget>
    <class>ItemView</class>
    <extends>QTreeView</extends>
-   <header>itemview.h</header>
+   <header>widgets/itemview.h</header>
   </customwidget>
   <customwidget>
    <class>GenreCombo</class>
    <extends>QComboBox</extends>
-   <header>genrecombo.h</header>
+   <header>widgets/genrecombo.h</header>
   </customwidget>
   <customwidget>
    <class>ToolButton</class>
    <extends>QToolButton</extends>
-   <header>toolbutton.h</header>
+   <header>widgets/toolbutton.h</header>
   </customwidget>
   <customwidget>
    <class>MenuButton</class>
    <extends>QToolButton</extends>
-   <header>menubutton.h</header>
+   <header>widgets/menubutton.h</header>
   </customwidget>
   <customwidget>
    <class>SizeWidget</class>
    <extends>QWidget</extends>
-   <header>sizewidget.h</header>
+   <header>widgets/sizewidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/devices/encoders.cpp b/devices/encoders.cpp
index 903f7330f..eb1f9a37e 100644
--- a/devices/encoders.cpp
+++ b/devices/encoders.cpp
@@ -23,8 +23,8 @@
  ****************************************************************************************/
 
 #include "encoders.h"
-#include "utils.h"
-#include "localize.h"
+#include "support/utils.h"
+#include "support/localize.h"
 #include <QRegExp>
 #include <QProcess>
 
diff --git a/devices/extractjob.cpp b/devices/extractjob.cpp
index 6c8b6c644..7ea4c8e29 100644
--- a/devices/extractjob.cpp
+++ b/devices/extractjob.cpp
@@ -22,12 +22,12 @@
 
 #include "extractjob.h"
 #include "device.h"
-#include "utils.h"
-#include "tags.h"
+#include "support/utils.h"
+#include "tags/tags.h"
 #include "cdparanoia.h"
-#include "covers.h"
-#include "mpdconnection.h"
-#include "settings.h"
+#include "gui/covers.h"
+#include "mpd/mpdconnection.h"
+#include "gui/settings.h"
 #include <QStringList>
 #include <QProcess>
 #include <QFile>
diff --git a/devices/filejob.cpp b/devices/filejob.cpp
index 12ff7aea8..c821607bf 100644
--- a/devices/filejob.cpp
+++ b/devices/filejob.cpp
@@ -22,12 +22,12 @@
  */
 
 #include "filejob.h"
-#include "utils.h"
+#include "support/utils.h"
 #include "device.h"
-#include "songview.h"
-#include "covers.h"
-#include "thread.h"
-#include "globalstatic.h"
+#include "context/songview.h"
+#include "gui/covers.h"
+#include "support/thread.h"
+#include "support/globalstatic.h"
 #include <QFile>
 #include <QTimer>
 #include <QTemporaryFile>
diff --git a/devices/filejob.h b/devices/filejob.h
index b875c3997..b452e81ec 100644
--- a/devices/filejob.h
+++ b/devices/filejob.h
@@ -26,7 +26,7 @@
 
 #include <QObject>
 #include <QSet>
-#include "song.h"
+#include "mpd/song.h"
 #include "deviceoptions.h"
 
 class QTemporaryFile;
diff --git a/devices/filenameschemedialog.cpp b/devices/filenameschemedialog.cpp
index 0b1d5e437..46c9e5528 100644
--- a/devices/filenameschemedialog.cpp
+++ b/devices/filenameschemedialog.cpp
@@ -22,9 +22,9 @@
  */
 
 #include "filenameschemedialog.h"
-#include "song.h"
-#include "localize.h"
-#include "messagebox.h"
+#include "mpd/song.h"
+#include "support/localize.h"
+#include "support/messagebox.h"
 
 static const char * constVariableProperty="cantata-var";
 FilenameSchemeDialog::FilenameSchemeDialog(QWidget *parent)
diff --git a/devices/filenameschemedialog.h b/devices/filenameschemedialog.h
index c2392c0dd..eaaaaf64e 100644
--- a/devices/filenameschemedialog.h
+++ b/devices/filenameschemedialog.h
@@ -25,8 +25,8 @@
 #define FILENAMESCHEMEDIALOG_H
 
 #include "ui_filenameschemedialog.h"
-#include "dialog.h"
-#include "song.h"
+#include "support/dialog.h"
+#include "mpd/song.h"
 #include "deviceoptions.h"
 
 class FilenameSchemeDialog : public Dialog, Ui::FilenameSchemeDialog
diff --git a/devices/filenameschemedialog.ui b/devices/filenameschemedialog.ui
index d2ad025ca..1a53490c7 100644
--- a/devices/filenameschemedialog.ui
+++ b/devices/filenameschemedialog.ui
@@ -204,12 +204,12 @@
   <customwidget>
    <class>UrlLabel</class>
    <extends>QLabel</extends>
-   <header>urllabel.h</header>
+   <header>support/urllabel.h</header>
   </customwidget>
   <customwidget>
    <class>LineEdit</class>
    <extends>QLineEdit</extends>
-   <header>lineedit.h</header>
+   <header>support/lineedit.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/devices/freespaceinfo.cpp b/devices/freespaceinfo.cpp
index 8febbc3a2..595576291 100644
--- a/devices/freespaceinfo.cpp
+++ b/devices/freespaceinfo.cpp
@@ -22,7 +22,7 @@
  */
 
 #include "freespaceinfo.h"
-#include "utils.h"
+#include "support/utils.h"
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KDiskFreeSpaceInfo>
 #elif defined(Q_OS_UNIX)
diff --git a/devices/fsdevice.cpp b/devices/fsdevice.cpp
index abe8ed163..3a3ea3f89 100644
--- a/devices/fsdevice.cpp
+++ b/devices/fsdevice.cpp
@@ -22,24 +22,24 @@
  */
 
 #include "umsdevice.h"
-#include "tags.h"
-#include "musiclibrarymodel.h"
-#include "musiclibraryitemsong.h"
-#include "musiclibraryitemalbum.h"
-#include "musiclibraryitemartist.h"
-#include "musiclibraryitemroot.h"
-#include "dirviewmodel.h"
+#include "tags/tags.h"
+#include "models/musiclibrarymodel.h"
+#include "models/musiclibraryitemsong.h"
+#include "models/musiclibraryitemalbum.h"
+#include "models/musiclibraryitemartist.h"
+#include "models/musiclibraryitemroot.h"
+#include "models/dirviewmodel.h"
 #include "devicepropertiesdialog.h"
 #include "devicepropertieswidget.h"
-#include "utils.h"
-#include "mpdparseutils.h"
-#include "mpdconnection.h"
+#include "support/utils.h"
+#include "mpd/mpdparseutils.h"
+#include "mpd/mpdconnection.h"
 #include "encoders.h"
 #include "transcodingjob.h"
 #include "actiondialog.h"
-#include "localize.h"
-#include "covers.h"
-#include "thread.h"
+#include "support/localize.h"
+#include "gui/covers.h"
+#include "support/thread.h"
 #include <QDir>
 #include <QFile>
 #include <QFileInfo>
diff --git a/devices/fsdevice.h b/devices/fsdevice.h
index 89d0b2cbb..293951e24 100644
--- a/devices/fsdevice.h
+++ b/devices/fsdevice.h
@@ -25,11 +25,11 @@
 #define FSDEVICE_H
 
 #include "device.h"
-#include "song.h"
-#include "utils.h"
+#include "mpd/song.h"
+#include "support/utils.h"
 #include "freespaceinfo.h"
-#include "musiclibraryitemroot.h"
-#include "httpserver.h"
+#include "models/musiclibraryitemroot.h"
+#include "http/httpserver.h"
 #include <QStringList>
 
 class Thread;
diff --git a/devices/mountpoints.cpp b/devices/mountpoints.cpp
index 627922f97..a802dd677 100644
--- a/devices/mountpoints.cpp
+++ b/devices/mountpoints.cpp
@@ -22,7 +22,7 @@
  */
 
 #include "mountpoints.h"
-#include "globalstatic.h"
+#include "support/globalstatic.h"
 #include <QSocketNotifier>
 #include <QFile>
 #include <QStringList>
diff --git a/devices/mtpdevice.cpp b/devices/mtpdevice.cpp
index f4f3eb780..ed8fc05b0 100644
--- a/devices/mtpdevice.cpp
+++ b/devices/mtpdevice.cpp
@@ -22,25 +22,25 @@
  */
 
 #include "mtpdevice.h"
-#include "musiclibrarymodel.h"
-#include "musiclibraryitemsong.h"
-#include "musiclibraryitemalbum.h"
-#include "musiclibraryitemartist.h"
-#include "musiclibraryitemroot.h"
-#include "dirviewmodel.h"
+#include "models/musiclibrarymodel.h"
+#include "models/musiclibraryitemsong.h"
+#include "models/musiclibraryitemalbum.h"
+#include "models/musiclibraryitemartist.h"
+#include "models/musiclibraryitemroot.h"
+#include "models/dirviewmodel.h"
 #include "devicepropertiesdialog.h"
 #include "devicepropertieswidget.h"
-#include "covers.h"
-#include "song.h"
+#include "gui/covers.h"
+#include "mpd/song.h"
 #include "encoders.h"
 #include "transcodingjob.h"
-#include "utils.h"
-#include "mpdparseutils.h"
-#include "mpdconnection.h"
-#include "localize.h"
+#include "support/utils.h"
+#include "mpd/mpdparseutils.h"
+#include "mpd/mpdconnection.h"
+#include "support/localize.h"
 #include "filejob.h"
-#include "configuration.h"
-#include "thread.h"
+#include "support/configuration.h"
+#include "support/thread.h"
 #include <QTimer>
 #include <QDir>
 #include <QTemporaryFile>
diff --git a/devices/mtpdevice.h b/devices/mtpdevice.h
index 745f64fd3..c6a052e9a 100644
--- a/devices/mtpdevice.h
+++ b/devices/mtpdevice.h
@@ -25,7 +25,7 @@
 #define MTPDEVICE_H
 
 #include "fsdevice.h"
-#include "song.h"
+#include "mpd/song.h"
 #include "config.h"
 #ifdef ENABLE_KDE_SUPPORT
 #include <solid/portablemediaplayer.h>
diff --git a/devices/musicbrainz.cpp b/devices/musicbrainz.cpp
index b95307c1e..bfeb6719a 100644
--- a/devices/musicbrainz.cpp
+++ b/devices/musicbrainz.cpp
@@ -24,7 +24,7 @@
 */
 
 #include "musicbrainz.h"
-#include "networkproxyfactory.h"
+#include "network/networkproxyfactory.h"
 #include <QNetworkProxy>
 #include <QCryptographicHash>
 #include <cstdio>
@@ -43,8 +43,8 @@
 #include <QList>
 #include <QRegExp>
 #include "config.h"
-#include "thread.h"
-#include "localize.h"
+#include "support/thread.h"
+#include "support/localize.h"
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
diff --git a/devices/remotedevicepropertiesdialog.cpp b/devices/remotedevicepropertiesdialog.cpp
index 82d865f83..d40908469 100644
--- a/devices/remotedevicepropertiesdialog.cpp
+++ b/devices/remotedevicepropertiesdialog.cpp
@@ -24,10 +24,10 @@
 #include "remotedevicepropertiesdialog.h"
 #include "devicepropertieswidget.h"
 #include "remotedevicepropertieswidget.h"
-#include "devicesmodel.h"
-#include "localize.h"
-#include "messagebox.h"
-#include "icon.h"
+#include "models/devicesmodel.h"
+#include "support/localize.h"
+#include "support/messagebox.h"
+#include "support/icon.h"
 #include <QTabWidget>
 #include <QStyle>
 #include <QIcon>
diff --git a/devices/remotedevicepropertiesdialog.h b/devices/remotedevicepropertiesdialog.h
index 7faf9fa41..b6fcdc191 100644
--- a/devices/remotedevicepropertiesdialog.h
+++ b/devices/remotedevicepropertiesdialog.h
@@ -24,7 +24,7 @@
 #ifndef REMOTEDEVICEPROPERTIESDIALOG_H
 #define REMOTEDEVICEPROPERTIESDIALOG_H
 
-#include "dialog.h"
+#include "support/dialog.h"
 #include "remotefsdevice.h"
 
 class QTabWidget;
diff --git a/devices/remotedevicepropertieswidget.cpp b/devices/remotedevicepropertieswidget.cpp
index 2288dafb3..dc8a5bc7c 100644
--- a/devices/remotedevicepropertieswidget.cpp
+++ b/devices/remotedevicepropertieswidget.cpp
@@ -23,14 +23,14 @@
 
 #include "remotedevicepropertieswidget.h"
 #include "filenameschemedialog.h"
-#include "covers.h"
-#include "localize.h"
+#include "gui/covers.h"
+#include "support/localize.h"
 #include <QTabWidget>
 #include <QIcon>
 #if QT_VERSION >= 0x050000
 #include <QUrlQuery>
 #endif
-#include "lineedit.h"
+#include "support/lineedit.h"
 #include "config.h"
 
 enum Type {
diff --git a/devices/remotedevicepropertieswidget.ui b/devices/remotedevicepropertieswidget.ui
index 10c588c10..30e42dbd6 100644
--- a/devices/remotedevicepropertieswidget.ui
+++ b/devices/remotedevicepropertieswidget.ui
@@ -444,17 +444,17 @@
   <customwidget>
    <class>PathRequester</class>
    <extends>QLineEdit</extends>
-   <header>pathrequester.h</header>
+   <header>support/pathrequester.h</header>
   </customwidget>
   <customwidget>
    <class>LineEdit</class>
    <extends>QLineEdit</extends>
-   <header>lineedit.h</header>
+   <header>support/lineedit.h</header>
   </customwidget>
   <customwidget>
    <class>BuddyLabel</class>
    <extends>QLabel</extends>
-   <header>buddylabel.h</header>
+   <header>support/buddylabel.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/devices/remotefsdevice.cpp b/devices/remotefsdevice.cpp
index c858cfb9f..f6a2dece7 100644
--- a/devices/remotefsdevice.cpp
+++ b/devices/remotefsdevice.cpp
@@ -26,11 +26,11 @@
 #include "remotedevicepropertiesdialog.h"
 #include "devicepropertieswidget.h"
 #include "actiondialog.h"
-#include "inputdialog.h"
-#include "utils.h"
-#include "httpserver.h"
-#include "localize.h"
-#include "configuration.h"
+#include "support/inputdialog.h"
+#include "support/utils.h"
+#include "http/httpserver.h"
+#include "support/localize.h"
+#include "support/configuration.h"
 #include "mountpoints.h"
 #include "mounterinterface.h"
 #include "avahi/avahi.h"
diff --git a/devices/splitlabelwidget.cpp b/devices/splitlabelwidget.cpp
index c60f9917f..9b452e45e 100644
--- a/devices/splitlabelwidget.cpp
+++ b/devices/splitlabelwidget.cpp
@@ -22,7 +22,7 @@
  */
 
 #include "splitlabelwidget.h"
-#include "squeezedtextlabel.h"
+#include "support/squeezedtextlabel.h"
 #include <QFormLayout>
 #include <QBoxLayout>
 
diff --git a/devices/synccollectionwidget.cpp b/devices/synccollectionwidget.cpp
index 50fff9af4..d44490d9a 100644
--- a/devices/synccollectionwidget.cpp
+++ b/devices/synccollectionwidget.cpp
@@ -22,14 +22,14 @@
  */
 
 #include "synccollectionwidget.h"
-#include "treeview.h"
-#include "musiclibraryproxymodel.h"
-#include "musiclibraryitemartist.h"
-#include "musiclibraryitemalbum.h"
-#include "musiclibraryitemsong.h"
-#include "icon.h"
-#include "localize.h"
-#include "actioncollection.h"
+#include "widgets/treeview.h"
+#include "models/musiclibraryproxymodel.h"
+#include "models/musiclibraryitemartist.h"
+#include "models/musiclibraryitemalbum.h"
+#include "models/musiclibraryitemsong.h"
+#include "support/icon.h"
+#include "support/localize.h"
+#include "support/actioncollection.h"
 #include <QTimer>
 #include <QAction>
 
diff --git a/devices/synccollectionwidget.h b/devices/synccollectionwidget.h
index bd9966178..604b17680 100644
--- a/devices/synccollectionwidget.h
+++ b/devices/synccollectionwidget.h
@@ -25,8 +25,8 @@
 #define _SYNCCOLLECTIONWIDGET_H_
 
 #include "ui_synccollectionwidget.h"
-#include "song.h"
-#include "musiclibrarymodel.h"
+#include "mpd/song.h"
+#include "models/musiclibrarymodel.h"
 #include <QSet>
 
 class QTimer;
diff --git a/devices/synccollectionwidget.ui b/devices/synccollectionwidget.ui
index 72a8d48a2..590fdd399 100644
--- a/devices/synccollectionwidget.ui
+++ b/devices/synccollectionwidget.ui
@@ -41,17 +41,17 @@
   <customwidget>
    <class>SqueezedTextLabel</class>
    <extends>QLabel</extends>
-   <header>squeezedtextlabel.h</header>
+   <header>support/squeezedtextlabel.h</header>
   </customwidget>
   <customwidget>
    <class>LineEdit</class>
    <extends>QLineEdit</extends>
-   <header>lineedit.h</header>
+   <header>support/lineedit.h</header>
   </customwidget>
   <customwidget>
    <class>TreeView</class>
    <extends>QTreeView</extends>
-   <header>treeview.h</header>
+   <header>widgets/treeview.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/devices/syncdialog.cpp b/devices/syncdialog.cpp
index 8eff92409..a5c781283 100644
--- a/devices/syncdialog.cpp
+++ b/devices/syncdialog.cpp
@@ -24,12 +24,12 @@
 #include "syncdialog.h"
 #include "synccollectionwidget.h"
 #include "actiondialog.h"
-#include "song.h"
-#include "musiclibrarymodel.h"
-#include "devicesmodel.h"
-#include "localize.h"
-#include "messagebox.h"
-#include "icons.h"
+#include "mpd/song.h"
+#include "models/musiclibrarymodel.h"
+#include "models/devicesmodel.h"
+#include "support/localize.h"
+#include "support/messagebox.h"
+#include "widgets/icons.h"
 #include <QSplitter>
 
 struct SyncSong : public Song
diff --git a/devices/syncdialog.h b/devices/syncdialog.h
index b8ac39099..5e1ca8a5d 100644
--- a/devices/syncdialog.h
+++ b/devices/syncdialog.h
@@ -24,8 +24,8 @@
 #ifndef _SYNC_DIALOG_H_
 #define _SYNC_DIALOG_H_
 
-#include "dialog.h"
-#include "song.h"
+#include "support/dialog.h"
+#include "mpd/song.h"
 
 class Device;
 class SyncCollectionWidget;
diff --git a/devices/umsdevice.cpp b/devices/umsdevice.cpp
index 5caac60d5..6203fecba 100644
--- a/devices/umsdevice.cpp
+++ b/devices/umsdevice.cpp
@@ -22,11 +22,11 @@
  */
 
 #include "umsdevice.h"
-#include "utils.h"
+#include "support/utils.h"
 #include "devicepropertiesdialog.h"
 #include "devicepropertieswidget.h"
 #include "actiondialog.h"
-#include "localize.h"
+#include "support/localize.h"
 #include <QDir>
 #include <QFile>
 #include <QFileInfo>
diff --git a/devices/valueslider.cpp b/devices/valueslider.cpp
index 8395fd624..30b33d5f0 100644
--- a/devices/valueslider.cpp
+++ b/devices/valueslider.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************************/
 
 #include "valueslider.h"
-#include "localize.h"
+#include "support/localize.h"
 #include <QGridLayout>
 
 ValueSlider::ValueSlider(QWidget *parent)
diff --git a/dynamic/dynamic.cpp b/dynamic/dynamic.cpp
index 1b4b1ccc4..647213e48 100644
--- a/dynamic/dynamic.cpp
+++ b/dynamic/dynamic.cpp
@@ -23,16 +23,16 @@
 
 #include "dynamic.h"
 #include "config.h"
-#include "utils.h"
-#include "mpdconnection.h"
-#include "icons.h"
-#include "roles.h"
-#include "networkaccessmanager.h"
-#include "settings.h"
-#include "localize.h"
-#include "plurals.h"
-#include "actioncollection.h"
-#include "globalstatic.h"
+#include "support/utils.h"
+#include "mpd/mpdconnection.h"
+#include "widgets/icons.h"
+#include "models/roles.h"
+#include "network/networkaccessmanager.h"
+#include "gui/settings.h"
+#include "support/localize.h"
+#include "gui/plurals.h"
+#include "support/actioncollection.h"
+#include "support/globalstatic.h"
 #include <QDir>
 #include <QFile>
 #include <QTextStream>
diff --git a/dynamic/dynamic.h b/dynamic/dynamic.h
index fdbf51554..9ae077114 100644
--- a/dynamic/dynamic.h
+++ b/dynamic/dynamic.h
@@ -29,7 +29,7 @@
 #include <QMap>
 #include <QString>
 #include <QStringList>
-#include "actionmodel.h"
+#include "models/actionmodel.h"
 
 class QTimer;
 class NetworkJob;
diff --git a/dynamic/dynamicpage.cpp b/dynamic/dynamicpage.cpp
index 305f9ef6f..7e1b69e66 100644
--- a/dynamic/dynamicpage.cpp
+++ b/dynamic/dynamicpage.cpp
@@ -24,14 +24,14 @@
 #include "dynamicpage.h"
 #include "dynamic.h"
 #include "dynamicrulesdialog.h"
-#include "localize.h"
-#include "icons.h"
-#include "action.h"
-#include "actioncollection.h"
-#include "mpdconnection.h"
-#include "statuslabel.h"
-#include "messagebox.h"
-#include "stdactions.h"
+#include "support/localize.h"
+#include "widgets/icons.h"
+#include "support/action.h"
+#include "support/actioncollection.h"
+#include "mpd/mpdconnection.h"
+#include "widgets/statuslabel.h"
+#include "support/messagebox.h"
+#include "gui/stdactions.h"
 
 DynamicPage::DynamicPage(QWidget *p)
     : QWidget(p)
diff --git a/dynamic/dynamicpage.h b/dynamic/dynamicpage.h
index 2f0ba4deb..bca15b605 100644
--- a/dynamic/dynamicpage.h
+++ b/dynamic/dynamicpage.h
@@ -26,7 +26,7 @@
 
 #include "ui_dynamicpage.h"
 #include "dynamicproxymodel.h"
-#include "page.h"
+#include "gui/page.h"
 
 class Action;
 
diff --git a/dynamic/dynamicpage.ui b/dynamic/dynamicpage.ui
index f87ada84c..278960989 100644
--- a/dynamic/dynamicpage.ui
+++ b/dynamic/dynamicpage.ui
@@ -86,22 +86,22 @@
   <customwidget>
    <class>ItemView</class>
    <extends>QTreeView</extends>
-   <header>itemview.h</header>
+   <header>widgets/itemview.h</header>
   </customwidget>
   <customwidget>
    <class>StatusLabel</class>
    <extends>QLabel</extends>
-   <header>statuslabel.h</header>
+   <header>widgets/statuslabel.h</header>
   </customwidget>
   <customwidget>
    <class>ToolButton</class>
    <extends>QToolButton</extends>
-   <header>toolbutton.h</header>
+   <header>widgets/toolbutton.h</header>
   </customwidget>
   <customwidget>
    <class>SizeWidget</class>
    <extends>QWidget</extends>
-   <header>sizewidget.h</header>
+   <header>widgets/sizewidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/dynamic/dynamicproxymodel.h b/dynamic/dynamicproxymodel.h
index 1f5775467..8f108197d 100644
--- a/dynamic/dynamicproxymodel.h
+++ b/dynamic/dynamicproxymodel.h
@@ -24,7 +24,7 @@
 #ifndef DYNAMICPROXYMODEL_H
 #define DYNAMICPROXYMODEL_H
 
-#include "proxymodel.h"
+#include "models/proxymodel.h"
 
 class DynamicProxyModel : public ProxyModel
 {
diff --git a/dynamic/dynamicrule.ui b/dynamic/dynamicrule.ui
index 7f54fd700..5dba317e9 100644
--- a/dynamic/dynamicrule.ui
+++ b/dynamic/dynamicrule.ui
@@ -308,17 +308,17 @@
   <customwidget>
    <class>BuddyLabel</class>
    <extends>QLabel</extends>
-   <header>buddylabel.h</header>
+   <header>support/buddylabel.h</header>
   </customwidget>
   <customwidget>
    <class>LineEdit</class>
    <extends>QLineEdit</extends>
-   <header>lineedit.h</header>
+   <header>support/lineedit.h</header>
   </customwidget>
   <customwidget>
    <class>CompletionCombo</class>
    <extends>QComboBox</extends>
-   <header>completioncombo.h</header>
+   <header>widgets/completioncombo.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/dynamic/dynamicruledialog.cpp b/dynamic/dynamicruledialog.cpp
index d496621cc..348f9d2da 100644
--- a/dynamic/dynamicruledialog.cpp
+++ b/dynamic/dynamicruledialog.cpp
@@ -22,8 +22,8 @@
  */
 
 #include "dynamicruledialog.h"
-#include "musiclibrarymodel.h"
-#include "localize.h"
+#include "models/musiclibrarymodel.h"
+#include "support/localize.h"
 
 static const int constMinDate=1800;
 static const int constMaxDate=2100;
diff --git a/dynamic/dynamicruledialog.h b/dynamic/dynamicruledialog.h
index c6cab0a23..16093f06a 100644
--- a/dynamic/dynamicruledialog.h
+++ b/dynamic/dynamicruledialog.h
@@ -25,7 +25,7 @@
 #define DYNAMIC_RULE_DIALOG_H
 
 #include "config.h"
-#include "dialog.h"
+#include "support/dialog.h"
 #include "ui_dynamicrule.h"
 #include "dynamic.h"
 
diff --git a/dynamic/dynamicrules.ui b/dynamic/dynamicrules.ui
index 90e62fff2..798cbf32d 100644
--- a/dynamic/dynamicrules.ui
+++ b/dynamic/dynamicrules.ui
@@ -116,22 +116,22 @@
   <customwidget>
    <class>UrlLabel</class>
    <extends>QLabel</extends>
-   <header>urllabel.h</header>
+   <header>support/urllabel.h</header>
   </customwidget>
   <customwidget>
    <class>LineEdit</class>
    <extends>QWidget</extends>
-   <header>lineedit.h</header>
+   <header>support/lineedit.h</header>
   </customwidget>
   <customwidget>
    <class>ListView</class>
    <extends>QListView</extends>
-   <header>listview.h</header>
+   <header>widgets/listview.h</header>
   </customwidget>
   <customwidget>
    <class>MessageWidget</class>
    <extends>QFrame</extends>
-   <header>messagewidget.h</header>
+   <header>support/messagewidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/dynamic/dynamicrulesdialog.cpp b/dynamic/dynamicrulesdialog.cpp
index b8db9b6c6..a423a0815 100644
--- a/dynamic/dynamicrulesdialog.cpp
+++ b/dynamic/dynamicrulesdialog.cpp
@@ -24,10 +24,10 @@
 #include "dynamicrulesdialog.h"
 #include "dynamicruledialog.h"
 #include "dynamic.h"
-#include "messagebox.h"
-#include "localize.h"
-#include "icons.h"
-#include "basicitemdelegate.h"
+#include "support/messagebox.h"
+#include "support/localize.h"
+#include "widgets/icons.h"
+#include "widgets/basicitemdelegate.h"
 #include <QIcon>
 #include <QStandardItem>
 #include <QStandardItemModel>
diff --git a/dynamic/dynamicrulesdialog.h b/dynamic/dynamicrulesdialog.h
index 42119f002..88a911e7c 100644
--- a/dynamic/dynamicrulesdialog.h
+++ b/dynamic/dynamicrulesdialog.h
@@ -25,7 +25,7 @@
 #define DYNAMIC_RULES_DIALOG_H
 
 #include "config.h"
-#include "dialog.h"
+#include "support/dialog.h"
 #include "ui_dynamicrules.h"
 #include "dynamic.h"
 
diff --git a/gui/albumspage.cpp b/gui/albumspage.cpp
index 8fdda766d..cc9d5614b 100644
--- a/gui/albumspage.cpp
+++ b/gui/albumspage.cpp
@@ -22,16 +22,16 @@
  */
 
 #include "albumspage.h"
-#include "mpdconnection.h"
+#include "mpd/mpdconnection.h"
 #include "covers.h"
-#include "musiclibrarymodel.h"
-#include "musiclibraryitemsong.h"
-#include "albumsmodel.h"
-#include "localize.h"
-#include "messagebox.h"
+#include "models/musiclibrarymodel.h"
+#include "models/musiclibraryitemsong.h"
+#include "models/albumsmodel.h"
+#include "support/localize.h"
+#include "support/messagebox.h"
 #include "settings.h"
 #include "stdactions.h"
-#include "utils.h"
+#include "support/utils.h"
 
 AlbumsPage::AlbumsPage(QWidget *p)
     : QWidget(p)
diff --git a/gui/albumspage.h b/gui/albumspage.h
index 33602105c..630f3da83 100644
--- a/gui/albumspage.h
+++ b/gui/albumspage.h
@@ -25,7 +25,7 @@
 #define ALBUMSPAGE_H
 
 #include "ui_albumspage.h"
-#include "albumsproxymodel.h"
+#include "models/albumsproxymodel.h"
 #include "page.h"
 
 class Action;
diff --git a/gui/albumspage.ui b/gui/albumspage.ui
index 95ac426ab..cdd368171 100644
--- a/gui/albumspage.ui
+++ b/gui/albumspage.ui
@@ -48,22 +48,22 @@
   <customwidget>
    <class>ItemView</class>
    <extends>QTreeView</extends>
-   <header>itemview.h</header>
+   <header>widgets/itemview.h</header>
   </customwidget>
   <customwidget>
    <class>GenreCombo</class>
    <extends>QComboBox</extends>
-   <header>genrecombo.h</header>
+   <header>widgets/genrecombo.h</header>
   </customwidget>
   <customwidget>
    <class>ToolButton</class>
    <extends>QToolButton</extends>
-   <header>toolbutton.h</header>
+   <header>widgets/toolbutton.h</header>
   </customwidget>
   <customwidget>
    <class>SizeWidget</class>
    <extends>QWidget</extends>
-   <header>sizewidget.h</header>
+   <header>widgets/sizewidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/gui/application.cpp b/gui/application.cpp
index 58dee741f..eed4205b6 100644
--- a/gui/application.cpp
+++ b/gui/application.cpp
@@ -27,8 +27,8 @@
 #include <KDE/KCmdLineArgs>
 #include <KDE/KStartupInfo>
 #include "initialsettingswizard.h"
-#include "thread.h"
-#include "song.h"
+#include "support/thread.h"
+#include "mpd/song.h"
 #else
 #include <QIcon>
 #ifdef Q_OS_WIN
@@ -39,19 +39,19 @@
 #include <QDir>
 #endif
 #endif
-#include "icon.h"
-#include "icons.h"
-#include "utils.h"
+#include "support/icon.h"
+#include "widgets/icons.h"
+#include "support/utils.h"
 #include "config.h"
 #include "mainwindow.h"
-#include "mpdconnection.h"
-#include "mpdstats.h"
-#include "mpdstatus.h"
-#include "thread.h"
+#include "mpd/mpdconnection.h"
+#include "mpd/mpdstats.h"
+#include "mpd/mpdstatus.h"
+#include "support/thread.h"
 #ifdef ENABLE_EXTERNAL_TAGS
-#include "taghelperiface.h"
+#include "tags/taghelperiface.h"
 #endif
-#include "gtkstyle.h"
+#include "support/gtkstyle.h"
 
 void Application::initObjects()
 {
diff --git a/gui/cachesettings.cpp b/gui/cachesettings.cpp
index c5f8d83a3..7d35f9010 100644
--- a/gui/cachesettings.cpp
+++ b/gui/cachesettings.cpp
@@ -22,27 +22,27 @@
 */
 
 #include "cachesettings.h"
-#include "localize.h"
-#include "artistview.h"
-#include "albumview.h"
-#include "songview.h"
-#include "contextwidget.h"
-#include "wikipediasettings.h"
+#include "support/localize.h"
+#include "context/artistview.h"
+#include "context/albumview.h"
+#include "context/songview.h"
+#include "context/contextwidget.h"
+#include "context/wikipediasettings.h"
 #include "covers.h"
-#include "musiclibrarymodel.h"
-#include "utils.h"
-#include "messagebox.h"
+#include "models/musiclibrarymodel.h"
+#include "support/utils.h"
+#include "support/messagebox.h"
 #include "config.h"
-#include "thread.h"
+#include "support/thread.h"
 #include "settings.h"
-#include "basicitemdelegate.h"
+#include "widgets/basicitemdelegate.h"
 #ifdef ENABLE_STREAMS
-#include "streamsmodel.h"
+#include "models/streamsmodel.h"
 #endif
 #ifdef ENABLE_ONLINE_SERVICES
-#include "podcastsearchdialog.h"
+#include "online//podcastsearchdialog.h"
 #endif
-#include "squeezedtextlabel.h"
+#include "support/squeezedtextlabel.h"
 #include <QLabel>
 #include <QPushButton>
 #include <QStyle>
diff --git a/gui/coverdialog.cpp b/gui/coverdialog.cpp
index 20bb2e52b..7819e9d9d 100644
--- a/gui/coverdialog.cpp
+++ b/gui/coverdialog.cpp
@@ -22,17 +22,17 @@
  */
 
 #include "coverdialog.h"
-#include "messagebox.h"
-#include "localize.h"
-#include "listview.h"
-#include "networkaccessmanager.h"
+#include "support/messagebox.h"
+#include "support/localize.h"
+#include "widgets/listview.h"
+#include "network/networkaccessmanager.h"
 #include "settings.h"
-#include "mpdconnection.h"
-#include "utils.h"
-#include "spinner.h"
-#include "messageoverlay.h"
-#include "icon.h"
-#include "icons.h"
+#include "mpd/mpdconnection.h"
+#include "support/utils.h"
+#include "support/spinner.h"
+#include "widgets/messageoverlay.h"
+#include "support/icon.h"
+#include "widgets/icons.h"
 #include "qjson/parser.h"
 #include "config.h"
 #include <QVBoxLayout>
diff --git a/gui/coverdialog.h b/gui/coverdialog.h
index 4492602fb..8c26c6abe 100644
--- a/gui/coverdialog.h
+++ b/gui/coverdialog.h
@@ -25,8 +25,8 @@
 #define COVER_DIALOG_H
 
 #include "config.h"
-#include "dialog.h"
-#include "song.h"
+#include "support/dialog.h"
+#include "mpd/song.h"
 #include "ui_coverdialog.h"
 #include "covers.h"
 #include <QSet>
diff --git a/gui/coverdialog.ui b/gui/coverdialog.ui
index 92e66b928..b070bdc3d 100644
--- a/gui/coverdialog.ui
+++ b/gui/coverdialog.ui
@@ -47,7 +47,7 @@
   <customwidget>
    <class>LineEdit</class>
    <extends>QLineEdit</extends>
-   <header>lineedit.h</header>
+   <header>support/lineedit.h</header>
   </customwidget>
   </customwidgets>
  <resources/>
diff --git a/gui/covers.cpp b/gui/covers.cpp
index be7ff2056..38d6feff7 100644
--- a/gui/covers.cpp
+++ b/gui/covers.cpp
@@ -22,23 +22,23 @@
  */
 
 #include "covers.h"
-#include "song.h"
-#include "utils.h"
-#include "mpdconnection.h"
-#include "networkaccessmanager.h"
+#include "mpd/song.h"
+#include "support/utils.h"
+#include "mpd/mpdconnection.h"
+#include "network/networkaccessmanager.h"
 #include "settings.h"
 #include "config.h"
-#include "deviceoptions.h"
-#include "thread.h"
+#include "devices/deviceoptions.h"
+#include "support/thread.h"
 #ifdef ENABLE_ONLINE_SERVICES
-#include "soundcloudservice.h"
-#include "podcastservice.h"
-#include "onlineservicesmodel.h"
+#include "online/soundcloudservice.h"
+#include "online/podcastservice.h"
+#include "models/onlineservicesmodel.h"
 #endif
 #ifdef TAGLIB_FOUND
-#include "tags.h"
+#include "tags/tags.h"
 #endif
-#include "globalstatic.h"
+#include "support/globalstatic.h"
 #include <QFile>
 #include <QDir>
 #include <QUrl>
diff --git a/gui/covers.h b/gui/covers.h
index 5ac8ae1a9..fb45aa154 100644
--- a/gui/covers.h
+++ b/gui/covers.h
@@ -32,7 +32,7 @@
 #include <QPixmap>
 #include <QMutex>
 #include <QCache>
-#include "song.h"
+#include "mpd/song.h"
 #include "config.h"
 
 class QString;
diff --git a/gui/currentcover.cpp b/gui/currentcover.cpp
index 0a8f2a612..8b63a905b 100644
--- a/gui/currentcover.cpp
+++ b/gui/currentcover.cpp
@@ -24,9 +24,9 @@
 #include "currentcover.h"
 #include "covers.h"
 #include "config.h"
-#include "icons.h"
-#include "utils.h"
-#include "globalstatic.h"
+#include "widgets/icons.h"
+#include "support/utils.h"
+#include "support/globalstatic.h"
 #include <QFile>
 #include <QCoreApplication>
 
diff --git a/gui/currentcover.h b/gui/currentcover.h
index 46d10a65a..7a23f3ba1 100644
--- a/gui/currentcover.h
+++ b/gui/currentcover.h
@@ -26,7 +26,7 @@
 
 #include <QObject>
 #include <QImage>
-#include "song.h"
+#include "mpd/song.h"
 
 class QPixmap;
 
diff --git a/gui/folderpage.cpp b/gui/folderpage.cpp
index 31f10acb6..a2dd5151a 100644
--- a/gui/folderpage.cpp
+++ b/gui/folderpage.cpp
@@ -22,12 +22,12 @@
  */
 
 #include "folderpage.h"
-#include "mpdconnection.h"
-#include "musiclibrarymodel.h"
+#include "mpd/mpdconnection.h"
+#include "models/musiclibrarymodel.h"
 #include "settings.h"
-#include "localize.h"
-#include "messagebox.h"
-#include "actioncollection.h"
+#include "support/localize.h"
+#include "support/messagebox.h"
+#include "support/actioncollection.h"
 #include "stdactions.h"
 #ifndef Q_OS_WIN
 #include <QProcess>
diff --git a/gui/folderpage.h b/gui/folderpage.h
index c582141fd..f75052083 100644
--- a/gui/folderpage.h
+++ b/gui/folderpage.h
@@ -25,8 +25,8 @@
 #define FOLDERPAGE_H
 
 #include "ui_folderpage.h"
-#include "dirviewmodel.h"
-#include "dirviewproxymodel.h"
+#include "models/dirviewmodel.h"
+#include "models/dirviewproxymodel.h"
 #include "page.h"
 
 class Action;
diff --git a/gui/folderpage.ui b/gui/folderpage.ui
index ae5ae250c..8c9ad7411 100644
--- a/gui/folderpage.ui
+++ b/gui/folderpage.ui
@@ -58,17 +58,17 @@
   <customwidget>
    <class>ItemView</class>
    <extends>QTreeView</extends>
-   <header>itemview.h</header>
+   <header>widgets/itemview.h</header>
   </customwidget>
   <customwidget>
    <class>ToolButton</class>
    <extends>QToolButton</extends>
-   <header>toolbutton.h</header>
+   <header>widgets/toolbutton.h</header>
   </customwidget>
   <customwidget>
    <class>SizeWidget</class>
    <extends>QWidget</extends>
-   <header>sizewidget.h</header>
+   <header>widgets/sizewidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/gui/initialsettingswizard.cpp b/gui/initialsettingswizard.cpp
index cb379d066..1764365e0 100644
--- a/gui/initialsettingswizard.cpp
+++ b/gui/initialsettingswizard.cpp
@@ -22,12 +22,12 @@
  */
 
 #include "initialsettingswizard.h"
-#include "messagebox.h"
+#include "support/messagebox.h"
 #include "settings.h"
-#include "utils.h"
-#include "icon.h"
-#include "icons.h"
-#include "mpduser.h"
+#include "support/utils.h"
+#include "support/icon.h"
+#include "widgets/icons.h"
+#include "mpd/mpduser.h"
 #include <QDir>
 #if QT_VERSION > 0x050000
 #include <QStandardPaths>
diff --git a/gui/initialsettingswizard.h b/gui/initialsettingswizard.h
index a4214dc0b..3001bbc03 100644
--- a/gui/initialsettingswizard.h
+++ b/gui/initialsettingswizard.h
@@ -25,7 +25,7 @@
 #define INITIALSETTINGSWIZARD_H
 
 #include "ui_initialsettingswizard.h"
-#include "mpdconnection.h"
+#include "mpd/mpdconnection.h"
 #include <QWizard>
 
 class InitialSettingsWizard : public QWizard, public Ui::InitialSettingsWizard
diff --git a/gui/initialsettingswizard.ui b/gui/initialsettingswizard.ui
index 1e13ef1ad..bc7be6ff3 100644
--- a/gui/initialsettingswizard.ui
+++ b/gui/initialsettingswizard.ui
@@ -957,29 +957,29 @@
   <customwidget>
    <class>BuddyLabel</class>
    <extends>QLabel</extends>
-   <header>buddylabel.h</header>
+   <header>support/buddylabel.h</header>
   </customwidget>
   <customwidget>
    <class>LineEdit</class>
    <extends>QLineEdit</extends>
-   <header>lineedit.h</header>
+   <header>support/lineedit.h</header>
   </customwidget>
   <customwidget>
    <class>WizardPage</class>
    <extends>QWizardPage</extends>
-   <header>wizardpage.h</header>
+   <header>widgets/wizardpage.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>PathRequester</class>
    <extends>QLineEdit</extends>
-   <header>pathrequester.h</header>
+   <header>support/pathrequester.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>StateLabel</class>
    <extends>QLabel</extends>
-   <header>statelabel.h</header>
+   <header>widgets/statelabel.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/gui/interfacesettings.cpp b/gui/interfacesettings.cpp
index 75375797d..9b1f04ef8 100644
--- a/gui/interfacesettings.cpp
+++ b/gui/interfacesettings.cpp
@@ -23,15 +23,15 @@
 
 #include "interfacesettings.h"
 #include "settings.h"
-#include "itemview.h"
-#include "localize.h"
-#include "musiclibraryitemalbum.h"
-#include "albumsmodel.h"
-#include "fancytabwidget.h"
-#include "basicitemdelegate.h"
-#include "playqueueview.h"
-#include "pathrequester.h"
-#include "flickcharm.h"
+#include "widgets/itemview.h"
+#include "support/localize.h"
+#include "models/musiclibraryitemalbum.h"
+#include "models/albumsmodel.h"
+#include "support/fancytabwidget.h"
+#include "widgets/basicitemdelegate.h"
+#include "widgets/playqueueview.h"
+#include "support/pathrequester.h"
+#include "support/flickcharm.h"
 #include <QComboBox>
 #ifndef ENABLE_KDE_SUPPORT
 #include <QDir>
diff --git a/gui/interfacesettings.ui b/gui/interfacesettings.ui
index 904825566..f1439cac5 100644
--- a/gui/interfacesettings.ui
+++ b/gui/interfacesettings.ui
@@ -933,17 +933,17 @@ within the folder of the current track, or within its parent folder. If no image
   <customwidget>
    <class>BuddyLabel</class>
    <extends>QLabel</extends>
-   <header>buddylabel.h</header>
+   <header>support/buddylabel.h</header>
   </customwidget>
   <customwidget>
    <class>StateLabel</class>
    <extends>QLabel</extends>
-   <header>statelabel.h</header>
+   <header>widgets/statelabel.h</header>
   </customwidget>
   <customwidget>
    <class>PathRequester</class>
    <extends>QLineEdit</extends>
-   <header>pathrequester.h</header>
+   <header>support/pathrequester.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/gui/librarypage.cpp b/gui/librarypage.cpp
index 0efa45c3c..ed29b4d46 100644
--- a/gui/librarypage.cpp
+++ b/gui/librarypage.cpp
@@ -22,18 +22,18 @@
  */
 
 #include "librarypage.h"
-#include "mpdconnection.h"
-#include "mpdstats.h"
+#include "mpd/mpdconnection.h"
+#include "mpd/mpdstats.h"
 #include "covers.h"
-#include "musiclibrarymodel.h"
-#include "musiclibraryitemartist.h"
-#include "musiclibraryitemalbum.h"
-#include "musiclibraryitemsong.h"
-#include "localize.h"
-#include "messagebox.h"
+#include "models/musiclibrarymodel.h"
+#include "models/musiclibraryitemartist.h"
+#include "models/musiclibraryitemalbum.h"
+#include "models/musiclibraryitemsong.h"
+#include "support/localize.h"
+#include "support/messagebox.h"
 #include "settings.h"
 #include "stdactions.h"
-#include "utils.h"
+#include "support/utils.h"
 
 LibraryPage::LibraryPage(QWidget *p)
     : QWidget(p)
diff --git a/gui/librarypage.h b/gui/librarypage.h
index f8221a156..dbb08b9ea 100644
--- a/gui/librarypage.h
+++ b/gui/librarypage.h
@@ -25,7 +25,7 @@
 #define LIBRARYPAGE_H
 
 #include "ui_librarypage.h"
-#include "musiclibraryproxymodel.h"
+#include "models/musiclibraryproxymodel.h"
 #include "page.h"
 
 class Action;
diff --git a/gui/librarypage.ui b/gui/librarypage.ui
index 45a7098c9..151a3dc9c 100644
--- a/gui/librarypage.ui
+++ b/gui/librarypage.ui
@@ -48,22 +48,22 @@
   <customwidget>
    <class>ItemView</class>
    <extends>QTreeView</extends>
-   <header>itemview.h</header>
+   <header>widgets/itemview.h</header>
   </customwidget>
   <customwidget>
    <class>GenreCombo</class>
    <extends>QComboBox</extends>
-   <header>genrecombo.h</header>
+   <header>widgets/genrecombo.h</header>
   </customwidget>
   <customwidget>
    <class>ToolButton</class>
    <extends>QToolButton</extends>
-   <header>toolbutton.h</header>
+   <header>widgets/toolbutton.h</header>
   </customwidget>
   <customwidget>
    <class>SizeWidget</class>
    <extends>QWidget</extends>
-   <header>sizewidget.h</header>
+   <header>widgets/sizewidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/gui/main.cpp b/gui/main.cpp
index 34337695d..c9601561a 100644
--- a/gui/main.cpp
+++ b/gui/main.cpp
@@ -34,34 +34,34 @@
 #include <QFile>
 #include <QSettings>
 #endif
-#include "utils.h"
+#include "support/utils.h"
 #include "config.h"
 #include "settings.h"
 #include "initialsettingswizard.h"
 #include "mainwindow.h"
-#include "song.h"
-#include "thread.h"
+#include "mpd/song.h"
+#include "support/thread.h"
 
 // To enable debug...
-#include "mpdconnection.h"
-#include "mpdparseutils.h"
+#include "mpd/mpdconnection.h"
+#include "mpd/mpdparseutils.h"
 #include "covers.h"
-#include "wikipediaengine.h"
-#include "lastfmengine.h"
-#include "metaengine.h"
-#include "backdropcreator.h"
+#include "context/wikipediaengine.h"
+#include "context/lastfmengine.h"
+#include "context/metaengine.h"
+#include "context/backdropcreator.h"
 #ifdef ENABLE_DYNAMIC
-#include "dynamic.h"
+#include "dynamic/dynamic.h"
 #endif
-#include "streamfetcher.h"
-#include "httpserver.h"
-#include "songdialog.h"
-#include "networkaccessmanager.h"
-#include "ultimatelyricsprovider.h"
+#include "streams/streamfetcher.h"
+#include "http/httpserver.h"
+#include "widgets/songdialog.h"
+#include "network/networkaccessmanager.h"
+#include "context/ultimatelyricsprovider.h"
 #ifdef ENABLE_EXTERNAL_TAGS
-#include "taghelperiface.h"
+#include "tags/taghelperiface.h"
 #endif
-#include "contextwidget.h"
+#include "context/contextwidget.h"
 
 #include <QMutex>
 #include <QMutexLocker>
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index c04fd2830..b5b8863bd 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -25,84 +25,84 @@
  */
 
 #include "mainwindow.h"
-#include "localize.h"
+#include "support/localize.h"
 #include "plurals.h"
-#include "thread.h"
+#include "support/thread.h"
 #include "trayitem.h"
-#include "messagebox.h"
-#include "inputdialog.h"
-#include "playlistsmodel.h"
+#include "support/messagebox.h"
+#include "support/inputdialog.h"
+#include "models/playlistsmodel.h"
 #include "covers.h"
 #include "coverdialog.h"
 #include "currentcover.h"
 #include "preferencesdialog.h"
-#include "mpdconnection.h"
-#include "mpdstats.h"
-#include "mpdstatus.h"
-#include "mpdparseutils.h"
+#include "mpd/mpdconnection.h"
+#include "mpd/mpdstats.h"
+#include "mpd/mpdstatus.h"
+#include "mpd/mpdparseutils.h"
 #include "settings.h"
-#include "utils.h"
-#include "musiclibrarymodel.h"
-#include "musiclibraryitemartist.h"
-#include "musiclibraryitemalbum.h"
+#include "support/utils.h"
+#include "models/musiclibrarymodel.h"
+#include "models/musiclibraryitemartist.h"
+#include "models/musiclibraryitemalbum.h"
 #include "librarypage.h"
 #include "albumspage.h"
 #include "folderpage.h"
 #ifdef ENABLE_STREAMS
-#include "streamspage.h"
-#include "streamdialog.h"
+#include "streams/streamspage.h"
+#include "streams/streamdialog.h"
 #endif
 #include "searchpage.h"
-#include "gtkstyle.h"
+#include "support/gtkstyle.h"
 #ifdef ENABLE_DEVICES_SUPPORT
-#include "filejob.h"
-#include "devicespage.h"
-#include "devicesmodel.h"
-#include "actiondialog.h"
-#include "syncdialog.h"
+#include "devices/filejob.h"
+#include "devices/devicespage.h"
+#include "models/devicesmodel.h"
+#include "devices/actiondialog.h"
+#include "devices/syncdialog.h"
 #if defined CDDB_FOUND || defined MUSICBRAINZ5_FOUND
-#include "audiocddevice.h"
+#include "devices/audiocddevice.h"
 #endif
 #endif
 #ifdef ENABLE_ONLINE_SERVICES
-#include "onlineservicespage.h"
-#include "onlineservicesmodel.h"
+#include "online/onlineservicespage.h"
+#include "models/onlineservicesmodel.h"
 #endif
-#include "httpserver.h"
+#include "http/httpserver.h"
 #ifdef TAGLIB_FOUND
-#include "trackorganiser.h"
-#include "tageditor.h"
-#include "tags.h"
+#include "tags/trackorganiser.h"
+#include "tags/tageditor.h"
+#include "tags/tags.h"
 #ifdef ENABLE_REPLAYGAIN_SUPPORT
-#include "rgdialog.h"
+#include "replaygain/rgdialog.h"
 #endif
 #endif
-#include "streamsmodel.h"
+#include "models/streamsmodel.h"
 #include "playlistspage.h"
-#include "fancytabwidget.h"
-#include "timeslider.h"
+#include "support/fancytabwidget.h"
+#include "widgets/timeslider.h"
 #ifdef QT_QTDBUS_FOUND
-#include "mpris.h"
+#include "dbus/mpris.h"
 #include "cantataadaptor.h"
-#include "powermanagement.h"
+#include "dbus/powermanagement.h"
 #endif
 #if !defined Q_OS_WIN && !defined Q_OS_MAC
-#include "mountpoints.h"
+#include "devices/mountpoints.h"
 #endif
 #ifdef ENABLE_DYNAMIC
-#include "dynamicpage.h"
-#include "dynamic.h"
+#include "dynamic/dynamicpage.h"
+#include "dynamic/dynamic.h"
 #endif
-#include "messagewidget.h"
-#include "groupedview.h"
-#include "actionitemdelegate.h"
-#include "icons.h"
-#include "volumeslider.h"
-#include "action.h"
-#include "actioncollection.h"
+#include "support/messagewidget.h"
+#include "widgets/groupedview.h"
+#include "widgets/actionitemdelegate.h"
+#include "widgets/icons.h"
+#include "widgets/volumeslider.h"
+#include "support/action.h"
+#include "support/actioncollection.h"
 #include "stdactions.h"
 #ifdef ENABLE_HTTP_STREAM_PLAYBACK
-#include "httpstream.h"
+#include "mpd/httpstream.h"
 #endif
 #ifdef Q_OS_WIN
 static void raiseWindow(QWidget *w);
diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index c63972797..e4c11a793 100644
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -39,9 +39,9 @@ class KToggleAction;
 #include <QToolButton>
 #include <QStringList>
 #include "ui_mainwindow.h"
-#include "playqueuemodel.h"
-#include "playqueueproxymodel.h"
-#include "song.h"
+#include "models/playqueuemodel.h"
+#include "models/playqueueproxymodel.h"
+#include "mpd/song.h"
 #include "config.h"
 
 class Action;
diff --git a/gui/mainwindow.ui b/gui/mainwindow.ui
index dadc03359..24d3769c8 100644
--- a/gui/mainwindow.ui
+++ b/gui/mainwindow.ui
@@ -345,80 +345,80 @@
   <customwidget>
    <class>SqueezedTextLabel</class>
    <extends>QLabel</extends>
-   <header>squeezedtextlabel.h</header>
+   <header>support/squeezedtextlabel.h</header>
   </customwidget>
   <customwidget>
    <class>SongLabel</class>
    <extends>QLabel</extends>
-   <header>songlabel.h</header>
+   <header>widgets/songlabel.h</header>
   </customwidget>
   <customwidget>
    <class>PlayQueueView</class>
    <extends>QTreeView</extends>
-   <header>playqueueview.h</header>
+   <header>widgets/playqueueview.h</header>
   </customwidget>
   <customwidget>
    <class>TimeSlider</class>
    <extends>QSlider</extends>
-   <header>timeslider.h</header>
+   <header>widgets/timeslider.h</header>
   </customwidget>
   <customwidget>
    <class>FancyTabWidget</class>
    <extends>QTabWidget</extends>
-   <header>fancytabwidget.h</header>
+   <header>support/fancytabwidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>MessageWidget</class>
    <extends>QFrame</extends>
-   <header>messagewidget.h</header>
+   <header>support/messagewidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>AutohidingSplitter</class>
    <extends>QSplitter</extends>
-   <header>autohidingsplitter.h</header>
+   <header>widgets/autohidingsplitter.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>MenuButton</class>
    <extends>QToolButton</extends>
-   <header>menubutton.h</header>
+   <header>widgets/menubutton.h</header>
   </customwidget>
   <customwidget>
    <class>ToolButton</class>
    <extends>QToolButton</extends>
-   <header>toolbutton.h</header>
+   <header>widgets/toolbutton.h</header>
   </customwidget>
   <customwidget>
    <class>ContextWidget</class>
    <extends>QWidget</extends>
-   <header>contextwidget.h</header>
+   <header>context/contextwidget.h</header>
   </customwidget>
   <customwidget>
    <class>SearchWidget</class>
    <extends>QLineEdit</extends>
-   <header>searchwidget.h</header>
+   <header>widgets/searchwidget.h</header>
   </customwidget>
   <customwidget>
    <class>SpacerWidget</class>
    <extends>QWidget</extends>
-   <header>spacerwidget.h</header>
+   <header>widgets/spacerwidget.h</header>
   </customwidget>
   <customwidget>
    <class>SizeWidget</class>
    <extends>QWidget</extends>
-   <header>sizewidget.h</header>
+   <header>widgets/sizewidget.h</header>
   </customwidget>
   <customwidget>
    <class>SizeGrip</class>
    <extends>QWidget</extends>
-   <header>sizegrip.h</header>
+   <header>widgets/sizegrip.h</header>
   </customwidget>
   <customwidget>
    <class>VolumeSlider</class>
    <extends>QSlider</extends>
-   <header>volumeslider.h</header>
+   <header>widgets/volumeslider.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/gui/mediakeys.cpp b/gui/mediakeys.cpp
index 37ecf763c..c2259675d 100644
--- a/gui/mediakeys.cpp
+++ b/gui/mediakeys.cpp
@@ -23,7 +23,7 @@
 
 #include "mediakeys.h"
 #ifdef QT_QTDBUS_FOUND
-#include "gnomemediakeys.h"
+#include "dbus/gnomemediakeys.h"
 #endif
 #ifdef CANTATA_USE_QXT_MEDIAKEYS
 #include "qxtmediakeys.h"
@@ -31,7 +31,7 @@
 #include "multimediakeysinterface.h"
 #include "stdactions.h"
 #include "settings.h"
-#include "globalstatic.h"
+#include "support/globalstatic.h"
 
 GLOBAL_STATIC(MediaKeys, instance)
 
diff --git a/gui/page.h b/gui/page.h
index d5e1cd191..ed1ee2baf 100644
--- a/gui/page.h
+++ b/gui/page.h
@@ -24,7 +24,7 @@
 #ifndef PAGE_H
 #define PAGE_H
 
-#include "song.h"
+#include "mpd/song.h"
 
 class Page
 {
diff --git a/gui/playbacksettings.cpp b/gui/playbacksettings.cpp
index c1f1a69e2..cb333d7e8 100644
--- a/gui/playbacksettings.cpp
+++ b/gui/playbacksettings.cpp
@@ -23,11 +23,11 @@
 
 #include "playbacksettings.h"
 #include "settings.h"
-#include "localize.h"
-#include "mpdconnection.h"
-#include "icon.h"
-#include "basicitemdelegate.h"
-#include "messagebox.h"
+#include "support/localize.h"
+#include "mpd/mpdconnection.h"
+#include "support/icon.h"
+#include "widgets/basicitemdelegate.h"
+#include "support/messagebox.h"
 #include <QListWidget>
 
 #define REMOVE(w) \
diff --git a/gui/playbacksettings.h b/gui/playbacksettings.h
index 9fb86f49c..0e3198ad2 100644
--- a/gui/playbacksettings.h
+++ b/gui/playbacksettings.h
@@ -25,7 +25,7 @@
 #define PLAYBACKSETTINGS_H
 
 #include "ui_playbacksettings.h"
-#include "output.h"
+#include "mpd/output.h"
 #include <QList>
 #include <QSet>
 
diff --git a/gui/playbacksettings.ui b/gui/playbacksettings.ui
index 1b3be1771..ab7e2c2ba 100644
--- a/gui/playbacksettings.ui
+++ b/gui/playbacksettings.ui
@@ -254,12 +254,12 @@
   <customwidget>
    <class>BuddyLabel</class>
    <extends>QLabel</extends>
-   <header>buddylabel.h</header>
+   <header>support/buddylabel.h</header>
   </customwidget>
   <customwidget>
    <class>UrlLabel</class>
    <extends>QWidget</extends>
-   <header>urllabel.h</header>
+   <header>support/urllabel.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/gui/playlistspage.cpp b/gui/playlistspage.cpp
index a6c52318f..29be47fd3 100644
--- a/gui/playlistspage.cpp
+++ b/gui/playlistspage.cpp
@@ -22,16 +22,15 @@
  */
 
 #include "playlistspage.h"
-#include "playlistsmodel.h"
-#include "mpdconnection.h"
-#include "messagebox.h"
-#include "inputdialog.h"
-#include "localize.h"
-#include "icons.h"
+#include "models/playlistsmodel.h"
+#include "mpd/mpdconnection.h"
+#include "support/messagebox.h"
+#include "support/inputdialog.h"
+#include "support/localize.h"
+#include "widgets/icons.h"
 #include "stdactions.h"
-#include "actioncollection.h"
-#include "mpdconnection.h"
-#include "tableview.h"
+#include "support/actioncollection.h"
+#include "widgets/tableview.h"
 #include "settings.h"
 #include <QMenu>
 #ifdef ENABLE_KDE_SUPPORT
diff --git a/gui/playlistspage.h b/gui/playlistspage.h
index 1381bb69c..18716ff98 100644
--- a/gui/playlistspage.h
+++ b/gui/playlistspage.h
@@ -25,7 +25,7 @@
 #define PLAYLISTSPAGE_H
 
 #include "ui_playlistspage.h"
-#include "playlistsproxymodel.h"
+#include "models/playlistsproxymodel.h"
 #include "page.h"
 
 class Action;
diff --git a/gui/playlistspage.ui b/gui/playlistspage.ui
index 74aa40c0e..626900782 100644
--- a/gui/playlistspage.ui
+++ b/gui/playlistspage.ui
@@ -48,27 +48,27 @@
   <customwidget>
    <class>ItemView</class>
    <extends>QTreeView</extends>
-   <header>itemview.h</header>
+   <header>widgets/itemview.h</header>
   </customwidget>
   <customwidget>
    <class>GenreCombo</class>
    <extends>QComboBox</extends>
-   <header>genrecombo.h</header>
+   <header>widgets/genrecombo.h</header>
   </customwidget>
   <customwidget>
    <class>ToolButton</class>
    <extends>QToolButton</extends>
-   <header>toolbutton.h</header>
+   <header>widgets/toolbutton.h</header>
   </customwidget>
   <customwidget>
    <class>MenuButton</class>
    <extends>QToolButton</extends>
-   <header>menubutton.h</header>
+   <header>widgets/menubutton.h</header>
   </customwidget>
   <customwidget>
    <class>SizeWidget</class>
    <extends>QWidget</extends>
-   <header>sizewidget.h</header>
+   <header>widgets/sizewidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/gui/preferencesdialog.cpp b/gui/preferencesdialog.cpp
index 3320c1e4d..1bd20cd50 100644
--- a/gui/preferencesdialog.cpp
+++ b/gui/preferencesdialog.cpp
@@ -24,32 +24,32 @@
 #include "preferencesdialog.h"
 #include "mainwindow.h"
 #include "settings.h"
-#include "icons.h"
+#include "widgets/icons.h"
 #include "interfacesettings.h"
 #ifdef ENABLE_STREAMS
-#include "streamssettings.h"
+#include "streams/streamssettings.h"
 #endif
 #ifdef ENABLE_ONLINE_SERVICES
-#include "onlinesettings.h"
+#include "online/onlinesettings.h"
 #endif
 #include "serversettings.h"
 #include "playbacksettings.h"
 #include "filesettings.h"
 #ifdef ENABLE_HTTP_SERVER
-#include "httpserversettings.h"
+#include "http/httpserversettings.h"
 #endif
-#include "contextsettings.h"
+#include "context/contextsettings.h"
 #include "cachesettings.h"
-#include "localize.h"
-#include "mpdconnection.h"
+#include "support/localize.h"
+#include "mpd/mpdconnection.h"
 #ifdef ENABLE_PROXY_CONFIG
-#include "proxysettings.h"
+#include "network/proxysettings.h"
 #endif
 #ifndef ENABLE_KDE_SUPPORT
 #include "shortcutssettingspage.h"
 #endif
 #if defined CDDB_FOUND || defined MUSICBRAINZ5_FOUND
-#include "audiocdsettings.h"
+#include "devices/audiocdsettings.h"
 #endif
 #ifndef ENABLE_KDE_SUPPORT
 #include "shortcutssettingspage.h"
diff --git a/gui/preferencesdialog.h b/gui/preferencesdialog.h
index 559661d22..0eaecc120 100644
--- a/gui/preferencesdialog.h
+++ b/gui/preferencesdialog.h
@@ -25,8 +25,8 @@
 #define PREFERENCES_DIALOG_H
 
 #include "config.h"
-#include "dialog.h"
-#include "pagewidget.h"
+#include "support/dialog.h"
+#include "support/pagewidget.h"
 
 #ifndef ENABLE_KDE_SUPPORT
 class ProxySettings;
@@ -51,6 +51,9 @@ class CacheSettings;
 class AudioCdSettings;
 #endif
 class QStringList;
+#ifdef ENABLE_PROXY_CONFIG
+class ProxySettings;
+#endif
 
 class PreferencesDialog : public Dialog
 {
diff --git a/gui/qxtmediakeys.cpp b/gui/qxtmediakeys.cpp
index d057b835e..3608eea18 100644
--- a/gui/qxtmediakeys.cpp
+++ b/gui/qxtmediakeys.cpp
@@ -22,7 +22,7 @@
  */
 
 #include "qxtmediakeys.h"
-#include "qxtglobalshortcut.h"
+#include "qxt/qxtglobalshortcut.h"
 
 QxtMediaKeys::QxtMediaKeys(QObject *p)
     : MultiMediaKeysInterface(p)
diff --git a/gui/searchpage.cpp b/gui/searchpage.cpp
index f36c85047..2c3fbbd86 100644
--- a/gui/searchpage.cpp
+++ b/gui/searchpage.cpp
@@ -22,14 +22,14 @@
  */
 
 #include "searchpage.h"
-#include "mpdconnection.h"
-#include "localize.h"
+#include "mpd/mpdconnection.h"
+#include "support/localize.h"
 #include "settings.h"
 #include "stdactions.h"
-#include "utils.h"
-#include "icon.h"
+#include "support/utils.h"
+#include "support/icon.h"
 #include "plurals.h"
-#include "tableview.h"
+#include "widgets/tableview.h"
 
 class SearchTableView : public TableView
 {
diff --git a/gui/searchpage.h b/gui/searchpage.h
index c17c95b9d..bc32335a3 100644
--- a/gui/searchpage.h
+++ b/gui/searchpage.h
@@ -26,8 +26,8 @@
 
 #include "ui_searchpage.h"
 #include "page.h"
-#include "searchmodel.h"
-#include "searchproxymodel.h"
+#include "models/searchmodel.h"
+#include "models/searchproxymodel.h"
 
 class Action;
 
diff --git a/gui/searchpage.ui b/gui/searchpage.ui
index 4a1830b54..50f79968c 100644
--- a/gui/searchpage.ui
+++ b/gui/searchpage.ui
@@ -48,22 +48,22 @@
   <customwidget>
    <class>SqueezedTextLabel</class>
    <extends>QLabel</extends>
-   <header>squeezedtextlabel.h</header>
+   <header>support/squeezedtextlabel.h</header>
   </customwidget>
   <customwidget>
    <class>ItemView</class>
    <extends>QTreeView</extends>
-   <header>itemview.h</header>
+   <header>widgets/itemview.h</header>
   </customwidget>
   <customwidget>
    <class>ToolButton</class>
    <extends>QToolButton</extends>
-   <header>toolbutton.h</header>
+   <header>widgets/toolbutton.h</header>
   </customwidget>
   <customwidget>
    <class>SizeWidget</class>
    <extends>QWidget</extends>
-   <header>sizewidget.h</header>
+   <header>widgets/sizewidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/gui/serversettings.cpp b/gui/serversettings.cpp
index 3ca9db8de..85a48e634 100644
--- a/gui/serversettings.cpp
+++ b/gui/serversettings.cpp
@@ -23,13 +23,13 @@
 
 #include "serversettings.h"
 #include "settings.h"
-#include "localize.h"
-#include "inputdialog.h"
-#include "messagebox.h"
-#include "icons.h"
-#include "musiclibrarymodel.h"
-#include "mpduser.h"
-#include "utils.h"
+#include "support/localize.h"
+#include "support/inputdialog.h"
+#include "support/messagebox.h"
+#include "widgets/icons.h"
+#include "models/musiclibrarymodel.h"
+#include "mpd/mpduser.h"
+#include "support/utils.h"
 #include <QDir>
 #include <QComboBox>
 #include <QPushButton>
diff --git a/gui/serversettings.h b/gui/serversettings.h
index e30a2e97a..c180e636f 100644
--- a/gui/serversettings.h
+++ b/gui/serversettings.h
@@ -25,8 +25,8 @@
 #define SERVERSETTINGS_H
 
 #include "ui_serversettings.h"
-#include "mpdconnection.h"
-#include "deviceoptions.h"
+#include "mpd/mpdconnection.h"
+#include "devices/deviceoptions.h"
 
 class ServerSettings : public QWidget, private Ui::ServerSettings
 {
diff --git a/gui/serversettings.ui b/gui/serversettings.ui
index 607ee3d7e..5bc50de49 100644
--- a/gui/serversettings.ui
+++ b/gui/serversettings.ui
@@ -431,22 +431,22 @@
   <customwidget>
    <class>BuddyLabel</class>
    <extends>QLabel</extends>
-   <header>buddylabel.h</header>
+   <header>support/buddylabel.h</header>
   </customwidget>
   <customwidget>
    <class>StateLabel</class>
    <extends>QLabel</extends>
-   <header>statelabel.h</header>
+   <header>widgets/statelabel.h</header>
   </customwidget>
   <customwidget>
    <class>LineEdit</class>
    <extends>QLineEdit</extends>
-   <header>lineedit.h</header>
+   <header>support/lineedit.h</header>
   </customwidget>
   <customwidget>
    <class>PathRequester</class>
    <extends>QLineEdit</extends>
-   <header>pathrequester.h</header>
+   <header>support/pathrequester.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/gui/settings.cpp b/gui/settings.cpp
index 2fbbd7083..f535d8ad8 100644
--- a/gui/settings.cpp
+++ b/gui/settings.cpp
@@ -22,14 +22,13 @@
  */
 
 #include "settings.h"
-#include "musiclibraryitemalbum.h"
-#include "fancytabwidget.h"
-#include "albumsmodel.h"
-#include "itemview.h"
-#include "mpdparseutils.h"
-#include "utils.h"
-#include "mediakeys.h"
-#include "globalstatic.h"
+#include "models/musiclibraryitemalbum.h"
+#include "support/fancytabwidget.h"
+#include "models/albumsmodel.h"
+#include "widgets/itemview.h"
+#include "mpd/mpdparseutils.h"
+#include "support/utils.h"
+#include "support/globalstatic.h"
 #if defined ENABLE_KDE_SUPPORT && defined ENABLE_KWALLET
 #include <kwallet.h>
 #endif
diff --git a/gui/settings.h b/gui/settings.h
index e69f5cfb8..4d5733ace 100644
--- a/gui/settings.h
+++ b/gui/settings.h
@@ -24,9 +24,9 @@
 #ifndef SETTINGS_H
 #define SETTINGS_H
 
-#include "configuration.h"
+#include "support/configuration.h"
 #include "config.h"
-#include "mpdconnection.h"
+#include "mpd/mpdconnection.h"
 #if defined ENABLE_KDE_SUPPORT && defined ENABLE_KWALLET
 namespace KWallet {
 class Wallet;
diff --git a/gui/shortcutssettingspage.cpp b/gui/shortcutssettingspage.cpp
index d5095a3fe..e2df5a717 100644
--- a/gui/shortcutssettingspage.cpp
+++ b/gui/shortcutssettingspage.cpp
@@ -23,16 +23,16 @@
 
 #include "shortcutssettingspage.h"
 #include "mediakeys.h"
-#include "toolbutton.h"
-#include "actioncollection.h"
-#include "shortcutssettingswidget.h"
-#include "basicitemdelegate.h"
-#include "localize.h"
+#include "widgets/toolbutton.h"
+#include "support/actioncollection.h"
+#include "support/shortcutssettingswidget.h"
+#include "widgets/basicitemdelegate.h"
+#include "support/localize.h"
 #include "settings.h"
-#include "icons.h"
-#include "buddylabel.h"
-#include "utils.h"
-#include "flickcharm.h"
+#include "widgets/icons.h"
+#include "support/buddylabel.h"
+#include "support/utils.h"
+#include "support/flickcharm.h"
 #include <QBoxLayout>
 #include <QComboBox>
 #include <QGroupBox>
diff --git a/gui/stdactions.cpp b/gui/stdactions.cpp
index 635cdfbea..9f7aa48b7 100644
--- a/gui/stdactions.cpp
+++ b/gui/stdactions.cpp
@@ -22,16 +22,16 @@
  */
 
 #include "stdactions.h"
-#include "localize.h"
-#include "action.h"
-#include "actioncollection.h"
-#include "playlistsmodel.h"
+#include "support/localize.h"
+#include "support/action.h"
+#include "support/actioncollection.h"
+#include "models/playlistsmodel.h"
 #ifdef ENABLE_DEVICES_SUPPORT
-#include "devicesmodel.h"
+#include "models/devicesmodel.h"
 #endif
-#include "icon.h"
-#include "icons.h"
-#include "globalstatic.h"
+#include "support/icon.h"
+#include "widgets/icons.h"
+#include "support/globalstatic.h"
 #include <QMenu>
 #include <QCoreApplication>
 
diff --git a/gui/stdactions.h b/gui/stdactions.h
index 451bdb891..0c53068a0 100644
--- a/gui/stdactions.h
+++ b/gui/stdactions.h
@@ -25,7 +25,7 @@
 #define STDACTIONS_H
 
 #include "config.h"
-#include "action.h"
+#include "support/action.h"
 
 class StdActions
 {
diff --git a/gui/trayitem.cpp b/gui/trayitem.cpp
index 8b73242ac..c960f261b 100644
--- a/gui/trayitem.cpp
+++ b/gui/trayitem.cpp
@@ -23,16 +23,16 @@
 
 #include "trayitem.h"
 #ifdef QT_QTDBUS_FOUND
-#include "notify.h"
+#include "dbus/notify.h"
 #endif
-#include "localize.h"
+#include "support/localize.h"
 #include "mainwindow.h"
 #include "settings.h"
-#include "action.h"
-#include "icons.h"
-#include "song.h"
+#include "support/action.h"
+#include "widgets/icons.h"
+#include "mpd/song.h"
 #include "stdactions.h"
-#include "utils.h"
+#include "support/utils.h"
 #include "currentcover.h"
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KMenu>
diff --git a/gui/trayitem.h b/gui/trayitem.h
index 7620611bc..5cc213bc4 100644
--- a/gui/trayitem.h
+++ b/gui/trayitem.h
@@ -30,7 +30,7 @@
 class KMenu;
 #else
 #include <QSystemTrayIcon>
-#include "icon.h"
+#include "support/icon.h"
 class QMenu;
 #endif
 #include "config.h"
diff --git a/http/httpserver.cpp b/http/httpserver.cpp
index d3a2e37e8..750f70cb2 100644
--- a/http/httpserver.cpp
+++ b/http/httpserver.cpp
@@ -24,11 +24,11 @@
 #include "httpserver.h"
 #include "httpsocket.h"
 #ifdef TAGLIB_FOUND
-#include "tags.h"
+#include "tags/tags.h"
 #endif
-#include "settings.h"
-#include "thread.h"
-#include "globalstatic.h"
+#include "gui/settings.h"
+#include "support/thread.h"
+#include "support/globalstatic.h"
 #include <QFile>
 #include <QUrl>
 #include <QTimer>
diff --git a/http/httpserver.h b/http/httpserver.h
index 5326088bf..2bfe7c280 100644
--- a/http/httpserver.h
+++ b/http/httpserver.h
@@ -27,7 +27,7 @@
 #include <QObject>
 #include <QByteArray>
 #include <QSet>
-#include "song.h"
+#include "mpd/song.h"
 #include "config.h"
 
 class HttpSocket;
diff --git a/http/httpserversettings.cpp b/http/httpserversettings.cpp
index 74fd364e5..7ea4ad7e8 100644
--- a/http/httpserversettings.cpp
+++ b/http/httpserversettings.cpp
@@ -22,8 +22,8 @@
  */
 
 #include "httpserversettings.h"
-#include "settings.h"
-#include "localize.h"
+#include "gui/settings.h"
+#include "support/localize.h"
 #include "httpserver.h"
 #include <QComboBox>
 #include <QNetworkInterface>
diff --git a/http/httpserversettings.ui b/http/httpserversettings.ui
index 510916ff3..d53c3542b 100644
--- a/http/httpserversettings.ui
+++ b/http/httpserversettings.ui
@@ -83,7 +83,7 @@
   <customwidget>
    <class>BuddyLabel</class>
    <extends>QLabel</extends>
-   <header>buddylabel.h</header>
+   <header>support/buddylabel.h</header>
   </customwidget>
  </customwidgets>
  <tabstops/>
diff --git a/http/httpsocket.cpp b/http/httpsocket.cpp
index 861241926..21d83f539 100644
--- a/http/httpsocket.cpp
+++ b/http/httpsocket.cpp
@@ -24,10 +24,10 @@
 #include "config.h"
 #include "httpsocket.h"
 #include "httpserver.h"
-#include "settings.h"
+#include "gui/settings.h"
 #if defined CDDB_FOUND || defined MUSICBRAINZ5_FOUND
-#include "cdparanoia.h"
-#include "extractjob.h"
+#include "devices/cdparanoia.h"
+#include "devices/extractjob.h"
 #endif
 #include <QTcpSocket>
 #include <QNetworkInterface>
diff --git a/models/actionmodel.cpp b/models/actionmodel.cpp
index aad8f3868..d7d730144 100644
--- a/models/actionmodel.cpp
+++ b/models/actionmodel.cpp
@@ -22,7 +22,7 @@
  */
 
 #include "actionmodel.h"
-#include "stdactions.h"
+#include "gui/stdactions.h"
 #include "roles.h"
 
 #ifdef ENABLE_UBUNTU
diff --git a/models/actionmodel.h b/models/actionmodel.h
index 02e79d641..d5598d984 100644
--- a/models/actionmodel.h
+++ b/models/actionmodel.h
@@ -26,7 +26,7 @@
 
 #include <QAbstractItemModel>
 #include <QMetaType>
-#include "action.h"
+#include "support/action.h"
 #include "config.h"
 
 class ActionModel : public QAbstractItemModel
diff --git a/models/albumsmodel.cpp b/models/albumsmodel.cpp
index ca2b414f7..38ab0d3c2 100644
--- a/models/albumsmodel.cpp
+++ b/models/albumsmodel.cpp
@@ -28,23 +28,23 @@
 #include <QStringList>
 #include <QPainter>
 #include <QFile>
-#include "localize.h"
-#include "plurals.h"
-#include "globalstatic.h"
+#include "support/localize.h"
+#include "gui/plurals.h"
+#include "support/globalstatic.h"
 #include "albumsmodel.h"
-#include "settings.h"
+#include "gui/settings.h"
 #include "musiclibraryitemsong.h"
 #include "musiclibraryitemartist.h"
 #include "musiclibraryitemroot.h"
 #include "musiclibrarymodel.h"
 #include "playqueuemodel.h"
 #include "proxymodel.h"
-#include "song.h"
-#include "covers.h"
+#include "mpd/song.h"
+#include "gui/covers.h"
 #include "roles.h"
-#include "mpdparseutils.h"
-#include "icons.h"
-#include "utils.h"
+#include "mpd/mpdparseutils.h"
+#include "widgets/icons.h"
+#include "support/utils.h"
 #include "config.h"
 #if defined ENABLE_MODEL_TEST
 #include "modeltest.h"
diff --git a/models/albumsmodel.h b/models/albumsmodel.h
index e15f1307b..a28c529f0 100644
--- a/models/albumsmodel.h
+++ b/models/albumsmodel.h
@@ -27,7 +27,7 @@
 #include <QList>
 #include <QSet>
 #include <QStringList>
-#include "song.h"
+#include "mpd/song.h"
 #include "musiclibraryitemalbum.h"
 #include "actionmodel.h"
 
diff --git a/models/devicesmodel.cpp b/models/devicesmodel.cpp
index 8d76ed468..a8253398e 100644
--- a/models/devicesmodel.cpp
+++ b/models/devicesmodel.cpp
@@ -28,22 +28,22 @@
 #include "musiclibrarymodel.h"
 #include "devicesmodel.h"
 #include "playqueuemodel.h"
-#include "settings.h"
+#include "gui/settings.h"
 #include "roles.h"
-#include "mpdparseutils.h"
-#include "mpdconnection.h"
-#include "umsdevice.h"
-#include "httpserver.h"
-#include "localize.h"
-#include "icons.h"
-#include "mountpoints.h"
-#include "stdactions.h"
-#include "actioncollection.h"
+#include "mpd/mpdparseutils.h"
+#include "mpd/mpdconnection.h"
+#include "devices/umsdevice.h"
+#include "http/httpserver.h"
+#include "support/localize.h"
+#include "widgets/icons.h"
+#include "devices/mountpoints.h"
+#include "gui/stdactions.h"
+#include "support/actioncollection.h"
 #include "config.h"
 #if defined CDDB_FOUND || defined MUSICBRAINZ5_FOUND
-#include "audiocddevice.h"
+#include "devices/audiocddevice.h"
 #endif
-#include "globalstatic.h"
+#include "support/globalstatic.h"
 #include <QMenu>
 #include <QStringList>
 #include <QMimeData>
diff --git a/models/devicesmodel.h b/models/devicesmodel.h
index 51db2118b..7450b8172 100644
--- a/models/devicesmodel.h
+++ b/models/devicesmodel.h
@@ -24,11 +24,11 @@
 #define DEVICES_MODEL_H
 
 #include <QSet>
-#include "song.h"
+#include "mpd/song.h"
 #include "config.h"
-#include "remotefsdevice.h"
+#include "devices/remotefsdevice.h"
 #include "multimusicmodel.h"
-#include "cdalbum.h"
+#include "devices/cdalbum.h"
 #include "musiclibraryproxymodel.h"
 
 class QMimeData;
diff --git a/models/digitallyimported.cpp b/models/digitallyimported.cpp
index d6fed3f38..3bd05860c 100644
--- a/models/digitallyimported.cpp
+++ b/models/digitallyimported.cpp
@@ -22,11 +22,11 @@
  */
 
 #include "digitallyimported.h"
-#include "configuration.h"
-#include "networkaccessmanager.h"
+#include "support/configuration.h"
+#include "network/networkaccessmanager.h"
 #include "qjson/parser.h"
-#include "localize.h"
-#include "globalstatic.h"
+#include "support/localize.h"
+#include "support/globalstatic.h"
 #include <QNetworkRequest>
 #include <QTime>
 #include <QTimer>
diff --git a/models/dirviewitemfile.h b/models/dirviewitemfile.h
index ed8e35e79..8e9d4ca00 100644
--- a/models/dirviewitemfile.h
+++ b/models/dirviewitemfile.h
@@ -27,7 +27,7 @@
 #define DIRVIEWITEMFILE_H
 
 #include "dirviewitem.h"
-#include "mpdconnection.h"
+#include "mpd/mpdconnection.h"
 
 class DirViewItemFile : public DirViewItem
 {
diff --git a/models/dirviewmodel.cpp b/models/dirviewmodel.cpp
index 493e448c8..341a28c59 100644
--- a/models/dirviewmodel.cpp
+++ b/models/dirviewmodel.cpp
@@ -31,22 +31,22 @@
 #include <QFile>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-#include "localize.h"
-#include "plurals.h"
+#include "support/localize.h"
+#include "gui/plurals.h"
 #include "dirviewmodel.h"
 #include "dirviewitem.h"
 #include "dirviewitemfile.h"
 #include "playqueuemodel.h"
 #include "musiclibrarymodel.h"
 #include "roles.h"
-#include "settings.h"
-#include "mpdconnection.h"
-#include "icon.h"
-#include "icons.h"
+#include "gui/settings.h"
+#include "mpd/mpdconnection.h"
+#include "support/icon.h"
+#include "widgets/icons.h"
 #include "config.h"
-#include "utils.h"
+#include "support/utils.h"
 #include "qtiocompressor/qtiocompressor.h"
-#include "globalstatic.h"
+#include "support/globalstatic.h"
 #if defined ENABLE_MODEL_TEST
 #include "modeltest.h"
 #endif
diff --git a/models/multimusicmodel.h b/models/multimusicmodel.h
index 0e0f6a9ee..52475bd9c 100644
--- a/models/multimusicmodel.h
+++ b/models/multimusicmodel.h
@@ -24,7 +24,7 @@
 #define MULTI_MUSIC_MODEL_H
 
 #include "musicmodel.h"
-#include "song.h"
+#include "mpd/song.h"
 #include <QList>
 #include <QObject>
 
diff --git a/models/musiclibraryitemalbum.cpp b/models/musiclibraryitemalbum.cpp
index ccf9fdbe2..397b6b8bd 100644
--- a/models/musiclibraryitemalbum.cpp
+++ b/models/musiclibraryitemalbum.cpp
@@ -28,15 +28,14 @@
 #include "musiclibraryitemartist.h"
 #include "musiclibraryitemalbum.h"
 #include "musiclibraryitemsong.h"
-#include "song.h"
-#include "covers.h"
-#include "icons.h"
+#include "gui/covers.h"
+#include "widgets/icons.h"
 #ifdef ENABLE_DEVICES_SUPPORT
-#include "device.h"
-#include "utils.h"
+#include "devices/device.h"
+#include "support/utils.h"
 #endif
 #ifdef ENABLE_ONLINE_SERVICES
-#include "onlineservice.h"
+#include "online/onlineservice.h"
 #include "onlineservicesmodel.h"
 #endif
 #include <QPixmap>
diff --git a/models/musiclibraryitemalbum.h b/models/musiclibraryitemalbum.h
index 734b0a48b..c9a2079e9 100644
--- a/models/musiclibraryitemalbum.h
+++ b/models/musiclibraryitemalbum.h
@@ -31,7 +31,7 @@
 #include <QVariant>
 #include <QSet>
 #include "musiclibraryitem.h"
-#include "song.h"
+#include "mpd/song.h"
 
 class QPixmap;
 class MusicLibraryItemArtist;
diff --git a/models/musiclibraryitemartist.cpp b/models/musiclibraryitemartist.cpp
index 0cb754c34..a0fdc8f0d 100644
--- a/models/musiclibraryitemartist.cpp
+++ b/models/musiclibraryitemartist.cpp
@@ -29,17 +29,16 @@
 #include "musiclibraryitemalbum.h"
 #include "musiclibraryitemsong.h"
 #include "musiclibrarymodel.h"
-#include "song.h"
-#include "mpdparseutils.h"
-#include "localize.h"
-#include "covers.h"
-#include "icons.h"
+#include "mpd/mpdparseutils.h"
+#include "support/localize.h"
+#include "gui/covers.h"
+#include "widgets/icons.h"
 #ifdef ENABLE_DEVICES_SUPPORT
-#include "device.h"
-#include "utils.h"
+#include "devices/device.h"
+#include "support/utils.h"
 #endif
 #ifdef ENABLE_ONLINE_SERVICES
-#include "onlineservice.h"
+#include "online/onlineservice.h"
 #include "onlineservicesmodel.h"
 #endif
 
diff --git a/models/musiclibraryitemartist.h b/models/musiclibraryitemartist.h
index 0127a8b4f..88c2d5f2a 100644
--- a/models/musiclibraryitemartist.h
+++ b/models/musiclibraryitemartist.h
@@ -31,7 +31,7 @@
 #include <QVariant>
 #include <QHash>
 #include "musiclibraryitem.h"
-#include "song.h"
+#include "mpd/song.h"
 
 class QPixmap;
 class MusicLibraryItemRoot;
diff --git a/models/musiclibraryitempodcast.cpp b/models/musiclibraryitempodcast.cpp
index d55948cad..069258a80 100644
--- a/models/musiclibraryitempodcast.cpp
+++ b/models/musiclibraryitempodcast.cpp
@@ -27,13 +27,12 @@
 #include "musiclibraryitempodcast.h"
 #include "musiclibraryitemsong.h"
 #include "onlineservicesmodel.h"
-#include "onlineservice.h"
-#include "song.h"
-#include "icons.h"
+#include "online/onlineservice.h"
+#include "widgets/icons.h"
 #include "qtiocompressor/qtiocompressor.h"
-#include "utils.h"
-#include "covers.h"
-#include "rssparser.h"
+#include "support/utils.h"
+#include "gui/covers.h"
+#include "online/rssparser.h"
 #include <QPixmap>
 #include <QFile>
 #include <QXmlStreamReader>
diff --git a/models/musiclibraryitempodcast.h b/models/musiclibraryitempodcast.h
index e229a5266..946f2e501 100644
--- a/models/musiclibraryitempodcast.h
+++ b/models/musiclibraryitempodcast.h
@@ -30,7 +30,7 @@
 #include <QUrl>
 #include "musiclibraryitem.h"
 #include "musiclibraryitemsong.h"
-#include "song.h"
+#include "mpd/song.h"
 
 class QPixmap;
 class QNetworkReply;
diff --git a/models/musiclibraryitemroot.cpp b/models/musiclibraryitemroot.cpp
index 7be1639bc..7021961d2 100644
--- a/models/musiclibraryitemroot.cpp
+++ b/models/musiclibraryitemroot.cpp
@@ -28,10 +28,9 @@
 #include "musiclibraryitemartist.h"
 #include "musiclibraryitemalbum.h"
 #include "musiclibraryitemsong.h"
-#include "mpdparseutils.h"
-#include "mpdconnection.h"
-#include "song.h"
-#include "localize.h"
+#include "mpd/mpdparseutils.h"
+#include "mpd/mpdconnection.h"
+#include "support/localize.h"
 #include "qtiocompressor/qtiocompressor.h"
 #include "musicmodel.h"
 #include <QXmlStreamReader>
diff --git a/models/musiclibraryitemroot.h b/models/musiclibraryitemroot.h
index 21cb8a536..496a27cb7 100644
--- a/models/musiclibraryitemroot.h
+++ b/models/musiclibraryitemroot.h
@@ -35,8 +35,8 @@
 #include <QModelIndex>
 #include <QImage>
 #include "musiclibraryitem.h"
-#include "song.h"
-#include "icon.h"
+#include "mpd/song.h"
+#include "support/icon.h"
 
 class QDateTime;
 class QXmlStreamReader;
diff --git a/models/musiclibraryitemsong.cpp b/models/musiclibraryitemsong.cpp
index 08b63283f..04fe3a0f0 100644
--- a/models/musiclibraryitemsong.cpp
+++ b/models/musiclibraryitemsong.cpp
@@ -22,7 +22,6 @@
  */
 
 #include "musiclibraryitemsong.h"
-#include "song.h"
 
 void MusicLibraryItemSong::initGenres() const
 {
diff --git a/models/musiclibraryitemsong.h b/models/musiclibraryitemsong.h
index a55d641e4..1d110157c 100644
--- a/models/musiclibraryitemsong.h
+++ b/models/musiclibraryitemsong.h
@@ -30,7 +30,7 @@
 #include <QList>
 #include <QVariant>
 #include "musiclibraryitem.h"
-#include "song.h"
+#include "mpd/song.h"
 
 class MusicLibraryItemAlbum;
 
diff --git a/models/musiclibrarymodel.cpp b/models/musiclibrarymodel.cpp
index 160b0ee58..a2331696f 100644
--- a/models/musiclibrarymodel.cpp
+++ b/models/musiclibrarymodel.cpp
@@ -31,17 +31,17 @@
 #include "musiclibrarymodel.h"
 #include "albumsmodel.h"
 #include "playqueuemodel.h"
-#include "settings.h"
+#include "gui/settings.h"
 #include "config.h"
-#include "covers.h"
-#include "mpdparseutils.h"
-#include "mpdconnection.h"
-#include "localize.h"
-#include "utils.h"
-#include "icons.h"
-#include "stdactions.h"
+#include "gui/covers.h"
+#include "mpd/mpdparseutils.h"
+#include "mpd/mpdconnection.h"
+#include "support/localize.h"
+#include "support/utils.h"
+#include "widgets/icons.h"
+#include "gui/stdactions.h"
 #include "qtiocompressor/qtiocompressor.h"
-#include "globalstatic.h"
+#include "support/globalstatic.h"
 #include <QCommonStyle>
 #include <QFile>
 #include <QTimer>
diff --git a/models/musiclibrarymodel.h b/models/musiclibrarymodel.h
index 6d650808c..4748b0941 100644
--- a/models/musiclibrarymodel.h
+++ b/models/musiclibrarymodel.h
@@ -32,7 +32,7 @@
 #include <QMap>
 #include "musiclibraryitemroot.h"
 #include "musiclibraryitemalbum.h"
-#include "song.h"
+#include "mpd/song.h"
 #include "musicmodel.h"
 
 class QMimeData;
diff --git a/models/musicmodel.cpp b/models/musicmodel.cpp
index d2f32cdcd..c73433eb6 100644
--- a/models/musicmodel.cpp
+++ b/models/musicmodel.cpp
@@ -28,14 +28,14 @@
 #include "musiclibraryitemroot.h"
 #ifdef ENABLE_ONLINE_SERVICES
 #include "musiclibraryitempodcast.h"
-#include "onlineservice.h"
+#include "online/onlineservice.h"
 #endif
 #include "musicmodel.h"
 #include "roles.h"
-#include "localize.h"
-#include "plurals.h"
-#include "icons.h"
-#include "covers.h"
+#include "support/localize.h"
+#include "gui/plurals.h"
+#include "widgets/icons.h"
+#include "gui/covers.h"
 #include <QStringList>
 
 MusicModel::MusicModel(QObject *parent)
diff --git a/models/onlineservicesmodel.cpp b/models/onlineservicesmodel.cpp
index 394637e39..700ced195 100644
--- a/models/onlineservicesmodel.cpp
+++ b/models/onlineservicesmodel.cpp
@@ -30,27 +30,27 @@
 #include "musiclibrarymodel.h"
 #include "dirviewmodel.h"
 #include "onlineservicesmodel.h"
-#include "onlineservice.h"
+#include "online/onlineservice.h"
 #ifdef ENABLE_DEVICES_SUPPORT
-#include "onlinedevice.h"
+#include "online/onlinedevice.h"
 #endif
-#include "jamendoservice.h"
-#include "magnatuneservice.h"
-#include "soundcloudservice.h"
-#include "podcastservice.h"
+#include "online/jamendoservice.h"
+#include "online/magnatuneservice.h"
+#include "online/soundcloudservice.h"
+#include "online/podcastservice.h"
 #include "playqueuemodel.h"
 #include "roles.h"
-#include "mpdparseutils.h"
-#include "localize.h"
-#include "plurals.h"
-#include "icons.h"
-#include "filejob.h"
-#include "utils.h"
-#include "stdactions.h"
-#include "actioncollection.h"
-#include "networkaccessmanager.h"
-#include "settings.h"
-#include "globalstatic.h"
+#include "mpd/mpdparseutils.h"
+#include "support/localize.h"
+#include "gui/plurals.h"
+#include "widgets/icons.h"
+#include "devices/filejob.h"
+#include "support/utils.h"
+#include "gui/stdactions.h"
+#include "support/actioncollection.h"
+#include "network/networkaccessmanager.h"
+#include "gui/settings.h"
+#include "support/globalstatic.h"
 #ifdef ENABLE_STREAMS
 #include "streamsmodel.h"
 #endif
diff --git a/models/onlineservicesmodel.h b/models/onlineservicesmodel.h
index 296ecf9a2..bdba1959f 100644
--- a/models/onlineservicesmodel.h
+++ b/models/onlineservicesmodel.h
@@ -24,9 +24,9 @@
 #define ONLINE_SERVICES_MODEL_H
 
 #include <QSet>
-#include "song.h"
+#include "mpd/song.h"
 #include "config.h"
-#include "covers.h"
+#include "gui/covers.h"
 #include "multimusicmodel.h"
 #include "musiclibraryproxymodel.h"
 
diff --git a/models/playlistsmodel.cpp b/models/playlistsmodel.cpp
index 83a659763..0961fae0a 100644
--- a/models/playlistsmodel.cpp
+++ b/models/playlistsmodel.cpp
@@ -32,20 +32,20 @@
 #include "playlistsmodel.h"
 #include "playlistsproxymodel.h"
 #include "playqueuemodel.h"
-#include "groupedview.h"
+#include "widgets/groupedview.h"
 #include "roles.h"
-#include "plurals.h"
-#include "localize.h"
-#include "utils.h"
-#include "globalstatic.h"
-#include "mpdparseutils.h"
-#include "mpdstats.h"
-#include "mpdconnection.h"
+#include "gui/plurals.h"
+#include "support/localize.h"
+#include "support/utils.h"
+#include "support/globalstatic.h"
+#include "mpd/mpdparseutils.h"
+#include "mpd/mpdstats.h"
+#include "mpd/mpdconnection.h"
 #include "playqueuemodel.h"
 #include "streamsmodel.h"
-#include "icons.h"
+#include "widgets/icons.h"
 #ifdef ENABLE_HTTP_SERVER
-#include "httpserver.h"
+#include "http/httpserver.h"
 #endif
 
 #if defined ENABLE_MODEL_TEST
diff --git a/models/playlistsmodel.h b/models/playlistsmodel.h
index 4b1d11cb8..46702b988 100644
--- a/models/playlistsmodel.h
+++ b/models/playlistsmodel.h
@@ -30,8 +30,8 @@
 #include <QIcon>
 #include <QAbstractItemModel>
 #include <QList>
-#include "playlist.h"
-#include "song.h"
+#include "mpd/playlist.h"
+#include "mpd/song.h"
 #include "actionmodel.h"
 
 class QMenu;
diff --git a/models/playqueuemodel.cpp b/models/playqueuemodel.cpp
index 4cfef5c90..f5de5b9b7 100644
--- a/models/playqueuemodel.cpp
+++ b/models/playqueuemodel.cpp
@@ -25,28 +25,28 @@
  * along with QtMPC.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "localize.h"
+#include "support/localize.h"
 #include "playqueuemodel.h"
-#include "mpdconnection.h"
-#include "mpdparseutils.h"
-#include "mpdstats.h"
-#include "mpdstatus.h"
-#include "streamfetcher.h"
+#include "mpd/mpdconnection.h"
+#include "mpd/mpdparseutils.h"
+#include "mpd/mpdstats.h"
+#include "mpd/mpdstatus.h"
+#include "streams/streamfetcher.h"
 #include "streamsmodel.h"
-#include "httpserver.h"
-#include "settings.h"
-#include "icon.h"
-#include "utils.h"
+#include "http/httpserver.h"
+#include "gui/settings.h"
+#include "support/icon.h"
+#include "support/utils.h"
 #include "config.h"
-#include "action.h"
-#include "actioncollection.h"
-#include "covers.h"
-#include "groupedview.h"
+#include "support/action.h"
+#include "support/actioncollection.h"
+#include "gui/covers.h"
+#include "widgets/groupedview.h"
 #include "roles.h"
 #ifdef ENABLE_DEVICES_SUPPORT
 #include "devicesmodel.h"
 #if defined CDDB_FOUND || defined MUSICBRAINZ5_FOUND
-#include "audiocddevice.h"
+#include "devices/audiocddevice.h"
 #endif
 #endif
 #include <QPalette>
diff --git a/models/playqueuemodel.h b/models/playqueuemodel.h
index a76f7d544..b546298c3 100644
--- a/models/playqueuemodel.h
+++ b/models/playqueuemodel.h
@@ -28,8 +28,8 @@
 #ifndef PLAYQUEUEMODEL_H
 #define PLAYQUEUEMODEL_H
 
-#include "song.h"
-#include "mpdstatus.h"
+#include "mpd/song.h"
+#include "mpd/mpdstatus.h"
 #include "config.h"
 #include <QStringList>
 #include <QAbstractItemModel>
diff --git a/models/playqueueproxymodel.cpp b/models/playqueueproxymodel.cpp
index fa38cbdd8..5511b8685 100644
--- a/models/playqueueproxymodel.cpp
+++ b/models/playqueueproxymodel.cpp
@@ -27,7 +27,7 @@
 #include <QByteArray>
 #include "playqueueproxymodel.h"
 #include "playqueuemodel.h"
-#include "song.h"
+#include "mpd/song.h"
 
 PlayQueueProxyModel::PlayQueueProxyModel(QObject *parent)
     : ProxyModel(parent)
diff --git a/models/proxymodel.cpp b/models/proxymodel.cpp
index 422b350cc..2c2c41a38 100644
--- a/models/proxymodel.cpp
+++ b/models/proxymodel.cpp
@@ -23,7 +23,7 @@
 
 #include "proxymodel.h"
 #ifndef ENABLE_UBUNTU
-#include "settings.h"
+#include "gui/settings.h"
 #endif
 #include <QMap>
 #include <QString>
diff --git a/models/proxymodel.h b/models/proxymodel.h
index 270f50650..a1e6fb87c 100644
--- a/models/proxymodel.h
+++ b/models/proxymodel.h
@@ -26,7 +26,7 @@
 
 #include <QSortFilterProxyModel>
 #include <QStringList>
-#include "song.h"
+#include "mpd/song.h"
 #include "config.h"
 
 class QMimeData;
diff --git a/models/searchmodel.cpp b/models/searchmodel.cpp
index b74e46e5f..7e9027139 100644
--- a/models/searchmodel.cpp
+++ b/models/searchmodel.cpp
@@ -22,9 +22,9 @@
  */
 
 #include "searchmodel.h"
-#include "icons.h"
+#include "widgets/icons.h"
 #include "roles.h"
-#include "mpdconnection.h"
+#include "mpd/mpdconnection.h"
 #include "playqueuemodel.h"
 #include <QString>
 #include <QVariant>
diff --git a/models/searchmodel.h b/models/searchmodel.h
index a097c825b..e4763ead9 100644
--- a/models/searchmodel.h
+++ b/models/searchmodel.h
@@ -24,7 +24,7 @@
 #ifndef SEARCH_MODEL_H
 #define SEARCH_MODEL_H
 
-#include "song.h"
+#include "mpd/song.h"
 #include "actionmodel.h"
 #include <QList>
 
diff --git a/models/streamsearchmodel.cpp b/models/streamsearchmodel.cpp
index 75b05c01f..0dc369cad 100644
--- a/models/streamsearchmodel.cpp
+++ b/models/streamsearchmodel.cpp
@@ -22,13 +22,13 @@
  */
 
 #include "streamsearchmodel.h"
-#include "icons.h"
+#include "widgets/icons.h"
 #include "roles.h"
-#include "localize.h"
-#include "plurals.h"
+#include "support/localize.h"
+#include "gui/plurals.h"
 #include "playqueuemodel.h"
-#include "networkaccessmanager.h"
-#include "stdactions.h"
+#include "network/networkaccessmanager.h"
+#include "gui/stdactions.h"
 #include <QString>
 #include <QVariant>
 #include <QXmlStreamReader>
diff --git a/models/streamsmodel.cpp b/models/streamsmodel.cpp
index 9e0cec70f..2e2fbfadd 100644
--- a/models/streamsmodel.cpp
+++ b/models/streamsmodel.cpp
@@ -22,28 +22,28 @@
  */
 
 #include "streamsmodel.h"
-#include "mpdconnection.h"
-#include "mpdparseutils.h"
+#include "mpd/mpdconnection.h"
+#include "mpd/mpdparseutils.h"
 #include <QUrl>
 
 #ifdef ENABLE_STREAMS
-#include "icons.h"
-#include "networkaccessmanager.h"
-#include "localize.h"
-#include "plurals.h"
-#include "utils.h"
-#include "settings.h"
+#include "widgets/icons.h"
+#include "network/networkaccessmanager.h"
+#include "support/localize.h"
+#include "gui/plurals.h"
+#include "support/utils.h"
+#include "gui/settings.h"
 #include "playqueuemodel.h"
 #include "roles.h"
-#include "action.h"
-#include "stdactions.h"
-#include "actioncollection.h"
+#include "support/action.h"
+#include "gui/stdactions.h"
+#include "support/actioncollection.h"
 #include "digitallyimported.h"
 #include "qjson/parser.h"
 #include "qtiocompressor/qtiocompressor.h"
-#include "utils.h"
+#include "support/utils.h"
 #include "config.h"
-#include "globalstatic.h"
+#include "support/globalstatic.h"
 #include <QModelIndex>
 #include <QString>
 #include <QSet>
diff --git a/models/streamsmodel.h b/models/streamsmodel.h
index 6233ecec0..8a78e013e 100644
--- a/models/streamsmodel.h
+++ b/models/streamsmodel.h
@@ -28,8 +28,8 @@
 #include "config.h"
 
 #ifdef ENABLE_STREAMS
-#include "stream.h"
-#include "playlist.h"
+#include "mpd/stream.h"
+#include "mpd/playlist.h"
 #include <QIcon>
 #include <QList>
 #include <QMap>
diff --git a/mpd/cuefile.cpp b/mpd/cuefile.cpp
index 136e616ed..4d8c7f8d5 100644
--- a/mpd/cuefile.cpp
+++ b/mpd/cuefile.cpp
@@ -23,8 +23,8 @@
 
 #include "cuefile.h"
 #include "mpdconnection.h"
-#include "utils.h"
-#include "settings.h"
+#include "support/utils.h"
+#include "gui/settings.h"
 #include <QBuffer>
 #include <QDateTime>
 #include <QFile>
diff --git a/mpd/httpstream.cpp b/mpd/httpstream.cpp
index feb0de839..6ab0901f0 100644
--- a/mpd/httpstream.cpp
+++ b/mpd/httpstream.cpp
@@ -24,7 +24,7 @@
 #include "httpstream.h"
 #include "mpdconnection.h"
 #include "mpdstatus.h"
-#include "settings.h"
+#include "gui/settings.h"
 #if QT_VERSION < 0x050000
 #include <phonon/audiooutput.h>
 #endif
diff --git a/mpd/mpdconnection.cpp b/mpd/mpdconnection.cpp
index 413937ddf..a74e1f3e6 100644
--- a/mpd/mpdconnection.cpp
+++ b/mpd/mpdconnection.cpp
@@ -26,23 +26,23 @@
 
 #include "mpdconnection.h"
 #include "mpdparseutils.h"
-#include "musiclibraryitemroot.h"
-#include "streamsmodel.h"
+#include "models/musiclibraryitemroot.h"
+#include "models/streamsmodel.h"
 #ifndef ENABLE_UBUNTU
 #include "mpduser.h"
 #endif
-#include "localize.h"
-#include "utils.h"
-#include "globalstatic.h"
+#include "support/localize.h"
+#include "support/utils.h"
+#include "support/globalstatic.h"
 #include <QApplication>
 #include <QStringList>
 #include <QTimer>
 #include <QDir>
-#include "thread.h"
-#include "settings.h"
+#include "support/thread.h"
+#include "gui/settings.h"
 #include "cuefile.h"
 #ifdef QT_QTDBUS_FOUND
-#include "powermanagement.h"
+#include "dbus/powermanagement.h"
 #endif
 #include <QDebug>
 static bool debugEnabled=false;
diff --git a/mpd/mpdparseutils.cpp b/mpd/mpdparseutils.cpp
index f3875ca97..f642960e8 100644
--- a/mpd/mpdparseutils.cpp
+++ b/mpd/mpdparseutils.cpp
@@ -29,28 +29,28 @@
 #include <QStringList>
 #include <QUrl>
 #include <QFile>
-#include "dirviewitemroot.h"
-#include "dirviewitemdir.h"
-#include "dirviewitemfile.h"
-#include "musiclibraryitemartist.h"
-#include "musiclibraryitemalbum.h"
-#include "musiclibraryitemsong.h"
-#include "musiclibraryitemroot.h"
+#include "models/dirviewitemroot.h"
+#include "models/dirviewitemdir.h"
+#include "models/dirviewitemfile.h"
+#include "models/musiclibraryitemartist.h"
+#include "models/musiclibraryitemalbum.h"
+#include "models/musiclibraryitemsong.h"
+#include "models/musiclibraryitemroot.h"
 #include "mpdparseutils.h"
 #include "mpdstatus.h"
 #include "mpdstats.h"
 #include "playlist.h"
 #include "song.h"
 #include "output.h"
-#include "covers.h"
+#include "gui/covers.h"
 #ifdef ENABLE_HTTP_SERVER
-#include "httpserver.h"
+#include "http/httpserver.h"
 #endif
-#include "utils.h"
+#include "support/utils.h"
 #include "cuefile.h"
 #include "mpdconnection.h"
 #ifdef ENABLE_ONLINE_SERVICES
-#include "onlineservice.h"
+#include "online/onlineservice.h"
 #endif
 
 #include <QDebug>
diff --git a/mpd/mpduser.cpp b/mpd/mpduser.cpp
index c6ea63f51..5bd27cf61 100644
--- a/mpd/mpduser.cpp
+++ b/mpd/mpduser.cpp
@@ -23,10 +23,10 @@
 
 #include "mpduser.h"
 #include "config.h"
-#include "utils.h"
-#include "localize.h"
-#include "settings.h"
-#include "globalstatic.h"
+#include "support/utils.h"
+#include "support/localize.h"
+#include "gui/settings.h"
+#include "support/globalstatic.h"
 #include <QTextStream>
 #include <QProcess>
 #include <QDir>
diff --git a/mpd/song.cpp b/mpd/song.cpp
index 53c81af38..ed6abb0fd 100644
--- a/mpd/song.cpp
+++ b/mpd/song.cpp
@@ -27,11 +27,8 @@
 #include <cmath>
 #include "config.h"
 #include "song.h"
-#include "musiclibraryitemalbum.h"
-#include "localize.h"
-#ifndef CANTATA_NO_SONG_TIME_FUNCTION
-#include "utils.h"
-#endif
+#include "models/musiclibraryitemalbum.h"
+#include "support/localize.h"
 #include <QMap>
 #include <QStringList>
 #include <QSet>
diff --git a/mpd/song.h b/mpd/song.h
index 6298c66f7..d8e765201 100644
--- a/mpd/song.h
+++ b/mpd/song.h
@@ -32,7 +32,7 @@
 #include <QSet>
 #include <QMetaType>
 #include "config.h"
-#include "utils.h"
+#include "support/utils.h"
 
 struct Song
 {
diff --git a/network/networkaccessmanager.cpp b/network/networkaccessmanager.cpp
index db2f24281..9ad9fabed 100644
--- a/network/networkaccessmanager.cpp
+++ b/network/networkaccessmanager.cpp
@@ -23,9 +23,9 @@
 
 #include "networkaccessmanager.h"
 #include "networkproxyfactory.h"
-#include "settings.h"
+#include "gui/settings.h"
 #include "config.h"
-#include "globalstatic.h"
+#include "support/globalstatic.h"
 #include <QTimerEvent>
 #include <QTimer>
 
diff --git a/network/proxysettings.cpp b/network/proxysettings.cpp
index 6314c7b53..bfe13355b 100644
--- a/network/proxysettings.cpp
+++ b/network/proxysettings.cpp
@@ -23,7 +23,7 @@
 
 #include "proxysettings.h"
 #include "networkproxyfactory.h"
-#include "localize.h"
+#include "support/localize.h"
 #include <QSettings>
 
 ProxySettings::ProxySettings(QWidget *parent)
diff --git a/network/proxysettings.ui b/network/proxysettings.ui
index facade81a..d9823c791 100644
--- a/network/proxysettings.ui
+++ b/network/proxysettings.ui
@@ -126,12 +126,12 @@
   <customwidget>
    <class>LineEdit</class>
    <extends>QLineEdit</extends>
-   <header>lineedit.h</header>
+   <header>support/lineedit.h</header>
   </customwidget>
   <customwidget>
    <class>BuddyLabel</class>
    <extends>QLabel</extends>
-   <header>buddylabel.h</header>
+   <header>support/buddylabel.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/online/jamendoservice.cpp b/online/jamendoservice.cpp
index 3e776fc00..37b9629a8 100644
--- a/online/jamendoservice.cpp
+++ b/online/jamendoservice.cpp
@@ -23,11 +23,11 @@
 
 #include "jamendoservice.h"
 #include "jamendosettingsdialog.h"
-#include "musiclibraryitemartist.h"
-#include "musiclibraryitemalbum.h"
-#include "musiclibraryitemsong.h"
-#include "song.h"
-#include "configuration.h"
+#include "models/musiclibraryitemartist.h"
+#include "models/musiclibraryitemalbum.h"
+#include "models/musiclibraryitemsong.h"
+#include "mpd/song.h"
+#include "support/configuration.h"
 #include "config.h"
 #include <QXmlStreamReader>
 
diff --git a/online/jamendosettingsdialog.cpp b/online/jamendosettingsdialog.cpp
index 8e15a1ea0..76a90bdd8 100644
--- a/online/jamendosettingsdialog.cpp
+++ b/online/jamendosettingsdialog.cpp
@@ -22,8 +22,8 @@
  */
 
 #include "jamendosettingsdialog.h"
-#include "localize.h"
-#include "buddylabel.h"
+#include "support/localize.h"
+#include "support/buddylabel.h"
 #include <QFormLayout>
 
 JamendoSettingsDialog::JamendoSettingsDialog(QWidget *parent)
diff --git a/online/jamendosettingsdialog.h b/online/jamendosettingsdialog.h
index dd21c90f3..ecb917333 100644
--- a/online/jamendosettingsdialog.h
+++ b/online/jamendosettingsdialog.h
@@ -24,7 +24,7 @@
 #ifndef JAMENDO_SETTINGS_DIALOG_H
 #define JAMENDO_SETTINGS_DIALOG_H
 
-#include "dialog.h"
+#include "support/dialog.h"
 #include <QComboBox>
 
 class JamendoSettingsDialog : public Dialog
diff --git a/online/magnatuneservice.cpp b/online/magnatuneservice.cpp
index c7156440a..b7f3a8648 100644
--- a/online/magnatuneservice.cpp
+++ b/online/magnatuneservice.cpp
@@ -23,12 +23,12 @@
 
 #include "magnatuneservice.h"
 #include "magnatunesettingsdialog.h"
-#include "musiclibraryitemartist.h"
-#include "musiclibraryitemalbum.h"
-#include "musiclibraryitemsong.h"
-#include "song.h"
-#include "configuration.h"
-#include "localize.h"
+#include "models/musiclibraryitemartist.h"
+#include "models/musiclibraryitemalbum.h"
+#include "models/musiclibraryitemsong.h"
+#include "mpd/song.h"
+#include "support/configuration.h"
+#include "support/localize.h"
 #include <QXmlStreamReader>
 
 MagnatuneMusicLoader::MagnatuneMusicLoader(const QUrl &src)
diff --git a/online/magnatunesettingsdialog.cpp b/online/magnatunesettingsdialog.cpp
index 07241a1bf..b3c357ca9 100644
--- a/online/magnatunesettingsdialog.cpp
+++ b/online/magnatunesettingsdialog.cpp
@@ -23,8 +23,8 @@
 
 #include "magnatunesettingsdialog.h"
 #include "magnatuneservice.h"
-#include "localize.h"
-#include "buddylabel.h"
+#include "support/localize.h"
+#include "support/buddylabel.h"
 #include <QFormLayout>
 
 MagnatuneSettingsDialog::MagnatuneSettingsDialog(QWidget *parent)
diff --git a/online/magnatunesettingsdialog.h b/online/magnatunesettingsdialog.h
index 6e983b0a4..343fc7062 100644
--- a/online/magnatunesettingsdialog.h
+++ b/online/magnatunesettingsdialog.h
@@ -24,8 +24,8 @@
 #ifndef MAGNATUNE_SETTINGS_DIALOG_H
 #define MAGNATUNE_SETTINGS_DIALOG_H
 
-#include "dialog.h"
-#include "lineedit.h"
+#include "support/dialog.h"
+#include "support/lineedit.h"
 #include <QComboBox>
 
 class BuddyLabel;
diff --git a/online/onlinedevice.cpp b/online/onlinedevice.cpp
index 8958f51ac..a0add19a3 100644
--- a/online/onlinedevice.cpp
+++ b/online/onlinedevice.cpp
@@ -22,11 +22,11 @@
  */
 
 #include "onlinedevice.h"
-#include "musiclibrarymodel.h"
-#include "dirviewmodel.h"
-#include "utils.h"
-#include "networkaccessmanager.h"
-#include "mpdconnection.h"
+#include "models/musiclibrarymodel.h"
+#include "models/dirviewmodel.h"
+#include "support/utils.h"
+#include "network/networkaccessmanager.h"
+#include "mpd/mpdconnection.h"
 #include <QDir>
 
 void OnlineDevice::copySongTo(const Song &s, const QString &musicPath, bool overwrite, bool copyCover)
diff --git a/online/onlinedevice.h b/online/onlinedevice.h
index 8baea36e1..0c1fcca98 100644
--- a/online/onlinedevice.h
+++ b/online/onlinedevice.h
@@ -24,8 +24,8 @@
 #ifndef ONLINE_DEVICE_H
 #define ONLINE_DEVICE_H
 
-#include "device.h"
-#include "song.h"
+#include "devices/device.h"
+#include "mpd/song.h"
 
 class NetworkJob;
 class OnlineDevice : public Device
diff --git a/online/onlineservice.cpp b/online/onlineservice.cpp
index 316375cae..4cd528b7e 100644
--- a/online/onlineservice.cpp
+++ b/online/onlineservice.cpp
@@ -22,15 +22,15 @@
  */
 
 #include "onlineservice.h"
-#include "onlineservicesmodel.h"
-#include "musiclibrarymodel.h"
-#include "utils.h"
-#include "networkaccessmanager.h"
-#include "mpdparseutils.h"
-#include "covers.h"
+#include "models/onlineservicesmodel.h"
+#include "models/musiclibrarymodel.h"
+#include "support/utils.h"
+#include "network/networkaccessmanager.h"
+#include "mpd/mpdparseutils.h"
+#include "gui/covers.h"
 #include "qtiocompressor/qtiocompressor.h"
-#include "thread.h"
-#include "settings.h"
+#include "support/thread.h"
+#include "gui/settings.h"
 #include <QFile>
 #include <QXmlStreamReader>
 
diff --git a/online/onlineservice.h b/online/onlineservice.h
index 5dcca4b37..2b4ad2f12 100644
--- a/online/onlineservice.h
+++ b/online/onlineservice.h
@@ -24,9 +24,9 @@
 #ifndef ONLINE_SERVICE_H
 #define ONLINE_SERVICE_H
 
-#include "musiclibraryitemroot.h"
-#include "song.h"
-#include "localize.h"
+#include "models/musiclibraryitemroot.h"
+#include "mpd/song.h"
+#include "support/localize.h"
 #include <QObject>
 #include <QUrl>
 #include <QModelIndex>
diff --git a/online/onlineservicespage.cpp b/online/onlineservicespage.cpp
index 89adcabf6..100286d95 100644
--- a/online/onlineservicespage.cpp
+++ b/online/onlineservicespage.cpp
@@ -22,23 +22,23 @@
  */
 
 #include "onlineservicespage.h"
-#include "musiclibraryitemroot.h"
-#include "musiclibraryitemartist.h"
-#include "musiclibraryitemalbum.h"
-#include "musiclibraryitemsong.h"
-#include "musiclibraryitempodcast.h"
-#include "onlineservicesmodel.h"
+#include "models/musiclibraryitemroot.h"
+#include "models/musiclibraryitemartist.h"
+#include "models/musiclibraryitemalbum.h"
+#include "models/musiclibraryitemsong.h"
+#include "models/musiclibraryitempodcast.h"
+#include "models/onlineservicesmodel.h"
 #include "jamendoservice.h"
 #include "magnatuneservice.h"
 #include "soundcloudservice.h"
 #include "podcastservice.h"
-#include "settings.h"
-#include "messagebox.h"
-#include "localize.h"
-#include "icons.h"
-#include "stdactions.h"
-#include "actioncollection.h"
-#include "inputdialog.h"
+#include "gui/settings.h"
+#include "support/messagebox.h"
+#include "support/localize.h"
+#include "widgets/icons.h"
+#include "gui/stdactions.h"
+#include "support/actioncollection.h"
+#include "support/inputdialog.h"
 #include "podcastsearchdialog.h"
 #include <QMenu>
 
diff --git a/online/onlineservicespage.h b/online/onlineservicespage.h
index 9bbf41ef3..3e3894a9d 100644
--- a/online/onlineservicespage.h
+++ b/online/onlineservicespage.h
@@ -26,8 +26,8 @@
 
 #include "ui_onlineservicespage.h"
 #include "onlineservice.h"
-#include "musiclibraryproxymodel.h"
-#include "page.h"
+#include "models/musiclibraryproxymodel.h"
+#include "gui/page.h"
 
 class Action;
 class QAction;
diff --git a/online/onlineservicespage.ui b/online/onlineservicespage.ui
index fb5fd890a..622656573 100644
--- a/online/onlineservicespage.ui
+++ b/online/onlineservicespage.ui
@@ -51,27 +51,27 @@
   <customwidget>
    <class>ItemView</class>
    <extends>QTreeView</extends>
-   <header>itemview.h</header>
+   <header>widgets/itemview.h</header>
   </customwidget>
   <customwidget>
    <class>GenreCombo</class>
    <extends>QComboBox</extends>
-   <header>genrecombo.h</header>
+   <header>widgets/genrecombo.h</header>
   </customwidget>
   <customwidget>
    <class>ToolButton</class>
    <extends>QToolButton</extends>
-   <header>toolbutton.h</header>
+   <header>widgets/toolbutton.h</header>
   </customwidget>
   <customwidget>
    <class>MenuButton</class>
    <extends>QToolButton</extends>
-   <header>menubutton.h</header>
+   <header>widgets/menubutton.h</header>
   </customwidget>
   <customwidget>
    <class>SizeWidget</class>
    <extends>QWidget</extends>
-   <header>sizewidget.h</header>
+   <header>widgets/sizewidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/online/onlinesettings.cpp b/online/onlinesettings.cpp
index 325670bdd..753aa99b5 100644
--- a/online/onlinesettings.cpp
+++ b/online/onlinesettings.cpp
@@ -22,12 +22,12 @@
  */
 
 #include "onlinesettings.h"
-#include "onlineservicesmodel.h"
+#include "models/onlineservicesmodel.h"
 #include "onlineservice.h"
-#include "basicitemdelegate.h"
-#include "icon.h"
-#include "localize.h"
-#include "flickcharm.h"
+#include "widgets/basicitemdelegate.h"
+#include "support/icon.h"
+#include "support/localize.h"
+#include "support/flickcharm.h"
 #include <QListWidget>
 
 enum Roles {
diff --git a/online/podcastsearchdialog.cpp b/online/podcastsearchdialog.cpp
index 0153ebbf7..ce4951138 100644
--- a/online/podcastsearchdialog.cpp
+++ b/online/podcastsearchdialog.cpp
@@ -22,20 +22,20 @@
  */
 
 #include "podcastsearchdialog.h"
-#include "pagewidget.h"
-#include "lineedit.h"
-#include "networkaccessmanager.h"
+#include "support/pagewidget.h"
+#include "support/lineedit.h"
+#include "network/networkaccessmanager.h"
 #include "opmlparser.h"
-#include "icons.h"
-#include "spinner.h"
+#include "widgets/icons.h"
+#include "support/spinner.h"
 #include "qjson/parser.h"
-#include "basicitemdelegate.h"
-#include "onlineservicesmodel.h"
+#include "widgets/basicitemdelegate.h"
+#include "models/onlineservicesmodel.h"
 #include "podcastservice.h"
-#include "utils.h"
-#include "action.h"
-#include "textbrowser.h"
-#include "messagewidget.h"
+#include "support/utils.h"
+#include "support/action.h"
+#include "widgets/textbrowser.h"
+#include "support/messagewidget.h"
 #include "rssparser.h"
 #include <QLabel>
 #include <QPushButton>
diff --git a/online/podcastsearchdialog.h b/online/podcastsearchdialog.h
index 76556bac8..b0d26ce3c 100644
--- a/online/podcastsearchdialog.h
+++ b/online/podcastsearchdialog.h
@@ -24,8 +24,8 @@
 #ifndef PODCAST_SEARCH_DIALOG_H
 #define PODCAST_SEARCH_DIALOG_H
 
-#include "dialog.h"
-#include "icon.h"
+#include "support/dialog.h"
+#include "support/icon.h"
 #include <QList>
 #include <QUrl>
 
diff --git a/online/podcastservice.cpp b/online/podcastservice.cpp
index 49bd87458..c58248579 100644
--- a/online/podcastservice.cpp
+++ b/online/podcastservice.cpp
@@ -23,15 +23,14 @@
 
 #include "podcastservice.h"
 #include "podcastsettingsdialog.h"
-#include "networkaccessmanager.h"
-#include "onlineservicesmodel.h"
-#include "musiclibraryitempodcast.h"
-#include "musiclibraryitemsong.h"
-#include "utils.h"
-#include "settings.h"
-#include "mpdconnection.h"
+#include "models/onlineservicesmodel.h"
+#include "models/musiclibraryitempodcast.h"
+#include "models/musiclibraryitemsong.h"
+#include "support/utils.h"
+#include "gui/settings.h"
+#include "mpd/mpdconnection.h"
 #include "config.h"
-#include "httpserver.h"
+#include "http/httpserver.h"
 #include <QCoreApplication>
 #include <QDir>
 #include <QUrl>
diff --git a/online/podcastservice.h b/online/podcastservice.h
index 3f96dc4cc..92d6da917 100644
--- a/online/podcastservice.h
+++ b/online/podcastservice.h
@@ -25,7 +25,7 @@
 #define PODCAST_SERVICE_H
 
 #include "onlineservice.h"
-#include "networkaccessmanager.h"
+#include "network/networkaccessmanager.h"
 #include <QLatin1String>
 #include <QList>
 #include <QDateTime>
diff --git a/online/podcastsettingsdialog.cpp b/online/podcastsettingsdialog.cpp
index 5a320a510..ede7cf7a0 100644
--- a/online/podcastsettingsdialog.cpp
+++ b/online/podcastsettingsdialog.cpp
@@ -22,11 +22,11 @@
  */
 
 #include "podcastsettingsdialog.h"
-#include "buddylabel.h"
-#include "pathrequester.h"
-#include "settings.h"
-#include "localize.h"
-#include "utils.h"
+#include "support/buddylabel.h"
+#include "support/pathrequester.h"
+#include "gui/settings.h"
+#include "support/localize.h"
+#include "support/utils.h"
 #include <QComboBox>
 #include <QCheckBox>
 #include <QFormLayout>
diff --git a/online/podcastsettingsdialog.h b/online/podcastsettingsdialog.h
index 937e7c941..002e611d9 100644
--- a/online/podcastsettingsdialog.h
+++ b/online/podcastsettingsdialog.h
@@ -24,7 +24,7 @@
 #ifndef PODCAST_SETTINGS_DIALOG_H
 #define PODCAST_SETTINGS_DIALOG_H
 
-#include "dialog.h"
+#include "support/dialog.h"
 
 class QComboBox;
 class QCheckBox;
diff --git a/online/soundcloudservice.cpp b/online/soundcloudservice.cpp
index 118dd0fcf..c7ef7c206 100644
--- a/online/soundcloudservice.cpp
+++ b/online/soundcloudservice.cpp
@@ -22,10 +22,10 @@
  */
 
 #include "soundcloudservice.h"
-#include "networkaccessmanager.h"
+#include "network/networkaccessmanager.h"
 #include "qjson/parser.h"
-#include "onlineservicesmodel.h"
-#include "musiclibraryitemsong.h"
+#include "models/onlineservicesmodel.h"
+#include "models/musiclibraryitemsong.h"
 #include "config.h"
 #include <QCoreApplication>
 #include <QUrl>
diff --git a/replaygain/CMakeLists.txt b/replaygain/CMakeLists.txt
index c3c65a63c..1da86068e 100644
--- a/replaygain/CMakeLists.txt
+++ b/replaygain/CMakeLists.txt
@@ -9,7 +9,6 @@ if (FFMPEG_FOUND OR MPG123_FOUND)
         include_directories(${MPG123_INCLUDE_DIRS})
     endif (MPG123_FOUND)
 
-    include_directories(${CMAKE_SOURCE_DIR}/replaygain ${CMAKE_SOURCE_DIR}/support)
     set(CANTATA_RG_SRCS ${CANTATA_RG_SRCS} main.cpp replaygain.cpp trackscanner.cpp jobcontroller.cpp ../support/thread.cpp)
     set(CANTATA_RG_MOC_HDRS ${CANTATA_RG_MOC_HDRS} replaygain.h trackscanner.h jobcontroller.h ../support/thread.h)
 
@@ -42,7 +41,7 @@ if (FFMPEG_FOUND OR MPG123_FOUND)
         target_link_libraries(cantata-replaygain ${EBUR128_LIBRARY})
     else (EBUR128_FOUND)
         message("-- Using supplied libebur128")
-        include_directories(${CMAKE_SOURCE_DIR}/3rdparty/ebur128)
+        include_directories(${CMAKE_SOURCE_DIR}/3rdparty)
         add_subdirectory(${CMAKE_SOURCE_DIR}/3rdparty/ebur128 ${CMAKE_BINARY_DIR}/3rdparty/ebur128)
         target_link_libraries(cantata-replaygain ebur128)
     endif (EBUR128_FOUND)
diff --git a/replaygain/ffmpeginput.cpp b/replaygain/ffmpeginput.cpp
index 7aa5e5031..1323947d5 100644
--- a/replaygain/ffmpeginput.cpp
+++ b/replaygain/ffmpeginput.cpp
@@ -32,7 +32,7 @@ extern "C" {
 #include <QString>
 #include <QList>
 #include <QByteArray>
-#include "ebur128.h"
+#include "ebur128/ebur128.h"
 #include "ffmpeginput.h"
 
 static QMutex mutex;
diff --git a/replaygain/jobcontroller.cpp b/replaygain/jobcontroller.cpp
index d5399cd49..726e8343a 100644
--- a/replaygain/jobcontroller.cpp
+++ b/replaygain/jobcontroller.cpp
@@ -22,8 +22,8 @@
  */
 
 #include "jobcontroller.h"
-#include "thread.h"
-#include "globalstatic.h"
+#include "support/thread.h"
+#include "support/globalstatic.h"
 
 Job::Job()
     : abortRequested(false)
diff --git a/replaygain/mpg123input.cpp b/replaygain/mpg123input.cpp
index 3a614c992..2c84b838a 100644
--- a/replaygain/mpg123input.cpp
+++ b/replaygain/mpg123input.cpp
@@ -19,7 +19,7 @@ extern "C" {
 #include <QFile>
 #include <QString>
 #include <QByteArray>
-#include "ebur128.h"
+#include "ebur128/ebur128.h"
 #include "mpg123input.h"
 
 struct Mpg123Input::Handle {
diff --git a/replaygain/rgdialog.cpp b/replaygain/rgdialog.cpp
index be9248abe..6c0d9b22b 100644
--- a/replaygain/rgdialog.cpp
+++ b/replaygain/rgdialog.cpp
@@ -23,20 +23,20 @@
 
 #include "rgdialog.h"
 #ifdef ENABLE_DEVICES_SUPPORT
-#include "device.h"
-#include "devicesmodel.h"
+#include "devices/device.h"
+#include "models/devicesmodel.h"
 #endif
-#include "settings.h"
-#include "tags.h"
+#include "gui/settings.h"
+#include "tags/tags.h"
 #include "tagreader.h"
-#include "utils.h"
-#include "localize.h"
-#include "messagebox.h"
+#include "support/utils.h"
+#include "support/localize.h"
+#include "support/messagebox.h"
 #include "jobcontroller.h"
-#include "basicitemdelegate.h"
-#include "action.h"
-#include "cuefile.h"
-#include "flickcharm.h"
+#include "widgets/basicitemdelegate.h"
+#include "support/action.h"
+#include "mpd/cuefile.h"
+#include "support/flickcharm.h"
 #include <QComboBox>
 #include <QTreeWidget>
 #include <QLabel>
diff --git a/replaygain/rgdialog.h b/replaygain/rgdialog.h
index 549976341..211126208 100644
--- a/replaygain/rgdialog.h
+++ b/replaygain/rgdialog.h
@@ -25,9 +25,9 @@
 #define _RGDIALOG_H_
 
 #include <QFont>
-#include "songdialog.h"
+#include "widgets/songdialog.h"
 #include "albumscanner.h"
-#include "tags.h"
+#include "tags/tags.h"
 #include "config.h"
 
 class QComboBox;
diff --git a/replaygain/tagreader.cpp b/replaygain/tagreader.cpp
index 86f006620..727331408 100644
--- a/replaygain/tagreader.cpp
+++ b/replaygain/tagreader.cpp
@@ -22,7 +22,6 @@
  */
 
 #include "tagreader.h"
-#include "tags.h"
 
 void TagReader::setDetails(const QList<Song> &s, const QString &dir)
 {
diff --git a/replaygain/tagreader.h b/replaygain/tagreader.h
index 434be5587..66c393894 100644
--- a/replaygain/tagreader.h
+++ b/replaygain/tagreader.h
@@ -25,8 +25,8 @@
 #define _TAGREADER_H_
 
 #include "jobcontroller.h"
-#include "song.h"
-#include "tags.h"
+#include "mpd/song.h"
+#include "tags/tags.h"
 
 class TagReader : public StandardJob
 {
diff --git a/replaygain/trackscanner.h b/replaygain/trackscanner.h
index f1837b7b2..4cf55d4f9 100644
--- a/replaygain/trackscanner.h
+++ b/replaygain/trackscanner.h
@@ -25,7 +25,7 @@
 #define _SCANNER_H_
 
 #include "jobcontroller.h"
-#include "ebur128.h"
+#include "ebur128/ebur128.h"
 
 class Input;
 
diff --git a/streams/digitallyimportedsettings.cpp b/streams/digitallyimportedsettings.cpp
index f5fa75273..3b5c7c0a4 100644
--- a/streams/digitallyimportedsettings.cpp
+++ b/streams/digitallyimportedsettings.cpp
@@ -22,10 +22,10 @@
  */
 
 #include "digitallyimportedsettings.h"
-#include "digitallyimported.h"
-#include "localize.h"
-#include "buddylabel.h"
-#include "lineedit.h"
+#include "models/digitallyimported.h"
+#include "support/localize.h"
+#include "support/buddylabel.h"
+#include "support/lineedit.h"
 #include <QPushButton>
 #include <QComboBox>
 
diff --git a/streams/digitallyimportedsettings.h b/streams/digitallyimportedsettings.h
index 79999da5e..2760312eb 100644
--- a/streams/digitallyimportedsettings.h
+++ b/streams/digitallyimportedsettings.h
@@ -24,8 +24,9 @@
 #ifndef DIGITALLYIMPORTED_SETTINGS_H
 #define DIGITALLYIMPORTED_SETTINGS_H
 
-#include "dialog.h"
+#include "support/dialog.h"
 #include "ui_digitallyimportedsettings.h"
+
 class LineEdit;
 class QComboBox;
 class QPushButton;
diff --git a/streams/digitallyimportedsettings.ui b/streams/digitallyimportedsettings.ui
index 465d76993..1f868ebfa 100644
--- a/streams/digitallyimportedsettings.ui
+++ b/streams/digitallyimportedsettings.ui
@@ -190,12 +190,12 @@
   <customwidget>
    <class>LineEdit</class>
    <extends>QLineEdit</extends>
-   <header>lineedit.h</header>
+   <header>support/lineedit.h</header>
   </customwidget>
   <customwidget>
    <class>BuddyLabel</class>
    <extends>QLabel</extends>
-   <header>buddylabel.h</header>
+   <header>support/buddylabel.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/streams/streamdialog.cpp b/streams/streamdialog.cpp
index e499a1e8b..33f5a36a9 100644
--- a/streams/streamdialog.cpp
+++ b/streams/streamdialog.cpp
@@ -26,13 +26,13 @@
 #include <QValidator>
 #include <QUrl>
 #include "streamdialog.h"
-#include "mainwindow.h"
-#include "settings.h"
-#include "streamsmodel.h"
-#include "localize.h"
-#include "icons.h"
-#include "mpdconnection.h"
-#include "buddylabel.h"
+#include "gui/mainwindow.h"
+#include "gui/settings.h"
+#include "models/streamsmodel.h"
+#include "support/localize.h"
+#include "widgets/icons.h"
+#include "mpd/mpdconnection.h"
+#include "support/buddylabel.h"
 #include "config.h"
     
 class NameValidator : public QValidator
diff --git a/streams/streamdialog.h b/streams/streamdialog.h
index f921b284a..6ef25c81a 100644
--- a/streams/streamdialog.h
+++ b/streams/streamdialog.h
@@ -25,9 +25,9 @@
 #define STREAMDIALOG_H
 
 #include <QSet>
-#include "combobox.h"
-#include "dialog.h"
-#include "lineedit.h"
+#include "support/combobox.h"
+#include "support/dialog.h"
+#include "support/lineedit.h"
 
 class QLabel;
 class BuddyLabel;
diff --git a/streams/streamfetcher.cpp b/streams/streamfetcher.cpp
index b17ac1cce..598a28a62 100644
--- a/streams/streamfetcher.cpp
+++ b/streams/streamfetcher.cpp
@@ -22,11 +22,11 @@
  */
 
 #include "streamfetcher.h"
-#include "networkaccessmanager.h"
-#include "mpdconnection.h"
-#include "mpdparseutils.h"
-#include "streamsmodel.h"
-#include "localize.h"
+#include "network/networkaccessmanager.h"
+#include "mpd/mpdconnection.h"
+#include "mpd/mpdparseutils.h"
+#include "models/streamsmodel.h"
+#include "support/localize.h"
 #include <QRegExp>
 #include <QUrl>
 #include <QXmlStreamReader>
diff --git a/streams/streamproviderlistdialog.cpp b/streams/streamproviderlistdialog.cpp
index 54ebef12a..5a4d10aca 100644
--- a/streams/streamproviderlistdialog.cpp
+++ b/streams/streamproviderlistdialog.cpp
@@ -23,13 +23,14 @@
 
 #include "streamproviderlistdialog.h"
 #include "streamssettings.h"
-#include "networkaccessmanager.h"
-#include "basicitemdelegate.h"
-#include "messagebox.h"
-#include "squeezedtextlabel.h"
-#include "spinner.h"
-#include "messageoverlay.h"
-#include "flickcharm.h"
+#include "network/networkaccessmanager.h"
+#include "widgets/basicitemdelegate.h"
+#include "support/messagebox.h"
+#include "support/squeezedtextlabel.h"
+#include "support/spinner.h"
+#include "widgets/actionitemdelegate.h"
+#include "widgets/messageoverlay.h"
+#include "support/flickcharm.h"
 #include <QLabel>
 #include <QXmlStreamReader>
 #include <QTreeWidget>
diff --git a/streams/streamspage.cpp b/streams/streamspage.cpp
index f77c24fdc..189d26e28 100644
--- a/streams/streamspage.cpp
+++ b/streams/streamspage.cpp
@@ -23,16 +23,16 @@
 
 #include "streamspage.h"
 #include "streamdialog.h"
-#include "mpdconnection.h"
-#include "messagebox.h"
-#include "localize.h"
-#include "icons.h"
-#include "stdactions.h"
-#include "actioncollection.h"
-#include "networkaccessmanager.h"
-#include "settings.h"
-#include "statuslabel.h"
-#include "digitallyimported.h"
+#include "mpd/mpdconnection.h"
+#include "support/messagebox.h"
+#include "support/localize.h"
+#include "widgets/icons.h"
+#include "gui/stdactions.h"
+#include "support/actioncollection.h"
+#include "network/networkaccessmanager.h"
+#include "gui/settings.h"
+#include "widgets/statuslabel.h"
+#include "models/digitallyimported.h"
 #include "digitallyimportedsettings.h"
 #include <QToolButton>
 #ifdef ENABLE_KDE_SUPPORT
diff --git a/streams/streamspage.h b/streams/streamspage.h
index 3390c1495..a461b0096 100644
--- a/streams/streamspage.h
+++ b/streams/streamspage.h
@@ -25,10 +25,10 @@
 #define STREAMSPAGE_H
 
 #include "ui_streamspage.h"
-#include "streamsproxymodel.h"
-#include "streamsearchmodel.h"
-#include "streamsmodel.h"
-#include "page.h"
+#include "models/streamsproxymodel.h"
+#include "models/streamsearchmodel.h"
+#include "models/streamsmodel.h"
+#include "gui/page.h"
 
 class Action;
 class QAction;
diff --git a/streams/streamspage.ui b/streams/streamspage.ui
index a18099478..6278f31fd 100644
--- a/streams/streamspage.ui
+++ b/streams/streamspage.ui
@@ -67,27 +67,27 @@
   <customwidget>
    <class>ItemView</class>
    <extends>QTreeView</extends>
-   <header>itemview.h</header>
+   <header>widgets/itemview.h</header>
   </customwidget>
   <customwidget>
    <class>MenuButton</class>
    <extends>QToolButton</extends>
-   <header>menubutton.h</header>
+   <header>widgets/menubutton.h</header>
   </customwidget>
   <customwidget>
    <class>ToolButton</class>
    <extends>QToolButton</extends>
-   <header>toolbutton.h</header>
+   <header>widgets/toolbutton.h</header>
   </customwidget>
   <customwidget>
    <class>SizeWidget</class>
    <extends>QWidget</extends>
-   <header>sizewidget.h</header>
+   <header>widgets/sizewidget.h</header>
   </customwidget>
   <customwidget>
    <class>ServiceStatusLabel</class>
    <extends>QLabel</extends>
-   <header>servicestatuslabel.h</header>
+   <header>widgets/servicestatuslabel.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/streams/streamssettings.cpp b/streams/streamssettings.cpp
index e78e0b951..8fbb479d1 100644
--- a/streams/streamssettings.cpp
+++ b/streams/streamssettings.cpp
@@ -22,16 +22,16 @@
  */
 
 #include "streamssettings.h"
-#include "streamsmodel.h"
+#include "models/streamsmodel.h"
 #include "streamproviderlistdialog.h"
-#include "basicitemdelegate.h"
-#include "icon.h"
-#include "localize.h"
+#include "widgets/basicitemdelegate.h"
+#include "support/icon.h"
+#include "support/localize.h"
 #include "tar.h"
-#include "messagebox.h"
-#include "utils.h"
+#include "support/messagebox.h"
+#include "support/utils.h"
 #include "digitallyimportedsettings.h"
-#include "flickcharm.h"
+#include "support/flickcharm.h"
 #include <QListWidget>
 #include <QMenu>
 #include <QFileInfo>
diff --git a/support/flickcharm.cpp b/support/flickcharm.cpp
index 71534d8ed..00972a4e6 100644
--- a/support/flickcharm.cpp
+++ b/support/flickcharm.cpp
@@ -23,8 +23,7 @@
 
 #include "flickcharm.h"
 #include "globalstatic.h"
-#include "settings.h"
-#include "support/utils.h"
+#include "utils.h"
 #include <QAbstractScrollArea>
 #include <QAbstractItemView>
 #include <QApplication>
@@ -71,7 +70,7 @@ public:
 
 FlickCharm::FlickCharm(QObject *parent): QObject(parent)
 {
-    d = Settings::self()->touchFriendly() ? new FlickCharmPrivate : 0;
+    d = Utils::touchFriendly() ? new FlickCharmPrivate : 0;
 }
 
 FlickCharm::~FlickCharm()
diff --git a/support/shortcutssettingswidget.h b/support/shortcutssettingswidget.h
index 4d75b7fa1..b724b63b0 100644
--- a/support/shortcutssettingswidget.h
+++ b/support/shortcutssettingswidget.h
@@ -22,7 +22,7 @@
 #define SHORTCUTSSETTINGSWIDGET_H
 
 #include <QSortFilterProxyModel>
-#include "ui_shortcutssettingswidget.h"
+#include "support/ui_shortcutssettingswidget.h"
 
 class ActionCollection;
 class ShortcutsModel;
diff --git a/support/shortcutssettingswidget.ui b/support/shortcutssettingswidget.ui
index b81fe915a..6db7a53df 100644
--- a/support/shortcutssettingswidget.ui
+++ b/support/shortcutssettingswidget.ui
@@ -111,19 +111,19 @@
   <customwidget>
    <class>KeySequenceWidget</class>
    <extends>QWidget</extends>
-   <header>keysequencewidget.h</header>
+   <header>support/keysequencewidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>LineEdit</class>
    <extends>QLineEdit</extends>
-   <header>lineedit.h</header>
+   <header>support/lineedit.h</header>
    <container>0</container>
   </customwidget>
   <customwidget>
    <class>BuddyLabel</class>
    <extends>QLabel</extends>
-   <header>buddylabel.h</header>
+   <header>support/buddylabel.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/tags/CMakeLists.txt b/tags/CMakeLists.txt
index 62d250fa2..caf189e78 100644
--- a/tags/CMakeLists.txt
+++ b/tags/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories(${QTINCLUDES} ${TAGLIB_INCLUDES} ${CMAKE_SOURCE_DIR}/tags)
+include_directories(${QTINCLUDES} ${TAGLIB_INCLUDES})
 set(CANTATA_TAGS_SRCS main.cpp taghelper.cpp tags.cpp filetyperesolver.cpp ../mpd/song.cpp)
 set(CANTATA_TAGS_MOC_HDRS taghelper.h)
 
diff --git a/tags/tageditor.cpp b/tags/tageditor.cpp
index 0847fedfd..8fcfced50 100644
--- a/tags/tageditor.cpp
+++ b/tags/tageditor.cpp
@@ -23,19 +23,19 @@
 
 #include "tageditor.h"
 #include "tags.h"
-#include "tagspinbox.h"
-#include "musiclibrarymodel.h"
-#include "mpdconnection.h"
-#include "settings.h"
-#include "messagebox.h"
-#include "inputdialog.h"
-#include "localize.h"
+#include "widgets/tagspinbox.h"
+#include "models/musiclibrarymodel.h"
+#include "mpd/mpdconnection.h"
+#include "gui/settings.h"
+#include "support/messagebox.h"
+#include "support/inputdialog.h"
+#include "support/localize.h"
 #include "trackorganiser.h"
-#include "cuefile.h"
-#include "utils.h"
+#include "mpd/cuefile.h"
+#include "support/utils.h"
 #ifdef ENABLE_DEVICES_SUPPORT
-#include "devicesmodel.h"
-#include "device.h"
+#include "models/devicesmodel.h"
+#include "devices/device.h"
 #endif
 #include <QMenu>
 #include <QCloseEvent>
diff --git a/tags/tageditor.h b/tags/tageditor.h
index 8529633a9..ff4361d99 100644
--- a/tags/tageditor.h
+++ b/tags/tageditor.h
@@ -25,7 +25,7 @@
 #define TAG_EDITOR_H
 
 #include "config.h"
-#include "songdialog.h"
+#include "widgets/songdialog.h"
 #include "ui_tageditor.h"
 #include <QSet>
 #include <QList>
diff --git a/tags/tageditor.ui b/tags/tageditor.ui
index 1a3021080..e39808fba 100644
--- a/tags/tageditor.ui
+++ b/tags/tageditor.ui
@@ -228,32 +228,32 @@
   <customwidget>
    <class>LineEdit</class>
    <extends>QLineEdit</extends>
-   <header>lineedit.h</header>
+   <header>support/lineedit.h</header>
   </customwidget>
   <customwidget>
    <class>CompletionCombo</class>
    <extends>QComboBox</extends>
-   <header>completioncombo.h</header>
+   <header>widgets/completioncombo.h</header>
   </customwidget>
   <customwidget>
    <class>ComboBox</class>
    <extends>QComboBox</extends>
-   <header>combobox.h</header>
+   <header>support/combobox.h</header>
   </customwidget>
   <customwidget>
    <class>TagSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>tagspinbox.h</header>
+   <header>widgets/tagspinbox.h</header>
   </customwidget>
   <customwidget>
    <class>StateLabel</class>
    <extends>QLabel</extends>
-   <header>statelabel.h</header>
+   <header>widgets/statelabel.h</header>
   </customwidget>
   <customwidget>
    <class>UrlLabel</class>
    <extends>QLabel</extends>
-   <header>urllabel.h</header>
+   <header>support/urllabel.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/tags/taghelperiface.cpp b/tags/taghelperiface.cpp
index e2f8ea699..6b9b1e291 100644
--- a/tags/taghelperiface.cpp
+++ b/tags/taghelperiface.cpp
@@ -24,8 +24,8 @@
 #include "taghelperiface.h"
 #include "tags.h"
 #include "config.h"
-#include "globalstatic.h"
-#include "thread.h"
+#include "support/globalstatic.h"
+#include "support/thread.h"
 #include <QMutexLocker>
 #include <QProcess>
 #include <QDataStream>
diff --git a/tags/taghelperiface.h b/tags/taghelperiface.h
index be2bfdbcc..f4146c17e 100644
--- a/tags/taghelperiface.h
+++ b/tags/taghelperiface.h
@@ -24,7 +24,7 @@
 #ifndef TAG_HELPER_IFACE_H
 #define TAG_HELPER_IFACE_H
 
-#include "song.h"
+#include "mpd/song.h"
 #include <QImage>
 #include <QString>
 #include <QMutex>
diff --git a/tags/tags.cpp b/tags/tags.cpp
index 87b658ff6..2ceeb77d5 100644
--- a/tags/tags.cpp
+++ b/tags/tags.cpp
@@ -24,7 +24,7 @@
 #include "tags.h"
 #include "config.h"
 #include "filetyperesolver.h"
-#include "utils.h"
+#include "support/utils.h"
 #include <algorithm>
 #include <cctype>
 #include <cmath>
diff --git a/tags/tags.h b/tags/tags.h
index fd27a1a6c..cd3ad417f 100644
--- a/tags/tags.h
+++ b/tags/tags.h
@@ -24,8 +24,8 @@
 #ifndef TAGS_H
 #define TAGS_H
 
-#include "song.h"
-#include "utils.h"
+#include "mpd/song.h"
+#include "support/utils.h"
 #include "config.h"
 #include <QImage>
 #include <QMetaType>
diff --git a/tags/trackorganiser.cpp b/tags/trackorganiser.cpp
index 3fbb5de92..a77819ea2 100644
--- a/tags/trackorganiser.cpp
+++ b/tags/trackorganiser.cpp
@@ -22,25 +22,25 @@
  */
 
 #include "trackorganiser.h"
-#include "filenameschemedialog.h"
+#include "devices/filenameschemedialog.h"
 #ifdef ENABLE_DEVICES_SUPPORT
-#include "devicesmodel.h"
+#include "models/devicesmodel.h"
 #endif
-#include "device.h"
-#include "musiclibrarymodel.h"
-#include "dirviewmodel.h"
-#include "settings.h"
-#include "mpdconnection.h"
-#include "utils.h"
-#include "songview.h"
-#include "localize.h"
-#include "messagebox.h"
-#include "icons.h"
-#include "basicitemdelegate.h"
-#include "cuefile.h"
-#include "covers.h"
-#include "contextwidget.h"
-#include "flickcharm.h"
+#include "devices/device.h"
+#include "models/musiclibrarymodel.h"
+#include "models/dirviewmodel.h"
+#include "gui/settings.h"
+#include "mpd/mpdconnection.h"
+#include "support/utils.h"
+#include "context/songview.h"
+#include "support/localize.h"
+#include "support/messagebox.h"
+#include "widgets/icons.h"
+#include "widgets/basicitemdelegate.h"
+#include "mpd/cuefile.h"
+#include "gui/covers.h"
+#include "context/contextwidget.h"
+#include "support/flickcharm.h"
 #include <QTimer>
 #include <QFile>
 #include <QDir>
diff --git a/tags/trackorganiser.h b/tags/trackorganiser.h
index a90b0be1a..7558881fd 100644
--- a/tags/trackorganiser.h
+++ b/tags/trackorganiser.h
@@ -25,10 +25,10 @@
 #define TRACKORGANISER_H
 
 #include "ui_trackorganiser.h"
-#include "songdialog.h"
+#include "widgets/songdialog.h"
 #include "config.h"
 #ifdef ENABLE_DEVICES_SUPPORT
-#include "device.h"
+#include "devices/device.h"
 #else
 #include "deviceoptions.h"
 #endif
diff --git a/tags/trackorganiser.ui b/tags/trackorganiser.ui
index c35cd0615..ea4203eb7 100644
--- a/tags/trackorganiser.ui
+++ b/tags/trackorganiser.ui
@@ -140,17 +140,17 @@
   <customwidget>
    <class>LineEdit</class>
    <extends>QLineEdit</extends>
-   <header>lineedit.h</header>
+   <header>support/lineedit.h</header>
   </customwidget>
   <customwidget>
    <class>BuddyLabel</class>
    <extends>QLabel</extends>
-   <header>buddylabel.h</header>
+   <header>support/buddylabel.h</header>
   </customwidget>
   <customwidget>
    <class>UrlLabel</class>
    <extends>QLabel</extends>
-   <header>urllabel.h</header>
+   <header>support/urllabel.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/ubuntu/backend/mpdbackend.cpp b/ubuntu/backend/mpdbackend.cpp
index ed863312f..83d66c237 100644
--- a/ubuntu/backend/mpdbackend.cpp
+++ b/ubuntu/backend/mpdbackend.cpp
@@ -23,11 +23,11 @@
  */
 
 #include "mpdbackend.h"
-#include "mpdconnection.h"
-#include "currentcover.h"
-#include "covers.h"
-#include "localize.h"
-#include "plurals.h"
+#include "mpd/mpdconnection.h"
+#include "gui/currentcover.h"
+#include "gui/covers.h"
+#include "support/localize.h"
+#include "gui/plurals.h"
 #include <QString>
 #include <QModelIndex>
 
diff --git a/ubuntu/backend/mpdbackend.h b/ubuntu/backend/mpdbackend.h
index 1a6169ed7..2969b9001 100644
--- a/ubuntu/backend/mpdbackend.h
+++ b/ubuntu/backend/mpdbackend.h
@@ -29,17 +29,17 @@
 #include <QString>
 #include <QTimer>
 
-#include "mpdconnection.h"
-#include "albumsmodel.h"
-#include "musiclibrarymodel.h"
-#include "playlistsmodel.h"
-#include "playqueuemodel.h"
-#include "playqueueproxymodel.h"
-#include "musiclibraryproxymodel.h"
-#include "albumsproxymodel.h"
-#include "playlistsproxymodel.h"
-#include "dirviewmodel.h"
-#include "dirviewproxymodel.h"
+#include "mpd/mpdconnection.h"
+#include "models/albumsmodel.h"
+#include "models/musiclibrarymodel.h"
+#include "models/playlistsmodel.h"
+#include "models/playqueuemodel.h"
+#include "models/playqueueproxymodel.h"
+#include "models/musiclibraryproxymodel.h"
+#include "models/albumsproxymodel.h"
+#include "models/playlistsproxymodel.h"
+#include "models/dirviewmodel.h"
+#include "models/dirviewproxymodel.h"
 
 class MPDBackend : public QObject
 {
diff --git a/ubuntu/main.cpp b/ubuntu/main.cpp
index 0aac2dc29..340abe8bf 100644
--- a/ubuntu/main.cpp
+++ b/ubuntu/main.cpp
@@ -29,21 +29,21 @@
 #include <QStandardPaths>
 #include <QDir>
 
-#include "mpdconnection.h"
-#include "song.h"
-#include "mpdparseutils.h"
-#include "settings.h"
-#include "thread.h"
+#include "mpd/mpdconnection.h"
+#include "mpd/song.h"
+#include "mpd/mpdparseutils.h"
+#include "gui/settings.h"
+#include "support/thread.h"
 #include "ubuntu/backend/mpdbackend.h"
-#include "utils.h"
-#include "musiclibrarymodel.h"
-#include "albumsmodel.h"
-#include "playlistsmodel.h"
-#include "currentcover.h"
+#include "support/utils.h"
+#include "models/musiclibrarymodel.h"
+#include "models/albumsmodel.h"
+#include "models/playlistsmodel.h"
+#include "gui/currentcover.h"
 #include "config.h"
 
 // To enable debug...
-#include "covers.h"
+#include "gui/covers.h"
 //#include "wikipediaengine.h"
 //#include "lastfmengine.h"
 //#include "metaengine.h"
@@ -54,7 +54,7 @@
 //#include "streamfetcher.h"
 //#include "httpserver.h"
 //#include "songdialog.h"
-#include "networkaccessmanager.h"
+#include "network/networkaccessmanager.h"
 //#include "ultimatelyricsprovider.h"
 //#ifdef ENABLE_EXTERNAL_TAGS
 //#include "taghelperiface.h"
diff --git a/widgets/actionitemdelegate.cpp b/widgets/actionitemdelegate.cpp
index c10e64204..c04e36eec 100644
--- a/widgets/actionitemdelegate.cpp
+++ b/widgets/actionitemdelegate.cpp
@@ -22,11 +22,11 @@
  */
 
 #include "actionitemdelegate.h"
-#include "roles.h"
-#include "icon.h"
-#include "utils.h"
+#include "models/roles.h"
+#include "support/icon.h"
+#include "support/utils.h"
 #include "config.h"
-#include "actionmodel.h"
+#include "models/actionmodel.h"
 #include "groupedview.h"
 #include <QPainter>
 #include <QPixmap>
diff --git a/widgets/autohidingsplitter.cpp b/widgets/autohidingsplitter.cpp
index 1f048507b..117d2e139 100644
--- a/widgets/autohidingsplitter.cpp
+++ b/widgets/autohidingsplitter.cpp
@@ -23,8 +23,8 @@
  */
 
 #include "autohidingsplitter.h"
-#include "gtkstyle.h"
-#include "utils.h"
+#include "support/gtkstyle.h"
+#include "support/utils.h"
 #include <QSplitterHandle>
 #include <QTimer>
 #include <QChildEvent>
diff --git a/widgets/basicitemdelegate.cpp b/widgets/basicitemdelegate.cpp
index ba02208ba..2d4859ded 100644
--- a/widgets/basicitemdelegate.cpp
+++ b/widgets/basicitemdelegate.cpp
@@ -22,8 +22,8 @@
  */
 
 #include "basicitemdelegate.h"
-#include "gtkstyle.h"
-#include "utils.h"
+#include "support/gtkstyle.h"
+#include "support/utils.h"
 #include <QPainter>
 #include <QStyle>
 #include <QStyledItemDelegate>
diff --git a/widgets/completioncombo.h b/widgets/completioncombo.h
index 7040e19f6..01bf5e8b9 100644
--- a/widgets/completioncombo.h
+++ b/widgets/completioncombo.h
@@ -67,8 +67,8 @@
 //     }
 // };
 // #else
-#include "combobox.h"
-#include "lineedit.h"
+#include "support/combobox.h"
+#include "support/lineedit.h"
 #include <QAbstractItemView>
 
 class CompletionCombo : public ComboBox
diff --git a/widgets/genrecombo.cpp b/widgets/genrecombo.cpp
index 68b163f74..fd6b10b42 100644
--- a/widgets/genrecombo.cpp
+++ b/widgets/genrecombo.cpp
@@ -23,9 +23,9 @@
 
 #include "genrecombo.h"
 #include "toolbutton.h"
-#include "localize.h"
-#include "actioncollection.h"
-#include "action.h"
+#include "support/localize.h"
+#include "support/actioncollection.h"
+#include "support/action.h"
 #include <QEvent>
 
 static Action *action=0;
diff --git a/widgets/genrecombo.h b/widgets/genrecombo.h
index b6885227e..2d24597c4 100644
--- a/widgets/genrecombo.h
+++ b/widgets/genrecombo.h
@@ -24,7 +24,7 @@
 #ifndef GENRECOMBO_H
 #define GENRECOMBO_H
 
-#include "combobox.h"
+#include "support/combobox.h"
 #include <QSet>
 
 class GenreCombo : public ComboBox
diff --git a/widgets/groupedview.cpp b/widgets/groupedview.cpp
index e78b7e9e2..9ef8723ac 100644
--- a/widgets/groupedview.cpp
+++ b/widgets/groupedview.cpp
@@ -21,20 +21,20 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "covers.h"
+#include "gui/covers.h"
 #include "groupedview.h"
-#include "mpdstatus.h"
-#include "song.h"
+#include "mpd/mpdstatus.h"
+#include "mpd/song.h"
 #include "actionitemdelegate.h"
 #include "basicitemdelegate.h"
 #include "itemview.h"
 #include "config.h"
-#include "localize.h"
-#include "plurals.h"
-#include "icons.h"
-#include "gtkstyle.h"
-#include "flickcharm.h"
-#include "roles.h"
+#include "support/localize.h"
+#include "gui/plurals.h"
+#include "widgets/icons.h"
+#include "support/gtkstyle.h"
+#include "support/flickcharm.h"
+#include "models/roles.h"
 #include <QStyledItemDelegate>
 #include <QApplication>
 #include <QFontMetrics>
diff --git a/widgets/icons.cpp b/widgets/icons.cpp
index 8b519a797..5c5d6fd0d 100644
--- a/widgets/icons.cpp
+++ b/widgets/icons.cpp
@@ -23,8 +23,8 @@
 
 #include "icons.h"
 #include "config.h"
-#include "settings.h"
-#include "globalstatic.h"
+#include "gui/settings.h"
+#include "support/globalstatic.h"
 #include <QApplication>
 #include <QPixmap>
 #include <QFont>
@@ -34,7 +34,7 @@
 #include <QFile>
 #include <math.h>
 #if !defined Q_OS_WIN && !defined Q_OS_MAC && !defined ENABLE_UBUNTU
-#include "gtkstyle.h"
+#include "support/gtkstyle.h"
 #endif
 
 GLOBAL_STATIC(Icons, instance)
diff --git a/widgets/icons.h b/widgets/icons.h
index cc877c45c..42b6a6522 100644
--- a/widgets/icons.h
+++ b/widgets/icons.h
@@ -24,7 +24,7 @@
 #ifndef ICONS_H
 #define ICONS_H
 
-#include "icon.h"
+#include "support/icon.h"
 #include "config.h"
 
 class QColor;
diff --git a/widgets/itemview.cpp b/widgets/itemview.cpp
index d98ea3c3d..4cd1a0cde 100644
--- a/widgets/itemview.cpp
+++ b/widgets/itemview.cpp
@@ -24,20 +24,20 @@
 #include "itemview.h"
 #include "groupedview.h"
 #include "tableview.h"
-#include "roles.h"
-#include "covers.h"
-#include "proxymodel.h"
+#include "models/roles.h"
+#include "gui/covers.h"
+#include "models/proxymodel.h"
 #include "actionitemdelegate.h"
 #include "basicitemdelegate.h"
-#include "actionmodel.h"
-#include "localize.h"
-#include "icon.h"
+#include "models/actionmodel.h"
+#include "support/localize.h"
+#include "support/icon.h"
 #include "config.h"
-#include "gtkstyle.h"
-#include "spinner.h"
+#include "support/gtkstyle.h"
+#include "support/spinner.h"
 #include "messageoverlay.h"
-#include "action.h"
-#include "actioncollection.h"
+#include "support/action.h"
+#include "support/actioncollection.h"
 #include <QToolButton>
 #include <QStyle>
 #include <QStyleOptionViewItem>
diff --git a/widgets/itemview.ui b/widgets/itemview.ui
index 907d56903..41ef8c0be 100644
--- a/widgets/itemview.ui
+++ b/widgets/itemview.ui
@@ -59,22 +59,22 @@
   <customwidget>
    <class>PaddedSqueezedTextLabel</class>
    <extends>QLabel</extends>
-   <header>squeezedtextlabel.h</header>
+   <header>support/squeezedtextlabel.h</header>
   </customwidget>
   <customwidget>
    <class>SearchWidget</class>
    <extends>QLineEdit</extends>
-   <header>searchwidget.h</header>
+   <header>widgets/searchwidget.h</header>
   </customwidget>
   <customwidget>
    <class>TreeView</class>
    <extends>QTreeView</extends>
-   <header>treeview.h</header>
+   <header>widgets/treeview.h</header>
   </customwidget>
   <customwidget>
    <class>ListView</class>
    <extends>QListView</extends>
-   <header>listview.h</header>
+   <header>widgets/listview.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/widgets/listview.cpp b/widgets/listview.cpp
index 7b7460416..1b96eb0d5 100644
--- a/widgets/listview.cpp
+++ b/widgets/listview.cpp
@@ -26,8 +26,8 @@
 #include "treeview.h"
 #include "config.h"
 #include "icons.h"
-#include "utils.h"
-#include "flickcharm.h"
+#include "support/utils.h"
+#include "support/flickcharm.h"
 #include <QMimeData>
 #include <QDrag>
 #include <QMouseEvent>
diff --git a/widgets/menubutton.cpp b/widgets/menubutton.cpp
index 6a7aadf97..2ba087a0c 100644
--- a/widgets/menubutton.cpp
+++ b/widgets/menubutton.cpp
@@ -22,9 +22,9 @@
  */
 
 #include "menubutton.h"
-#include "icon.h"
+#include "support/icon.h"
 #include "icons.h"
-#include "localize.h"
+#include "support/localize.h"
 #include <QAction>
 #include <QMenu>
 #include <QEvent>
diff --git a/widgets/messageoverlay.cpp b/widgets/messageoverlay.cpp
index a363b4c7a..0e8ce1c20 100644
--- a/widgets/messageoverlay.cpp
+++ b/widgets/messageoverlay.cpp
@@ -24,7 +24,7 @@
 #include "messageoverlay.h"
 #include "toolbutton.h"
 #include "icons.h"
-#include "localize.h"
+#include "support/localize.h"
 #include <QPainter>
 #include <QPaintEvent>
 #include <QTimer>
diff --git a/widgets/playqueueview.cpp b/widgets/playqueueview.cpp
index 04c4745e1..2e849c41b 100644
--- a/widgets/playqueueview.cpp
+++ b/widgets/playqueueview.cpp
@@ -22,22 +22,22 @@
  */
 
 #include "playqueueview.h"
-#include "playqueuemodel.h"
-#include "covers.h"
-#include "currentcover.h"
+#include "models/playqueuemodel.h"
+#include "gui/covers.h"
+#include "gui/currentcover.h"
 #include "groupedview.h"
 #include "treeview.h"
-#include "settings.h"
-#include "mpdstatus.h"
-#include "localize.h"
-#include "spinner.h"
+#include "gui/settings.h"
+#include "mpd/mpdstatus.h"
+#include "support/localize.h"
+#include "support/spinner.h"
 #include "messageoverlay.h"
 #include "basicitemdelegate.h"
 #include "icons.h"
-#include "gtkstyle.h"
-#include "actioncollection.h"
-#include "action.h"
-#include "roles.h"
+#include "support/gtkstyle.h"
+#include "support/actioncollection.h"
+#include "support/action.h"
+#include "models/roles.h"
 #include <QFile>
 #include <QPainter>
 #include <QApplication>
diff --git a/widgets/playqueueview.h b/widgets/playqueueview.h
index 57a834eaa..2bd25f532 100644
--- a/widgets/playqueueview.h
+++ b/widgets/playqueueview.h
@@ -33,7 +33,7 @@
 #include "tableview.h"
 #include "listview.h"
 #include "groupedview.h"
-#include "song.h"
+#include "mpd/song.h"
 #include "itemview.h"
 
 class QAbstractItemModel;
diff --git a/widgets/searchwidget.cpp b/widgets/searchwidget.cpp
index f3d250a06..0c9db176b 100644
--- a/widgets/searchwidget.cpp
+++ b/widgets/searchwidget.cpp
@@ -22,9 +22,9 @@
  */
 
 #include "searchwidget.h"
-#include "icon.h"
+#include "support/icon.h"
 #include "toolbutton.h"
-#include "localize.h"
+#include "support/localize.h"
 #include <QGridLayout>
 #include <QKeyEvent>
 #include <QKeySequence>
diff --git a/widgets/searchwidget.h b/widgets/searchwidget.h
index f4d04eab4..cde435a46 100644
--- a/widgets/searchwidget.h
+++ b/widgets/searchwidget.h
@@ -24,10 +24,10 @@
 #ifndef SEARRCHWIDGET_H
 #define SEARRCHWIDGET_H
 
-#include "lineedit.h"
+#include "support/lineedit.h"
 #include "toolbutton.h"
-#include "squeezedtextlabel.h"
-#include "combobox.h"
+#include "support/squeezedtextlabel.h"
+#include "support/combobox.h"
 #include <QSet>
 #include <QList>
 #include <QPair>
diff --git a/widgets/servicestatuslabel.cpp b/widgets/servicestatuslabel.cpp
index d785a889e..6ad2680d9 100644
--- a/widgets/servicestatuslabel.cpp
+++ b/widgets/servicestatuslabel.cpp
@@ -22,7 +22,7 @@
  */
 
 #include "servicestatuslabel.h"
-#include "localize.h"
+#include "support/localize.h"
 #include <QPalette>
 #include <QStyle>
 #include <QApplication>
diff --git a/widgets/sizewidget.cpp b/widgets/sizewidget.cpp
index 84811fa0c..d6be074d9 100644
--- a/widgets/sizewidget.cpp
+++ b/widgets/sizewidget.cpp
@@ -22,7 +22,6 @@
  */
 
 #include "sizewidget.h"
-#include "combobox.h"
 #include "toolbutton.h"
 #include "icons.h"
 
diff --git a/widgets/sizewidget.h b/widgets/sizewidget.h
index a716cc38b..472be00c4 100644
--- a/widgets/sizewidget.h
+++ b/widgets/sizewidget.h
@@ -25,7 +25,7 @@
 #define SIZEWIDGET_H
 
 #include <QWidget>
-#include "combobox.h"
+#include "support/combobox.h"
 
 class SizeWidget : public ComboBox
 {
diff --git a/widgets/songdialog.cpp b/widgets/songdialog.cpp
index 3d3cdc2b8..8be5640b7 100644
--- a/widgets/songdialog.cpp
+++ b/widgets/songdialog.cpp
@@ -22,8 +22,8 @@
  */
 
 #include "songdialog.h"
-#include "messagebox.h"
-#include "localize.h"
+#include "support/messagebox.h"
+#include "support/localize.h"
 #include <QFile>
 
 #include <QDebug>
diff --git a/widgets/songdialog.h b/widgets/songdialog.h
index 45ee44599..87d32e800 100644
--- a/widgets/songdialog.h
+++ b/widgets/songdialog.h
@@ -24,8 +24,8 @@
 #ifndef SONG_DIALOG_H
 #define SONG_DIALOG_H
 
-#include "dialog.h"
-#include "song.h"
+#include "support/dialog.h"
+#include "mpd/song.h"
 
 class SongDialog : public Dialog
 {
diff --git a/widgets/songlabel.cpp b/widgets/songlabel.cpp
index 838b6c9e1..412ab95e4 100644
--- a/widgets/songlabel.cpp
+++ b/widgets/songlabel.cpp
@@ -22,8 +22,8 @@
  */
 
 #include "songlabel.h"
-#include "localize.h"
-#include "song.h"
+#include "support/localize.h"
+#include "mpd/song.h"
 #include <QFontMetrics>
 
 QFontMetrics bm(QFont f)
diff --git a/widgets/statelabel.h b/widgets/statelabel.h
index 003dff3ef..2b6305124 100644
--- a/widgets/statelabel.h
+++ b/widgets/statelabel.h
@@ -24,7 +24,7 @@
 #ifndef STATELABEL_H
 #define STATELABEL_H
 
-#include "buddylabel.h"
+#include "support/buddylabel.h"
 
 class StateLabel : public BuddyLabel
 {
diff --git a/widgets/statuslabel.cpp b/widgets/statuslabel.cpp
index 87e6e84b7..a31b3418a 100644
--- a/widgets/statuslabel.cpp
+++ b/widgets/statuslabel.cpp
@@ -22,7 +22,7 @@
  */
 
 #include "statuslabel.h"
-#include "icon.h"
+#include "support/icon.h"
 #include <QLabel>
 #include <QHBoxLayout>
 #include <QApplication>
diff --git a/widgets/statuslabel.h b/widgets/statuslabel.h
index 8dbab5f3c..2f904f841 100644
--- a/widgets/statuslabel.h
+++ b/widgets/statuslabel.h
@@ -25,7 +25,7 @@
 #define STATUSLABEL_H
 
 #include <QFrame>
-#include "squeezedtextlabel.h"
+#include "support/squeezedtextlabel.h"
 
 class QLabel;
 
diff --git a/widgets/tableview.cpp b/widgets/tableview.cpp
index 2925d5fdd..f9ef2da13 100644
--- a/widgets/tableview.cpp
+++ b/widgets/tableview.cpp
@@ -23,9 +23,9 @@
 
 #include "tableview.h"
 #include "stretchheaderview.h"
-#include "settings.h"
-#include "localize.h"
-#include "roles.h"
+#include "gui/settings.h"
+#include "support/localize.h"
+#include "models/roles.h"
 #include <QMenu>
 #include <QAction>
 
diff --git a/widgets/tagspinbox.cpp b/widgets/tagspinbox.cpp
index b23373712..553e73535 100644
--- a/widgets/tagspinbox.cpp
+++ b/widgets/tagspinbox.cpp
@@ -22,7 +22,7 @@
  */
 
 #include "tagspinbox.h"
-#include "localize.h"
+#include "support/localize.h"
 #include <QPainter>
 #include <QLineEdit>
 
diff --git a/widgets/thinsplitterhandle.cpp b/widgets/thinsplitterhandle.cpp
index f9c691325..f8ede1f93 100644
--- a/widgets/thinsplitterhandle.cpp
+++ b/widgets/thinsplitterhandle.cpp
@@ -22,7 +22,7 @@
  */
  
 #include "thinsplitterhandle.h"
-#include "utils.h"
+#include "support/utils.h"
 #include <QResizeEvent>
 #include <QPainter>
 
diff --git a/widgets/timeslider.cpp b/widgets/timeslider.cpp
index 7627643c1..95ae02a1f 100644
--- a/widgets/timeslider.cpp
+++ b/widgets/timeslider.cpp
@@ -22,9 +22,9 @@
  */
 
 #include "timeslider.h"
-#include "song.h"
-#include "settings.h"
-#include "mpdconnection.h"
+#include "mpd/song.h"
+#include "gui/settings.h"
+#include "mpd/mpdconnection.h"
 #include <QLabel>
 #include <QHBoxLayout>
 #include <QProxyStyle>
diff --git a/widgets/toolbutton.cpp b/widgets/toolbutton.cpp
index d0a1f25ae..d5e1ffdde 100644
--- a/widgets/toolbutton.cpp
+++ b/widgets/toolbutton.cpp
@@ -22,10 +22,10 @@
  */
 
 #include "toolbutton.h"
-#include "icon.h"
-#include "gtkstyle.h"
+#include "support/icon.h"
+#include "support/gtkstyle.h"
 #include "config.h"
-#include "utils.h"
+#include "support/utils.h"
 #include <QMenu>
 #include <QStylePainter>
 #include <QStyleOptionToolButton>
diff --git a/widgets/treeview.cpp b/widgets/treeview.cpp
index 177a5207a..58b65f92b 100644
--- a/widgets/treeview.cpp
+++ b/widgets/treeview.cpp
@@ -22,12 +22,12 @@
  */
 
 #include "treeview.h"
-#include "roles.h"
+#include "models/roles.h"
 #include "icons.h"
 #include "config.h"
 #include "basicitemdelegate.h"
-#include "utils.h"
-#include "flickcharm.h"
+#include "support/utils.h"
+#include "support/flickcharm.h"
 #include <QMouseEvent>
 #include <QPaintEvent>
 #include <QPainter>
diff --git a/widgets/volumeslider.cpp b/widgets/volumeslider.cpp
index 67e6bff1e..2f45b0d24 100644
--- a/widgets/volumeslider.cpp
+++ b/widgets/volumeslider.cpp
@@ -22,14 +22,14 @@
  */
 
 #include "volumeslider.h"
-#include "localize.h"
-#include "mpdconnection.h"
-#include "mpdstatus.h"
-#include "action.h"
-#include "actioncollection.h"
-#include "stdactions.h"
-#include "utils.h"
-#include "settings.h"
+#include "support/localize.h"
+#include "mpd/mpdconnection.h"
+#include "mpd/mpdstatus.h"
+#include "support/action.h"
+#include "support/actioncollection.h"
+#include "gui/stdactions.h"
+#include "support/utils.h"
+#include "gui/settings.h"
 #include <QStyle>
 #include <QPainter>
 #include <QPainterPath>
diff --git a/widgets/wizardpage.cpp b/widgets/wizardpage.cpp
index e2b80978e..704af7be0 100644
--- a/widgets/wizardpage.cpp
+++ b/widgets/wizardpage.cpp
@@ -22,8 +22,8 @@
  */
 
 #include "wizardpage.h"
-#include "icon.h"
-#include "utils.h"
+#include "support/icon.h"
+#include "support/utils.h"
 #include <QPainter>
 #include <QStyle>