diff --git a/openlp/core/__init__.py b/openlp/core/__init__.py
index cf13aada5..fce0d08c4 100644
--- a/openlp/core/__init__.py
+++ b/openlp/core/__init__.py
@@ -20,7 +20,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 from PyQt4 import QtCore, QtGui
 
 from settingsmanager import SettingsManager
-from pluginmanager import PluginManager
+from openlp.core.lib.pluginmanager import PluginManager
 
 __all__ = ['SettingsManager', 'PluginManager', 'translate',
             'fileToXML' ]
diff --git a/openlp/core/pluginmanager.py b/openlp/core/lib/pluginmanager.py
similarity index 99%
rename from openlp/core/pluginmanager.py
rename to openlp/core/lib/pluginmanager.py
index 03749139e..94a858b2a 100644
--- a/openlp/core/pluginmanager.py
+++ b/openlp/core/lib/pluginmanager.py
@@ -17,7 +17,6 @@ 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 os
 import sys
 import logging
diff --git a/openlp/core/test/test_plugin_manager.py b/openlp/core/test/test_plugin_manager.py
index 1736d67fb..abf0961e4 100644
--- a/openlp/core/test/test_plugin_manager.py
+++ b/openlp/core/test/test_plugin_manager.py
@@ -1,4 +1,7 @@
 import logging
+import os, sys
+from openlp.core.lib.pluginmanager import PluginManager
+
 logging.basicConfig(level=logging.DEBUG,
                 format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s',
                 datefmt='%m-%d %H:%M',
@@ -14,11 +17,9 @@ logging.getLogger('').addHandler(console)
 log=logging.getLogger('')
 
 logging.info("Logging started")
-import os, sys
 mypath=os.path.split(os.path.abspath(__file__))[0]
 
 sys.path.insert(0,(os.path.join(mypath, '..' ,'..', '..')))
-from openlp.core.pluginmanager import PluginManager
 
 # test the plugin manager with some plugins in the test_plugins directory
 class TestPluginManager: