diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
index 63c2af3c8..f0394dd74 100644
--- a/src/libtomahawk/CMakeLists.txt
+++ b/src/libtomahawk/CMakeLists.txt
@@ -86,9 +86,9 @@ set( libSources
     infosystem/infosystemcache.cpp
     infosystem/infosystem.cpp
     infosystem/infosystemworker.cpp
-    infosystem/infoplugins/echonestplugin.cpp
-    infosystem/infoplugins/lastfmplugin.cpp
-    infosystem/infoplugins/musixmatchplugin.cpp
+    infosystem/infoplugins/generic/echonestplugin.cpp
+    infosystem/infoplugins/generic/lastfmplugin.cpp
+    infosystem/infoplugins/generic/musixmatchplugin.cpp
 
     playlist/treemodel.cpp
     playlist/treeproxymodel.cpp
@@ -253,9 +253,9 @@ set( libHeaders
     infosystem/infosystem.h
     infosystem/infosystemworker.h
     infosystem/infosystemcache.h
-    infosystem/infoplugins/echonestplugin.h
-    infosystem/infoplugins/lastfmplugin.h
-    infosystem/infoplugins/musixmatchplugin.h
+    infosystem/infoplugins/generic/echonestplugin.h
+    infosystem/infoplugins/generic/lastfmplugin.h
+    infosystem/infoplugins/generic/musixmatchplugin.h
 
     network/bufferiodevice.h
     network/msgprocessor.h
@@ -398,12 +398,12 @@ IF( APPLE )
     MARK_AS_ADVANCED( COREAUDIO_LIBRARY COREFOUNDATION_LIBRARY FOUNDATION_LIBRARY SCRIPTINGBRIDGE_LIBRARY )
 
     SET( libSources ${libSources} 
-      infosystem/infoplugins/adium.mm
-      infosystem/infoplugins/adiumplugin.cpp )
+      infosystem/infoplugins/mac/adium.mm
+      infosystem/infoplugins/mac/adiumplugin.cpp )
 
     SET( libHeaders ${libHeaders} 
-      infosystem/infoplugins/adium.h
-      infosystem/infoplugins/adiumplugin.h )
+      infosystem/infoplugins/mac/adium.h
+      infosystem/infoplugins/mac/adiumplugin.h )
 
     SET( OS_SPECIFIC_LINK_LIBRARIES
         ${OS_SPECIFIC_LINK_LIBRARIES}
diff --git a/src/libtomahawk/infosystem/infosystem.h b/src/libtomahawk/infosystem/infosystem.h
index 12d6bce85..0dea90be1 100644
--- a/src/libtomahawk/infosystem/infosystem.h
+++ b/src/libtomahawk/infosystem/infosystem.h
@@ -102,7 +102,9 @@ enum InfoType { // as items are saved in cache, mark them here to not change the
 
     InfoNoInfo = 52,
     InfoLove = 53,
-    InfoUnLove = 54
+    InfoUnLove = 54,
+
+    InfoNotifyUser = 55
 };
 
 typedef QMap< InfoType, QVariant > InfoMap;