diff --git a/.eric4project/openlp.org 2.0.e4q b/.eric4project/openlp.org 2.0.e4q
index 6de72d8eb..3269c439c 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-26, 21:42:18 -->
+<!-- Saved: 2008-11-26, 21:51:46 -->
 <!-- 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 05f885d47..f85dde85e 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: 2008-11-26, 21:42:18 -->
+<!-- Saved: 2008-11-26, 21:51:46 -->
 <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 9df8b0b5e..b24cdbba6 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-26, 21:42:18 -->
+<!-- Saved: 2008-11-26, 21:51:46 -->
 <!-- Copyright (C) 2008 Raoul Snyman, raoulsnyman@openlp.org -->
 <Project version="4.4">
   <ProgLanguage mixed="0">Python</ProgLanguage>
@@ -71,8 +71,10 @@
     <Source>openlp/core/ui/settings.py</Source>
     <Source>openlp/core/ui/alertform.py</Source>
     <Source>openlp/core/ui/about.py</Source>
-    <Source>openlp/plugins/songs/songplugin.py</Source>
     <Source>openlp/song/songxml.py</Source>
+    <Source>openlp/plugins/songs/songsplugin.py</Source>
+    <Source>openlp/plugins/songs/__init__.py</Source>
+    <Source>openlp/plugins/songs/forms/__init__.py</Source>
   </Sources>
   <Forms>
     <Form>openlp/resources/forms/mainwindow.ui</Form>
diff --git a/openlp/ui/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py
similarity index 100%
rename from openlp/ui/forms/editsongform.py
rename to openlp/plugins/songs/forms/editsongform.py
diff --git a/openlp/ui/forms/openlpexportform.py b/openlp/plugins/songs/forms/openlpexportform.py
similarity index 100%
rename from openlp/ui/forms/openlpexportform.py
rename to openlp/plugins/songs/forms/openlpexportform.py
diff --git a/openlp/ui/forms/openlpimportform.py b/openlp/plugins/songs/forms/openlpimportform.py
similarity index 100%
rename from openlp/ui/forms/openlpimportform.py
rename to openlp/plugins/songs/forms/openlpimportform.py
diff --git a/openlp/ui/forms/opensongexportform.py b/openlp/plugins/songs/forms/opensongexportform.py
similarity index 100%
rename from openlp/ui/forms/opensongexportform.py
rename to openlp/plugins/songs/forms/opensongexportform.py
diff --git a/openlp/ui/forms/opensongimportform.py b/openlp/plugins/songs/forms/opensongimportform.py
similarity index 100%
rename from openlp/ui/forms/opensongimportform.py
rename to openlp/plugins/songs/forms/opensongimportform.py