diff -r 424ba1d4ccef -r c8d3143d3c0e symbian3/mw/opensrv/package_definition_3.0.xml
--- a/symbian3/mw/opensrv/package_definition_3.0.xml	Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/opensrv/package_definition_3.0.xml	Wed Feb 03 20:06:22 2010 +0000
@@ -2,22 +2,19 @@
 <SystemDefinition schema="3.0.0">
   <package id="opensrv" name="Open Services" levels="prt lib server eng">
     <collection id="loudmouth" name="Loudmouth" level="prt">
+    	<!-- collection is really a component so it needs to be moved down a directory -->
       <component id="loudmouth_build" filter="s60" name="Loudmouth Build" introduced="^2">
         <unit bldFile="loudmouth/group"/>
       </component>
-      <component id="loudmouth_test" filter="s60" name="Loudmouth Test" purpose="development" introduced="^2">
-        <!-- <unit bldFile="loudmouth/tsrc/group"/> -->
-      </component>
     </collection>
     <collection id="libtelepathy" name="Telepathy Library" level="lib">
+    	<!-- collection is really a component so it needs to be moved down a directory -->
       <component id="libtelepathy_build" filter="s60" name="Telepathy Library Build" introduced="^2">
         <unit bldFile="libtelepathy/group"/>
       </component>
-      <component id="libtelepathy_test" filter="s60" name="Telepathy Library Test" purpose="development" introduced="^2">
-        <!-- <unit bldFile="libtelepathy/tsrc/group"/> -->
-      </component>
     </collection>
     <collection id="telepathygabble" name="Telepathy Gabble" level="eng">
+    	<!-- collection is really a component so it needs to be moved down a directory -->
       <component id="telepathygabble_build" filter="s60" name="Telepathy Gabble Build" introduced="^2">
         <unit bldFile="telepathygabble/group"/>
       </component>
@@ -29,17 +26,14 @@
       <component id="isoserver" filter="s60" name="ISO Server" introduced="^2">
         <unit bldFile="isolationserver/isoserver/group"/>
       </component>
-      <component id="isolationserver_test" filter="s60" name="Isloation Server Test" purpose="development" introduced="^2">
-        <!-- <unit bldFile="isolationserver/tsrc/group"/> -->
-      </component>
       <component id="isolationserver_build" filter="s60" name="Isloation Server Build" introduced="^2">
+      	<!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
         <unit bldFile="isolationserver/group"/>
       </component>
     </collection>
     <collection id="opensrv_info" name="Open Services Info" level="eng">
       <component id="opensrv_plat" filter="s60" name="Open Services Platform Interfaces" class="api" introduced="^2">
         <unit bldFile="opensrv_plat/group"/>
-        <!-- <unit bldFile="opensrv_plat/messagequeue_api/tsrc/group"/> -->
       </component>
     </collection>
   </package>