--- a/symbian3/app/printing/package_definition.xml	Wed Apr 21 18:29:51 2010 +0100
+++ b/symbian3/app/printing/package_definition.xml	Tue May 18 16:26:09 2010 +0100
@@ -54,22 +54,33 @@
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
 <block name="printing" level="services" long-name="Printing" levels="app">
-    <collection name="imageprint" long-name="ImagePrint" level="app">
-     <component name="clog" filter="s60" long-name="ImagePrint Logging" introduced="^2">
-      <unit bldFile="/sf/app/printing/imageprint/clog/group"/>
-     </component>
-     <component name="imageprintengine" filter="s60" long-name="ImagePrint Engine" introduced="^2">
-      <unit bldFile="/sf/app/printing/imageprint/imageprintengine/group"/>
-     </component>
-     <component name="imageprintui" filter="s60" long-name="ImagePrint UI" introduced="^2">
-      <unit bldFile="/sf/app/printing/imageprint/imageprintui/group"/>
-     </component>
-     <component name="imageprint_build" filter="s60" long-name="ImagePrint Build" introduced="^2">
-      <!--  Need to break the IBY includes into the other components, or remove #includes and make this a ROM component -->
-      <unit bldFile="/sf/app/printing/imageprint/group"/>
-     </component>
-    </collection>
-   </block>
+<collection name="DirectPrint" level="app">
+<component name="DirectPrintApp" filter="sf_build" long-name="DirectPrint App" introduced="^3">
+<unit bldFile="/sf/app/printing/DirectPrint/DirectPrintApp/group"/>
+</component>
+<component name="DirectPrintServer" filter="sf_build" long-name="DirectPrint Server" introduced="^3">
+<unit bldFile="/sf/app/printing/DirectPrint/DirectPrintServer/group"/>
+</component>
+<component name="DirectPrintClient" filter="sf_build" long-name="DirectPrint Client" introduced="^3">
+<unit bldFile="/sf/app/printing/DirectPrint/DirectPrintClient/group"/>
+</component>
+</collection>
+<collection name="imageprint" long-name="ImagePrint" level="app">
+<component name="clog" filter="s60" long-name="ImagePrint Logging" introduced="^2">
+<unit bldFile="/sf/app/printing/imageprint/clog/group"/>
+</component>
+<component name="imageprintengine" filter="s60" long-name="ImagePrint Engine" introduced="^2">
+<unit bldFile="/sf/app/printing/imageprint/imageprintengine/group"/>
+</component>
+<component name="imageprintui" filter="s60" long-name="ImagePrint UI" introduced="^2">
+<unit bldFile="/sf/app/printing/imageprint/imageprintui/group"/>
+</component>
+<component name="imageprint_build" filter="s60" long-name="ImagePrint Build" introduced="^2">
+<!--  Need to break the IBY includes into the other components, or remove #includes and make this a ROM component -->
+<unit bldFile="/sf/app/printing/imageprint/group"/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file