diff --git a/.eric4project/openlp.org 2.0.e4q b/.eric4project/openlp.org 2.0.e4q
index afd156796..6de72d8eb 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:40:00 -->
+<!-- Saved: 2008-11-26, 21:42:18 -->
 <!-- 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 9cc589227..05f885d47 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:40:00 -->
+<!-- Saved: 2008-11-26, 21:42:18 -->
 <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 1059a2593..9df8b0b5e 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:40:00 -->
+<!-- Saved: 2008-11-26, 21:42:18 -->
 <!-- Copyright (C) 2008 Raoul Snyman, raoulsnyman@openlp.org -->
 <Project version="4.4">
   <ProgLanguage mixed="0">Python</ProgLanguage>
@@ -33,7 +33,6 @@
     <Source>openlp/core/plugin.py</Source>
     <Source>openlp/core/xmlrootclass.py</Source>
     <Source>openlp/song/__init__.py</Source>
-    <Source>openlp/song/song.py</Source>
     <Source>openlp/song/test/test_song_opensong.py</Source>
     <Source>openlp/song/test/test_song_basic.py</Source>
     <Source>openlp/song/test/test_song_text.py</Source>
@@ -73,6 +72,7 @@
     <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>
   </Sources>
   <Forms>
     <Form>openlp/resources/forms/mainwindow.ui</Form>
diff --git a/openlp/plugins/songs/__init__.py b/openlp/plugins/songs/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/openlp/plugins/songs/forms/__init__.py b/openlp/plugins/songs/forms/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py
index 2174540b1..ce60faa0d 100644
--- a/openlp/plugins/songs/songsplugin.py
+++ b/openlp/plugins/songs/songsplugin.py
@@ -22,7 +22,7 @@ from PyQt4 import QtCore, QtGui
 from openlp.resources import *
 from openlp.core import Plugin, MediaManagerItem
 
-class SongPlugin(Plugin):
+class SongsPlugin(Plugin):
     def __init__(self):
         # Call the parent constructor
         Plugin.__init__('Song', '1.9.0')
diff --git a/openlp/song/songxml.py b/openlp/plugins/songs/songxml.py
similarity index 100%
rename from openlp/song/songxml.py
rename to openlp/plugins/songs/songxml.py
diff --git a/openlp/song/test/data_opensong/Amazing Grace b/openlp/plugins/songs/test/data_opensong/Amazing Grace
similarity index 100%
rename from openlp/song/test/data_opensong/Amazing Grace
rename to openlp/plugins/songs/test/data_opensong/Amazing Grace
diff --git a/openlp/song/test/data_opensong/På en fjern ensom høj b/openlp/plugins/songs/test/data_opensong/På en fjern ensom høj
similarity index 100%
rename from openlp/song/test/data_opensong/På en fjern ensom høj
rename to openlp/plugins/songs/test/data_opensong/På en fjern ensom høj
diff --git a/openlp/song/test/data_opensong/The Solid Rock b/openlp/plugins/songs/test/data_opensong/The Solid Rock
similarity index 100%
rename from openlp/song/test/data_opensong/The Solid Rock
rename to openlp/plugins/songs/test/data_opensong/The Solid Rock
diff --git a/openlp/song/test/data_text/CCLI example.txt b/openlp/plugins/songs/test/data_text/CCLI example.txt
similarity index 100%
rename from openlp/song/test/data_text/CCLI example.txt
rename to openlp/plugins/songs/test/data_text/CCLI example.txt
diff --git a/openlp/song/test/data_text/PåEnFjern.txt b/openlp/plugins/songs/test/data_text/PåEnFjern.txt
similarity index 100%
rename from openlp/song/test/data_text/PåEnFjern.txt
rename to openlp/plugins/songs/test/data_text/PåEnFjern.txt
diff --git a/openlp/song/test/test_song_basic.py b/openlp/plugins/songs/test/test_song_basic.py
similarity index 100%
rename from openlp/song/test/test_song_basic.py
rename to openlp/plugins/songs/test/test_song_basic.py
diff --git a/openlp/song/test/test_song_opensong.py b/openlp/plugins/songs/test/test_song_opensong.py
similarity index 100%
rename from openlp/song/test/test_song_opensong.py
rename to openlp/plugins/songs/test/test_song_opensong.py
diff --git a/openlp/song/test/test_song_text.py b/openlp/plugins/songs/test/test_song_text.py
similarity index 100%
rename from openlp/song/test/test_song_text.py
rename to openlp/plugins/songs/test/test_song_text.py
diff --git a/openlp/song/test/test_song_verse.py b/openlp/plugins/songs/test/test_song_verse.py
similarity index 100%
rename from openlp/song/test/test_song_verse.py
rename to openlp/plugins/songs/test/test_song_verse.py