--- a/package_definition.xml	Wed Sep 29 09:49:13 2010 +0100
+++ b/package_definition.xml	Wed Oct 06 15:43:10 2010 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="graphics.simulator" name="Graphics Simulator" levels="host guest" version="4.0.0">
+  <package id="graphics.simulator" name="Graphics Simulator" levels="host interface guest" version="4.0.0">
     <meta rel="License">
       <license type="EPL"><supplier>Nokia</supplier></license>
     </meta>
@@ -17,14 +17,19 @@
       <component id="guestopenvgu" name="Guest OpenVG Utilities" introduced="^4">
         <unit bldFile="guestrendering/guestopenvgu/group"/>
       </component>
-      <component id="guestvideodriver" name="Guest Video Driver" introduced="^4">
-        <unit bldFile="guestrendering/guestvideodriver/group"/>
+    </collection>
+    <collection id="vghwinterface" name="Virtual Graphics Hardware Interface" level="interface">
+      <component id="vghwapiwrapper" name="Virtual Graphics Hardware API Wrapper" target="desktop" introduced="^4">
+        <unit bldFile="vghwinterface/vghwapiwrapper/group"/>
+      </component>
+      <component id="vghwdriver" name="Virtual Graphics Hardware Driver" introduced="^4">
+        <unit bldFile="vghwinterface/vghwdriver/group"/>
       </component>
       <component id="vghwserialiser" name="Virtual Graphics Hardware Serialiser" introduced="^4">
-        <unit bldFile="guestrendering/vghwserialiser/group"/>
+        <unit bldFile="vghwinterface/vghwserialiser/group"/>
       </component>
       <component id="vghwutils" name="Virtual Graphics Hardware Utilities" introduced="^4">
-        <unit bldFile="guestrendering/vghwutils/group"/>
+        <unit bldFile="vghwinterface/vghwutils/group"/>
       </component>
     </collection>
     <collection id="hostsupport" name="Graphics Host Support" level="host">
@@ -37,12 +42,6 @@
       <component id="hostopenvg" name="Host OpenVG" target="desktop" introduced="^4">
         <unit bldFile="hostsupport/hostopenvg/group"/>
       </component>
-      <component id="khronosapiwrapper" name="Host Khronos API Wrapper" target="desktop" introduced="^4">
-        <unit bldFile="hostsupport/khronosapiwrapper/group"/>
-      </component>
-      <component id="syborggraphicswrapper" name="Host Syborg Graphics Wrapper" target="desktop" introduced="^4">
-        <unit bldFile="hostsupport/syborggraphicswrapper/group"/>
-      </component>
       <component id="hostthreadadapter" name="Host Thread Adapater" target="desktop" introduced="^4">
         <unit bldFile="hostsupport/hostthreadadapter/group"/>
       </component>