--- a/symbian4/single/sources_good.csv	Mon Sep 27 21:31:59 2010 +0100
+++ b/symbian4/single/sources_good.csv	Tue Sep 28 12:37:49 2010 +0100
@@ -1,11 +1,13 @@
 source,dst,type,pattern,sysdef
 http://developer.symbian.org/oss/FCL/sftools/fbf/utilities/,/utilities,tag,S4_LATESTGOOD,NON-NOKIA
 http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,tag,S4_LATESTGOOD,NON-NOKIA
-http://developer.symbian.org/oss/MCL/sf/adaptation/codecs.aricent/,/sf/adaptation/codecs.aricent,tag,S4_LATESTGOOD,NON-NOKIA
+http://developer.symbian.org/oss/FCL/sf/adaptation/codecs.aricent/,/sf/adaptation/codecs.aricent,tag,S4_LATESTGOOD,NON-NOKIA
+http://developer.symbian.org/oss/FCL/sf/adaptation/openmaxil.nokia/,/sf/adaptation/openmaxil.nokia,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,tag,S4_LATESTGOOD,NON-NOKIA
 http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/browserui/,/sf/app/browserui,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/camera/,/sf/app/camera,tag,S4_LATESTGOOD,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/calendarwidget/,/sf/app/calendarwidget,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/commonemail/,/sf/app/commonemail,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/conntools/,/sf/app/conntools,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/contacts/,/sf/app/contacts,tag,S4_LATESTGOOD,layers.sysdef.xml
@@ -14,16 +16,16 @@
 http://developer.symbian.org/oss/FCL/sf/app/files/,/sf/app/files,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/firsttimeuse/,/sf/app/firsttimeuse,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/helps/,/sf/app/helps,tag,S4_LATESTGOOD,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/app/homescreen/,/sf/app/homescreen,tag,S4_LATESTGOOD,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/homescreen/,/sf/app/homescreen,tag,S4_LATESTGOOD,
 http://developer.symbian.org/oss/FCL/sf/app/homescreentools/,/sf/app/homescreentools,tag,S4_LATESTGOOD,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/app/jrt/,/sf/app/jrt,tag,S4_LATESTGOOD,
+http://developer.symbian.org/oss/FCL/sf/app/jrt/,/sf/app/jrt,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/internetradio/,/sf/app/internetradio,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/location/,/sf/app/location,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/messaging/,/sf/app/messaging,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/mmsharinguis/,/sf/app/mmsharinguis,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/musicplayer/,/sf/app/musicplayer,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/organizer/,/sf/app/organizer,tag,S4_LATESTGOOD,
-http://developer.symbian.org/oss/FCL/sf/app/phone/,/sf/app/phone,tag,S4_LATESTGOOD,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/phone/,/sf/app/phone,tag,S4_LATESTGOOD,
 http://developer.symbian.org/oss/FCL/sf/app/photos/,/sf/app/photos,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/podcatcher/,/sf/app/podcatcher,tag,S4_LATESTGOOD,NON-NOKIA
 http://developer.symbian.org/oss/FCL/sf/app/printing/,/sf/app/printing,tag,S4_LATESTGOOD,layers.sysdef.xml
@@ -33,6 +35,7 @@
 http://developer.symbian.org/oss/FCL/sf/app/settingsuis/,/sf/app/settingsuis,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/search/,/sf/app/search,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/techview/,/sf/app/techview,tag,S4_LATESTGOOD,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/testtools/,/sf/app/testtools,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/videoplayer/,/sf/app/videoplayer,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/videotelephony/,/sf/app/videotelephony,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/webuis/,/sf/app/webuis,tag,S4_LATESTGOOD,layers.sysdef.xml
@@ -40,20 +43,20 @@
 http://developer.symbian.org/oss/FCL/sf/mw/appinstall/,/sf/mw/appinstall,tag,S4_LATESTGOOD,
 http://developer.symbian.org/oss/FCL/sf/mw/appsupport/,/sf/mw/appsupport,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/browser/,/sf/mw/browser,tag,S4_LATESTGOOD,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/btservices/,/sf/mw/btservices,tag,S4_LATESTGOOD,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/btservices/,/sf/mw/btservices,tag,S4_LATESTGOOD,
 http://developer.symbian.org/oss/FCL/sf/mw/camerasrv/,/sf/mw/camerasrv,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/classicui/,/sf/mw/classicui,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/dlnasrv/,/sf/mw/dlnasrv,tag,S4_LATESTGOOD,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/drm/,/sf/mw/drm,tag,S4_LATESTGOOD,
+http://developer.symbian.org/oss/FCL/sf/mw/drm/,/sf/mw/drm,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/gsprofilesrv/,/sf/mw/gsprofilesrv,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/gstreamer/,/sf/mw/gstreamer,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/hapticsservices/,/sf/mw/hapticsservices,tag,S4_LATESTGOOD,
-http://developer.symbian.org/oss/FCL/sf/mw/hb/,/sf/mw/hb,tag,S4_LATESTGOOD,
+http://developer.symbian.org/oss/FCL/sf/mw/hb/,/sf/mw/hb,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/helix/,/sf/mw/helix,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/hgwidgets/,/sf/mw/hgwidgets,tag,S4_LATESTGOOD,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,tag,S4_LATESTGOOD,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,tag,S4_LATESTGOOD,
 http://developer.symbian.org/oss/FCL/sf/mw/homescreensrvlegacy/,/sf/mw/homescreensrvlegacy,tag,S4_LATESTGOOD,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/imghandling/,/sf/mw/imghandling,tag,S4_LATESTGOOD,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/imghandling/,/sf/mw/imghandling,tag,S4_LATESTGOOD,
 http://developer.symbian.org/oss/FCL/sf/mw/imsrv/,/sf/mw/imsrv,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/inputmethods/,/sf/mw/inputmethods,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/ipappprotocols/,/sf/mw/ipappprotocols,tag,S4_LATESTGOOD,layers.sysdef.xml
@@ -65,20 +68,22 @@
 http://developer.symbian.org/oss/FCL/sf/mw/messagingmw/,/sf/mw/messagingmw,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/metadatasrv/,/sf/mw/metadatasrv,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/mmappfw/,/sf/mw/mmappfw,tag,S4_LATESTGOOD,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/mmmw/,/sf/mw/mmmw,tag,S4_LATESTGOOD,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/mmmw/,/sf/mw/mmmw,tag,S4_LATESTGOOD,
 http://developer.symbian.org/oss/FCL/sf/mw/netprotocols/,/sf/mw/netprotocols,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/platformthemes/,/sf/mw/platformthemes,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/platformtools/,/sf/mw/platformtools,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/phonesrv/,/sf/mw/phonesrv,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/qt/,/sf/mw/qt,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/qtextensions/,/sf/mw/qtextensions,tag,S4_LATESTGOOD,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/qtmobility/,/sf/mw/qtmobility,tag,S4_LATESTGOOD,
 http://developer.symbian.org/oss/FCL/sf/mw/remoteconn/,/sf/mw/remoteconn,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/remotemgmt/,/sf/mw/remotemgmt,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/searchsrv/,/sf/mw/searchsrv,tag,S4_LATESTGOOD,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/securitysrv/,/sf/mw/securitysrv,tag,S4_LATESTGOOD,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/securitysrv/,/sf/mw/securitysrv,tag,S4_LATESTGOOD,
 http://developer.symbian.org/oss/FCL/sf/mw/serviceapi/,/sf/mw/serviceapi,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/serviceapifw/,/sf/mw/serviceapifw,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/srvdiscovery/,/sf/mw/srvdiscovery,tag,S4_LATESTGOOD,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/socialmobilefw/,/sf/mw/socialmobilefw,tag,S4_LATESTGOOD,NON_NOKIA
 http://developer.symbian.org/oss/FCL/sf/mw/svgt/,/sf/mw/svgt,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/uiaccelerator/,/sf/mw/uiaccelerator,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/uiresources/,/sf/mw/uiresources,tag,S4_LATESTGOOD,
@@ -96,19 +101,23 @@
 http://developer.symbian.org/oss/FCL/sf/os/cellularsrv/,/sf/os/cellularsrv,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/os/commsfw/,/sf/os/commsfw,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,tag,S4_LATESTGOOD,
-http://developer.symbian.org/oss/FCL/sf/os/devicesrv/,/sf/os/devicesrv,tag,S4_LATESTGOOD,modified-FCL
+http://developer.symbian.org/oss/FCL/sf/os/devicesrv/,/sf/os/devicesrv,tag,S4_LATESTGOOD,
+http://developer.symbian.org/oss/FCL/sf/os/fshell/,/sf/os/fshell,tag,S4_LATESTGOOD,NON_NOKIA
 http://developer.symbian.org/oss/FCL/sf/os/graphics/,/sf/os/graphics,tag,S4_LATESTGOOD,
 http://developer.symbian.org/oss/FCL/sf/os/imagingext/,/sf/os/imagingext,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,tag,S4_LATESTGOOD,
 http://developer.symbian.org/oss/FCL/sf/os/lbs/,/sf/os/lbs,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/os/mm/,/sf/os/mm,tag,S4_LATESTGOOD,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/mmimaging/,/sf/os/mmimaging,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/os/networkingsrv/,/sf/os/networkingsrv,tag,S4_LATESTGOOD,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/openmaxil/,/sf/os/openmaxil,tag,S4_LATESTGOOD,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/osrndtools/,/sf/os/osrndtools,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/os/ossrv/,/sf/os/ossrv,tag,S4_LATESTGOOD,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/ostesttools/,/sf/os/ostesttools,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/os/persistentdata/,/sf/os/persistentdata,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/os/security/,/sf/os/security,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/os/textandloc/,/sf/os/textandloc,tag,S4_LATESTGOOD,
 http://developer.symbian.org/oss/FCL/sf/os/usb/,/sf/os/usb,tag,S4_LATESTGOOD,
 http://developer.symbian.org/oss/FCL/sf/os/wlan/,/sf/os/wlan,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/os/xmlsrv/,/sf/os/xmlsrv,tag,S4_LATESTGOOD,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/osrndtools/,/sf/os/osrndtools,tag,S4_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,tag,S4_LATESTGOOD,layers.sysdef.xml