diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py
index 42771249a..96991a40e 100644
--- a/openlp/core/lib/__init__.py
+++ b/openlp/core/lib/__init__.py
@@ -74,8 +74,10 @@ from songxmlhandler import SongXMLParser
 from themexmlhandler import ThemeXML
 from renderer import Renderer
 from rendermanager import RenderManager
-from mediamanageritem import MediaManagerItem, ImageList
+from mediamanageritem import MediaManagerItem
+from imagelist import ImageList
+from listwithpreviews import ListWithPreviews
 
 __all__ = [ 'translate', 'file_to_xml', 'str_to_bool',
-            'contextMenuAction', 'contextMenuSeparator',
-            'MediaManagerItem', 'ServiceItem']
+            'contextMenuAction', 'contextMenuSeparator','ServiceItem'
+]
diff --git a/openlp/core/lib/imagelist.py b/openlp/core/lib/imagelist.py
new file mode 100644
index 000000000..5ddd98d55
--- /dev/null
+++ b/openlp/core/lib/imagelist.py
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+"""
+OpenLP - Open Source Lyrics Projection
+Copyright (c) 2008-2009 Raoul Snyman
+Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free Software
+Foundation; version 2 of the License.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place, Suite 330, Boston, MA 02111-1307 USA
+"""
+import types
+
+from PyQt4 import QtCore, QtGui
+from openlp.core.lib.toolbar import *
+from openlp.core.lib import translate
+
+class ImageList(QtGui.QListView):
+
+    def __init__(self,parent=None,name=None):
+        QtGui.QListView.__init__(self,parent)
+
+    def mouseMoveEvent(self, event):
+        """
+        Drag and drop event does not care what data is selected
+        as the recepient will use events to request the data move
+        just tell it what plugin to call
+        """
+        if event.buttons() != QtCore.Qt.LeftButton:
+            return
+        drag = QtGui.QDrag(self)
+        mimeData = QtCore.QMimeData()
+        drag.setMimeData(mimeData)
+        mimeData.setText(u'Image')
+        dropAction = drag.start(QtCore.Qt.CopyAction)
+        if dropAction == QtCore.Qt.CopyAction:
+            self.close()
+
+
diff --git a/openlp/plugins/images/lib/listwithpreviews.py b/openlp/core/lib/listwithpreviews.py
similarity index 100%
rename from openlp/plugins/images/lib/listwithpreviews.py
rename to openlp/core/lib/listwithpreviews.py
diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py
index b496b1c9e..31a73b740 100644
--- a/openlp/core/lib/mediamanageritem.py
+++ b/openlp/core/lib/mediamanageritem.py
@@ -22,35 +22,17 @@ import types
 from PyQt4 import QtCore, QtGui
 from openlp.core.lib.toolbar import *
 from openlp.core.lib import translate
-
-# xxx this should be in core.lib probably
-from openlp.plugins.images.lib import ListWithPreviews
-class ImageList(QtGui.QListView):
-
-    def __init__(self,parent=None,name=None):
-        QtGui.QListView.__init__(self,parent)
-
-    def mouseMoveEvent(self, event):
-        """
-        Drag and drop event does not care what data is selected
-        as the recepient will use events to request the data move
-        just tell it what plugin to call
-        """
-        if event.buttons() != QtCore.Qt.LeftButton:
-            return
-        drag = QtGui.QDrag(self)
-        mimeData = QtCore.QMimeData()
-        drag.setMimeData(mimeData)
-        mimeData.setText(u'Image')
-        dropAction = drag.start(QtCore.Qt.CopyAction)
-        if dropAction == QtCore.Qt.CopyAction:
-            self.close()
-
-
+from imagelist import ImageList
+from listwithpreviews import ListWithPreviews
+from serviceitem import ServiceItem
 class MediaManagerItem(QtGui.QWidget):
     """
     MediaManagerItem is a helper widget for plugins.
     """
+    global log
+    log = logging.getLogger(u'MediaManagerItem')
+    log.info(u'Media Item loaded')
+
     def __init__(self, parent=None, icon=None, title=None):
         """
         Constructor to create the media manager item.