diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
index 4b88df85a..711381a61 100644
--- a/src/libtomahawk/CMakeLists.txt
+++ b/src/libtomahawk/CMakeLists.txt
@@ -145,14 +145,14 @@ set( libGuiSources
widgets/RecentlyPlayedPlaylistsModel.cpp
widgets/ScriptCollectionHeader.cpp
widgets/ScrollingLabel.cpp
- widgets/SearchWidget.cpp
widgets/SeekSlider.cpp
widgets/SourceTreePopupDialog.cpp
widgets/ToggleButton.cpp
- widgets/infowidgets/SourceInfoWidget.cpp
- widgets/infowidgets/ArtistInfoWidget.cpp
- widgets/infowidgets/AlbumInfoWidget.cpp
- widgets/infowidgets/TrackInfoWidget.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
@@ -373,13 +373,13 @@ ENDIF(LIBLASTFM_FOUND)
set( libUI ${libUI}
widgets/PlaylistTypeSelectorDialog.ui
widgets/NewPlaylistWidget.ui
- widgets/SearchWidget.ui
widgets/HeaderWidget.ui
widgets/NewReleasesWidget.ui
- widgets/infowidgets/SourceInfoWidget.ui
- widgets/infowidgets/ArtistInfoWidget.ui
- widgets/infowidgets/AlbumInfoWidget.ui
- widgets/infowidgets/TrackInfoWidget.ui
+ viewpages/SearchViewPage.ui
+ viewpages/SourceViewPage.ui
+ viewpages/ArtistViewPage.ui
+ viewpages/AlbumViewPage.ui
+ viewpages/TrackViewPage.ui
playlist/QueueView.ui
filemetadata/MetadataEditor.ui
accounts/AccountFactoryWrapper.ui
@@ -566,7 +566,7 @@ file( GLOB thirdpartyKdsingleapplicationguardHeaders "thirdparty/kdsingleapplica
file( GLOB thirdpartyQocoaHeaders "thirdparty/Qocoa/*.h" )
file( GLOB utilsHeaders "utils/*.h" )
file( GLOB widgetsHeaders "widgets/*.h" )
-file( GLOB widgetsInfowidgetsHeaders "widgets/infowidgets/*.h" )
+file( GLOB widgetsViewpagesHeaders "viewpages/*.h" )
file( GLOB widgetsSearchlineeditHeaders "widgets/searchlineedit/*.h" )
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/config.h DESTINATION include/libtomahawk )
@@ -595,5 +595,5 @@ install( FILES ${thirdpartyKdsingleapplicationguardHeaders} DESTINATION include/
install( FILES ${thirdpartyQocoaHeaders} DESTINATION include/libtomahawk/thirdparty/Qocoa )
install( FILES ${utilsHeaders} DESTINATION include/libtomahawk/utils )
install( FILES ${widgetsHeaders} DESTINATION include/libtomahawk/widgets )
-install( FILES ${widgetsInfowidgetsHeaders} DESTINATION include/libtomahawk/widgets/infowidgets )
+install( FILES ${widgetsViewpagesHeaders} DESTINATION include/libtomahawk/viewpages )
install( FILES ${widgetsSearchlineeditHeaders} DESTINATION include/libtomahawk/widgets/searchlineedit )
diff --git a/src/libtomahawk/GlobalActionManager.cpp b/src/libtomahawk/GlobalActionManager.cpp
index 8a742a318..1b14bb2ca 100644
--- a/src/libtomahawk/GlobalActionManager.cpp
+++ b/src/libtomahawk/GlobalActionManager.cpp
@@ -47,7 +47,7 @@
#include "utils/TomahawkUtils.h"
#include "utils/XspfLoader.h"
#include "utils/XspfGenerator.h"
-#include "widgets/SearchWidget.h"
+#include "viewpages/SearchViewPage.h"
#include "Album.h"
#include "Artist.h"
diff --git a/src/libtomahawk/ViewManager.cpp b/src/libtomahawk/ViewManager.cpp
index 98d8a078d..4fe3d5b20 100644
--- a/src/libtomahawk/ViewManager.cpp
+++ b/src/libtomahawk/ViewManager.cpp
@@ -44,10 +44,10 @@
#include "playlist/dynamic/widgets/DynamicWidget.h"
#include "resolvers/ScriptCollection.h"
#include "widgets/NewReleasesWidget.h"
-#include "widgets/infowidgets/SourceInfoWidget.h"
-#include "widgets/infowidgets/ArtistInfoWidget.h"
-#include "widgets/infowidgets/AlbumInfoWidget.h"
-#include "widgets/infowidgets/TrackInfoWidget.h"
+#include "viewpages/SourceViewPage.h"
+#include "viewpages/ArtistViewPage.h"
+#include "viewpages/AlbumViewPage.h"
+#include "viewpages/TrackViewPage.h"
#include "widgets/NewPlaylistWidget.h"
#include "widgets/AnimatedSplitter.h"
diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp b/src/libtomahawk/viewpages/AlbumViewPage.cpp
similarity index 98%
rename from src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp
rename to src/libtomahawk/viewpages/AlbumViewPage.cpp
index 011529e17..0e3418f06 100644
--- a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp
+++ b/src/libtomahawk/viewpages/AlbumViewPage.cpp
@@ -18,8 +18,8 @@
* along with Tomahawk. If not, see .
*/
-#include "AlbumInfoWidget.h"
-#include "ui_AlbumInfoWidget.h"
+#include "AlbumViewPage.h"
+#include "ui_AlbumViewPage.h"
#include "audio/AudioEngine.h"
#include "ViewManager.h"
diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h b/src/libtomahawk/viewpages/AlbumViewPage.h
similarity index 100%
rename from src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h
rename to src/libtomahawk/viewpages/AlbumViewPage.h
diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui b/src/libtomahawk/viewpages/AlbumViewPage.ui
similarity index 100%
rename from src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui
rename to src/libtomahawk/viewpages/AlbumViewPage.ui
diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp b/src/libtomahawk/viewpages/ArtistViewPage.cpp
similarity index 99%
rename from src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp
rename to src/libtomahawk/viewpages/ArtistViewPage.cpp
index 645ec4071..9b692a884 100644
--- a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp
+++ b/src/libtomahawk/viewpages/ArtistViewPage.cpp
@@ -17,8 +17,8 @@
* along with Tomahawk. If not, see .
*/
-#include "ArtistInfoWidget.h"
-#include "ui_ArtistInfoWidget.h"
+#include "ArtistViewPage.h"
+#include "ui_ArtistViewPage.h"
#include
#include
diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.h b/src/libtomahawk/viewpages/ArtistViewPage.h
similarity index 100%
rename from src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.h
rename to src/libtomahawk/viewpages/ArtistViewPage.h
diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui b/src/libtomahawk/viewpages/ArtistViewPage.ui
similarity index 100%
rename from src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui
rename to src/libtomahawk/viewpages/ArtistViewPage.ui
diff --git a/src/libtomahawk/widgets/SearchWidget.cpp b/src/libtomahawk/viewpages/SearchViewPage.cpp
similarity index 99%
rename from src/libtomahawk/widgets/SearchWidget.cpp
rename to src/libtomahawk/viewpages/SearchViewPage.cpp
index 84e646803..4b3f8b62c 100644
--- a/src/libtomahawk/widgets/SearchWidget.cpp
+++ b/src/libtomahawk/viewpages/SearchViewPage.cpp
@@ -17,8 +17,8 @@
* along with Tomahawk. If not, see .
*/
-#include "SearchWidget.h"
-#include "ui_SearchWidget.h"
+#include "SearchViewPage.h"
+#include "ui_SearchViewPage.h"
#include "SourceList.h"
#include "MetaPlaylistInterface.h"
diff --git a/src/libtomahawk/widgets/SearchWidget.h b/src/libtomahawk/viewpages/SearchViewPage.h
similarity index 100%
rename from src/libtomahawk/widgets/SearchWidget.h
rename to src/libtomahawk/viewpages/SearchViewPage.h
diff --git a/src/libtomahawk/widgets/SearchWidget.ui b/src/libtomahawk/viewpages/SearchViewPage.ui
similarity index 100%
rename from src/libtomahawk/widgets/SearchWidget.ui
rename to src/libtomahawk/viewpages/SearchViewPage.ui
diff --git a/src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp b/src/libtomahawk/viewpages/SourceViewPage.cpp
similarity index 98%
rename from src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp
rename to src/libtomahawk/viewpages/SourceViewPage.cpp
index 085f01871..cc3528af7 100644
--- a/src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp
+++ b/src/libtomahawk/viewpages/SourceViewPage.cpp
@@ -16,8 +16,8 @@
* along with Tomahawk. If not, see .
*/
-#include "SourceInfoWidget.h"
-#include "ui_SourceInfoWidget.h"
+#include "SourceViewPage.h"
+#include "ui_SourceViewPage.h"
#include "Source.h"
#include "ViewManager.h"
diff --git a/src/libtomahawk/widgets/infowidgets/SourceInfoWidget.h b/src/libtomahawk/viewpages/SourceViewPage.h
similarity index 100%
rename from src/libtomahawk/widgets/infowidgets/SourceInfoWidget.h
rename to src/libtomahawk/viewpages/SourceViewPage.h
diff --git a/src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui b/src/libtomahawk/viewpages/SourceViewPage.ui
similarity index 100%
rename from src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui
rename to src/libtomahawk/viewpages/SourceViewPage.ui
diff --git a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp b/src/libtomahawk/viewpages/TrackViewPage.cpp
similarity index 98%
rename from src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp
rename to src/libtomahawk/viewpages/TrackViewPage.cpp
index b41b3c970..173ca4119 100644
--- a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp
+++ b/src/libtomahawk/viewpages/TrackViewPage.cpp
@@ -18,8 +18,8 @@
* along with Tomahawk. If not, see .
*/
-#include "TrackInfoWidget.h"
-#include "ui_TrackInfoWidget.h"
+#include "TrackViewPage.h"
+#include "ui_TrackViewPage.h"
#include
#include
diff --git a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.h b/src/libtomahawk/viewpages/TrackViewPage.h
similarity index 100%
rename from src/libtomahawk/widgets/infowidgets/TrackInfoWidget.h
rename to src/libtomahawk/viewpages/TrackViewPage.h
diff --git a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui b/src/libtomahawk/viewpages/TrackViewPage.ui
similarity index 100%
rename from src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui
rename to src/libtomahawk/viewpages/TrackViewPage.ui
diff --git a/src/tomahawk/TomahawkWindow.cpp b/src/tomahawk/TomahawkWindow.cpp
index 621feb5a4..3b7401e1f 100644
--- a/src/tomahawk/TomahawkWindow.cpp
+++ b/src/tomahawk/TomahawkWindow.cpp
@@ -49,8 +49,6 @@
#include "utils/NetworkAccessManager.h"
#include "widgets/AccountsToolButton.h"
#include "widgets/AnimatedSplitter.h"
-#include "widgets/NewPlaylistWidget.h"
-#include "widgets/SearchWidget.h"
#include "widgets/ContainedMenuButton.h"
#include "thirdparty/Qocoa/qsearchfield.h"
#include "playlist/dynamic/GeneratorInterface.h"
@@ -65,6 +63,7 @@
#include "jobview/JobStatusModel.h"
#include "sip/SipPlugin.h"
#include "filemetadata/ScanManager.h"
+#include "viewpages/SearchViewPage.h"
#include "viewpages/whatsnew_0_8/WhatsNew_0_8.h"
#include "Playlist.h"
diff --git a/src/tomahawk/sourcetree/items/TemporaryPageItem.cpp b/src/tomahawk/sourcetree/items/TemporaryPageItem.cpp
index 69fbd54a4..08e8d79fa 100644
--- a/src/tomahawk/sourcetree/items/TemporaryPageItem.cpp
+++ b/src/tomahawk/sourcetree/items/TemporaryPageItem.cpp
@@ -21,10 +21,10 @@
#include "GlobalActionManager.h"
#include "ViewManager.h"
-#include "widgets/infowidgets/AlbumInfoWidget.h"
-#include "widgets/infowidgets/ArtistInfoWidget.h"
-#include "widgets/infowidgets/TrackInfoWidget.h"
-#include "widgets/SearchWidget.h"
+#include "viewpages/AlbumViewPage.h"
+#include "viewpages/ArtistViewPage.h"
+#include "viewpages/TrackViewPage.h"
+#include "viewpages/SearchViewPage.h"
#include "utils/ImageRegistry.h"
#include "utils/Closure.h"
#include "utils/Logger.h"