MCL/sftools/fbf/projects/platforms: comparison symbian3/single/sysdefs/sf3c.svg

equal deleted inserted replaced

-:731411a3cd2a
+:b73548d05e72
 <?xml version="1.0" encoding="UTF-8"?>
 <?AdobeSVGViewer resolution="600"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:m="http://exslt.org/math" version="1.1" onload="wrapalltext()" viewBox="-3.2 -3.2 1100 689.8118117952596" class="collection-fixed" onscroll="resized()" onzoom="resized()" onresize="resized()">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:m="http://exslt.org/math" version="1.1" onload="wrapalltext()" viewBox="-3.2 -3.2 1365.4999999999998 685.1661644863985" class="collection-fixed" onscroll="resized()" onzoom="resized()" onresize="resized()">
 <title>Symbian OS ^3 System Model: %d %b %Y</title>
 <defs>
 <style type="text/css">
 text.layer, text.package, text.collection, text.component,
 text.cbox, text.lgrp, text.label, text.lgd {
 		trans+=')';
 		e.setAttribute('transform',trans);
 ]]><![CDATA[
 		}
 	]]></script>
-<g id="os" transform="translate(3.1999999999999993 412.52)" class="layer">
+<g id="os" transform="translate(3.1999999999999993 404.06)" class="layer">
-<rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="231.26000000000002"/>
+<rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="227.03"/>
-<text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="231.26000000000002" height="9.3" x="-115.93">OS</text>
+<text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="227.03" height="9.3" x="-113.815">OS</text>
-<g class="layer-detail" transform="translate(27.05 3.2)">
+<g class="layer-detail" transform="translate(57.04999999999988 3.2)">
-<rect x="-14.25" class="layer" y="-3.2" width="1077.6" height="231.26000000000002"/>
+<rect x="-44.249999999999886" class="layer" y="-3.2" width="1343.0999999999997" height="227.03"/>
 <g>
-<g id="kernelhwsrv" class="package" transform="translate( 0 123.43000000000002)">
+<g id="kernelhwsrv" class="package" transform="translate( 0 119.20000000000002)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
 <rect class="package" x="0" width="68.7" height="101.43" y="0" style="fill:tan;"/>
-<text text-anchor="middle" class="package" width="68.7" x="34.35" y="100.42999999999999">Kernel &amp; HW Services</text>
+<text text-anchor="middle" class="package" width="68.7" x="34.35" y="100.43">Kernel &amp; HW Services</text>
 <g transform="translate(0 3.2)">
 <g id="brdbootldr" transform="translate(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Board Boot Loader</text>
 <g transform="translate(0 6.299999999999999)"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Kernel &amp; HW Services Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="boardsupport" class="package" transform="translate( 70.8 123.43000000000002)">
+<g id="boardsupport" class="package" transform="translate( 70.8 119.20000000000002)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
 <rect class="package" x="0" width="27.900000000000002" height="101.43" y="0" style="fill:tan;"/>
-<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="100.42999999999999">Board Support</text>
+<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="100.43">Board Support</text>
 <g transform="translate(0 3.2)">
 <g id="emulator" transform="translate(0 75.2)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Emulator</text>
 <g transform="translate(0 6.299999999999999)"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Board Support Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="buildtools" class="package" transform="translate( 100.8 123.43000000000002)">
+<g id="buildtools" class="package" transform="translate( 100.8 119.20000000000002)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
 <rect class="package" x="0" width="33.3" height="101.43" y="0" style="fill:darkgray;"/>
-<text text-anchor="middle" class="package" width="33.3" x="16.65" y="100.42999999999999">Build Tools</text>
+<text text-anchor="middle" class="package" width="33.3" x="16.65" y="100.43">Build Tools</text>
 <g transform="translate(0 3.2)">
 <g id="bldsystemtools" transform="translate(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Build System Tools</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
 <g id="ossrv" class="package" transform="translate( 0 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
-<rect class="package" x="0" width="86.4" height="120.23000000000002" y="0" style="fill:tan;"/>
+<rect class="package" x="0" width="121.79999999999998" height="116.00000000000001" y="0" style="fill:tan;"/>
-<text text-anchor="middle" class="package" width="86.4" x="43.2" y="119.23000000000002">Generic OS Services</text>
+<text text-anchor="middle" class="package" width="121.79999999999998" x="60.89999999999999" y="105" dy="0.375em">Generic OS Services</text>
 <g transform="translate(0 3.2)">
+<g id="ossrv_pub" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Generic OS Services Public Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="ossrv_plat" transform="translate(17.7 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Generic OS Services Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="stdlibs" transform="translate(0 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Standard Libraries</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="ssl" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">SSL</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="glib" transform="translate(0 0)" class="collection">
+<g id="glib" transform="translate(35.4 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">GLib</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="stdcpp" transform="translate(17.7 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">C++ Standard Library</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="ofdbus" transform="translate(17.7 0)" class="collection">
+<g id="ofdbus" transform="translate(53.099999999999994 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Open Foundation D-Bus</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="utilitylibraries" transform="translate(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Utility Libraries</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="genericservices" transform="translate(35.4 0)" class="collection">
+<g id="genericservices" transform="translate(70.8 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Generic Services</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="syslibsapitest" transform="translate(53.099999999999994 0)" class="collection placeholder">
+<g id="syslibsapitest" transform="translate(88.5 0)" class="collection placeholder">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">SysLibs API Tests</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="compressionlibs" transform="translate(17.7 18.8)" class="collection">
 <g id="lowlevellibsandfws" transform="translate(0 75.2)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Low Level Libs &amp; Fmwks.</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="ossrv_info" transform="translate(70.8 0)" class="collection">
+<g id="ossrv_info" transform="translate(106.19999999999999 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Generic OS Services Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="persistentdata" class="package" transform="translate( 88.5 0)">
+<g id="persistentdata" class="package" transform="translate( 123.89999999999998 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
-<rect class="package" x="0" width="33.3" height="120.23000000000002" y="0" style="fill:tan;"/>
+<rect class="package" x="0" width="33.3" height="116.00000000000001" y="0" style="fill:tan;"/>
-<text text-anchor="middle" class="package" width="33.3" x="16.65" y="119.23000000000002">Persistent Data Services</text>
+<text text-anchor="middle" class="package" width="33.3" x="16.65" y="105" dy="0.375em">Persistent Data Services</text>
 <g transform="translate(0 3.2)">
 <g id="featuremgmt" transform="translate(0 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Feature Management</text>
 <g transform="translate(0 6.299999999999999)"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Persistent Data Services Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="devicesrv" class="package" transform="translate( 123.9 0)">
+<g id="devicesrv" class="package" transform="translate( 159.29999999999998 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
-<rect class="package" x="0" width="86.4" height="120.23000000000002" y="0" style="fill:tan;"/>
+<rect class="package" x="0" width="121.79999999999998" height="116.00000000000001" y="0" style="fill:tan;"/>
-<text text-anchor="middle" class="package" width="86.4" x="43.2" y="119.23000000000002">Device Services</text>
+<text text-anchor="middle" class="package" width="121.79999999999998" x="60.89999999999999" y="105" dy="0.375em">Device Services</text>
 <g transform="translate(0 3.2)">
+<g id="devicesrv_pub" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Device Services Public Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="devicesrv_plat" transform="translate(17.7 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Device Services Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="accessoryservices" transform="translate(0 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Accessory Services</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="commonservices" transform="translate(0 0)" class="collection">
+<g id="commonservices" transform="translate(35.4 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Common Services</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="dosservices" transform="translate(0 75.2)" class="collection">
 <g id="hwrmhaptics" transform="translate(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">HWRM Haptics</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="mediator" transform="translate(17.7 0)" class="collection">
+<g id="mediator" transform="translate(53.099999999999994 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Mediator</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="psmservices" transform="translate(35.4 0)" class="collection">
+<g id="psmservices" transform="translate(70.8 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Power Save Mode Services</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="resourcemgmt" transform="translate(17.7 75.2)" class="collection">
 <g id="systemhealthmanagement" transform="translate(17.7 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">System Health Mgmt.</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="devicesrvapitest" transform="translate(53.099999999999994 0)" class="collection placeholder">
+<g id="devicesrvapitest" transform="translate(88.5 0)" class="collection placeholder">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Devices Services API Tests</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="devicesrv_info" transform="translate(70.8 0)" class="collection">
+<g id="devicesrv_info" transform="translate(106.19999999999999 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Device Services Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="security" class="package" transform="translate( 212.4 0)">
+<g id="security" class="package" transform="translate( 283.2 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color1.mouseover" end="s8-color1.mouseout"/>
-<rect class="package" x="0" width="68.7" height="120.23000000000002" y="0" style="fill:rgb(228,14,98);"/>
+<rect class="package" x="0" width="68.7" height="116.00000000000001" y="0" style="fill:rgb(228,14,98);"/>
-<text text-anchor="middle" class="package" width="68.7" x="34.35" y="119.23000000000002">OS Security</text>
+<text text-anchor="middle" class="package" width="68.7" x="34.35" y="105" dy="0.375em">OS Security</text>
 <g transform="translate(0 3.2)">
 <g id="authenticationservices" transform="translate(0 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Authentication Services</text>
 <g transform="translate(0 6.299999999999999)"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">OS Security Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="lbs" class="package" transform="translate( 283.20000000000005 0)">
+<g id="lbs" class="package" transform="translate( 354 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
-<rect class="package" x="0" width="68.7" height="120.23000000000002" y="0" style="fill:whitesmoke;"/>
+<rect class="package" x="0" width="68.7" height="116.00000000000001" y="0" style="fill:whitesmoke;"/>
-<text text-anchor="middle" class="package" width="68.7" x="34.35" y="119.23000000000002">Locating Services</text>
+<text text-anchor="middle" class="package" width="68.7" x="34.35" y="115.00000000000001">Locating Services</text>
 <g transform="translate(0 3.2)">
 <g id="datasourcemodules" transform="translate(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Generic Positioning Plugins</text>
 <g transform="translate(0 6.299999999999999)"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Locating Services Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="commsfw" class="package" transform="translate( 354.00000000000006 0)">
+<g id="commsfw" class="package" transform="translate( 424.8 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-<rect class="package" x="0" width="51" height="120.23000000000002" y="0" style="fill:moccasin;"/>
+<rect class="package" x="0" width="51" height="116.00000000000001" y="0" style="fill:moccasin;"/>
-<text text-anchor="middle" class="package" width="51" x="25.5" y="119.23000000000002">Comms Framework</text>
+<text text-anchor="middle" class="package" width="51" x="25.5" y="115.00000000000001">Comms Framework</text>
 <g transform="translate(0 3.2)">
 <g id="commsprocess" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Comms Process</text>
 <g transform="translate(0 6.299999999999999)"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Comms Framework Tools</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="networkingsrv" class="package" transform="translate( 407.1000000000001 0)">
+<g id="networkingsrv" class="package" transform="translate( 477.90000000000003 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-<rect class="package" x="0" width="68.7" height="120.23000000000002" y="0" style="fill:moccasin;"/>
+<rect class="package" x="0" width="68.7" height="116.00000000000001" y="0" style="fill:moccasin;"/>
-<text text-anchor="middle" class="package" width="68.7" x="34.35" y="119.23000000000002">Networking Services</text>
+<text text-anchor="middle" class="package" width="68.7" x="34.35" y="105" dy="0.375em">Networking Services</text>
 <g transform="translate(0 3.2)">
 <g id="esockapiextensions" transform="translate(0 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">ESock API Extensions</text>
 <g transform="translate(0 6.299999999999999)"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">PPP Compression Plugins</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="wlan" class="package" transform="translate( 477.9000000000001 0)">
+<g id="wlan" class="package" transform="translate( 548.7 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-<rect class="package" x="0" width="33.3" height="120.23000000000002" y="0" style="fill:moccasin;"/>
+<rect class="package" x="0" width="68.7" height="116.00000000000001" y="0" style="fill:moccasin;"/>
-<text text-anchor="middle" class="package" width="33.3" x="16.65" y="119.23000000000002">WLAN</text>
+<text text-anchor="middle" class="package" width="68.7" x="34.35" y="86.2" dy="0.375em">WLAN</text>
 <g transform="translate(0 3.2)">
+<g id="wlan_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">WLAN Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="wlan_pub" transform="translate(17.7 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">WLAN Public Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="wlan_bearer" transform="translate(0 94)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">WLAN Bearer</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="wlanapitest" transform="translate(0 0)" class="collection placeholder">
+<g id="wlanapitest" transform="translate(35.4 0)" class="collection placeholder">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">WLAN API Tests</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="wlan_info" transform="translate(17.7 0)" class="collection">
+<g id="wlan_info" transform="translate(53.099999999999994 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">WLAN Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="cellularsrv" class="package" transform="translate( 513.3000000000001 0)">
+<g id="cellularsrv" class="package" transform="translate( 619.5 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
-<rect class="package" x="0" width="51" height="120.23000000000002" y="0" style="fill:darkkhaki;"/>
+<rect class="package" x="0" width="51" height="116.00000000000001" y="0" style="fill:darkkhaki;"/>
 <text text-anchor="middle" class="package" width="35.4" x="33.3" y="86.2" dy="0.375em">Cellular Baseband Services</text>
 <g transform="translate(0 3.2)">
 <g id="basebandabstraction" transform="translate(0 75.2)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Baseband Abstraction</text>
 <g id="basebandadaptationplugins" transform="translate(0 94)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Baseband Adapt. Plugins</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="fax" transform="translate(0 18.8)" class="collection">
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Fax</text>
-<g transform="translate(0 6.299999999999999)"/>
-</g>
 <g id="smsprotocols" transform="translate(0 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">SMS Protocols</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="telephonyprotocols" transform="translate(17.7 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Telephony Protocols</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="telephonyserver" transform="translate(17.7 18.8)" class="collection">
+<g id="telephonyserver" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Telephony Server</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="telephonyserverplugins" transform="translate(0 56.400000000000006)" class="collection">
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Telephony API Tests</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="bt" class="package" transform="translate( 566.4000000000001 0)">
+<g id="bt" class="package" transform="translate( 672.6 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
-<rect class="package" x="0" width="51" height="120.23000000000002" y="0" style="fill:orchid;"/>
+<rect class="package" x="0" width="68.7" height="116.00000000000001" y="0" style="fill:orchid;"/>
-<text text-anchor="middle" class="package" width="51" x="25.5" y="119.23000000000002">Bluetooth</text>
+<text text-anchor="middle" class="package" width="68.7" x="34.35" y="105" dy="0.375em">Bluetooth</text>
 <g transform="translate(0 3.2)">
+<g id="bt_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Bluetooth Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="bluetooth" transform="translate(0 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Bluetooth Core</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="bluetoothmgmt" transform="translate(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Bluetooth Management</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="bluetoothcommsprofiles" transform="translate(0 0)" class="collection">
+<g id="bluetoothcommsprofiles" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Btooth. Comms Profiles</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="bthci" transform="translate(0 18.8)" class="collection">
 <g id="irda" transform="translate(17.7 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">IrDA</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="bluetoothapitest" transform="translate(17.7 0)" class="collection placeholder">
+<g id="bluetoothapitest" transform="translate(35.4 0)" class="collection placeholder">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Bluetooth API Tests</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="atext" transform="translate(17.7 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">AT Extensions</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="bt_info" transform="translate(35.4 0)" class="collection">
+<g id="bt_info" transform="translate(53.099999999999994 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Bluetooth Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="usb" class="package" transform="translate( 619.5000000000001 0)">
+<g id="usb" class="package" transform="translate( 743.4 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
-<rect class="package" x="0" width="27.900000000000002" height="120.23000000000002" y="0" style="fill:orchid;"/>
+<rect class="package" x="0" width="33.3" height="116.00000000000001" y="0" style="fill:orchid;"/>
-<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="119.23000000000002">USB</text>
+<text text-anchor="middle" class="package" width="33.3" x="16.65" y="105" dy="0.375em">USB</text>
 <g transform="translate(0 3.2)">
+<g id="usb_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">USB Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="usbldd" transform="translate(0 75.2)" class="collection placeholder">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">USB Logical Device Drivers</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="usbmgmt" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">USB Management</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="usb_info" transform="translate(0 0)" class="collection">
+<g id="usb_info" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">USB Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="mm" class="package" transform="translate( 649.5000000000001 0)">
+<g id="mm" class="package" transform="translate( 778.8 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-<rect class="package" x="0" width="86.4" height="120.23000000000002" y="0" style="fill:rgb(175,212,240);"/>
+<rect class="package" x="0" width="86.4" height="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
-<text text-anchor="middle" class="package" width="86.4" x="43.2" y="119.23000000000002">Multimedia</text>
+<text text-anchor="middle" class="package" width="70.80000000000001" x="51" y="86.2" dy="0.375em">Multimedia</text>
 <g transform="translate(0 3.2)">
+<g id="mm_pub" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">MM Public Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="mm_plat" transform="translate(17.7 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">MM Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="devsoundextensions" transform="translate(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Devsound Extensions</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="video" transform="translate(17.7 18.8)" class="collection placeholder">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Codecs</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="imagingandcamerafws" transform="translate(0 0)" class="collection">
+<g id="imagingandcamerafws" transform="translate(35.4 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Imaging &amp; Camera Fmwks.</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="mmlibs" transform="translate(35.4 18.8)" class="collection">
 <g id="mmplugins" transform="translate(53.099999999999994 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Multimedia Plugins</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="mm_info" transform="translate(17.7 0)" class="collection">
+<g id="mm_info" transform="translate(53.099999999999994 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Multimedia Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="mmresourcemgmt" transform="translate(70.8 18.8)" class="collection">
 <g id="mmhais" transform="translate(17.7 94)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">MM HW Adapt. Interfaces</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="mmapitest" transform="translate(35.4 0)" class="collection">
+<g id="mmapitest" transform="translate(70.8 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Multimedia API Tests</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="imagingext" class="package" transform="translate( 738.0000000000001 0)">
+<g id="imagingext" class="package" transform="translate( 867.3 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-<rect class="package" x="0" width="33.3" height="120.23000000000002" y="0" style="fill:rgb(175,212,240);"/>
+<rect class="package" x="0" width="51" height="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
-<text text-anchor="middle" class="package" width="33.3" x="16.65" y="119.23000000000002">Imaging Extensions</text>
+<text text-anchor="middle" class="package" width="51" x="25.5" y="105" dy="0.375em">Imaging Extensions</text>
 <g transform="translate(0 3.2)">
-<g id="imageadaptationextensions" transform="translate(0 0)" class="collection">
+<g id="imagingext_pub" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Imaging Ext. Public Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="imagingext_plat" transform="translate(17.7 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Imaging Ext. Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="imageadaptationextensions" transform="translate(35.4 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Image Adapt. Ext.</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="imagingmodules" transform="translate(0 75.2)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Imaging Modules</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="imagingext_info" transform="translate(17.7 0)" class="collection">
+</g>
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+</g>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Imaging Ext. Info</text>
+<g id="graphics" class="package" transform="translate( 920.4 0)">
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-</g>
-</g>
-<g id="graphics" class="package" transform="translate( 773.4000000000001 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-<rect class="package" x="0" width="86.4" height="120.23000000000002" y="0" style="fill:orange;"/>
+<rect class="package" x="0" width="104.1" height="116.00000000000001" y="0" style="fill:orange;"/>
-<text text-anchor="middle" class="package" width="86.4" x="43.2" y="119.23000000000002">Graphics</text>
+<text text-anchor="middle" class="package" width="88.5" x="59.849999999999994" y="29.8" dy="0.375em">Graphics</text>
 <g transform="translate(0 3.2)">
 <g id="graphicsaccelaration" transform="translate(0 94)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Graphics Acceleration</text>
 <g transform="translate(0 6.299999999999999)"/>
 <g id="graphicstest" transform="translate(0 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Graphics Test</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="graphics_info" transform="translate(17.7 0)" class="collection">
+<g id="graphics_plat" transform="translate(17.7 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Graphics Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="graphics_info" transform="translate(35.4 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Graphics Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="windowing" transform="translate(35.4 0)" class="collection">
+<g id="windowing" transform="translate(53.099999999999994 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Windowing</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="printingservices" transform="translate(53.099999999999994 0)" class="collection">
+<g id="printingservices" transform="translate(70.8 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Printing Services</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="fbs" transform="translate(0 37.6)" class="collection">
 <g id="graphicstools" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Graphics Tools</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="graphicsapitest" transform="translate(70.8 0)" class="collection placeholder">
+<g id="graphicsapitest" transform="translate(88.5 0)" class="collection placeholder">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Graphics API Tests</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="textandloc" class="package" transform="translate( 861.9000000000001 0)">
+<g id="textandloc" class="package" transform="translate( 1026.6 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-<rect class="package" x="0" width="33.3" height="120.23000000000002" y="0" style="fill:orange;"/>
+<rect class="package" x="0" width="68.7" height="116.00000000000001" y="0" style="fill:orange;"/>
-<text text-anchor="middle" class="package" width="33.3" x="16.65" y="119.23000000000002">Text &amp; Localisation Services</text>
+<text text-anchor="middle" class="package" width="68.7" x="34.35" y="115.00000000000001">Text &amp; Localisation Services</text>
 <g transform="translate(0 3.2)">
+<g id="textandloc_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Text &amp; Localisation Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="textandloc_pub" transform="translate(17.7 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Text &amp; Localisation Public Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="charconvfw" transform="translate(0 75.2)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Character Conversion</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="fontandtxtsrv" transform="translate(0 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Font &amp; Text Services</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="textlayout" transform="translate(0 0)" class="collection">
+<g id="textlayout" transform="translate(35.4 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Text Layout</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="textandlocutils" transform="translate(0 56.400000000000006)" class="collection">
 <g id="textandloctools" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Text &amp; Localisation Tools</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="textandloc_info" transform="translate(17.7 0)" class="collection">
+<g id="textandloc_info" transform="translate(53.099999999999994 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Text &amp; Localisation Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="xmlsrv" class="package" transform="translate( 897.3000000000001 0)">
+<g id="xmlsrv" class="package" transform="translate( 1097.3999999999999 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
-<rect class="package" x="0" width="27.900000000000002" height="120.23000000000002" y="0" style="fill:slateblue;"/>
+<rect class="package" x="0" width="33.3" height="116.00000000000001" y="0" style="fill:slateblue;"/>
-<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="119.23000000000002">XML Services</text>
+<text text-anchor="middle" class="package" width="33.3" x="16.65" y="115.00000000000001">XML Services</text>
 <g transform="translate(0 3.2)">
+<g id="xmlsrv_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">XML Services Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="xmlsecurityengine" transform="translate(0 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">XML Security Engine</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="xml" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">XML</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="xmlsrv_info" transform="translate(0 0)" class="collection">
+<g id="xmlsrv_info" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">XML Services Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="deviceplatformrelease" class="package" transform="translate( 927.3000000000001 0)">
+<g id="deviceplatformrelease" class="package" transform="translate( 1132.8 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
-<rect class="package" x="0" width="68.7" height="120.23000000000002" y="0" style="fill:darkgray;"/>
+<rect class="package" x="0" width="68.7" height="116.00000000000001" y="0" style="fill:darkgray;"/>
-<text text-anchor="middle" class="package" width="68.7" x="34.35" y="119.23000000000002">Device Platform Release</text>
+<text text-anchor="middle" class="package" width="68.7" x="34.35" y="115.00000000000001">Device Platform Release</text>
 <g transform="translate(0 3.2)">
 <g id="s60extras" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">S60 Extras</text>
 <g transform="translate(0 6.299999999999999)"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Device Platform Release Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="osrndtools" class="package" transform="translate( 998.1 0)">
+<g id="osrndtools" class="package" transform="translate( 1203.6 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
-<rect class="package" x="0" width="51" height="120.23000000000002" y="0" style="fill:darkgray;"/>
+<rect class="package" x="0" width="51" height="116.00000000000001" y="0" style="fill:darkgray;"/>
-<text text-anchor="middle" class="package" width="51" x="25.5" y="119.23000000000002">OS R&amp;D tools</text>
+<text text-anchor="middle" class="package" width="51" x="25.5" y="115.00000000000001">OS R&amp;D tools</text>
 <g transform="translate(0 3.2)">
 <g id="stif" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">STIF</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
 </g>
 <g id="mw" transform="translate(3.1999999999999993 178.06)" class="layer">
-<rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="231.26000000000002"/>
+<rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="222.8"/>
-<text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="231.26000000000002" height="9.3" x="-115.93">Middleware</text>
+<text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="222.8" height="9.3" x="-111.7">Middleware</text>
-<g class="layer-detail" transform="translate(25.55 3.2)">
+<g class="layer-detail" transform="translate(15.499999999999705 3.2)">
-<rect x="-12.75" class="layer" y="-3.2" width="1077.6" height="231.26000000000002"/>
+<rect x="-2.6999999999997044" class="layer" y="-3.2" width="1343.0999999999997" height="222.8"/>
 <g>
-<g id="appsupport" class="package" transform="translate( 0 104.63000000000001)">
+<g id="appsupport" class="package" transform="translate( 0 100.4)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
-<rect class="package" x="0" width="68.7" height="120.23000000000002" y="0" style="fill:slateblue;"/>
+<rect class="package" x="0" width="86.4" height="116.00000000000001" y="0" style="fill:slateblue;"/>
-<text text-anchor="middle" class="package" width="68.7" x="34.35" y="119.23">Generic App Support</text>
+<text text-anchor="middle" class="package" width="53.10000000000001" x="59.85" y="48.6" dy="0.375em">Generic App Support</text>
 <g transform="translate(0 3.2)">
+<g id="appsupport_pub" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Generic App Support Public Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="appsupport_plat" transform="translate(17.7 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Generic App Support Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="contextframework" transform="translate(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Context Framework</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="coreapplicationuis" transform="translate(0 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Core App UIs</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="flashliteapi_3_1" transform="translate(0 0)" class="collection">
+<g id="flashliteapi_3_1" transform="translate(35.4 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Flash Lite API 3.1</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="mediakeys" transform="translate(0 75.2)" class="collection">
 <g id="contenthandling" transform="translate(35.4 75.2)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Content Handling</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="openenvutils" transform="translate(17.7 0)" class="collection">
+<g id="openenvutils" transform="translate(53.099999999999994 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Open Env. Utilities</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="printingsupport" transform="translate(17.7 18.8)" class="collection">
 <g id="tzpcside" transform="translate(53.099999999999994 75.2)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Time Zone PC Side</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="appsupport_info" transform="translate(35.4 0)" class="collection">
+<g id="appsupport_info" transform="translate(70.8 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Generic App Support Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="securitysrv" class="package" transform="translate( 70.8 104.63000000000001)">
+<g id="securitysrv" class="package" transform="translate( 88.5 100.4)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color1.mouseover" end="s8-color1.mouseout"/>
-<rect class="package" x="0" width="51" height="120.23000000000002" y="0" style="fill:rgb(228,14,98);"/>
+<rect class="package" x="0" width="51" height="116.00000000000001" y="0" style="fill:rgb(228,14,98);"/>
-<text text-anchor="middle" class="package" width="51" x="25.5" y="119.23">Security Services</text>
+<text text-anchor="middle" class="package" width="51" x="25.5" y="115.00000000000003">Security Services</text>
 <g transform="translate(0 3.2)">
+<g id="secsrv_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Security Services Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="cms" transform="translate(0 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Certificate Management Service</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="remotelock" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Remote Lock</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="securitydialogs" transform="translate(0 0)" class="collection">
+<g id="securitydialogs" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Security Dialogs</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="boottimeintegritycheck" transform="translate(17.7 75.2)" class="collection">
 <g id="devencdiskutils" transform="translate(35.4 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Device Encryption Disk Utils</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="securitysrv_info" transform="translate(17.7 0)" class="collection">
+<g id="securitysrv_info" transform="translate(35.4 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Security Services Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="drm" class="package" transform="translate( 123.9 104.63000000000001)">
+<g id="drm" class="package" transform="translate( 141.6 100.4)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color1.mouseover" end="s8-color1.mouseout"/>
-<rect class="package" x="0" width="27.900000000000002" height="120.23000000000002" y="0" style="fill:rgb(228,14,98);"/>
+<rect class="package" x="0" width="51" height="116.00000000000001" y="0" style="fill:rgb(228,14,98);"/>
-<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="119.23">DRM</text>
+<text text-anchor="middle" class="package" width="51" x="25.5" y="115.00000000000003">DRM</text>
 <g transform="translate(0 3.2)">
+<g id="drm_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">DRM Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="drm_pub" transform="translate(17.7 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">DRM Public Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="commondrm" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Common DRM</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="wmdrm" transform="translate(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Windows Media DRM</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="drm_info" transform="translate(0 0)" class="collection">
+<g id="drm_info" transform="translate(35.4 0)" class="collection placeholder">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">DRM Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
 <g id="locationsrv" class="package" transform="translate( 0 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
-<rect class="package" x="0" width="33.3" height="101.43" y="0" style="fill:whitesmoke;"/>
+<rect class="package" x="0" width="51" height="97.2" y="0" style="fill:whitesmoke;"/>
-<text text-anchor="middle" class="package" width="33.3" x="16.65" y="100.43">Location Services</text>
+<text text-anchor="middle" class="package" width="51" x="25.5" y="96.2">Location Services</text>
 <g transform="translate(0 3.2)">
+<g id="locsrv_pub" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Services Public Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="locsrv_plat" transform="translate(17.7 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Services Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="genericpositioningplugins" transform="translate(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Generic Positioning Plugins</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="locationmapnavfw" transform="translate(0 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Map &amp; Nav Fmwk.</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="locationsystemui" transform="translate(0 0)" class="collection">
+<g id="locationsystemui" transform="translate(35.4 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location System UI</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="supl" transform="translate(17.7 37.6)" class="collection">
 <g id="locationtriggering" transform="translate(17.7 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Triggering</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="locationsrv_info" transform="translate(17.7 0)" class="collection">
+</g>
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+</g>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Services Info</text>
+<g id="accesssec" class="package" transform="translate( 194.7 100.4)">
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-</g>
-</g>
-<g id="accesssec" class="package" transform="translate( 153.9 104.63000000000001)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-<rect class="package" x="0" width="33.3" height="120.23000000000002" y="0" style="fill:moccasin;"/>
+<rect class="package" x="0" width="33.3" height="116.00000000000001" y="0" style="fill:moccasin;"/>
-<text text-anchor="middle" class="package" width="33.3" x="16.65" y="119.23">Access Security</text>
+<text text-anchor="middle" class="package" width="33.3" x="16.65" y="115.00000000000003">Access Security</text>
 <g transform="translate(0 3.2)">
-<g id="wlansecuritysettings" transform="translate(0 0)" class="collection">
+<g id="accesssec_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Access Security Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="wlansecuritysettings" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">WLAN Security Settings</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="eapol" transform="translate(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">EAPOL</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="accesssec_info" transform="translate(17.7 0)" class="collection">
+</g>
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+</g>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Access Security Info</text>
+<g id="ipconnmgmt" class="package" transform="translate( 230.1 100.4)">
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-</g>
-</g>
-<g id="ipconnmgmt" class="package" transform="translate( 189.3 104.63000000000001)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-<rect class="package" x="0" width="51" height="120.23000000000002" y="0" style="fill:moccasin;"/>
+<rect class="package" x="0" width="86.4" height="116.00000000000001" y="0" style="fill:moccasin;"/>
-<text text-anchor="middle" class="package" width="51" x="25.5" y="119.23">IP Connectivity Mgmt.</text>
+<text text-anchor="middle" class="package" width="86.4" x="43.2" y="115.00000000000003">IP Connectivity Mgmt.</text>
 <g transform="translate(0 3.2)">
+<g id="ipcm_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">IP Connectivity Mgmt. Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="ipcm_pub" transform="translate(17.7 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">IP Connectivity Mgmt. Public Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="accesspointcontrol" transform="translate(0 75.2)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Access Point Control</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="connectionmonitoring" transform="translate(17.7 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Connection Monitoring</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="connectionutilities" transform="translate(0 0)" class="collection">
+<g id="connectionutilities" transform="translate(35.4 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Connection Utilities</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="dbcreator" transform="translate(17.7 0)" class="collection">
+<g id="dbcreator" transform="translate(53.099999999999994 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">DB Creator</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="ipconnmgmt_info" transform="translate(35.4 0)" class="collection">
+<g id="ipconnmgmt_info" transform="translate(70.8 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">IP Connectivity Mgmt. Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="netprotocols" class="package" transform="translate( 242.4 104.63000000000001)">
+<g id="netprotocols" class="package" transform="translate( 318.6 100.4)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-<rect class="package" x="0" width="27.900000000000002" height="120.23000000000002" y="0" style="fill:moccasin;"/>
+<rect class="package" x="0" width="33.3" height="116.00000000000001" y="0" style="fill:moccasin;"/>
-<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="119.23">High-level Internet Protocols</text>
+<text text-anchor="middle" class="package" width="33.3" x="16.65" y="115.00000000000003">High-level Internet Protocols</text>
 <g transform="translate(0 3.2)">
+<g id="netprotocols_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">High-level Internet Protocols Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="httpfilters" transform="translate(0 75.2)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">HTTP Filters</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="applayerpluginsandutils" transform="translate(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">App Layer Plugins &amp; Utils</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="netprotocols_info" transform="translate(0 0)" class="collection">
+<g id="netprotocols_info" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">High-level Internet Protocols Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="ipappprotocols" class="package" transform="translate( 272.40000000000003 104.63000000000001)">
+<g id="ipappprotocols" class="package" transform="translate( 354 100.4)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-<rect class="package" x="0" width="33.3" height="120.23000000000002" y="0" style="fill:moccasin;"/>
+<rect class="package" x="0" width="33.3" height="116.00000000000001" y="0" style="fill:moccasin;"/>
-<text text-anchor="middle" class="package" width="33.3" x="16.65" y="119.23">IP App Protocols</text>
+<text text-anchor="middle" class="package" width="33.3" x="16.65" y="115.00000000000003">IP App Protocols</text>
 <g transform="translate(0 3.2)">
+<g id="ipappprotocols_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">IP App Protocols Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="rtp" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">RTP</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="sipproviderplugins" transform="translate(0 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">SIP Provider Plugins</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="ipappprotocols_info" transform="translate(0 0)" class="collection">
+<g id="ipappprotocols_info" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">IP App Protocols Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="wirelessacc" class="package" transform="translate( 35.4 0)">
+<g id="wirelessacc" class="package" transform="translate( 53.1 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-<rect class="package" x="0" width="27.900000000000002" height="101.43" y="0" style="fill:moccasin;"/>
+<rect class="package" x="0" width="27.900000000000002" height="97.2" y="0" style="fill:moccasin;"/>
-<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="100.43">Wireless Access</text>
+<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="96.2">Wireless Access</text>
 <g transform="translate(0 3.2)">
+<g id="hsfw_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">HotSpot FW Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="hotspotfw" transform="translate(0 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">HotSpot Framework</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="wlanutilities" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">WLAN Utilities</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="wirelessacc_info" transform="translate(0 0)" class="collection">
+</g>
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+</g>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Wireless Access Info</text>
+<g id="vpnclient" class="package" transform="translate( 83.1 0)">
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-</g>
-</g>
-<g id="vpnclient" class="package" transform="translate( 65.39999999999999 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-<rect class="package" x="0" width="33.3" height="101.43" y="0" style="fill:moccasin;"/>
+<rect class="package" x="0" width="51" height="97.2" y="0" style="fill:moccasin;"/>
-<text text-anchor="middle" class="package" width="33.3" x="16.65" y="100.43">VPN Client</text>
+<text text-anchor="middle" class="package" width="51" x="25.5" y="96.2">VPN Client</text>
 <g transform="translate(0 3.2)">
-<g id="vpnapiimpl" transform="translate(0 0)" class="collection">
+<g id="vpnc_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">VPN Client Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="vpnapiimpl" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">VPN API Impl.</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="vpnengine" transform="translate(0 37.6)" class="collection">
 <g id="vpnui" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">VPN UI</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="vpnclient_info" transform="translate(17.7 0)" class="collection">
+<g id="vpnclient_info" transform="translate(35.4 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">VPN Client Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="ipappsrv" class="package" transform="translate( 100.79999999999998 0)">
+<g id="ipappsrv" class="package" transform="translate( 136.2 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
-<rect class="package" x="0" width="33.3" height="101.43" y="0" style="fill:darkkhaki;"/>
+<rect class="package" x="0" width="51" height="97.2" y="0" style="fill:darkkhaki;"/>
-<text text-anchor="middle" class="package" width="33.3" x="16.65" y="48.6" dy="0.375em">IP App Services</text>
+<text text-anchor="middle" class="package" width="51" x="25.5" y="48.6" dy="0.375em">IP App Services</text>
 <g transform="translate(0 3.2)">
+<g id="ipappsrv_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">IP App Services Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="natfw" transform="translate(0 75.2)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">NAT Framework</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="multimediacommsengine" transform="translate(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Multimedia Comms Engine</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="natplugins" transform="translate(0 0)" class="collection">
+<g id="natplugins" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">NAT Plugins</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="ipappsrv_info" transform="translate(17.7 0)" class="collection">
+<g id="ipappsrv_info" transform="translate(35.4 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">IP App Services Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="phonesrv" class="package" transform="translate( 136.2 0)">
+<g id="phonesrv" class="package" transform="translate( 189.29999999999998 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
-<rect class="package" x="0" width="51" height="101.43" y="0" style="fill:darkkhaki;"/>
+<rect class="package" x="0" width="68.7" height="97.2" y="0" style="fill:darkkhaki;"/>
-<text text-anchor="middle" class="package" width="35.4" x="33.3" y="67.4" dy="0.375em">Telephony &amp; SIM Services</text>
+<text text-anchor="middle" class="package" width="53.1" x="42.15" y="67.4" dy="0.375em">Telephony &amp; SIM Services</text>
 <g transform="translate(0 3.2)">
+<g id="phonesrv_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Telephony &amp; SIM Services Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="telutils" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Telephony Utils</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="convergedcallengine" transform="translate(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Converged Call Engine</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="engines" transform="translate(0 0)" class="collection">
+<g id="engines" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Telephony Engines</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="networkhandling" transform="translate(17.7 75.2)" class="collection">
 <g id="satengine" transform="translate(17.7 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">SIM Application Toolkit Engine</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="satui" transform="translate(17.7 0)" class="collection">
+<g id="satui" transform="translate(35.4 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">SIM App Toolkit UI</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="phonecmdhandler" transform="translate(35.4 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Phone Command Handler</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="phonesrv_info" transform="translate(35.4 0)" class="collection">
+<g id="phonesrv_info" transform="translate(53.099999999999994 0)" class="collection placeholder">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Telephony &amp; SIM Services Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="messagingmw" class="package" transform="translate( 189.29999999999998 0)">
+<g id="messagingmw" class="package" transform="translate( 260.1 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-<rect class="package" x="0" width="33.3" height="101.43" y="0" style="fill:lightpink;"/>
+<rect class="package" x="0" width="51" height="97.2" y="0" style="fill:lightpink;"/>
-<text text-anchor="middle" class="package" width="33.3" x="16.65" y="100.43">Messaging Middleware</text>
+<text text-anchor="middle" class="package" width="51" x="25.5" y="96.2">Messaging Middleware</text>
 <g transform="translate(0 3.2)">
+<g id="msgfw_pub" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Msg. Middleware Public Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="msgfw_plat" transform="translate(17.7 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Msg. Middleware Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="msgbranched" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Messaging Branched</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="messagingfw" transform="translate(17.7 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Messaging Framework</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="messagingmw_info" transform="translate(0 0)" class="collection">
+<g id="messagingmw_info" transform="translate(35.4 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Msg. Middleware Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="imsrv" class="package" transform="translate( 224.7 0)">
+<g id="imsrv" class="package" transform="translate( 313.20000000000005 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-<rect class="package" x="0" width="33.3" height="101.43" y="0" style="fill:lightpink;"/>
+<rect class="package" x="0" width="33.3" height="97.2" y="0" style="fill:lightpink;"/>
-<text text-anchor="middle" class="package" width="33.3" x="16.65" y="100.43">Instant Msg. &amp; Presence Services</text>
+<text text-anchor="middle" class="package" width="33.3" x="16.65" y="86.2" dy="0.375em">Instant Msg. &amp; Presence Services</text>
 <g transform="translate(0 3.2)">
+<g id="imsrv_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Instant Msg. &amp; Presence Services Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="ximpfw" transform="translate(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">XIMP Framework</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="imservices" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">IM Services</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="brandingserver" transform="translate(0 0)" class="collection">
+<g id="brandingserver" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Branding Server</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="imsrv_info" transform="translate(17.7 0)" class="collection">
+</g>
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+</g>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Instant Msg. &amp; Presence Services Info</text>
+<g id="legacypresence" class="package" transform="translate( 348.6 0)">
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-</g>
-</g>
-<g id="legacypresence" class="package" transform="translate( 260.1 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-<rect class="package" x="0" width="68.7" height="101.43" y="0" style="fill:lightpink;"/>
+<rect class="package" x="0" width="68.7" height="97.2" y="0" style="fill:lightpink;"/>
-<text text-anchor="middle" class="package" width="68.7" x="34.35" y="100.43">Legacy Presence Services</text>
+<text text-anchor="middle" class="package" width="68.7" x="34.35" y="96.2">Legacy Presence Services</text>
 <g transform="translate(0 3.2)">
+<g id="pressrv_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Legacy Presence Services Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="xdmengine" transform="translate(0 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">XDM Engine</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="xdmsettingsui" transform="translate(0 0)" class="collection">
+<g id="xdmsettingsui" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">XDM Settings UI</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="xdmprotocols" transform="translate(0 18.8)" class="collection">
 <g id="msgconnmanager" transform="translate(17.7 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Msg. Conn. Manager</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="presencesettingsui" transform="translate(17.7 0)" class="collection">
+<g id="presencesettingsui" transform="translate(35.4 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Presence Settings UI</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="simpleengine" transform="translate(17.7 37.6)" class="collection">
 <g id="simpledatamodeladapter" transform="translate(53.099999999999994 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">SIMPLE Data Model Adapter</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="legacypresence_info" transform="translate(35.4 0)" class="collection">
+</g>
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+</g>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Legacy Presence Services Info</text>
+<g id="opensrv" class="package" transform="translate( 419.40000000000003 0)">
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-</g>
-</g>
-<g id="opensrv" class="package" transform="translate( 330.90000000000003 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-<rect class="package" x="0" width="33.3" height="101.43" y="0" style="fill:lightpink;"/>
+<rect class="package" x="0" width="33.3" height="97.2" y="0" style="fill:lightpink;"/>
-<text text-anchor="middle" class="package" width="33.3" x="16.65" y="100.43">Open Services</text>
+<text text-anchor="middle" class="package" width="33.3" x="16.65" y="96.2">Open Services</text>
 <g transform="translate(0 3.2)">
+<g id="opensrv_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Open Services Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="loudmouth" transform="translate(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Loudmouth</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="libtelepathy" transform="translate(0 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Telepathy Library</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="telepathygabble" transform="translate(0 0)" class="collection">
+<g id="telepathygabble" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Telepathy Gabble</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="isolationserver" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Isolation Server</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="opensrv_info" transform="translate(17.7 0)" class="collection">
+</g>
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+</g>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Open Services Info</text>
+<g id="remotemgmt" class="package" transform="translate( 454.8 0)">
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-</g>
-</g>
-<g id="remotemgmt" class="package" transform="translate( 366.3 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
-<rect class="package" x="0" width="51" height="101.43" y="0" style="fill:darkseagreen;"/>
+<rect class="package" x="0" width="68.7" height="97.2" y="0" style="fill:darkseagreen;"/>
-<text text-anchor="middle" class="package" width="51" x="25.5" y="100.43">Remote Management</text>
+<text text-anchor="middle" class="package" width="68.7" x="34.35" y="86.2" dy="0.375em">Remote Management</text>
 <g transform="translate(0 3.2)">
+<g id="remotemgmt_pub" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Remote Mgmt. Public Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="remotemgmt_plat" transform="translate(17.7 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Remote Mgmt. Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="policymanagement" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Policy Management</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="syncmlfw" transform="translate(0 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">SyncML Framework</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="terminalsecurity" transform="translate(0 0)" class="collection">
+<g id="terminalsecurity" transform="translate(35.4 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Terminal Security</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="omaprovisioning" transform="translate(17.7 0)" class="collection">
+<g id="omaprovisioning" transform="translate(53.099999999999994 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">OMA Provisioning</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="devicediagnosticsfw" transform="translate(0 56.400000000000006)" class="collection">
 <g id="fotaapplication" transform="translate(17.7 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">FOTA App</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="remotemgmt_info" transform="translate(35.4 0)" class="collection">
+</g>
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+</g>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Remote Mgmt. Info</text>
+<g id="remotestorage" class="package" transform="translate( 389.4 100.4)">
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-</g>
-</g>
-<g id="remotestorage" class="package" transform="translate( 307.8 104.63000000000001)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
-<rect class="package" x="0" width="27.900000000000002" height="120.23000000000002" y="0" style="fill:orchid;"/>
+<rect class="package" x="0" width="27.900000000000002" height="116.00000000000001" y="0" style="fill:orchid;"/>
-<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="119.23">Remote Storage</text>
+<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000003">Remote Storage</text>
 <g transform="translate(0 3.2)">
+<g id="rsfw_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Remote Storage Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="remotestoragefw" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Remote Storage Fmwk.</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="remotestorage_info" transform="translate(0 0)" class="collection">
+</g>
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+</g>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Remote Storage Info</text>
+<g id="remoteconn" class="package" transform="translate( 419.4 100.4)">
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-</g>
-</g>
-<g id="remoteconn" class="package" transform="translate( 337.8 104.63000000000001)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
-<rect class="package" x="0" width="33.3" height="120.23000000000002" y="0" style="fill:orchid;"/>
+<rect class="package" x="0" width="33.3" height="116.00000000000001" y="0" style="fill:orchid;"/>
-<text text-anchor="middle" class="package" width="33.3" x="16.65" y="119.23">Remote Connectivity</text>
+<text text-anchor="middle" class="package" width="33.3" x="16.65" y="115.00000000000003">Remote Connectivity</text>
 <g transform="translate(0 3.2)">
 <g id="connectivitymodules" transform="translate(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Connectivity Modules</text>
 <g transform="translate(0 6.299999999999999)"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">OBEX</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="srvdiscovery" class="package" transform="translate( 373.2 104.63000000000001)">
+<g id="srvdiscovery" class="package" transform="translate( 454.79999999999995 100.4)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
-<rect class="package" x="0" width="27.900000000000002" height="120.23000000000002" y="0" style="fill:orchid;"/>
+<rect class="package" x="0" width="33.3" height="116.00000000000001" y="0" style="fill:orchid;"/>
-<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="119.23">Service Discovery &amp; Usage</text>
+<text text-anchor="middle" class="package" width="33.3" x="16.65" y="115.00000000000003">Service Discovery &amp; Usage</text>
 <g transform="translate(0 3.2)">
+<g id="upnpstack_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UPnP Stack Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="servicediscoveryandcontrol" transform="translate(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Service Discovery &amp; Control</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="upnp" transform="translate(0 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UPnP</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="srvdiscovery_info" transform="translate(0 0)" class="collection">
+<g id="srvdiscovery_info" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Service Discovery &amp; Usage Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="dlnasrv" class="package" transform="translate( 419.40000000000003 0)">
+<g id="dlnasrv" class="package" transform="translate( 525.6 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
-<rect class="package" x="0" width="68.7" height="101.43" y="0" style="fill:orchid;"/>
+<rect class="package" x="0" width="86.4" height="97.2" y="0" style="fill:orchid;"/>
-<text text-anchor="middle" class="package" width="68.7" x="34.35" y="100.43">DLNA Services</text>
+<text text-anchor="middle" class="package" width="86.4" x="43.2" y="86.2" dy="0.375em">DLNA Services</text>
 <g transform="translate(0 3.2)">
-<g id="upnpavcontrolpoint" transform="translate(0 0)" class="collection">
+<g id="dlnasrv_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">DLNA Services Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="upnpavcontrolpoint" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UPnP A/V Control Point</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="upnpmediaserver" transform="translate(0 56.400000000000006)" class="collection">
 <g id="upnpsharing" transform="translate(17.7 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UPnP Sharing</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="upnpmpxplugins" transform="translate(17.7 0)" class="collection">
+<g id="upnpmpxplugins" transform="translate(35.4 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UPnP MPX Plugins</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="upnpharvester" transform="translate(17.7 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UPnP Harvester</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="homesync" transform="translate(35.4 0)" class="collection">
+<g id="homesync" transform="translate(53.099999999999994 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Home Sync</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="homemedia" transform="translate(35.4 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Home Media</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="dlnasrv_info" transform="translate(53.099999999999994 0)" class="collection">
+<g id="dlnasrv_info" transform="translate(70.8 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">DLNA Services Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="btservices" class="package" transform="translate( 403.2 104.63000000000001)">
+<g id="btservices" class="package" transform="translate( 490.19999999999993 100.4)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
-<rect class="package" x="0" width="33.3" height="120.23000000000002" y="0" style="fill:orchid;"/>
+<rect class="package" x="0" width="68.7" height="116.00000000000001" y="0" style="fill:orchid;"/>
-<text text-anchor="middle" class="package" width="33.3" x="16.65" y="119.23">Bluetooth Services</text>
+<text text-anchor="middle" class="package" width="68.7" x="34.35" y="115.00000000000003">Bluetooth Services</text>
 <g transform="translate(0 3.2)">
+<g id="btservices_pub" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">BT Services Public Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="btservices_plat" transform="translate(17.7 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">BT Services Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="bluetoothengine" transform="translate(0 75.2)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Bluetooth Engine</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="bluetoothappprofiles" transform="translate(0 0)" class="collection">
+<g id="bluetoothappprofiles" transform="translate(35.4 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Btooth. App Profiles</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="btservices_info" transform="translate(17.7 0)" class="collection">
+<g id="btservices_info" transform="translate(53.099999999999994 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">BT Services Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="usbservices" class="package" transform="translate( 438.59999999999997 104.63000000000001)">
+<g id="usbservices" class="package" transform="translate( 560.9999999999999 100.4)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
-<rect class="package" x="0" width="27.900000000000002" height="120.23000000000002" y="0" style="fill:orchid;"/>
+<rect class="package" x="0" width="33.3" height="116.00000000000001" y="0" style="fill:orchid;"/>
-<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="119.23">USB Services</text>
+<text text-anchor="middle" class="package" width="33.3" x="16.65" y="115.00000000000003">USB Services</text>
 <g transform="translate(0 3.2)">
-<g id="usbservices_info" transform="translate(0 0)" class="collection">
+<g id="usbservices_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">USB Services Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="usbservices_info" transform="translate(17.7 0)" class="collection placeholder">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">USB Services Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="usbengines" transform="translate(0 37.6)" class="collection">
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">USB UIs</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="shortlinkconn" class="package" transform="translate( 468.59999999999997 104.63000000000001)">
+<g id="shortlinkconn" class="package" transform="translate( 596.3999999999999 100.4)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
-<rect class="package" x="0" width="27.900000000000002" height="120.23000000000002" y="0" style="fill:orchid;"/>
+<rect class="package" x="0" width="27.900000000000002" height="116.00000000000001" y="0" style="fill:orchid;"/>
-<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="119.23">Shortlink Connectivity</text>
+<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000003">Shortlink Connectivity</text>
 <g transform="translate(0 3.2)">
+<g id="shortlinkconn_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Shortlink Connectivity Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="localconnectivityservice" transform="translate(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Local Connectivity Service</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="shortlinkconn_info" transform="translate(0 0)" class="collection">
+</g>
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+</g>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Shortlink Connectivity Info</text>
+<g id="imghandling" class="package" transform="translate( 614.1 0)">
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-</g>
-</g>
-<g id="imghandling" class="package" transform="translate( 490.20000000000005 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-<rect class="package" x="0" width="27.900000000000002" height="101.43" y="0" style="fill:rgb(175,212,240);"/>
+<rect class="package" x="0" width="27.900000000000002" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
-<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="100.43">Image Handling</text>
+<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="96.2">Image Handling</text>
 <g transform="translate(0 3.2)">
+<g id="imagehandling_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Image Handling Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="imagehandlinglib" transform="translate(0 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Image Handling Library</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="imagehandlingutilities" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Image Handling Utilities</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="imghandling_info" transform="translate(0 0)" class="collection">
+</g>
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+</g>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Image Handling Info</text>
+<g id="metadatasrv" class="package" transform="translate( 644.1 0)">
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-</g>
-</g>
-<g id="metadatasrv" class="package" transform="translate( 520.2 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-<rect class="package" x="0" width="27.900000000000002" height="101.43" y="0" style="fill:rgb(175,212,240);"/>
+<rect class="package" x="0" width="33.3" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
-<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="100.43">Legacy Metadata Services</text>
+<text text-anchor="middle" class="package" width="33.3" x="16.65" y="86.2" dy="0.375em">Legacy Metadata Services</text>
 <g transform="translate(0 3.2)">
+<g id="metadatasrv_pub" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Legacy Metadata Services Public Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="metadatasrv_plat" transform="translate(17.7 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Legacy Metadata Services Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="mediamanagementutilities" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Media Mgmt. Utilities</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="metadatasrv_info" transform="translate(0 0)" class="collection">
+</g>
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+</g>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Legacy Metadata Services Info</text>
+<g id="mds" class="package" transform="translate( 679.5 0)">
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-</g>
-</g>
-<g id="mds" class="package" transform="translate( 550.2 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-<rect class="package" x="0" width="51" height="101.43" y="0" style="fill:rgb(175,212,240);"/>
+<rect class="package" x="0" width="68.7" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
-<text text-anchor="middle" class="package" width="51" x="25.5" y="100.43">Metadata Services</text>
+<text text-anchor="middle" class="package" width="68.7" x="34.35" y="96.2">Metadata Services</text>
 <g transform="translate(0 3.2)">
+<g id="mds_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Metadata Services Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="mds_pub" transform="translate(17.7 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Metadata Services Public Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="metadataengine" transform="translate(0 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Metadata Engine</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="watchdog" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Watchdog</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="clfwrapper" transform="translate(0 0)" class="collection">
+<g id="clfwrapper" transform="translate(35.4 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Content Listing FW Wrapper</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="mds_info" transform="translate(17.7 0)" class="collection">
+<g id="mds_info" transform="translate(53.099999999999994 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Metadata Services Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="mmuifw" class="package" transform="translate( 603.3000000000001 0)">
+<g id="mmuifw" class="package" transform="translate( 750.3 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-<rect class="package" x="0" width="51" height="101.43" y="0" style="fill:rgb(175,212,240);"/>
+<rect class="package" x="0" width="51" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
-<text text-anchor="middle" class="package" width="51" x="25.5" y="100.43">Multimedia UI Fmwk.</text>
+<text text-anchor="middle" class="package" width="51" x="25.5" y="86.2" dy="0.375em">Multimedia UI Fmwk.</text>
 <g transform="translate(0 3.2)">
-<g id="mmuifw_info" transform="translate(0 0)" class="collection">
+<g id="mmuifw_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">MM UI FW Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="mmuifw_info" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Multimedia UI Fmwk. Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="osncore" transform="translate(0 18.8)" class="collection">
+<g id="osncore" transform="translate(0 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">OS Neutral Library Core</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="alfwidgetutils" transform="translate(17.7 0)" class="collection">
+<g id="alfwidgetutils" transform="translate(17.7 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Accelerated LAF Widget Utils</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="resourcepool" transform="translate(17.7 18.8)" class="collection">
+<g id="resourcepool" transform="translate(17.7 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Resource Pool</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="widgetmodel" transform="translate(0 37.6)" class="collection">
+<g id="widgetmodel" transform="translate(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Widget Model</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="mulwidgets" transform="translate(35.4 0)" class="collection">
+<g id="mulwidgets" transform="translate(35.4 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">MUL Widgets</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="videoutils" class="package" transform="translate( 656.4000000000001 0)">
+<g id="videoutils" class="package" transform="translate( 803.4 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-<rect class="package" x="0" width="33.3" height="101.43" y="0" style="fill:rgb(175,212,240);"/>
+<rect class="package" x="0" width="33.3" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
-<text text-anchor="middle" class="package" width="33.3" x="16.65" y="100.43">Video Utils</text>
+<text text-anchor="middle" class="package" width="33.3" x="16.65" y="96.2">Video Utils</text>
 <g transform="translate(0 3.2)">
+<g id="videoutils_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Utils Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="videoscheduler" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Scheduler</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="videoconnutility" transform="translate(17.7 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Conn. Utility</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="videoutils_info" transform="translate(0 0)" class="collection">
+<g id="videoutils_info" transform="translate(17.7 0)" class="collection placeholder">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Utils Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="mmmw" class="package" transform="translate( 498.59999999999997 104.63000000000001)">
+<g id="mmmw" class="package" transform="translate( 626.3999999999999 100.4)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-<rect class="package" x="0" width="33.3" height="120.23000000000002" y="0" style="fill:rgb(175,212,240);"/>
+<rect class="package" x="0" width="51" height="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
-<text text-anchor="middle" class="package" width="33.3" x="16.65" y="119.23">Multimedia Middleware</text>
+<text text-anchor="middle" class="package" width="51" x="25.5" y="115.00000000000003">Multimedia Middleware</text>
 <g transform="translate(0 3.2)">
+<g id="mmmw_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">MM Middleware Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="mmfenh" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">MMF Enhancements</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="mm_fw" transform="translate(0 56.400000000000006)" class="collection placeholder">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Multimedia Frameworks</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="mmserv" transform="translate(0 0)" class="collection">
+<g id="mmserv" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Multimedia Services</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="mmmw_info" transform="translate(17.7 0)" class="collection">
+<g id="mmmw_info" transform="translate(35.4 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">MM Middleware Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="helix" class="package" transform="translate( 534 104.63000000000001)">
+<g id="helix" class="package" transform="translate( 679.4999999999999 100.4)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-<rect class="package" x="0" width="27.900000000000002" height="120.23000000000002" y="0" style="fill:rgb(175,212,240);"/>
+<rect class="package" x="0" width="27.900000000000002" height="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
-<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="119.23">Helix</text>
+<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000003">Helix</text>
 <g transform="translate(0 3.2)">
 <g id="helix_ren" transform="translate(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Helix Engine</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="camerasrv" class="package" transform="translate( 691.8000000000001 0)">
+<g id="camerasrv" class="package" transform="translate( 838.8 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-<rect class="package" x="0" width="33.3" height="101.43" y="0" style="fill:rgb(175,212,240);"/>
+<rect class="package" x="0" width="51" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
-<text text-anchor="middle" class="package" width="33.3" x="16.65" y="100.43">Camera Services</text>
+<text text-anchor="middle" class="package" width="51" x="25.5" y="96.2">Camera Services</text>
 <g transform="translate(0 3.2)">
+<g id="camerasrv_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Camera Services Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="camappengine" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Camera App Engine</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="camcordermmfplugin" transform="translate(0 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Camcorder MMF Plugin</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="configmanagers" transform="translate(0 0)" class="collection">
+<g id="configmanagers" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Config Managers</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="camerasrv_info" transform="translate(17.7 0)" class="collection">
+<g id="camerasrv_info" transform="translate(35.4 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Camera Services Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="mmappfw" class="package" transform="translate( 727.2 0)">
+<g id="mmappfw" class="package" transform="translate( 891.9 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-<rect class="package" x="0" width="27.900000000000002" height="101.43" y="0" style="fill:rgb(175,212,240);"/>
+<rect class="package" x="0" width="33.3" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
-<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="100.43">Multimedia App Fmwk.</text>
+<text text-anchor="middle" class="package" width="33.3" x="16.65" y="96.2">Multimedia App Fmwk.</text>
 <g transform="translate(0 3.2)">
+<g id="mmappfw_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">MM App FW Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="mpx" transform="translate(0 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Multimedia Player</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="mmappcomponents" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Multimedia App Cmp.</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="mmappfw_info" transform="translate(0 0)" class="collection">
+<g id="mmappfw_info" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">MM App FW Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="inputmethods" class="package" transform="translate( 564 104.63000000000001)">
+<g id="inputmethods" class="package" transform="translate( 709.4999999999999 100.4)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-<rect class="package" x="0" width="33.3" height="120.23000000000002" y="0" style="fill:orange;"/>
+<rect class="package" x="0" width="51" height="116.00000000000001" y="0" style="fill:orange;"/>
-<text text-anchor="middle" class="package" width="33.3" x="16.65" y="119.23">Input Methods</text>
+<text text-anchor="middle" class="package" width="51" x="25.5" y="115.00000000000003">Input Methods</text>
 <g transform="translate(0 3.2)">
-<g id="textinput" transform="translate(0 0)" class="collection">
+<g id="inputmethods_pub" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Input Methods Public Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="inputmethods_plat" transform="translate(17.7 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Input Methods Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="textinput" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Text Input</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="fep" transform="translate(0 18.8)" class="collection">
+<g id="fep" transform="translate(0 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">FEP</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="inputmethods_info" transform="translate(17.7 0)" class="collection">
+<g id="inputmethods_info" transform="translate(35.4 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Input Methods Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="qt" class="package placeholder" transform="translate( 599.4 104.63000000000001)">
+<g id="qt" class="package placeholder" transform="translate( 762.5999999999999 100.4)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-<rect class="package" x="0" width="78" height="120.23000000000002" y="0" style="fill:orange;"/>
+<rect class="package" x="0" width="78" height="116.00000000000001" y="0" style="fill:orange;"/>
-<text text-anchor="middle" class="package" width="78" x="39" y="59.114999999999995" dy="0.375em" height="15.600000000000001">Qt</text>
+<text text-anchor="middle" class="package" width="78" x="39" y="57.00000000000003" dy="0.375em" height="15.600000000000001">Qt</text>
 <g transform="translate(0 3.2)"/>
 </g>
-<g id="classicui" class="package" transform="translate( 679.5 104.63000000000001)">
+<g id="classicui" class="package" transform="translate( 842.6999999999999 100.4)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-<rect class="package" x="0" width="68.7" height="120.23000000000002" y="0" style="fill:orange;"/>
+<rect class="package" x="0" width="104.1" height="116.00000000000001" y="0" style="fill:orange;"/>
-<text text-anchor="middle" class="package" width="68.7" x="34.35" y="119.23">Classic UI</text>
+<text text-anchor="middle" class="package" width="104.1" x="52.05" y="115.00000000000003">Classic UI</text>
 <g transform="translate(0 3.2)">
+<g id="classicui_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Classic UI Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="classicui_pub" transform="translate(17.7 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Classic UI Public Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="ode" transform="translate(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Open Dynamics Engine</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="uifw" transform="translate(0 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UI Framework</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="commonuis" transform="translate(0 0)" class="collection">
+<g id="commonuis" transform="translate(35.4 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Common UIs</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="applicationinterworkingfw" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">App Interworking Fmwk.</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="psln" transform="translate(17.7 0)" class="collection">
+<g id="psln" transform="translate(53.099999999999994 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Personalization</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="commonadapter" transform="translate(17.7 56.400000000000006)" class="collection">
 <g id="akntouchgesturefw" transform="translate(17.7 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Avkon Touch Gesture Framework</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="uiutils" transform="translate(35.4 0)" class="collection">
+<g id="uiutils" transform="translate(70.8 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UI Utils</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="commonuisupport" transform="translate(35.4 56.400000000000006)" class="collection">
 <g id="lafagnosticuifoundation" transform="translate(0 75.2)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Look-and-Feel Agnostic UI Foundation</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="classicui_info" transform="translate(53.099999999999994 0)" class="collection">
+<g id="classicui_info" transform="translate(88.5 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Classic UI Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="svgt" class="package" transform="translate( 750.3 104.63000000000001)">
+<g id="svgt" class="package" transform="translate( 948.9 100.4)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-<rect class="package" x="0" width="27.900000000000002" height="120.23000000000002" y="0" style="fill:orange;"/>
+<rect class="package" x="0" width="27.900000000000002" height="116.00000000000001" y="0" style="fill:orange;"/>
-<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="119.23">SVG Tiny</text>
+<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000003">SVG Tiny</text>
 <g transform="translate(0 3.2)">
-<g id="svgt_info" transform="translate(0 0)" class="collection">
+<g id="svgt_plat" transform="translate(0 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">SVG Tiny Info</text>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">SVG Tiny Platform Interfaces</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="svgtopt" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">SVG-T Engine</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="uiaccelerator" class="package" transform="translate( 780.3 104.63000000000001)">
+<g id="uiaccelerator" class="package" transform="translate( 978.9 100.4)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-<rect class="package" x="0" width="27.900000000000002" height="120.23000000000002" y="0" style="fill:orange;"/>
+<rect class="package" x="0" width="27.900000000000002" height="116.00000000000001" y="0" style="fill:orange;"/>
-<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="119.23">UI Accelerator</text>
+<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000003">UI Accelerator</text>
 <g transform="translate(0 3.2)">
-<g id="uiaccelerator_info" transform="translate(0 0)" class="collection">
+<g id="uiaccelerator_plat" transform="translate(0 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UI Accelerator Info</text>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UI Accelerator Platform Interfaces</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="uiacceltk" transform="translate(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UI Accelerator Toolkit</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="uiresources" class="package" transform="translate( 810.3 104.63000000000001)">
+<g id="uiresources" class="package" transform="translate( 1008.9 100.4)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-<rect class="package" x="0" width="68.7" height="120.23000000000002" y="0" style="fill:orange;"/>
+<rect class="package" x="0" width="104.1" height="116.00000000000001" y="0" style="fill:orange;"/>
-<text text-anchor="middle" class="package" width="68.7" x="34.35" y="119.23">UI Resources</text>
+<text text-anchor="middle" class="package" width="104.1" x="52.05" y="105" dy="0.375em">UI Resources</text>
 <g transform="translate(0 3.2)">
-<g id="uiresources_info" transform="translate(0 0)" class="collection">
+<g id="uiresources_pub" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UI Resources Public Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="uiresources_plat" transform="translate(17.7 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UI Resources Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="uiresources_info" transform="translate(35.4 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UI Resources Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="uigraphics" transform="translate(0 18.8)" class="collection">
 <g id="layouts" transform="translate(0 75.2)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Layouts</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="skins" transform="translate(17.7 0)" class="collection">
+<g id="skins" transform="translate(53.099999999999994 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Skins</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="pictographs" transform="translate(35.4 0)" class="collection">
+<g id="pictographs" transform="translate(70.8 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Pictographs</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="locales" transform="translate(0 56.400000000000006)" class="collection">
 <g id="fontsupport" transform="translate(17.7 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Font Support</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="helpthemes" transform="translate(53.099999999999994 0)" class="collection">
+<g id="helpthemes" transform="translate(88.5 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Help Themes</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="hapticsservices" class="package" transform="translate( 881.0999999999999 104.63000000000001)">
+<g id="hapticsservices" class="package" transform="translate( 1115.1 100.4)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-<rect class="package" x="0" width="27.900000000000002" height="120.23000000000002" y="0" style="fill:orange;"/>
+<rect class="package" x="0" width="33.3" height="116.00000000000001" y="0" style="fill:orange;"/>
-<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="119.23">Haptics Services</text>
+<text text-anchor="middle" class="package" width="33.3" x="16.65" y="115.00000000000003">Haptics Services</text>
 <g transform="translate(0 3.2)">
+<g id="hapticsservices_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Haptics Services Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="hapticsservices_pub" transform="translate(17.7 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Haptics Services Public Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="tacticonserver" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Tacticon Server</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="tactilefeedback" transform="translate(0 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Tactile Feedback</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="hapticsservices_info" transform="translate(0 0)" class="collection">
+</g>
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+</g>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Haptics Services Info</text>
+<g id="gsprofilesrv" class="package" transform="translate( 1150.5 100.4)">
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-</g>
-</g>
-<g id="gsprofilesrv" class="package" transform="translate( 911.0999999999999 104.63000000000001)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-<rect class="package" x="0" width="27.900000000000002" height="120.23000000000002" y="0" style="fill:orange;"/>
+<rect class="package" x="0" width="33.3" height="116.00000000000001" y="0" style="fill:orange;"/>
-<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="119.23">General Settings &amp; Profiles Services</text>
+<text text-anchor="middle" class="package" width="33.3" x="16.65" y="105" dy="0.375em">General Settings &amp; Profiles Services</text>
 <g transform="translate(0 3.2)">
+<g id="gsprofilesrv_pub" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">GS &amp; Profiles Services Public Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="gsprofilesrv_plat" transform="translate(17.7 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">GS &amp; Profiles Services Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="gssettingsuis" transform="translate(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">General Settings UIs</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="profilesservices" transform="translate(0 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Profiles Services</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="gsprofilesrv_info" transform="translate(0 0)" class="collection">
+</g>
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+</g>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">GS &amp; Profiles Services Info</text>
+<g id="homescreensrv" class="package" transform="translate( 927.3 0)">
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-</g>
-</g>
-<g id="homescreensrv" class="package" transform="translate( 757.2 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-<rect class="package" x="0" width="51" height="101.43" y="0" style="fill:orange;"/>
+<rect class="package" x="0" width="51" height="97.2" y="0" style="fill:orange;"/>
-<text text-anchor="middle" class="package" width="51" x="25.5" y="100.43">Home Screen Services</text>
+<text text-anchor="middle" class="package" width="35.4" x="33.3" y="86.2" dy="0.375em">Home Screen Services</text>
 <g transform="translate(0 3.2)">
+<g id="homescreensrv_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Home Screen Services Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="xcfw" transform="translate(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">XML Content Framework</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="contentcontrolsrv" transform="translate(35.4 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Content Control Service</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="homescreensrv_info" transform="translate(0 0)" class="collection">
+</g>
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+</g>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Home Screen Services Info</text>
+<g id="appinstall" class="package" transform="translate( 1185.9 100.4)">
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-</g>
-</g>
-<g id="appinstall" class="package" transform="translate( 941.0999999999999 104.63000000000001)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
-<rect class="package" x="0" width="51" height="120.23000000000002" y="0" style="fill:slateblue;"/>
+<rect class="package" x="0" width="86.4" height="116.00000000000001" y="0" style="fill:slateblue;"/>
-<text text-anchor="middle" class="package" width="51" x="25.5" y="119.23">App Installation</text>
+<text text-anchor="middle" class="package" width="86.4" x="43.2" y="115.00000000000003">App Installation</text>
 <g transform="translate(0 3.2)">
+<g id="appinstall_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">App Installation Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="appinstall_pub" transform="translate(17.7 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">App Installation Public Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="ncdengine" transform="translate(0 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Nokia Content Discover</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="appinstaller" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">App Installer</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="iaupdateapi_stub" transform="translate(0 0)" class="collection">
+<g id="iaupdateapi_stub" transform="translate(35.4 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">IA Update API Stub</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="iaupdate" transform="translate(17.7 0)" class="collection">
+<g id="iaupdate" transform="translate(53.099999999999994 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Independent Apps Update</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="installationservices" transform="translate(17.7 18.8)" class="collection">
 <g id="secureswitools" transform="translate(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Secure SW Install Tools</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="appinstall_info" transform="translate(35.4 0)" class="collection">
+<g id="appinstall_info" transform="translate(70.8 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">App Installation Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="serviceapifw" class="package" transform="translate( 810.3000000000001 0)">
+<g id="serviceapifw" class="package" transform="translate( 980.4 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
-<rect class="package" x="0" width="27.900000000000002" height="101.43" y="0" style="fill:slateblue;"/>
+<rect class="package" x="0" width="33.3" height="97.2" y="0" style="fill:slateblue;"/>
-<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="100.43">Service API Framework</text>
+<text text-anchor="middle" class="package" width="33.3" x="16.65" y="86.2" dy="0.375em">Service API Framework</text>
 <g transform="translate(0 3.2)">
+<g id="serviceapifw_pub" transform="translate(0 0)" class="collection placeholder">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Service API FW Public Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="serviceapifw_plat" transform="translate(17.7 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Service API FW Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="rtsecuritymanager" transform="translate(0 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Runtime Security Manager</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="languageinterworkingfw" transform="translate(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Language Interworking FW</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="serviceapifw_info" transform="translate(0 0)" class="collection">
+</g>
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+</g>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Service API Fmwk. Info</text>
+<g id="serviceapi" class="package" transform="translate( 1015.8 0)">
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-</g>
-</g>
-<g id="serviceapi" class="package" transform="translate( 840.3000000000001 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
-<rect class="package" x="0" width="27.900000000000002" height="101.43" y="0" style="fill:slateblue;"/>
+<rect class="package" x="0" width="27.900000000000002" height="97.2" y="0" style="fill:slateblue;"/>
-<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="100.43">Service API</text>
+<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="96.2">Service API</text>
 <g transform="translate(0 3.2)">
 <g id="serviceproviders" transform="translate(0 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Service Providers</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="web" class="package" transform="translate( 870.3000000000001 0)">
+<g id="web" class="package" transform="translate( 1045.8 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
-<rect class="package" x="0" width="33.3" height="101.43" y="0" style="fill:slateblue;"/>
+<rect class="package" x="0" width="68.7" height="97.2" y="0" style="fill:slateblue;"/>
-<text text-anchor="middle" class="package" width="33.3" x="16.65" y="100.43">Web</text>
+<text text-anchor="middle" class="package" width="68.7" x="34.35" y="86.2" dy="0.375em">Web</text>
 <g transform="translate(0 3.2)">
-<g id="web_info" transform="translate(0 0)" class="collection">
+<g id="web_pub" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Web Public Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="web_plat" transform="translate(17.7 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Web Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="web_info" transform="translate(35.4 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Web Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="browserutilities" transform="translate(0 56.400000000000006)" class="collection">
 <g id="webengine" transform="translate(0 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Web Engine</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="codhandler" transform="translate(17.7 0)" class="collection">
+<g id="codhandler" transform="translate(53.099999999999994 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Content Object Descriptor Handler</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="widgets" transform="translate(0 18.8)" class="collection">
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Web Widget Framework</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="websrv" class="package" transform="translate( 994.1999999999999 104.63000000000001)">
+<g id="websrv" class="package" transform="translate( 1274.4 100.4)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
-<rect class="package" x="0" width="27.900000000000002" height="120.23000000000002" y="0" style="fill:slateblue;"/>
+<rect class="package" x="0" width="33.3" height="116.00000000000001" y="0" style="fill:slateblue;"/>
-<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="119.23">Web Services</text>
+<text text-anchor="middle" class="package" width="33.3" x="16.65" y="115.00000000000003">Web Services</text>
 <g transform="translate(0 3.2)">
+<g id="websrv_pub" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Web Services Public Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="webservices" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Web Services Fmwk.</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="websrv_info" transform="translate(0 0)" class="collection">
+<g id="websrv_info" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Web Services Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="platformtools" class="package" transform="translate( 1024.1999999999998 104.63000000000001)">
+<g id="platformtools" class="package" transform="translate( 1309.8000000000002 100.4)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
-<rect class="package" x="0" width="27.900000000000002" height="120.23000000000002" y="0" style="fill:darkgray;"/>
+<rect class="package" x="0" width="27.900000000000002" height="116.00000000000001" y="0" style="fill:darkgray;"/>
-<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="119.23">Platform Tools</text>
+<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000003">Platform Tools</text>
 <g transform="translate(0 3.2)">
 <g id="gfxconversion" transform="translate(0 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Graphics Conversion</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="uitools" class="package" transform="translate( 905.7 0)">
+<g id="uitools" class="package" transform="translate( 1116.6 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
-<rect class="package" x="0" width="68.7" height="101.43" y="0" style="fill:darkgray;"/>
+<rect class="package" x="0" width="68.7" height="97.2" y="0" style="fill:darkgray;"/>
-<text text-anchor="middle" class="package" width="68.7" x="34.35" y="100.43">UI Tools</text>
+<text text-anchor="middle" class="package" width="68.7" x="34.35" y="96.2">UI Tools</text>
 <g transform="translate(0 3.2)">
+<g id="uitools_pub" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UI Tools Public Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="uitools_plat" transform="translate(17.7 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UI Tools Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="cdlcompilertoolkit" transform="translate(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">CDL Compiler Toolkit</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="svgtencoder" transform="translate(17.7 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">SVGT Encoder</text>
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-<g id="uitools_info" transform="translate(0 0)" class="collection">
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UI Tools Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
 </g>
 </g>
 <g id="app" transform="translate(3.1999999999999993 0)" class="layer">
 <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="174.86"/>
 <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="174.86" height="9.3" x="-87.73">Applications</text>
 <g class="layer-detail" transform="translate(12.8 3.2)">
-<rect x="0" class="layer" y="-3.2" width="1077.6" height="174.86"/>
+<rect x="0" class="layer" y="-3.2" width="1343.0999999999997" height="174.86"/>
 <g>
 <g id="location" class="package" transform="translate( 0 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
-<rect class="package" x="0" width="68.7" height="82.63000000000001" y="0" style="fill:whitesmoke;"/>
+<rect class="package" x="0" width="104.1" height="82.63000000000001" y="0" style="fill:whitesmoke;"/>
-<text text-anchor="middle" class="package" width="68.7" x="34.35" y="81.63000000000001">Location Apps</text>
+<text text-anchor="middle" class="package" width="104.1" x="52.05" y="81.63000000000001">Location Apps</text>
 <g transform="translate(0 3.2)">
+<g id="loc_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Apps Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="loc_pub" transform="translate(17.7 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Apps Public Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="basiclocationinfodisplay" transform="translate(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Basic Location Info Display</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="eventsui" transform="translate(0 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Events UI</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="locationlandmarksrefappfors60" transform="translate(0 0)" class="collection">
+<g id="locationlandmarksrefappfors60" transform="translate(35.4 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Landmarks Ref App for S60</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="locationlandmarksuirefapp" transform="translate(17.7 0)" class="collection">
+<g id="locationlandmarksuirefapp" transform="translate(53.099999999999994 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Landmarks UI Ref App</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="locationsatviewrefapp" transform="translate(35.4 0)" class="collection">
+<g id="locationsatviewrefapp" transform="translate(70.8 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Satellite View Ref App</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="simpsyconfigurator" transform="translate(17.7 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Simulation PSY Configurator</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="mapnavproviderrefapp" transform="translate(53.099999999999994 0)" class="collection">
+<g id="mapnavproviderrefapp" transform="translate(88.5 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Map &amp; Nav Provider Ref App</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="locationcentre" transform="translate(17.7 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Centre</text>
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-<g id="location_info" transform="translate(35.4 18.8)" class="collection">
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Apps Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
 <g id="mmsharinguis" class="package" transform="translate( 0 85.83000000000001)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
-<rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:darkkhaki;"/>
+<rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:darkkhaki;"/>
-<text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000002">Multimedia Sharing UIs</text>
+<text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000002">Multimedia Sharing UIs</text>
 <g transform="translate(0 3.2)">
+<g id="mmsharinguis_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">MM Sharing UIs Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="mmsharing" transform="translate(0 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Multimedia Sharing</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="mmshplugins" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">MM Sharing Plugins</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="mmsharinguis_info" transform="translate(0 0)" class="collection">
+<g id="mmsharinguis_info" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">MM Sharing UIs Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="phone" class="package" transform="translate( 70.8 0)">
+<g id="phone" class="package" transform="translate( 106.19999999999999 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
 <rect class="package" x="0" width="33.3" height="168.46" y="0" style="fill:darkkhaki;"/>
 <text text-anchor="middle" class="package" width="33.3" x="16.65" y="167.46">Phone Apps</text>
 <g transform="translate(0 3.2)">
-<g id="phoneapp" transform="translate(0 0)" class="collection">
+<g id="phone_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Phone Apps Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="phoneapp" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Phone App</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="phoneengine" transform="translate(0 56.400000000000006)" class="collection">
 <g id="phoneuis" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Phone UIs</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="phone_info" transform="translate(17.7 0)" class="collection">
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Phone Apps Info</text>
-<g transform="translate(0 6.299999999999999)"/>
-</g>
 <g id="phoneplugins" transform="translate(17.7 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Phone Plugins</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="videotelephony" class="package" transform="translate( 106.19999999999999 0)">
+<g id="videotelephony" class="package" transform="translate( 141.6 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
 <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:darkkhaki;"/>
 <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000001">Video Telephony Apps</text>
 <g transform="translate(0 3.2)">
+<g id="videotelephony_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">VT Apps Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="vtengines" transform="translate(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Telephony Engines</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="vtuis" transform="translate(0 0)" class="collection">
+<g id="vtuis" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Telephony UIs</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="vtprotocolplugins" transform="translate(0 37.6)" class="collection">
 <g id="vtprotocolsstub" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">VT Protocols Stub</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="videotelephony_info" transform="translate(17.7 0)" class="collection">
+</g>
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+</g>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">VT Apps Info</text>
+<g id="iptelephony" class="package" transform="translate( 177 0)">
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-</g>
-</g>
-<g id="iptelephony" class="package" transform="translate( 141.6 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
 <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:darkkhaki;"/>
 <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000001">IP Telephony</text>
 <g transform="translate(0 3.2)">
-<g id="iptelcommsconfig" transform="translate(0 0)" class="collection">
+<g id="iptel_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">IP Telephony Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="iptelcommsconfig" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">IP Telephony Comms Config</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="convergedconnectionhandler" transform="translate(0 56.400000000000006)" class="collection">
 <g id="callcontinuity" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Call Continuity</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="iptelephony_info" transform="translate(17.7 0)" class="collection">
+</g>
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+</g>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">IP Telephony Info</text>
+<g id="settingsuis" class="package" transform="translate( 141.6 85.83000000000001)">
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-</g>
-</g>
-<g id="settingsuis" class="package" transform="translate( 106.19999999999999 85.83000000000001)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
 <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:darkseagreen;"/>
 <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000002">Settings UIs</text>
 <g transform="translate(0 3.2)">
+<g id="devmngt_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Settings UIs Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="defaultapplicationsettings" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Default App Settings</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="systemswuis" transform="translate(0 0)" class="collection">
+<g id="systemswuis" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">System SW UIs</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="settingsuis_info" transform="translate(17.7 0)" class="collection">
+</g>
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+</g>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Settings UIs Info</text>
+<g id="contentcontrol" class="package" transform="translate( 177 85.83000000000001)">
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-</g>
-</g>
-<g id="contentcontrol" class="package" transform="translate( 141.6 85.83000000000001)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
 <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:darkseagreen;"/>
 <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000002">Content Control Daemons</text>
 <g transform="translate(0 3.2)">
+<g id="contentctrl_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Content Control Daemons Platforn Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="dsdcmoadapter" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Data Sync DCMO Adapter</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="omads" transform="translate(0 0)" class="collection">
+<g id="omads" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">OMA Data Sync</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="contentcontrol_info" transform="translate(17.7 0)" class="collection">
+</g>
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+</g>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Content Control Daemons Info</text>
+<g id="devicecontrol" class="package" transform="translate( 212.4 85.83000000000001)">
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-</g>
-</g>
-<g id="devicecontrol" class="package" transform="translate( 177 85.83000000000001)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
 <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:darkseagreen;"/>
 <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000002">Device Control Daemons</text>
 <g transform="translate(0 3.2)">
 <g id="devicediagnostics" transform="translate(0 0)" class="collection">
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">OMA Content Provisioning</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="printing" class="package" transform="translate( 212.4 85.83000000000001)">
+<g id="printing" class="package" transform="translate( 247.8 85.83000000000001)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
 <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:orchid;"/>
 <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000002">Printing</text>
 <g transform="translate(0 3.2)">
 <g id="imageprint" transform="translate(0 0)" class="collection">
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">ImagePrint</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="files" class="package" transform="translate( 177 0)">
+<g id="files" class="package" transform="translate( 212.4 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
 <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:lightpink;"/>
 <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000001">File Manager Apps</text>
 <g transform="translate(0 3.2)">
+<g id="files_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">File Manager Apps Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="deviceencryption" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Device Encryption</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="filemanager" transform="translate(0 0)" class="collection">
+<g id="filemanager" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">File Manager</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="filesystemuis" transform="translate(17.7 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">File System UIs</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="files_info" transform="translate(17.7 0)" class="collection">
+</g>
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+</g>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">File Manager Apps Info</text>
+<g id="utils" class="package" transform="translate( 247.8 0)">
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-</g>
-</g>
-<g id="utils" class="package" transform="translate( 212.4 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
 <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:lightpink;"/>
 <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000001">Utility Apps</text>
 <g transform="translate(0 3.2)">
 <g id="extras" transform="translate(0 0)" class="collection">
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Extras</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="contacts" class="package" transform="translate( 242.4 0)">
+<g id="contacts" class="package" transform="translate( 277.80000000000007 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-<rect class="package" x="0" width="51" height="168.46" y="0" style="fill:lightpink;"/>
+<rect class="package" x="0" width="86.4" height="168.46" y="0" style="fill:lightpink;"/>
-<text text-anchor="middle" class="package" width="51" x="25.5" y="167.46">Contacts Apps</text>
+<text text-anchor="middle" class="package" width="86.4" x="43.2" y="167.46">Contacts Apps</text>
 <g transform="translate(0 3.2)">
+<g id="contacts_pub" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Contacts Apps Public Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="contacts_plat" transform="translate(17.7 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Contacts Apps Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="contactextensions" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Contacts Extensions</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="logsui" transform="translate(0 0)" class="collection">
+<g id="logsui" transform="translate(35.4 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Logs UI</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="phonebookui" transform="translate(17.7 0)" class="collection">
+<g id="phonebookui" transform="translate(53.099999999999994 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Phonebook UI</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="phonebookengines" transform="translate(0 56.400000000000006)" class="collection">
 <g id="predictivesearch" transform="translate(17.7 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Predictive Search</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="contacts_info" transform="translate(35.4 0)" class="collection">
+<g id="contacts_info" transform="translate(70.8 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Contacts Apps Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="organizer" class="package" transform="translate( 295.50000000000006 0)">
+<g id="organizer" class="package" transform="translate( 366.30000000000007 0)">
+<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
+<rect class="package" x="0" width="104.1" height="168.46" y="0" style="fill:lightpink;"/>
+<text text-anchor="middle" class="package" width="104.1" x="52.05" y="167.46">Organizer App Suite</text>
+<g transform="translate(0 3.2)">
+<g id="organizer_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Organizer App Suite Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="organizer_pub" transform="translate(17.7 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Organizer App Suite Public Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="alarmengines" transform="translate(0 37.6)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Alarm Engines</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="calendarengines" transform="translate(17.7 37.6)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Calendar Engines</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="meetingrequestengines" transform="translate(35.4 37.6)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Meeting Request Engines</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="searchfw" transform="translate(0 56.400000000000006)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Search Framework</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="alarmui" transform="translate(35.4 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Alarm UI</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="calendarui" transform="translate(0 18.8)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Calendar UI</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="meetingui" transform="translate(17.7 18.8)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Meeting UI</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="clock2" transform="translate(53.099999999999994 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Clock</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="notepad" transform="translate(35.4 18.8)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Notepad</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="searchui" transform="translate(70.8 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Search UI</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="pimappservices" transform="translate(17.7 56.400000000000006)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">PIM App Services</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="pimappsupport" transform="translate(0 75.2)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">PIM App Support</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="organizer_info" transform="translate(88.5 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Organizer App Suite Info</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+</g>
+</g>
+<g id="messaging" class="package" transform="translate( 472.50000000000006 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
 <rect class="package" x="0" width="68.7" height="168.46" y="0" style="fill:lightpink;"/>
-<text text-anchor="middle" class="package" width="68.7" x="34.35" y="167.46">Organizer App Suite</text>
+<text text-anchor="middle" class="package" width="68.7" x="34.35" y="167.46">Messaging Apps</text>
 <g transform="translate(0 3.2)">
-<g id="alarmengines" transform="translate(0 37.6)" class="collection">
+<g id="msg_pub" transform="translate(0 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Alarm Engines</text>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Msg. Apps Public APIs</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="calendarengines" transform="translate(17.7 37.6)" class="collection">
+<g id="msg_plat" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Calendar Engines</text>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Msg. Apps Platform APIs</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="meetingrequestengines" transform="translate(35.4 37.6)" class="collection">
+<g id="mobilemessaging" transform="translate(35.4 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Meeting Request Engines</text>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Mobile Messaging</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="searchfw" transform="translate(0 56.400000000000006)" class="collection">
+<g id="mmsengine" transform="translate(0 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Search Framework</text>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">MMS Engine</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="alarmui" transform="translate(0 0)" class="collection">
+<g id="messagingappbase" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Alarm UI</text>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Messaging App Base</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="calendarui" transform="translate(0 18.8)" class="collection">
+<g id="email" transform="translate(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Calendar UI</text>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Email</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="meetingui" transform="translate(17.7 18.8)" class="collection">
+<g id="messaging_info" transform="translate(53.099999999999994 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Meeting UI</text>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Messaging Apps Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="clock2" transform="translate(17.7 0)" class="collection">
+</g>
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+</g>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Clock</text>
+<g id="commonemail" class="package" transform="translate( 543.3000000000001 0)">
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-<g id="notepad" transform="translate(35.4 18.8)" class="collection">
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Notepad</text>
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-<g id="searchui" transform="translate(35.4 0)" class="collection">
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Search UI</text>
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-<g id="pimappservices" transform="translate(17.7 56.400000000000006)" class="collection">
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">PIM App Services</text>
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-<g id="pimappsupport" transform="translate(0 75.2)" class="collection">
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">PIM App Support</text>
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-<g id="organizer_info" transform="translate(53.099999999999994 0)" class="collection">
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Organizer App Suite Info</text>
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-</g>
-</g>
-<g id="messaging" class="package" transform="translate( 366.30000000000007 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-<rect class="package" x="0" width="33.3" height="168.46" y="0" style="fill:lightpink;"/>
+<rect class="package" x="0" width="68.7" height="168.46" y="0" style="fill:lightpink;"/>
-<text text-anchor="middle" class="package" width="33.3" x="16.65" y="167.46">Messaging Apps</text>
+<text text-anchor="middle" class="package" width="68.7" x="34.35" y="167.46">Email Apps</text>
 <g transform="translate(0 3.2)">
-<g id="mobilemessaging" transform="translate(0 0)" class="collection">
+<g id="email_pub" transform="translate(0 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Mobile Messaging</text>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Email Apps Public Interfaces</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="mmsengine" transform="translate(0 37.6)" class="collection">
+<g id="email_plat" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">MMS Engine</text>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Email Apps Platform Interfaces</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="messagingappbase" transform="translate(0 18.8)" class="collection">
+<g id="emailservices" transform="translate(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Messaging App Base</text>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Email Services</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="email" transform="translate(0 56.400000000000006)" class="collection">
+<g id="ipsservices" transform="translate(17.7 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Email</text>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">IMAP/POP/SMTP Services</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="messaging_info" transform="translate(17.7 0)" class="collection">
+<g id="emailcontacts" transform="translate(0 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Messaging Apps Info</text>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Email Contacts</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-</g>
+<g id="meetingrequest" transform="translate(0 18.8)" class="collection">
-</g>
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-<g id="commonemail" class="package" transform="translate( 401.70000000000005 0)">
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Meeting Request</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="emailuis" transform="translate(35.4 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Email UIs</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="commonemail_info" transform="translate(53.099999999999994 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Email Apps Info</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+</g>
+</g>
+<g id="conversations" class="package" transform="translate( 614.1 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-<rect class="package" x="0" width="33.3" height="168.46" y="0" style="fill:lightpink;"/>
+<rect class="package" x="0" width="68.7" height="82.63000000000001" y="0" style="fill:lightpink;"/>
-<text text-anchor="middle" class="package" width="33.3" x="16.65" y="167.46">Email Apps</text>
+<text text-anchor="middle" class="package" width="68.7" x="34.35" y="81.63000000000001">Conversation Apps</text>
 <g transform="translate(0 3.2)">
-<g id="emailservices" transform="translate(0 56.400000000000006)" class="collection">
+<g id="conversations_plat" transform="translate(0 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Email Services</text>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Conversation Apps Platform Interfaces</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="ipsservices" transform="translate(17.7 56.400000000000006)" class="collection">
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">IMAP/POP/SMTP Services</text>
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-<g id="emailcontacts" transform="translate(0 37.6)" class="collection">
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Email Contacts</text>
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-<g id="meetingrequest" transform="translate(0 18.8)" class="collection">
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Meeting Request</text>
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-<g id="emailuis" transform="translate(0 0)" class="collection">
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Email UIs</text>
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-<g id="commonemail_info" transform="translate(17.7 0)" class="collection">
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Email Apps Info</text>
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-</g>
-</g>
-<g id="conversations" class="package" transform="translate( 437.1 0)">
-<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-<rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:lightpink;"/>
-<text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000001">Conversation Apps</text>
-<g transform="translate(0 3.2)">
 <g id="uiservicetabsettings" transform="translate(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UI Service Tab Settings</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="imstutils" transform="translate(17.7 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">IM Service Tab Utils</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="uiservicetab" transform="translate(0 0)" class="collection">
+<g id="uiservicetab" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UI Service Tab</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="servicewidget" transform="translate(17.7 0)" class="collection">
+<g id="servicewidget" transform="translate(35.4 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Service Widget</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="instantmsgindicatorplugin" transform="translate(0 18.8)" class="collection">
 <g id="imstatuspaneindicatorplugin" transform="translate(17.7 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">IM Status Pane Indicator Plugin</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="conversations_info" transform="translate(35.4 0)" class="collection">
+<g id="conversations_info" transform="translate(53.099999999999994 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Conversation Apps Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="im" class="package" transform="translate( 490.20000000000005 0)">
+<g id="im" class="package" transform="translate( 684.9 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
 <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:lightpink;"/>
 <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000001">Instant Msg. Apps</text>
 <g transform="translate(0 3.2)">
+<g id="im_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Instant Msg. Apps Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="wvsettings20" transform="translate(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Wireless Village Settings Eng.</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="im_info" transform="translate(0 0)" class="collection">
+</g>
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+</g>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Instant Msg. Apps Info</text>
+<g id="dictionary" class="package" transform="translate( 614.1 85.83000000000001)">
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-</g>
-</g>
-<g id="dictionary" class="package" transform="translate( 437.1 85.83000000000001)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
 <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:lightpink;"/>
 <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000002">Dictionary</text>
 <g transform="translate(0 3.2)">
-<g id="userdict" transform="translate(0 0)" class="collection">
+<g id="dictionary_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Dictionary Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="userdict" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">User Dictionary</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="dictionary_info" transform="translate(17.7 0)" class="collection">
+</g>
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+</g>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Dictionary Info</text>
+<g id="camera" class="package" transform="translate( 714.9 0)">
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-</g>
-</g>
-<g id="camera" class="package" transform="translate( 520.2 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
-<rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
+<rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
-<text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000001">Camera Apps</text>
+<text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000001">Camera Apps</text>
 <g transform="translate(0 3.2)">
-<g id="camerauis" transform="translate(0 0)" class="collection">
+<g id="camera_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Camera Apps Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="camerauis" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Camera UIs</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="camera_info" transform="translate(17.7 0)" class="collection">
+<g id="camera_info" transform="translate(35.4 0)" class="collection placeholder">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Camera Apps Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="imgeditor" class="package" transform="translate( 555.6 0)">
+<g id="imgeditor" class="package" transform="translate( 768 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
 <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
 <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000001">Image Editor Apps</text>
 <g transform="translate(0 3.2)">
-<g id="imageeditor" transform="translate(0 0)" class="collection">
+<g id="imgeditor_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Image Editor Apps Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="imageeditor" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Image Editor UI</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="imageeditorengine" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Image Editor Engine</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="imgeditor_info" transform="translate(17.7 0)" class="collection">
+</g>
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+</g>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Image Editor Apps Info</text>
+<g id="videoeditor" class="package" transform="translate( 803.4 0)">
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-</g>
-</g>
-<g id="videoeditor" class="package" transform="translate( 591 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
 <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
 <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000001">Video Editor Apps</text>
 <g transform="translate(0 3.2)">
-<g id="videditor" transform="translate(0 0)" class="collection">
+<g id="videoeditor_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Editor Apps Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="videditor" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Editor</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="videoeditorengine" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Editor Engine</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="videoeditor_info" transform="translate(17.7 0)" class="collection">
+</g>
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+</g>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Editor Apps Info</text>
+<g id="videoplayer" class="package" transform="translate( 838.8 0)">
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-</g>
-</g>
-<g id="videoplayer" class="package" transform="translate( 626.4 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
 <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
 <text text-anchor="middle" class="package" width="0" x="33.3" y="67.4" dy="0.375em">Video Player Apps</text>
 <g transform="translate(0 3.2)">
+<g id="videoplayer_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Player Apps Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="videofeeds" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Feeds</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="filedetails" transform="translate(17.7 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">File Details</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="videoplayerapp" transform="translate(0 0)" class="collection">
+<g id="videoplayerapp" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Player App</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="videoplayback" transform="translate(17.7 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Playback Plugins</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="videoplayer_info" transform="translate(17.7 0)" class="collection">
+</g>
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+</g>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Player Apps Info</text>
+<g id="photos" class="package" transform="translate( 874.1999999999999 0)">
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-</g>
-</g>
-<g id="photos" class="package" transform="translate( 661.8 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
 <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
 <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000001">Photos</text>
 <g transform="translate(0 3.2)">
-<g id="photosgallery" transform="translate(0 0)" class="collection">
+<g id="photos_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Photos Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="photosgallery" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Photos Gallery</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="photos_info" transform="translate(17.7 0)" class="collection">
+</g>
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+</g>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Photos Info</text>
+<g id="musicplayer" class="package" transform="translate( 909.5999999999999 0)">
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-</g>
-</g>
-<g id="musicplayer" class="package" transform="translate( 697.1999999999999 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
-<rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
+<rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
-<text text-anchor="middle" class="package" width="33.3" x="16.65" y="48.6" dy="0.375em">Music Player Apps</text>
+<text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000001">Music Player Apps</text>
 <g transform="translate(0 3.2)">
-<g id="mpxmusicplayer" transform="translate(0 0)" class="collection">
+<g id="musicplayer_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Music Player Apps Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="mpxmusicplayer" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">MPX Music Player</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="musichomescreen_multiview" transform="translate(0 18.8)" class="collection">
 <g id="mpxplugins" transform="translate(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">MPX Plugins</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="musicplayer_info" transform="translate(17.7 0)" class="collection">
+<g id="musicplayer_info" transform="translate(35.4 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Music Player Apps Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="radio" class="package" transform="translate( 732.5999999999999 0)">
+<g id="radio" class="package" transform="translate( 962.6999999999999 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
 <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
 <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000001">Radio Apps</text>
 <g transform="translate(0 3.2)">
 <g id="fmradio" transform="translate(0 0)" class="collection">
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">FM Radio</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="internetradio" class="package placeholder" transform="translate( 762.5999999999999 0)">
+<g id="internetradio" class="package placeholder" transform="translate( 992.6999999999999 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
 <rect class="package" x="0" width="78" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
 <text text-anchor="middle" class="package" width="78" x="39" y="40.315000000000005" dy="0.375em" height="15.600000000000001">Internet Radio Apps</text>
 <g transform="translate(0 3.2)"/>
 </g>
-<g id="tv" class="package placeholder" transform="translate( 472.5 85.83000000000001)">
+<g id="tv" class="package placeholder" transform="translate( 649.5 85.83000000000001)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
 <rect class="package" x="0" width="78" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
 <text text-anchor="middle" class="package" width="78" x="39" y="40.315000000000026" dy="0.375em" height="15.600000000000001">TV Apps</text>
 <g transform="translate(0 3.2)"/>
 </g>
-<g id="voicerec" class="package" transform="translate( 842.6999999999999 0)">
+<g id="voicerec" class="package" transform="translate( 1072.7999999999997 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
-<rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
+<rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
-<text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000001">Voice Recorder Apps</text>
+<text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000001">Voice Recorder Apps</text>
 <g transform="translate(0 3.2)">
-<g id="voicerecorder" transform="translate(0 0)" class="collection">
+<g id="voicerec_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Voice Recorder Apps Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="voicerecorder" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Voice Recorder</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="voicerec_info" transform="translate(17.7 0)" class="collection">
+<g id="voicerec_info" transform="translate(35.4 0)" class="collection placeholder">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Voice Recorder Apps Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="screensaver" class="package" transform="translate( 878.0999999999999 0)">
+<g id="screensaver" class="package" transform="translate( 1125.8999999999996 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
 <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:orange;"/>
 <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000001">Screen Saver Apps</text>
 <g transform="translate(0 3.2)">
 <g id="scrsaver" transform="translate(0 18.8)" class="collection">
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Screen Saver Apps Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="homescreen" class="package" transform="translate( 908.0999999999999 0)">
+<g id="homescreen" class="package" transform="translate( 1155.8999999999996 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
 <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:orange;"/>
 <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000001">Home Screen Apps</text>
 <g transform="translate(0 3.2)">
-<g id="idlehomescreen" transform="translate(0 0)" class="collection">
+<g id="homescreen_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Home Screen Apps Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="idlehomescreen" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Idle Home Screen</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="menufw" transform="translate(0 37.6)" class="collection">
 <g id="taskswitcher" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Task Switcher</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="homescreen_info" transform="translate(17.7 0)" class="collection">
+</g>
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+</g>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Home Screen Apps Info</text>
+<g id="graphicsuis" class="package" transform="translate( 729.6 85.83000000000001)">
-<g transform="translate(0 6.299999999999999)"/>
-</g>
-</g>
-</g>
-<g id="graphicsuis" class="package" transform="translate( 552.6 85.83000000000001)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
 <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:orange;"/>
 <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000002">Graphics UIs</text>
 <g transform="translate(0 3.2)">
-<g id="graphicsuis_info" transform="translate(0 0)" class="collection">
+<g id="graphicsuis_plat" transform="translate(0 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Graphics UIs Info</text>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Graphics UIs Platform Interfaces</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="svgtviewer" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">SVG-T Viewer</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="profile" class="package" transform="translate( 943.4999999999999 0)">
+<g id="profile" class="package" transform="translate( 1191.2999999999997 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-<rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:orange;"/>
+<rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:orange;"/>
-<text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000001">Profiles</text>
+<text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000001">Profiles</text>
 <g transform="translate(0 3.2)">
-<g id="profilesapplication" transform="translate(0 0)" class="collection">
+<g id="profile_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Profiles Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="profilesapplication" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Profiles App</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="profile_info" transform="translate(17.7 0)" class="collection">
+<g id="profile_info" transform="translate(35.4 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Profiles Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="speechsrv" class="package" transform="translate( 588 85.83000000000001)">
+<g id="speechsrv" class="package" transform="translate( 765 85.83000000000001)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-<rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:orange;"/>
+<rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:orange;"/>
-<text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000002">Speech Recognition UIs</text>
+<text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000002">Speech Recognition UIs</text>
 <g transform="translate(0 3.2)">
-<g id="voiceui" transform="translate(0 0)" class="collection">
+<g id="speechsrv_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Speech Recognition UIs Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="voiceui" transform="translate(17.7 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Voice UI</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <g id="srsf" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Speech Recognition &amp; Synthesis FW</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="speechsrv_info" transform="translate(17.7 0)" class="collection">
+<g id="speechsrv_info" transform="translate(35.4 0)" class="collection placeholder">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Speech Recognition UIs Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="homescreentools" class="package" transform="translate( 623.4 85.83000000000001)">
+<g id="homescreentools" class="package" transform="translate( 818.1 85.83000000000001)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
 <rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:orange;"/>
 <text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000002">Home Screen Tools</text>
 <g transform="translate(0 3.2)">
 <g id="dtdinstaller" transform="translate(0 0)" class="collection">
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Widget Tools</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="webuis" class="package" transform="translate( 676.5 85.83000000000001)">
+<g id="webuis" class="package" transform="translate( 871.2 85.83000000000001)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
 <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:slateblue;"/>
 <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000002">Web UIs</text>
 <g transform="translate(0 3.2)">
 <g id="browserui" transform="translate(0 0)" class="collection">
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Push MTM</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="jrt" class="package" transform="translate( 711.9 85.83000000000001)">
+<g id="jrt" class="package" transform="translate( 906.6 85.83000000000001)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
 <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:slateblue;"/>
 <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000002">Java Runtime</text>
 <g transform="translate(0 3.2)">
+<g id="jrt_plat" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">JRT Platform Interfaces</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
 <g id="java_stubs" transform="translate(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Java Stubs</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">JRT Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="conntools" class="package" transform="translate( 741.9 85.83000000000001)">
+<g id="conntools" class="package" transform="translate( 936.6 85.83000000000001)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
 <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:moccasin;"/>
 <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000002">Connectivity Tools</text>
 <g transform="translate(0 3.2)">
 <g id="nettools" transform="translate(0 0)" class="collection">
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Emulator LAN</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="rndtools" class="package" transform="translate( 771.9 85.83000000000001)">
+<g id="rndtools" class="package" transform="translate( 966.6 85.83000000000001)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
 <rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:darkgray;"/>
 <text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000002">R&amp;D tools</text>
 <g transform="translate(0 3.2)">
 <g id="creator" transform="translate(0 56.400000000000006)" class="collection">
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Harmonized Test Interface UI</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="helps" class="package" transform="translate( 978.8999999999999 0)">
+<g id="helps" class="package" transform="translate( 1244.3999999999996 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
 <rect class="package" x="0" width="27.900000000000002" height="168.46" y="0" style="fill:orange;"/>
 <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="167.46">Help Apps</text>
 <g transform="translate(0 3.2)">
 <g id="csxhelp" transform="translate(0 18.8)" class="collection">
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Help Apps Info</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="techview" class="package" transform="translate( 1008.8999999999999 0)">
+<g id="techview" class="package" transform="translate( 1274.3999999999996 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
 <rect class="package" x="0" width="68.7" height="168.46" y="0" style="fill:orange;"/>
 <text text-anchor="middle" class="package" width="68.7" x="34.35" y="167.46">Techview</text>
 <g transform="translate(0 3.2)">
 <g id="buildverification" transform="translate(0 94)" class="collection">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="legend-root" class="legend" transform="translate(801.0794999999999 650.1800000000003) translate(295.7205 0) scale(2.9671260531481587) translate(-295.7205)">
+<g id="legend-root" class="legend" transform="translate(1066.5794999999998 637.4900000000001) translate(295.7205 0) scale(3.6853718291427207) translate(-295.7205)">
 <text text-anchor="middle" class="title" x="279.38525000000004" y="0">
 <tspan dy="0.75em" x="279.38525000000004">Symbian OS ^3</tspan>
 <tspan dy="1em" x="279.38525000000004">System Model</tspan>
 <tspan font-style="italic" dy="1em" id="release-version" x="279.38525000000004">%d %b %Y</tspan>
 </text>
 </g>
 </g>
 </g>
 <text text-anchor="middle" class="label" dy="0.375em" x="243.275" y="3.0999999999999996">
 <tspan dy="-0.5em" x="243.275">110 Packages</tspan>
-<tspan dy="1em" x="243.275">588 Collections</tspan>
+<tspan dy="1em" x="243.275">663 Collections</tspan>
 </text>
 </g>
 </g>
 </g>
 <g id="Zoom" onload="resized()">

changeset 446	b73548d05e72
parent 430	4f50419ea4dc
child 453	d5b0fa109a95