diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/app/musicplayer/package_definition.xml
--- a/symbian4/app/musicplayer/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/app/musicplayer/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="musicplayer" name="Music Player Apps" levels="plugins support hs app">
-	<!-- move the export .pri files into their components and uncomment the units -->
+ <package id="musicplayer" name="Music Player Apps" levels="plugins support engine app">
+	<!-- move the rom .pri files into their components and uncomment the units -->
 
   <collection id="musicplayer_utilities " name="Music Player Utilities" level="support">
    <component id="mpnowplayingbanner" filter="s60" name="MP Now Playing Banner" introduced="^4">
@@ -11,10 +11,10 @@
 	<!-- <unit bldFile="utilities/mpsettingsmanager" qt:proFile="mpsettingsmanager.pro" qt:qmakeArgs="-r -config rom"/> -->
    </component>
   </collection>
-  <collection id="musicfetcher " name="Music Fetcher" level="support">
+  <collection id="musicservices " name="Music Services" level="support">
 	<!-- collection is really a component, move down a directory -->
-   <component id="musicfetcher_buld" filter="s60" name="Music Fetcher Build" introduced="^4">
-	<!-- <unit bldFile="musicfetcher" qt:proFile="musicfetcher.pro" qt:qmakeArgs="-r -config rom"/> -->
+   <component id="musicservices_build" filter="s60" name="Music Services Build" introduced="^4">
+	<!-- <unit bldFile="musicservices" qt:proFile="musicservices.pro" qt:qmakeArgs="-r -config rom"/> -->
    </component>
   </collection>
   <collection id="musicplayer_app " name="Music Player Application" level="app">
@@ -23,12 +23,33 @@
 	<!-- <unit bldFile="app" qt:proFile="app.pro" qt:qmakeArgs="-r -config rom"/> -->
    </component>
   </collection>
-  <collection id="mpviewplugins " name="Music Player View Plugins" level="plugins">
+  <collection id="mpdata " name="Music Player Data" level="support">
+	<!-- collection is really a component, move down a directory -->
+   <component id="mpdata_build" filter="s60" name="Music Player Data Build" introduced="^4">
+	<!-- <unit bldFile="mpdata" qt:proFile="mpdata.pro" qt:qmakeArgs="-r -config rom"/> -->
+   </component>
+  </collection>
+  <collection id="mpengine " name="Music Player Engine" level="engine">
+	<!-- collection is really a component, move down a directory -->
+   <component id="mpengine_build" filter="s60" name="Music Player Engine Build" introduced="^4">
+	<!-- <unit bldFile="mpengine" qt:proFile="mpengine.pro" qt:qmakeArgs="-r -config rom"/> -->
+   </component>
+  </collection>
+  <collection id="mpviewplugins" name="Music Player View Plugins" level="plugins">
    <component id="mpcollectionviewplugin" filter="s60" name="MP Collection View Plugin" introduced="^4" class="plugin">
-    <!--<unit bldFile="mpviewplugins/mpcollectionviewplugin/group"/>-->
+    <!--<unit bldFile="mpviewplugins/mpcollectionviewplugin" qt:proFile="mpcollectionviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
    </component>
    <component id="mpplaybackviewplugin" filter="s60" name="MP Playback View Plugin" introduced="^4" class="plugin">
-    <!--<unit bldFile="mpviewplugins/mpplaybackviewplugin/group"/>-->
+    <!--<unit bldFile="mpviewplugins/mpplaybackviewplugin" qt:proFile="mpplaybackviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
+   </component>
+   <component id="mpsettingsviewplugin" filter="s60" name="MP Settings View Plugin" introduced="^4" class="plugin">
+    <!--<unit bldFile="mpviewplugins/mpsettingsviewplugin" qt:proFile="mpsettingsviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
+   </component>
+   <component id="mpdetailsviewplugin" filter="s60" name="MP Details View Plugin" introduced="^4" class="plugin">
+    <!--<unit bldFile="mpviewplugins/mpdetailsviewplugin" qt:proFile="mpdetailsviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
+   </component>
+   <component id="mpmediawallviewplugin" filter="s60" name="MP Media Wall View Plugin" introduced="^4" class="plugin">
+    <!--<unit bldFile="mpviewplugins/mpmediawallviewplugin" qt:proFile="mpmediawallviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
    </component>
   </collection>
   <collection id="mpserviceplugins" name="Music Player Service Plugins" level="plugins">
@@ -42,19 +63,25 @@
    <component id="mpxsqlitedbcommon" filter="s60" name="MPX SQLite Database Common" introduced="^4">
     <!--<unit bldFile="mpserviceplugins/mpxsqlitedbcommon/group"/>-->
    </component>
+   <component id="mpxsqlitedbhgplugin" filter="s60" name="MPX SQLite Database Hg Plugin" introduced="^4" class="plugin">
+    <!--<unit bldFile="mpserviceplugins/mpxsqlitedbhgplugin/group"/>-->
+   </component>
    <component id="mpxsqlitedbplugin" filter="s60" name="MPX SQLite Database Plugin" introduced="^4" class="plugin">
     <!--<unit bldFile="mpserviceplugins/mpxsqlitedbplugin/group"/>-->
    </component>
    <component id="mpxsqlitepodcastdbplugin" filter="s60" name="MPX SQLlite Podcast Database Plugin" introduced="^4" class="plugin">
     <!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
    </component>
+   <component id="mpxinmemoryplugin" filter="s60" name="MPX In-Memory Plugin" introduced="^4" class="plugin">
+    <!--<unit bldFile="mpserviceplugins/mpxinmemoryplugin/group"/>-->
+   </component>
    <component id="m3uplaylistplugin" filter="s60" name="M3U Playlist Plugin" introduced="^4" class="plugin">
     <!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
    </component>
   </collection>
   <collection id="musicplayer_info" name="Music Player Apps Info" level="app">
    <component id="musicplayer_build" filter="s60" name="Music Player Build">
-    <!-- should brak up into individual components  -->
+    <!-- break up into individual components. ROM includes should be in their components -->
 	<unit bldFile="." qt:proFile="qtmusicplayer.pro" qt:qmakeArgs="-r -config rom"/>
    </component>
   </collection>