diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b027c1543..68cbe3cee 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -126,8 +126,6 @@ SET( tomahawkHeadersGui ${tomahawkHeadersGui}
      resolversmodel.h
      delegateconfigwrapper.h
      tomahawkwindow.h
-
-     Qocoa/qsearchfield.h
 )
 
 SET( tomahawkUI ${tomahawkUI}
@@ -177,14 +175,12 @@ ENDIF( UNIX )
 IF( APPLE )
     INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/thirdparty/SPMediaKeyTap )
 
-    SET( tomahawkHeaders ${tomahawkHeaders} mac/tomahawkapp_mac.h mac/macshortcuthandler.h  )
-    SET( tomahawkSources ${tomahawkSources} mac/tomahawkapp_mac.mm  mac/macshortcuthandler.cpp Qocoa/qsearchfield_mac.mm )
+    SET( tomahawkHeaders ${tomahawkHeaders} mac/tomahawkapp_mac.h mac/macshortcuthandler.h )
+    SET( tomahawkSources ${tomahawkSources} mac/tomahawkapp_mac.mm mac/macshortcuthandler.cpp )
 
     IF(HAVE_SPARKLE)
         SET( tomahawkHeaders ${tomahawkHeaders} ${SPARKLE}/Headers )
     ENDIF(HAVE_SPARKLE)
-ELSE( APPLE )
-    SET( tomahawkSources ${tomahawkSources} Qocoa/qsearchfield.cpp )
 ENDIF( APPLE )
 
 IF(GLOOX_FOUND)
diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
index d54ae36f0..118eff7d3 100644
--- a/src/libtomahawk/CMakeLists.txt
+++ b/src/libtomahawk/CMakeLists.txt
@@ -207,10 +207,10 @@ set( libSources
     widgets/headerbreadcrumb.cpp
     widgets/siblingcrumbbutton.cpp
 
-    kdsingleapplicationguard/kdsingleapplicationguard.cpp
-    kdsingleapplicationguard/kdsharedmemorylocker.cpp
-    kdsingleapplicationguard/kdtoolsglobal.cpp
-    kdsingleapplicationguard/kdlockedsharedmemorypointer.cpp
+    thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.cpp
+    thirdparty/kdsingleapplicationguard/kdsharedmemorylocker.cpp
+    thirdparty/kdsingleapplicationguard/kdtoolsglobal.cpp
+    thirdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.cpp
 )
 
 set( libHeaders
@@ -407,7 +407,8 @@ set( libHeaders
     widgets/headerbreadcrumb.h
     widgets/siblingcrumbbutton.h
 
-    kdsingleapplicationguard/kdsingleapplicationguard.h
+    thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h
+    thirdparty/Qocoa/qsearchfield.h
 )
 
 set( libHeaders_NoMOC
@@ -499,7 +500,8 @@ IF( APPLE )
     SET( libSources ${libSources}
       infosystem/infoplugins/mac/adium.mm
       infosystem/infoplugins/mac/adiumplugin.cpp
-      utils/tomahawkutils_mac.mm )
+      utils/tomahawkutils_mac.mm
+      thirdparty/Qocoa/qsearchfield_mac.mm )
 
     SET( libHeaders ${libHeaders}
       infosystem/infoplugins/mac/adium.h
@@ -515,6 +517,8 @@ IF( APPLE )
 
         /System/Library/Frameworks/AppKit.framework
     )
+ELSE( APPLE )
+    SET( libSources ${libSources} thirdparty/Qocoa/qsearchfield.cpp )
 ENDIF( APPLE )
 
 IF(LIBLASTFM_FOUND)
diff --git a/src/libtomahawk/playlist/infobar/infobar.cpp b/src/libtomahawk/playlist/infobar/infobar.cpp
index 0bbf69075..c1873ef89 100644
--- a/src/libtomahawk/playlist/infobar/infobar.cpp
+++ b/src/libtomahawk/playlist/infobar/infobar.cpp
@@ -22,7 +22,7 @@
 #include <QLabel>
 #include <QPixmap>
 
-#include "context/ContextWidget.h"
+#include "thirdparty/Qocoa/qsearchfield.h"
 #include "utils/tomahawkutils.h"
 #include "utils/logger.h"
 
@@ -69,6 +69,13 @@ InfoBar::InfoBar( QWidget* parent )
     ui->longDescriptionLabel->setText( QString() );
     ui->imageLabel->setText( QString() );
 
+    m_searchWidget = new QSearchField( this );
+    m_searchWidget->setPlaceholderText( "Filter..." );
+    m_searchWidget->setMinimumWidth( 180 );
+    connect( m_searchWidget, SIGNAL( textChanged( QString ) ), this, SLOT( onFilterEdited() ) );
+
+    ui->horizontalLayout->addWidget( m_searchWidget );
+
     setAutoFillBackground( true );
 }
 
@@ -117,6 +124,13 @@ InfoBar::setPixmap( const QPixmap& p )
 }
 
 
+void
+InfoBar::onFilterEdited()
+{
+    emit filterTextChanged( m_searchWidget->text() );
+}
+
+
 void
 InfoBar::changeEvent( QEvent* e )
 {
diff --git a/src/libtomahawk/playlist/infobar/infobar.h b/src/libtomahawk/playlist/infobar/infobar.h
index ed658e9d9..2399d6656 100644
--- a/src/libtomahawk/playlist/infobar/infobar.h
+++ b/src/libtomahawk/playlist/infobar/infobar.h
@@ -22,10 +22,10 @@
 #include <QWidget>
 
 #include "dllmacro.h"
-
 #include "query.h"
 
 class QTimeLine;
+class QSearchField;
 class ContextWidget;
 
 namespace Ui
@@ -47,12 +47,20 @@ public slots:
     void setLongDescription( const QString& s );
     void setPixmap( const QPixmap& p );
 
+signals:
+    void filterTextChanged( const QString& filter );
+
 protected:
     void changeEvent( QEvent* e );
     void resizeEvent( QResizeEvent* e );
 
+private slots:
+    void onFilterEdited();
+
 private:
     Ui::InfoBar* ui;
+
+    QSearchField* m_searchWidget;
 };
 
 #endif // INFOBAR_H
diff --git a/src/Qocoa/qocoa_mac.h b/src/libtomahawk/thirdparty/Qocoa/qocoa_mac.h
similarity index 100%
rename from src/Qocoa/qocoa_mac.h
rename to src/libtomahawk/thirdparty/Qocoa/qocoa_mac.h
diff --git a/src/Qocoa/qsearchfield.cpp b/src/libtomahawk/thirdparty/Qocoa/qsearchfield.cpp
similarity index 98%
rename from src/Qocoa/qsearchfield.cpp
rename to src/libtomahawk/thirdparty/Qocoa/qsearchfield.cpp
index 316b31ca0..bc5716931 100644
--- a/src/Qocoa/qsearchfield.cpp
+++ b/src/libtomahawk/thirdparty/Qocoa/qsearchfield.cpp
@@ -29,7 +29,7 @@ THE SOFTWARE.
 #include "playlist/topbar/searchlineedit.h"
 #include "utils/tomahawkutils.h"
 
-class QSearchFieldPrivate
+class DLLEXPORT QSearchFieldPrivate
 {
 public:
     QSearchFieldPrivate(SearchLineEdit *lineEdit) : lineEdit(lineEdit) {}
diff --git a/src/Qocoa/qsearchfield.h b/src/libtomahawk/thirdparty/Qocoa/qsearchfield.h
similarity index 87%
rename from src/Qocoa/qsearchfield.h
rename to src/libtomahawk/thirdparty/Qocoa/qsearchfield.h
index 4e2ba42fa..0a76adce3 100644
--- a/src/Qocoa/qsearchfield.h
+++ b/src/libtomahawk/thirdparty/Qocoa/qsearchfield.h
@@ -3,8 +3,10 @@
 
 #include <QWidget>
 
+#include "dllmacro.h"
+
 class QSearchFieldPrivate;
-class QSearchField : public QWidget
+class DLLEXPORT QSearchField : public QWidget
 {
     Q_OBJECT
 public:
diff --git a/src/Qocoa/qsearchfield_mac.mm b/src/libtomahawk/thirdparty/Qocoa/qsearchfield_mac.mm
similarity index 100%
rename from src/Qocoa/qsearchfield_mac.mm
rename to src/libtomahawk/thirdparty/Qocoa/qsearchfield_mac.mm
diff --git a/src/libtomahawk/kdsingleapplicationguard/kdlockedsharedmemorypointer.cpp b/src/libtomahawk/thirdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.cpp
similarity index 100%
rename from src/libtomahawk/kdsingleapplicationguard/kdlockedsharedmemorypointer.cpp
rename to src/libtomahawk/thirdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.cpp
diff --git a/src/libtomahawk/kdsingleapplicationguard/kdlockedsharedmemorypointer.h b/src/libtomahawk/thirdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.h
similarity index 100%
rename from src/libtomahawk/kdsingleapplicationguard/kdlockedsharedmemorypointer.h
rename to src/libtomahawk/thirdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.h
diff --git a/src/libtomahawk/kdsingleapplicationguard/kdsharedmemorylocker.cpp b/src/libtomahawk/thirdparty/kdsingleapplicationguard/kdsharedmemorylocker.cpp
similarity index 100%
rename from src/libtomahawk/kdsingleapplicationguard/kdsharedmemorylocker.cpp
rename to src/libtomahawk/thirdparty/kdsingleapplicationguard/kdsharedmemorylocker.cpp
diff --git a/src/libtomahawk/kdsingleapplicationguard/kdsharedmemorylocker.h b/src/libtomahawk/thirdparty/kdsingleapplicationguard/kdsharedmemorylocker.h
similarity index 100%
rename from src/libtomahawk/kdsingleapplicationguard/kdsharedmemorylocker.h
rename to src/libtomahawk/thirdparty/kdsingleapplicationguard/kdsharedmemorylocker.h
diff --git a/src/libtomahawk/kdsingleapplicationguard/kdsingleapplicationguard.cpp b/src/libtomahawk/thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.cpp
similarity index 100%
rename from src/libtomahawk/kdsingleapplicationguard/kdsingleapplicationguard.cpp
rename to src/libtomahawk/thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.cpp
diff --git a/src/libtomahawk/kdsingleapplicationguard/kdsingleapplicationguard.h b/src/libtomahawk/thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h
similarity index 100%
rename from src/libtomahawk/kdsingleapplicationguard/kdsingleapplicationguard.h
rename to src/libtomahawk/thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h
diff --git a/src/libtomahawk/kdsingleapplicationguard/kdtoolsglobal.cpp b/src/libtomahawk/thirdparty/kdsingleapplicationguard/kdtoolsglobal.cpp
similarity index 100%
rename from src/libtomahawk/kdsingleapplicationguard/kdtoolsglobal.cpp
rename to src/libtomahawk/thirdparty/kdsingleapplicationguard/kdtoolsglobal.cpp
diff --git a/src/libtomahawk/kdsingleapplicationguard/kdtoolsglobal.h b/src/libtomahawk/thirdparty/kdsingleapplicationguard/kdtoolsglobal.h
similarity index 100%
rename from src/libtomahawk/kdsingleapplicationguard/kdtoolsglobal.h
rename to src/libtomahawk/thirdparty/kdsingleapplicationguard/kdtoolsglobal.h
diff --git a/src/libtomahawk/kdsingleapplicationguard/license-gpl b/src/libtomahawk/thirdparty/kdsingleapplicationguard/license-gpl
similarity index 100%
rename from src/libtomahawk/kdsingleapplicationguard/license-gpl
rename to src/libtomahawk/thirdparty/kdsingleapplicationguard/license-gpl
diff --git a/src/libtomahawk/kdsingleapplicationguard/pimpl_ptr.cpp b/src/libtomahawk/thirdparty/kdsingleapplicationguard/pimpl_ptr.cpp
similarity index 100%
rename from src/libtomahawk/kdsingleapplicationguard/pimpl_ptr.cpp
rename to src/libtomahawk/thirdparty/kdsingleapplicationguard/pimpl_ptr.cpp
diff --git a/src/libtomahawk/kdsingleapplicationguard/pimpl_ptr.h b/src/libtomahawk/thirdparty/kdsingleapplicationguard/pimpl_ptr.h
similarity index 100%
rename from src/libtomahawk/kdsingleapplicationguard/pimpl_ptr.h
rename to src/libtomahawk/thirdparty/kdsingleapplicationguard/pimpl_ptr.h
diff --git a/src/libtomahawk/viewmanager.cpp b/src/libtomahawk/viewmanager.cpp
index c56a15664..c4550965c 100644
--- a/src/libtomahawk/viewmanager.cpp
+++ b/src/libtomahawk/viewmanager.cpp
@@ -76,28 +76,14 @@ ViewManager::ViewManager( QObject* parent )
     s_instance = this;
 
     m_widget->setLayout( new QVBoxLayout() );
-
-//    m_topbar = new TopBar();
     m_infobar = new InfoBar();
     m_stack = new QStackedWidget();
 
-/*    m_splitter = new AnimatedSplitter();
-    m_splitter->setOrientation( Qt::Vertical );
-    m_splitter->setChildrenCollapsible( false );
-    m_splitter->setGreedyWidget( 0 );
-    m_splitter->addWidget( m_stack );*/
-
-//    m_splitter->addWidget( m_queueView );
-//    m_splitter->hide( 1, false );
-
     m_contextWidget = new ContextWidget();
 
     m_widget->layout()->addWidget( m_infobar );
-//    m_widget->layout()->addWidget( m_topbar );
-//    m_widget->layout()->addWidget( m_splitter );
     m_widget->layout()->addWidget( m_stack );
     m_widget->layout()->addWidget( m_contextWidget );
-//    m_widget->layout()->addWidget( m_queueButton );
 
     m_superCollectionView = new ArtistView();
     m_superCollectionModel = new TreeModel( m_superCollectionView );
@@ -122,11 +108,10 @@ ViewManager::ViewManager( QObject* parent )
     connect( AudioEngine::instance(), SIGNAL( playlistChanged( Tomahawk::PlaylistInterface* ) ), this, SLOT( playlistInterfaceChanged( Tomahawk::PlaylistInterface* ) ) );
 
     connect( &m_filterTimer, SIGNAL( timeout() ), SLOT( applyFilter() ) );
-
-/*    connect( m_topbar, SIGNAL( filterTextChanged( QString ) ), SLOT( setFilter( QString ) ) );
-    connect( m_topbar, SIGNAL( flatMode() ), SLOT( setTableMode() ) );
-    connect( m_topbar, SIGNAL( artistMode() ), SLOT( setTreeMode() ) );
-    connect( m_topbar, SIGNAL( albumMode() ), SLOT( setAlbumMode() ) );*/
+    connect( m_infobar, SIGNAL( filterTextChanged( QString ) ), SLOT( setFilter( QString ) ) );
+/*    connect( m_infobar, SIGNAL( flatMode() ), SLOT( setTableMode() ) );
+    connect( m_infobar, SIGNAL( artistMode() ), SLOT( setTreeMode() ) );
+    connect( m_infobar, SIGNAL( albumMode() ), SLOT( setAlbumMode() ) );*/
 }
 
 
diff --git a/src/main.cpp b/src/main.cpp
index ffaf976f6..2919968e7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,7 +18,7 @@
 
 #include "tomahawkapp.h"
 
-#include "kdsingleapplicationguard/kdsingleapplicationguard.h"
+#include "thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h"
 
 #include <QTranslator>
 
diff --git a/src/tomahawkapp.h b/src/tomahawkapp.h
index 6aa3fca33..c06d023ce 100644
--- a/src/tomahawkapp.h
+++ b/src/tomahawkapp.h
@@ -41,7 +41,7 @@
 #include "network/servent.h"
 
 #include "utils/tomahawkutils.h"
-#include "kdsingleapplicationguard/kdsingleapplicationguard.h"
+#include "thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h"
 
 class AudioEngine;
 class Database;
diff --git a/src/tomahawkwindow.cpp b/src/tomahawkwindow.cpp
index cc8f89bd2..6ba1a22ae 100644
--- a/src/tomahawkwindow.cpp
+++ b/src/tomahawkwindow.cpp
@@ -47,6 +47,7 @@
 #include "widgets/newplaylistwidget.h"
 #include "widgets/searchwidget.h"
 #include "widgets/playlisttypeselectordlg.h"
+#include "thirdparty/Qocoa/qsearchfield.h"
 
 #include "audiocontrols.h"
 #include "settingsdialog.h"
@@ -66,7 +67,6 @@
 #endif
 
 #include "utils/logger.h"
-#include "Qocoa/qsearchfield.h"
 
 using namespace Tomahawk;
 
diff --git a/src/tomahawkwindow.h b/src/tomahawkwindow.h
index 8343841b2..3ee444235 100644
--- a/src/tomahawkwindow.h
+++ b/src/tomahawkwindow.h
@@ -105,6 +105,7 @@ private slots:
     void maximize();
 
     void playlistCreateDialogFinished( int ret );
+
 private:
     void loadSettings();
     void saveSettings();