diff --git a/src/PipelineStatusView.h b/src/PipelineStatusView.h
index bfd53ebc8..81db8c80c 100644
--- a/src/PipelineStatusView.h
+++ b/src/PipelineStatusView.h
@@ -22,7 +22,7 @@
 #include <QTreeWidget>
 
 #include "typedefs.h"
-#include "utils/animatedsplitter.h"
+#include "widgets/animatedsplitter.h"
 
 class StreamConnection;
 
diff --git a/src/audiocontrols.cpp b/src/audiocontrols.cpp
index 604c27833..a2fa864c5 100644
--- a/src/audiocontrols.cpp
+++ b/src/audiocontrols.cpp
@@ -24,18 +24,16 @@
 #include <QMouseEvent>
 
 #include "audio/audioengine.h"
-#include "viewmanager.h"
 #include "playlist/playlistview.h"
 #include "database/database.h"
 #include "database/databasecommand_socialaction.h"
-
-#include "album.h"
-
-#include "utils/imagebutton.h"
+#include "widgets/imagebutton.h"
 #include "utils/tomahawkutils.h"
 #include "utils/logger.h"
-#include <globalactionmanager.h>
+#include "album.h"
 #include "dropjob.h"
+#include "globalactionmanager.h"
+#include "viewmanager.h"
 
 using namespace Tomahawk;
 
@@ -90,7 +88,7 @@ AudioControls::AudioControls( QWidget* parent )
 
     ui->ownerLabel->setForegroundRole( QPalette::Dark );
     ui->metaDataArea->setStyleSheet( "QWidget#metaDataArea {\nborder-width: 4px;\nborder-image: url(" RESPATH "images/now-playing-panel.png) 4 4 4 4 stretch stretch; }" );
-    
+
     ui->seekSlider->setEnabled( true );
     ui->volumeSlider->setRange( 0, 100 );
     ui->volumeSlider->setValue( AudioEngine::instance()->volume() );
@@ -99,7 +97,7 @@ AudioControls::AudioControls( QWidget* parent )
     ui->seekSlider->setTimeLine( &m_sliderTimeLine );
 
     connect( &m_sliderTimeLine,    SIGNAL( frameChanged( int ) ), ui->seekSlider, SLOT( setValue( int ) ) );
-    
+
     connect( ui->seekSlider,       SIGNAL( valueChanged( int ) ), AudioEngine::instance(), SLOT( seek( int ) ) );
     connect( ui->volumeSlider,     SIGNAL( valueChanged( int ) ), AudioEngine::instance(), SLOT( setVolume( int ) ) );
     connect( ui->prevButton,       SIGNAL( clicked() ), AudioEngine::instance(), SLOT( previous() ) );
@@ -189,7 +187,7 @@ AudioControls::onPlaybackStarted( const Tomahawk::result_ptr& result )
 
     if ( result.isNull() )
         return;
-    
+
     if ( m_currentTrack.isNull() || ( !m_currentTrack.isNull() && m_currentTrack.data()->id() != result.data()->id() ) )
         onPlaybackLoading( result );
 
@@ -197,7 +195,7 @@ AudioControls::onPlaybackStarted( const Tomahawk::result_ptr& result )
 
     if ( duration == -1 )
         duration = result.data()->duration() * 1000;
-    
+
     ui->seekSlider->setRange( 0, duration );
     ui->seekSlider->setValue( 0 );
 
@@ -208,7 +206,7 @@ AudioControls::onPlaybackStarted( const Tomahawk::result_ptr& result )
     m_seekMsecs = -1;
 
     ui->seekSlider->setVisible( true );
-    
+
     Tomahawk::InfoSystem::InfoCriteriaHash trackInfo;
     trackInfo["artist"] = result->artist()->name();
     trackInfo["album"] = result->album()->name();
@@ -374,7 +372,7 @@ AudioControls::onPlaybackTimer( qint64 msElapsed )
     const int seconds = msElapsed / 1000;
     ui->timeLabel->setText( TomahawkUtils::timeToString( seconds ) );
     ui->timeLeftLabel->setText( "-" + TomahawkUtils::timeToString( m_currentTrack->duration() - seconds ) );
-    
+
     if ( m_sliderTimeLine.currentTime() > msElapsed || m_seekMsecs != -1 )
     {
         m_sliderTimeLine.setPaused( true );
diff --git a/src/audiocontrols.ui b/src/audiocontrols.ui
index 8b4ea01ca..5f0ebf2dc 100644
--- a/src/audiocontrols.ui
+++ b/src/audiocontrols.ui
@@ -537,12 +537,12 @@
   <customwidget>
    <class>ImageButton</class>
    <extends>QPushButton</extends>
-   <header>utils/imagebutton.h</header>
+   <header>widgets/imagebutton.h</header>
   </customwidget>
   <customwidget>
    <class>QueryLabel</class>
    <extends>QLabel</extends>
-   <header>utils/querylabel.h</header>
+   <header>widgets/querylabel.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
index 057526ed4..c31ea2e2a 100644
--- a/src/libtomahawk/CMakeLists.txt
+++ b/src/libtomahawk/CMakeLists.txt
@@ -170,12 +170,9 @@ set( libSources
     network/controlconnection.cpp
 
     utils/tomahawkutils.cpp
-    utils/querylabel.cpp
-    utils/imagebutton.cpp
     utils/logger.cpp
     utils/proxystyle.cpp
     utils/widgetdragfilter.cpp
-    utils/animatedsplitter.cpp
     utils/xspfloader.cpp
     utils/xspfgenerator.cpp
     utils/jspfloader.cpp
@@ -184,6 +181,9 @@ set( libSources
     utils/shortenedlinkparser.cpp
     utils/stylehelper.cpp
 
+    widgets/querylabel.cpp
+    widgets/imagebutton.cpp
+    widgets/animatedsplitter.cpp
     widgets/elidedlabel.cpp
     widgets/newplaylistwidget.cpp
     widgets/searchwidget.cpp
@@ -370,11 +370,7 @@ set( libHeaders
     playlist/dynamic/database/DatabaseControl.h
     playlist/dynamic/database/DatabaseGenerator.h
 
-    utils/querylabel.h
-    utils/animatedcounterlabel.h
-    utils/imagebutton.h
     utils/widgetdragfilter.h
-    utils/animatedsplitter.h
     utils/xspfloader.h
     utils/xspfgenerator.h
     utils/jspfloader.h
@@ -383,6 +379,10 @@ set( libHeaders
     utils/shortenedlinkparser.h
     utils/stylehelper.h
 
+    widgets/querylabel.h
+    widgets/animatedcounterlabel.h
+    widgets/imagebutton.h
+    widgets/animatedsplitter.h
     widgets/elidedlabel.h
     widgets/newplaylistwidget.h
     widgets/searchwidget.h
diff --git a/src/libtomahawk/playlist/queueview.h b/src/libtomahawk/playlist/queueview.h
index 3b207fb49..266ab0008 100644
--- a/src/libtomahawk/playlist/queueview.h
+++ b/src/libtomahawk/playlist/queueview.h
@@ -21,7 +21,7 @@
 
 #include <QPushButton>
 
-#include "utils/animatedsplitter.h"
+#include "widgets/animatedsplitter.h"
 #include "playlistview.h"
 
 #include "dllmacro.h"
diff --git a/src/libtomahawk/playlist/topbar/topbar.ui b/src/libtomahawk/playlist/topbar/topbar.ui
index ba329f598..c5d123892 100644
--- a/src/libtomahawk/playlist/topbar/topbar.ui
+++ b/src/libtomahawk/playlist/topbar/topbar.ui
@@ -311,7 +311,7 @@
   <customwidget>
    <class>AnimatedCounterLabel</class>
    <extends>QLabel</extends>
-   <header>utils/animatedcounterlabel.h</header>
+   <header>widgets/animatedcounterlabel.h</header>
   </customwidget>
   <customwidget>
    <class>SearchLineEdit</class>
diff --git a/src/libtomahawk/viewmanager.cpp b/src/libtomahawk/viewmanager.cpp
index aae9cdd05..5ee170ef5 100644
--- a/src/libtomahawk/viewmanager.cpp
+++ b/src/libtomahawk/viewmanager.cpp
@@ -23,7 +23,6 @@
 
 #include "audio/audioengine.h"
 #include "context/ContextWidget.h"
-#include "utils/animatedsplitter.h"
 #include "infobar/infobar.h"
 #include "topbar/topbar.h"
 
@@ -49,6 +48,7 @@
 #include "widgets/infowidgets/ArtistInfoWidget.h"
 #include "widgets/infowidgets/AlbumInfoWidget.h"
 #include "widgets/newplaylistwidget.h"
+#include "widgets/animatedsplitter.h"
 
 #include "utils/logger.h"
 
diff --git a/src/libtomahawk/utils/animatedcounterlabel.h b/src/libtomahawk/widgets/animatedcounterlabel.h
similarity index 100%
rename from src/libtomahawk/utils/animatedcounterlabel.h
rename to src/libtomahawk/widgets/animatedcounterlabel.h
diff --git a/src/libtomahawk/utils/animatedsplitter.cpp b/src/libtomahawk/widgets/animatedsplitter.cpp
similarity index 100%
rename from src/libtomahawk/utils/animatedsplitter.cpp
rename to src/libtomahawk/widgets/animatedsplitter.cpp
diff --git a/src/libtomahawk/utils/animatedsplitter.h b/src/libtomahawk/widgets/animatedsplitter.h
similarity index 100%
rename from src/libtomahawk/utils/animatedsplitter.h
rename to src/libtomahawk/widgets/animatedsplitter.h
diff --git a/src/libtomahawk/utils/imagebutton.cpp b/src/libtomahawk/widgets/imagebutton.cpp
similarity index 100%
rename from src/libtomahawk/utils/imagebutton.cpp
rename to src/libtomahawk/widgets/imagebutton.cpp
diff --git a/src/libtomahawk/utils/imagebutton.h b/src/libtomahawk/widgets/imagebutton.h
similarity index 100%
rename from src/libtomahawk/utils/imagebutton.h
rename to src/libtomahawk/widgets/imagebutton.h
diff --git a/src/libtomahawk/utils/querylabel.cpp b/src/libtomahawk/widgets/querylabel.cpp
similarity index 99%
rename from src/libtomahawk/utils/querylabel.cpp
rename to src/libtomahawk/widgets/querylabel.cpp
index 2ded49c42..d41f0b96b 100644
--- a/src/libtomahawk/utils/querylabel.cpp
+++ b/src/libtomahawk/widgets/querylabel.cpp
@@ -27,7 +27,7 @@
 #include "artist.h"
 #include "album.h"
 #include "query.h"
-#include "tomahawkutils.h"
+#include "utils/tomahawkutils.h"
 #include "utils/logger.h"
 
 #define BOXMARGIN 2
diff --git a/src/libtomahawk/utils/querylabel.h b/src/libtomahawk/widgets/querylabel.h
similarity index 100%
rename from src/libtomahawk/utils/querylabel.h
rename to src/libtomahawk/widgets/querylabel.h
diff --git a/src/tomahawkwindow.cpp b/src/tomahawkwindow.cpp
index 6ba1a22ae..33595d9b4 100644
--- a/src/tomahawkwindow.cpp
+++ b/src/tomahawkwindow.cpp
@@ -41,9 +41,9 @@
 #include "viewmanager.h"
 #include "sip/SipHandler.h"
 #include "sourcetree/sourcetreeview.h"
-#include "utils/animatedsplitter.h"
 #include "utils/proxystyle.h"
 #include "utils/xspfloader.h"
+#include "widgets/animatedsplitter.h"
 #include "widgets/newplaylistwidget.h"
 #include "widgets/searchwidget.h"
 #include "widgets/playlisttypeselectordlg.h"
diff --git a/src/transferview.h b/src/transferview.h
index 814e9ca34..4cd02d5be 100644
--- a/src/transferview.h
+++ b/src/transferview.h
@@ -22,7 +22,7 @@
 #include <QTreeWidget>
 
 #include "typedefs.h"
-#include "utils/animatedsplitter.h"
+#include "widgets/animatedsplitter.h"
 
 class StreamConnection;