diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
index b0319158f..af0f8be22 100644
--- a/src/libtomahawk/CMakeLists.txt
+++ b/src/libtomahawk/CMakeLists.txt
@@ -38,7 +38,6 @@ set( libGuiSources
     playlist/InboxModel.cpp
     playlist/InboxView.cpp
     playlist/ContextView.cpp
-    playlist/PlaylistViewPage.cpp
     playlist/FlexibleTreeView.cpp
     playlist/TreeModel.cpp
     playlist/TreeProxyModel.cpp
@@ -116,6 +115,13 @@ set( libGuiSources
     utils/NetworkAccessManager.cpp
     utils/ShortLinkHelper.cpp
 
+    viewpages/SearchViewPage.cpp
+    viewpages/SourceViewPage.cpp
+    viewpages/ArtistViewPage.cpp
+    viewpages/AlbumViewPage.cpp
+    viewpages/TrackViewPage.cpp
+    viewpages/PlaylistViewPage.cpp
+
     widgets/AnimatedCounterLabel.cpp
     widgets/AnimatedSplitter.cpp
     widgets/BasicHeader.cpp
@@ -146,11 +152,7 @@ set( libGuiSources
     widgets/SeekSlider.cpp
     widgets/SourceTreePopupDialog.cpp
     widgets/ToggleButton.cpp
-    viewpages/SearchViewPage.cpp
-    viewpages/SourceViewPage.cpp
-    viewpages/ArtistViewPage.cpp
-    viewpages/AlbumViewPage.cpp
-    viewpages/TrackViewPage.cpp
+
     widgets/searchlineedit/ClearButton.cpp
     widgets/searchlineedit/LineEdit.cpp
     widgets/searchlineedit/SearchButton.cpp
diff --git a/src/libtomahawk/ViewManager.cpp b/src/libtomahawk/ViewManager.cpp
index 15ce28787..4090a324f 100644
--- a/src/libtomahawk/ViewManager.cpp
+++ b/src/libtomahawk/ViewManager.cpp
@@ -21,9 +21,11 @@
 
 #include "ViewManager.h"
 
+#include "SourceList.h"
+#include "TomahawkSettings.h"
+
 #include "audio/AudioEngine.h"
 
-#include "playlist/PlaylistViewPage.h"
 #include "playlist/ContextView.h"
 #include "playlist/FlexibleTreeView.h"
 #include "playlist/TreeModel.h"
@@ -34,20 +36,21 @@
 #include "playlist/ColumnView.h"
 #include "playlist/GridView.h"
 #include "playlist/AlbumModel.h"
-#include "SourceList.h"
-#include "TomahawkSettings.h"
-
 #include "playlist/InboxModel.h"
 #include "playlist/InboxView.h"
 #include "playlist/TrackItemDelegate.h"
 #include "playlist/RecentlyPlayedModel.h"
 #include "playlist/dynamic/widgets/DynamicWidget.h"
+
 #include "resolvers/ScriptCollection.h"
-#include "widgets/NewReleasesWidget.h"
+
+#include "viewpages/PlaylistViewPage.h"
 #include "viewpages/SourceViewPage.h"
 #include "viewpages/ArtistViewPage.h"
 #include "viewpages/AlbumViewPage.h"
 #include "viewpages/TrackViewPage.h"
+
+#include "widgets/NewReleasesWidget.h"
 #include "widgets/AnimatedSplitter.h"
 
 #include "utils/Logger.h"
diff --git a/src/libtomahawk/playlist/InboxView.h b/src/libtomahawk/playlist/InboxView.h
index 16393808c..98da3c64e 100644
--- a/src/libtomahawk/playlist/InboxView.h
+++ b/src/libtomahawk/playlist/InboxView.h
@@ -22,7 +22,7 @@
 #define INBOXVIEW_H
 
 #include "TrackView.h"
-#include "PlaylistViewPage.h"
+#include "viewpages/PlaylistViewPage.h"
 
 class InboxView : public TrackView
 {
diff --git a/src/libtomahawk/playlist/QueueView.h b/src/libtomahawk/playlist/QueueView.h
index 2a8fa4cb1..837eae07a 100644
--- a/src/libtomahawk/playlist/QueueView.h
+++ b/src/libtomahawk/playlist/QueueView.h
@@ -19,7 +19,7 @@
 #ifndef QUEUEVIEW_H
 #define QUEUEVIEW_H
 
-#include "playlist/PlaylistViewPage.h"
+#include "viewpages/PlaylistViewPage.h"
 
 #include "DllMacro.h"
 
diff --git a/src/libtomahawk/playlist/PlaylistViewPage.cpp b/src/libtomahawk/viewpages/PlaylistViewPage.cpp
similarity index 98%
rename from src/libtomahawk/playlist/PlaylistViewPage.cpp
rename to src/libtomahawk/viewpages/PlaylistViewPage.cpp
index 754724bf8..f7a05f414 100644
--- a/src/libtomahawk/playlist/PlaylistViewPage.cpp
+++ b/src/libtomahawk/viewpages/PlaylistViewPage.cpp
@@ -25,7 +25,7 @@
 #include "widgets/FilterHeader.h"
 #include "playlist/ContextView.h"
 #include "playlist/TrackView.h"
-#include "PlayableProxyModelPlaylistInterface.h"
+#include "playlist/PlayableProxyModelPlaylistInterface.h"
 #include "utils/TomahawkUtilsGui.h"
 #include "utils/ImageRegistry.h"
 #include "utils/Logger.h"
diff --git a/src/libtomahawk/playlist/PlaylistViewPage.h b/src/libtomahawk/viewpages/PlaylistViewPage.h
similarity index 100%
rename from src/libtomahawk/playlist/PlaylistViewPage.h
rename to src/libtomahawk/viewpages/PlaylistViewPage.h
diff --git a/src/libtomahawk/widgets/HistoryWidget.h b/src/libtomahawk/widgets/HistoryWidget.h
index 1929f6894..348417ab9 100644
--- a/src/libtomahawk/widgets/HistoryWidget.h
+++ b/src/libtomahawk/widgets/HistoryWidget.h
@@ -19,7 +19,7 @@
 #ifndef HISTORY_WIDGET_H
 #define HISTORY_WIDGET_H
 
-#include "playlist/PlaylistViewPage.h"
+#include "viewpages/PlaylistViewPage.h"
 #include "Query.h"
 #include "Source.h"
 #include "DllMacro.h"
diff --git a/src/tomahawk/sourcetree/items/LovedTracksItem.cpp b/src/tomahawk/sourcetree/items/LovedTracksItem.cpp
index d1b4d75f6..5ba9b4af5 100644
--- a/src/tomahawk/sourcetree/items/LovedTracksItem.cpp
+++ b/src/tomahawk/sourcetree/items/LovedTracksItem.cpp
@@ -24,7 +24,7 @@
 #include "DropJob.h"
 #include "ViewManager.h"
 
-#include "playlist/PlaylistViewPage.h"
+#include "viewpages/PlaylistViewPage.h"
 #include "playlist/ContextView.h"
 #include "playlist/TrackView.h"
 #include "playlist/TopLovedTracksModel.h"
diff --git a/src/tomahawk/sourcetree/items/SourceItem.cpp b/src/tomahawk/sourcetree/items/SourceItem.cpp
index 92102a37b..775ff28f1 100644
--- a/src/tomahawk/sourcetree/items/SourceItem.cpp
+++ b/src/tomahawk/sourcetree/items/SourceItem.cpp
@@ -35,12 +35,12 @@
 #include "Source.h"
 #include "SourceList.h"
 #include "playlist/ContextView.h"
-#include "playlist/PlaylistViewPage.h"
 #include "playlist/TrackView.h"
 #include "playlist/RecentlyAddedModel.h"
 #include "playlist/RecentlyPlayedModel.h"
 #include "sip/PeerInfo.h"
 #include "sip/SipPlugin.h"
+#include "viewpages/PlaylistViewPage.h"
 #include "widgets/HistoryWidget.h"
 #include "utils/ImageRegistry.h"
 #include "utils/TomahawkUtilsGui.h"