diff --git a/.eric4project/openlp.org 2.0.e4q b/.eric4project/openlp.org 2.0.e4q
index 7a8a7d042..84e7cb899 100644
--- a/.eric4project/openlp.org 2.0.e4q	
+++ b/.eric4project/openlp.org 2.0.e4q	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE UserProject SYSTEM "UserProject-4.0.dtd">
 <!-- eric4 user project file for project openlp.org 2.0 -->
-<!-- Saved: 2008-11-21, 20:51:04 -->
+<!-- Saved: 2008-11-22, 17:14:47 -->
 <!-- Copyright (C) 2008 Raoul Snyman, raoulsnyman@openlp.org -->
 <UserProject version="4.0">
 </UserProject>
\ No newline at end of file
diff --git a/.eric4project/openlp.org 2.0.e4t b/.eric4project/openlp.org 2.0.e4t
index a9ddac42a..b49f3dcb4 100644
--- a/.eric4project/openlp.org 2.0.e4t	
+++ b/.eric4project/openlp.org 2.0.e4t	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Tasks SYSTEM "Tasks-4.2.dtd">
 <!-- eric4 tasks file for project openlp.org 2.0 -->
-<!-- Saved: 2008-11-21, 20:51:04 -->
+<!-- Saved: 2008-11-22, 17:14:47 -->
 <Tasks version="4.2">
 </Tasks>
\ No newline at end of file
diff --git a/openlp.org 2.0.e4p b/openlp.org 2.0.e4p
index 8aaae61e5..6391f573d 100644
--- a/openlp.org 2.0.e4p	
+++ b/openlp.org 2.0.e4p	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Project SYSTEM "Project-4.4.dtd">
 <!-- eric4 project file for project openlp.org 2.0 -->
-<!-- Saved: 2008-11-21, 20:51:04 -->
+<!-- Saved: 2008-11-22, 17:14:47 -->
 <!-- Copyright (C) 2008 Raoul Snyman, raoulsnyman@openlp.org -->
 <Project version="4.4">
   <ProgLanguage mixed="0">Python</ProgLanguage>
@@ -48,8 +48,6 @@
     <Source>openlp/song/test/test_song_verse.py</Source>
     <Source>openlp/plugins/__init__.py</Source>
     <Source>openlp/plugins/testplugin1.py</Source>
-    <Source>openlp/plugins/plugin.py</Source>
-    <Source>openlp/plugins/plugin_manager.py</Source>
     <Source>openlp/plugins/testplugin2/__init__.py</Source>
     <Source>openlp/plugins/testplugin2/testplugin2.py</Source>
     <Source>openlp/plugins/test/test_plugin_manager.py</Source>
@@ -70,6 +68,8 @@
     <Source>openlp/plugins/test/test_mediamanageritem.py</Source>
     <Source>openlp/plugins/biblemanager/BibleOSISImpl.py</Source>
     <Source>openlp/plugins/biblemanager/test/test_bibleManagerOSIS.py</Source>
+    <Source>openlp/core/pluginmanager.py</Source>
+    <Source>openlp/core/mediamanageritem.py</Source>
   </Sources>
   <Forms>
     <Form>openlp/resources/forms/mainwindow.ui</Form>
diff --git a/openlp/core/__init__.py b/openlp/core/__init__.py
index 25bc9d548..c860a9519 100644
--- a/openlp/core/__init__.py
+++ b/openlp/core/__init__.py
@@ -21,4 +21,4 @@ from openlp.core.settingsmanager import SettingsManager
 from openlp.core.plugin import Plugin
 from openlp.core.pluginmanager import PluginManager
 
-__all__ = ['Renderer', 'SettingsManager', 'Plugin']
+__all__ = ['Renderer', 'SettingsManager', 'Plugin', 'PluginManager']
diff --git a/openlp/core/mediamanageritem.py b/openlp/core/mediamanageritem.py
new file mode 100644
index 000000000..354b62afa
--- /dev/null
+++ b/openlp/core/mediamanageritem.py
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80
+"""
+OpenLP - Open Source Lyrics Projection
+Copyright (c) 2008 Raoul Snyman
+Portions copyright (c) 2008 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
+"""
+
+from PyQt4 import QtCore, QtGui
+from openlp.resources import *
+
+class MediaManagerItem(QtGui.QWidget):
+    """
+    MediaManagerItem is a helper widget for plugins.
+    """
+    def __init__(self, icon=None, title=None):
+        """
+        Constructor to create the media manager item.
+        """
+        QtGui.QWidget.__init__(self)
+        self.Icon = QtGui.QIcon()
+        if icon is not None:
+            self.Icon.addPixmap(QtGui.QPixmap.fromImage(QtGui.QImage(icon)), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        else:
+            self.Icon = None
+        if title is not None:
+            self.Title = title
+        else:
+            self.Title = ''