diff --git a/.eric4project/openlp.org 2.0.e4q b/.eric4project/openlp.org 2.0.e4q
index c7f028cae..c8614a2b0 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: 2009-03-05, 22:27:52 -->
+<!-- Saved: 2009-03-07, 01:40:29 -->
 <!-- Copyright (C) 2009 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 3743de5be..d304e2f5d 100644
--- a/.eric4project/openlp.org 2.0.e4t	
+++ b/.eric4project/openlp.org 2.0.e4t	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Tasks SYSTEM "Tasks-4.2.dtd">
 <!-- eric4 tasks file for project openlp.org 2.0 -->
-<!-- Saved: 2009-03-05, 22:27:54 -->
+<!-- Saved: 2009-03-07, 01:40:29 -->
 <Tasks version="4.2">
   <Task priority="1" completed="False" bugfix="False">
     <Summary>TODO: what is the tags for bridge, pre-chorus?</Summary>
diff --git a/openlp.org 2.0.e4p b/openlp.org 2.0.e4p
index 24085d299..077a5e2ea 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.6.dtd">
 <!-- eric4 project file for project openlp.org 2.0 -->
-<!-- Saved: 2009-03-05, 22:27:52 -->
+<!-- Saved: 2009-03-07, 01:40:29 -->
 <!-- Copyright (C) 2009 Raoul Snyman, raoulsnyman@openlp.org -->
 <Project version="4.6">
   <Language>en</Language>
@@ -134,8 +134,10 @@
     <Source>openlp/plugins/videos/lib/videotab.py</Source>
     <Source>openlp/plugins/bibles/lib/biblemediaitem.py</Source>
     <Source>openlp/plugins/images/imageserviceitem.py</Source>
-    <Source>openlp/plugins/images/listwithpreviews.py</Source>
     <Source>openlp/core/ui/test/test_service_manager.py</Source>
+    <Source>openlp/plugins/images/lib/__init__.py</Source>
+    <Source>openlp/plugins/images/lib/imageserviceitem.py</Source>
+    <Source>openlp/plugins/images/lib/listwithpreviews.py</Source>
   </Sources>
   <Forms>
     <Form>resources/forms/openlpexportform.ui</Form>
diff --git a/openlp/plugins/images/imageplugin.py b/openlp/plugins/images/imageplugin.py
index 1a7be824c..6ee63683c 100644
--- a/openlp/plugins/images/imageplugin.py
+++ b/openlp/plugins/images/imageplugin.py
@@ -26,8 +26,8 @@ from openlp.core.lib import Plugin, PluginUtils, MediaManagerItem
 import logging
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
-from listwithpreviews import ListWithPreviews
-from imageserviceitem import ImageServiceItem
+from openlp.plugins.images.lib import ListWithPreviews
+from openlp.plugins.images.lib import ImageServiceItem
 
 class ImagePlugin(Plugin, PluginUtils):
     global log
@@ -126,7 +126,7 @@ class ImagePlugin(Plugin, PluginUtils):
             filename = self.ImageListData.get_filename(i)
             log.info("Click %s:%s"%(str(where), filename))
             where.add(filename)
-            
+
         where.render()
 
     def onImagePreviewClick(self):
diff --git a/openlp/plugins/images/lib/__init__.py b/openlp/plugins/images/lib/__init__.py
index e69de29bb..f289bfa41 100644
--- a/openlp/plugins/images/lib/__init__.py
+++ b/openlp/plugins/images/lib/__init__.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+"""
+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
+"""
+