diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
index c31ea2e2a..58db2f135 100644
--- a/src/libtomahawk/CMakeLists.txt
+++ b/src/libtomahawk/CMakeLists.txt
@@ -95,6 +95,8 @@ set( libSources
     database/databasecommand_genericselect.cpp
     database/database.cpp
 
+    infobar/infobar.cpp
+
     infosystem/infosystemcache.cpp
     infosystem/infosystem.cpp
     infosystem/infosystemworker.cpp
@@ -137,8 +139,6 @@ set( libSources
     playlist/topbar/lineedit.cpp
     playlist/topbar/searchbutton.cpp
 
-    playlist/infobar/infobar.cpp
-
     playlist/dynamic/DynamicPlaylist.cpp
     playlist/dynamic/DynamicControl.cpp
     playlist/dynamic/GeneratorFactory.cpp
@@ -296,6 +296,8 @@ set( libHeaders
     database/databasecommand_loadsocialactions.h
     database/databasecommand_genericselect.h
 
+    infobar/infobar.h
+
     infosystem/infosystem.h
     infosystem/infosystemworker.h
     infosystem/infosystemcache.h
@@ -349,8 +351,6 @@ set( libHeaders
     playlist/topbar/lineedit_p.h
     playlist/topbar/searchbutton.h
 
-    playlist/infobar/infobar.h
-
     playlist/dynamic/DynamicPlaylist.h
     playlist/dynamic/DynamicControl.h
     playlist/dynamic/GeneratorInterface.h
@@ -433,9 +433,9 @@ set( libUI ${libUI}
     widgets/infowidgets/ArtistInfoWidget.ui
     widgets/infowidgets/AlbumInfoWidget.ui
     playlist/topbar/topbar.ui
-    playlist/infobar/infobar.ui
     playlist/queueview.ui
     context/ContextWidget.ui
+    infobar/infobar.ui
 )
 
 include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/.. ..
diff --git a/src/libtomahawk/playlist/infobar/infobar.cpp b/src/libtomahawk/infobar/infobar.cpp
similarity index 100%
rename from src/libtomahawk/playlist/infobar/infobar.cpp
rename to src/libtomahawk/infobar/infobar.cpp
diff --git a/src/libtomahawk/playlist/infobar/infobar.h b/src/libtomahawk/infobar/infobar.h
similarity index 100%
rename from src/libtomahawk/playlist/infobar/infobar.h
rename to src/libtomahawk/infobar/infobar.h
diff --git a/src/libtomahawk/playlist/infobar/infobar.ui b/src/libtomahawk/infobar/infobar.ui
similarity index 100%
rename from src/libtomahawk/playlist/infobar/infobar.ui
rename to src/libtomahawk/infobar/infobar.ui