Merge "Add Janos Kovacs as integrator to ico-homescreen and wayland graphics subsystem."

[scm/meta/git.git] / git-trees

diff --git a/git-trees b/git-trees
index b7905d1..17c83da 100644 (file)
--- a/git-trees
+++ b/git-trees
@@ -1,357 +1,341 @@
 
 T: adaptation/alsa-scenario-scn-data-0-base
-D: System
+D: System / Hardware Adaptation
 B: tizen_2.1
 B: tizen_2.2
 
 T: adaptation/alsa-scenario-scn-data-0-mc1n2
-D: System
+D: System / Hardware Adaptation
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: adaptation/ap_samsung/device-manager-plugin-exynos
-D: System
+D: System / Hardware Adaptation
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: adaptation/ap_samsung/gst-plugins-e4x12
-D: Multimedia
+D: Multimedia / Media Camera
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: adaptation/ap_samsung/gst-plugins-fimcconvert
-D: Multimedia
+D: Multimedia / Media Service
 B: tizen_2.1
 B: tizen_2.2
 
 T: adaptation/ap_samsung/gst-plugins-s5pc2xx
-D: Multimedia
+D: Multimedia / Media Camera
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: adaptation/ap_samsung/libdrm-slp-gem
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Buffer Management
 B: tizen_2.0
 
 T: adaptation/ap_samsung/libomxil-e4x12
-D: Multimedia
+D: Multimedia / Media Camera
 B: tizen_2.1
 B: tizen_2.2
 
 T: adaptation/ap_samsung/libomxil-s5pc2xx
-D: Multimedia
+D: Multimedia / Codec
 B: tizen_2.1
 B: tizen_2.2
 
 T: adaptation/ap_samsung/libtbm-emulator
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Buffer Management
 B: tizen
 
 T: adaptation/ap_samsung/libtbm-exynos4412
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Buffer Management
+B: tizen
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: adaptation/ap_samsung/mfc-firmware
-D: System
+D: System / Hardware Adaptation
 B: tizen_2.1
 B: tizen_2.2
 
 T: adaptation/ap_samsung/system-plugin-slp
-D: 
+D: System / Hardware Adaptation
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: adaptation/ap_samsung/xserver-xorg-misc-exynos
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: adaptation/ap_samsung/xserver-xorg-video-exynos
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: adaptation/bluetooth-tools
-D: Network & Connectivity
+D: Network & Connectivity / Bluetooth
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: adaptation/device-config-audio
-D: System
+D: System / Hardware Adaptation
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: adaptation/device-config-touch
-D: System
+D: System / Hardware Adaptation
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: adaptation/device-manager-plugin-pinetrail
-D: System
+D: System / Hardware Adaptation
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: adaptation/devices/alsa-scenario-scn-data-0-mfld
-D: System
+D: System / Hardware Adaptation
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: adaptation/devices/alsa-scenario-scn-data-0-wm1811
-D: System
+D: System / Hardware Adaptation
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: adaptation/devices/bluetooth-firmware-bcm
-D: Network & Connectivity
+D: Network & Connectivity / Bluetooth
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: adaptation/devices/nfc-plugin-65nxp
-D: Network & Connectivity
+D: Network & Connectivity / NFC
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: adaptation/devices/nfc-plugin-nxp
-D: Network & Connectivity
+D: Network & Connectivity / NFC
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: adaptation/face-engine
 D: Graphics & UI Framework
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: adaptation/intel_mfld/bootstub-mfld-blackbay
-D: 
+D: System / Hardware Adaptation
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
-C: Missing domain!
 
 T: adaptation/intel_mfld/device-configs-mfld-blackbay
-D: 
+D: System / Hardware Adaptation
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
-C: Missing domain!
 
 T: adaptation/intel_mfld/device-manager-plugin-mfld-blackbay
-D: 
+D: System / Hardware Adaptation
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
-C: Missing domain!
 
 T: adaptation/intel_mfld/gst-plugins-atomisp
-D: Multimedia
+D: Multimedia / Media Camera
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: adaptation/intel_mfld/libmfldadvci-blackbay-bin
-D: 
+D: System / Hardware Adaptation
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: adaptation/intel_mfld/linux-firmware-mfld
-D: 
+D: System / Hardware Adaptation
+B: tizen
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
-C: Missing domain!
 
 T: adaptation/intel_mfld/mmfw-sysconf-mfld-blackbay
-D: 
+D: System / Hardware Adaptation
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
-C: Missing domain!
 
 T: adaptation/intel_mfld/preos-runtime
-D: 
+D: System / Hardware Adaptation
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
-C: Missing domain!
 
 T: adaptation/intel_mfld/psb-headers
-D: Graphics & UI Framework
+D: Graphics & UI Framework / GL
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: adaptation/intel_mfld/psb-video-mfld
-D: 
+D: Graphics & UI Framework / GL
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
-C: Missing domain!
 
 T: adaptation/intel_mfld/pulseaudio-modules-mfld-blackbay
-D: 
+D: Multimedia / Audio FW
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: adaptation/intel_mfld/pvr-bin-mdfld
-D: 
+D: Graphics & UI Framework / GL
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
-C: Missing domain!
 
 T: adaptation/intel_mfld/sensor-plugins-mfld-blackbay
-D: 
+D: System / Hardware Adaptation
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: adaptation/intel_mfld/sound-plugin-hal-mfld-blackbay
-D: 
+D: Multimedia / Audio FW
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: adaptation/intel_mfld/tel-plugin-mfld-blackbay
-D: 
+D: Telephony / Telephony FW
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
-C: Missing domain!
 
 T: adaptation/intel_mfld/xorg-server-configs-mfld-blackbay
-D: 
+D: Graphics & UI Framework / X Window System
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
-C: Missing domain!
 
 T: adaptation/mtdev
-D: System
+D: System / Hardware Adaptation
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: adaptation/opengl-es-virtual-drv
-D: Graphics & UI Framework
+D: Graphics & UI Framework / GL
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: adaptation/panda/mmfw-sysconf-omap4
-D: Automotive
+D: Automotive / Hardware Adaption
 B: tizen_2.0
 
 T: adaptation/panda/system-plugin-slp
-D: Automotive
+D: Automotive / Hardware Adaption
 B: tizen_2.0
 
 T: adaptation/system-plugin-ia-generic
-D: System
+D: System / Hardware Adaptation
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: adaptation/system-plugin-slp
-D: System
+D: System / Hardware Adaptation
 B: tizen_2.0
 
 T: adaptation/systemd-bootmode
-D: System
+D: System / Hardware Adaptation
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: adaptation/xorg-drv-mtev
-D: 
+D: Graphics & UI Framework / X Window System
 B: tizen_2.1
-C: Missing domain!
 
 T: adaptation/xorg-x11-drv-fbdev
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.1
 
 T: adaptation/xorg-x11-drv-intel
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 
 T: adaptation/xorg-x11-drv-keyboard
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.1
 
 T: adaptation/xorg-x11-drv-synaptics
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.1
 
 T: adaptation/xorg/driver/xserver-xorg-input-evdev
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: adaptation/xorg/driver/xserver-xorg-input-evdev-multitouch
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: adaptation/xorg/driver/xserver-xorg-input-gesture
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: adaptation/xorg/driver/xserver-xorg-misc
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: adaptation/xorg/driver/xserver-xorg-module-xdbg
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.1
 B: tizen_2.2
 
 T: adaptation/xorg/driver/xserver-xorg-video-emulator
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 
 T: adaptation/xorg/driver/xserver-xorg-video-emulfb
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -363,19 +347,19 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: apps/core/preloaded/app-selector
-D: App Framework
+D: App Framework / Application Launcher
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/boot-animation
 D: Applications
 M: Byung-soo Kim
 R: Kyungmin Park
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/bt-syspopup
@@ -383,17 +367,17 @@ D: Applications
 M: Taesoo Jun <steve.jun@samsung.com>
 M: Pyun DoHyun <dh79.pyun@samsung.com>
 I: Dohyun Pyun
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/calculator
 D: Applications
 M: José Souza <jose.souza@intel.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/calendar
@@ -401,167 +385,167 @@ D: Applications
 M: Flávio Ceolin <flavio.ceolin@intel.com>
 I: Taeho Kang
 R: Jae Pil Choi
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/call
 D: Applications
 M: Bruno Dilly <bruno.dilly@intel.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/call-setting
 D: Applications
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/camera
 D: Applications
 M: Gustavo Barbieri <gustavo.barbieri@intel.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/charging-animation
 D: Applications
 M: Donghoon Ryu
 I: Yongchul Park
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/ciss
 D: Applications
-B: tizen_2.1
 B: tizen
+B: tizen_2.1
 L: Flora-1.0
 
 T: apps/core/preloaded/clock
 D: Applications
 M: Bruno Dilly
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/draglock
 D: Applications
-B: tizen_2.0
 B: tizen
+B: tizen_2.0
 
 T: apps/core/preloaded/email
 D: Applications
 M: Gustavo Lima Chaves <gustavo.lima.chaves@intel.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/gallery
 D: Applications
 M: Bruno Dilly <bruno.dilly@intel.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/gnome-common
 D: Applications
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 
 T: apps/core/preloaded/image-viewer
 D: Applications
 M: Bruno Dilly <bruno.dilly@intel.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/indicator-win
 D: Applications
 M: Iván Briano <ivan.briano@intel.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/libslp-alarm
 D: Applications
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/libslp-memo
 D: Applications
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/libug-worldclock-efl
 D: Applications
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/lockscreen
 D: Applications
 M: Youngjoo Park <yjoo93.park@samsung.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/memo
 D: Applications
 M: José Souza <jose.souza@intel.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/menu-daemon
 D: Applications
 M: YoungJoo Park <yjoo93.park@samsung.com>
-B: tizen_2.0
 B: tizen
+B: tizen_2.0
 L: Flora-1.0
 
 T: apps/core/preloaded/menu-screen
 D: Applications
 M: Youngjoo Park <yjoo93.park@samsung.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/message-app
 D: Applications
 M: Iván Briano <ivan.briano@intel.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/minicontrol
 D: Applications
 M: Youngjoo Park <yjoo93.park@samsung.com>
 I: Youngsub Ko
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/mobileprint
@@ -569,40 +553,40 @@ D: Applications
 M: Taesoo Jun <steve.jun@samsung.com>
 M: GangHeok Kim <gangheok.kim@samsung.com>
 I: Gangheok Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/music-player
 D: Applications
 M: Flávio Ceolin <flavio.ceolin@intel.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/my-account
 D: Applications
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/myfiles
 D: Applications
 M: Leandro Dorileo <leandro.maciel.dorileo@intel.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/net-popup
 D: Applications
 M: Taesoo Jun <steve.jun@samsung.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/phone-contacts
@@ -610,9 +594,9 @@ D: Applications
 M: Gustavo Lima Chaves <gustavo.lima.chaves@intel.com>
 I: Sunggoo Kim
 R: Ensung Park
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/print-service
@@ -620,85 +604,89 @@ D: Applications
 M: Taesoo Jun <steve.jun@samsung.com>
 M: GangHeok Kim <gangheok.kim@samsung.com>
 I: Gangheok Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: GPL
 L: MIT-style
 
 T: apps/core/preloaded/pwlock
 D: Applications
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/quickpanel
 D: Applications
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/sat-ui
 D: Applications
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/settings
 D: Applications
 M: Leandro Dorileo <leandro.maciel.dorileo@intel.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/smartsearch
 D: Applications
 M: Bruno Dilly
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/starter
 D: Applications
 M: Youngjoo Park <yjoo93.park@samsung.com>
 I: Seungtaek Chung
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/taskmanager
 D: Applications
 M: Gustavo Lima Chaves <gustavo.lima.chaves@intel.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/tickernoti
 D: Applications
 M: Jongmin Lee
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: Apache
 L: Flora-1.0
 
+T: apps/core/preloaded/udisks-automount-agent
+D: System / Utilities
+B: tizen
+
 T: apps/core/preloaded/ug-bluetooth-efl
 D: Applications
 M: Taesoo Jun <steve.jun@samsung.com>
 M: Wu Zheng <wu.zheng@intel.com>
 M: Pyun DoHyun <dh79.pyun@samsung.com>
 I: Dohyun Pyun
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.0
 
 T: apps/core/preloaded/ug-camera-efl
@@ -706,9 +694,9 @@ D: Applications
 M: Gustavo Barbieri <gustavo.barbieri@intel.com>
 I: Hyunho Seo
 R: Nam-jin Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/ug-image-viewer-efl
@@ -716,42 +704,42 @@ D: Applications
 M: Bruno Dilly <bruno.dilly@intel.com>
 I: Jisung Ahn
 R: Sangjin Han
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/ug-memo-efl
 D: Applications
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/ug-mobile-ap
 D: Applications
 M: Taesoo Jun <steve.jun@samsung.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/ug-myfile-efl
 D: Applications
 M: Leandro Dorileo <leandro.maciel.dorileo@intel.com>
 I: A-ram Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/ug-nfc-efl
 D: Applications
 M: Taesoo Jun <steve.jun@samsung.com>
 M: Youngjae Shin <yj99.shin@samsung.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/ug-setting-gallery-efl
@@ -759,83 +747,83 @@ D: Applications
 M: Jubong Lee
 I: Jisung Ahn
 R: Sangjin Han
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/ug-setting-homescreen-efl
 D: Applications
 M: Youngjoo Park <yjoo93.park@samsung.com>
 I: Mi-ju Lee
-B: tizen_2.1
 B: tizen
+B: tizen_2.1
 L: Flora-1.1
 
 T: apps/core/preloaded/ug-setting-manage-applications-efl
 D: Applications
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/ug-wifi-direct
 D: Applications
 M: Taesoo Jun <steve.jun@samsung.com>
 I: Gibyoung Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/ug-wifi-efl
 D: Applications
 M: Taesoo Jun <steve.jun@samsung.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/usb-manager
 D: Applications
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Taeyoung Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: apps/core/preloaded/usb-syspopup
 D: Applications
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: Apache
 
 T: apps/core/preloaded/video-player
 D: Applications
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/volume-app
 D: Applications
 M: Youngjoo Park
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/core/preloaded/wrt-setting
 D: Applications
 M: Seung-mo Cho
 I: Leerang Song
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: apps/home/app-selector
@@ -1402,187 +1390,187 @@ B: tizen
 T: apps/osp/Account
 D: Applications
 M: Taeyun An
+B: tizen
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: apps/osp/Calculator
 D: Applications
 M: Taeyun An
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: apps/osp/Calendar
 D: Applications
 M: Taeyun An
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: apps/osp/CalendarService
 D: Applications
 M: Taeyun An
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: apps/osp/Call
 D: Applications
 M: Taeyun An
+B: tizen
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: apps/osp/Camera
 D: Applications
 M: Taeyun An
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: apps/osp/CertificateSelector
 D: Applications
 M: Yoonsoo Kim
+B: tizen
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: apps/osp/Clock
 D: Applications
 M: Taeyun An
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: apps/osp/Contacts
 D: Applications
 M: Taeyun An
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: apps/osp/Dial
 D: Applications
 M: Taeyun An
+B: tizen
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: apps/osp/Email
 D: Applications
 M: Taeyun An
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: apps/osp/Gallery
 D: Applications
 M: Taeyun An
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: apps/osp/Home
 D: Applications
 M: Taeyun An
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: apps/osp/ImageViewer
 D: Applications
 M: Taeyun An
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: apps/osp/Installer
 D: Applications
 M: Taeyun An
+B: tizen
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: apps/osp/Internet
 D: Applications
 M: Taeyun An
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: apps/osp/Lock
 D: Applications
 M: Taeyun An
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: apps/osp/Memo
 D: Applications
 M: Taeyun An
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: apps/osp/Messages
 D: Applications
 M: Taeyun An
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: apps/osp/MusicPlayer
 D: Applications
 M: Taeyun An
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: apps/osp/MyFiles
 D: Applications
 M: Taeyun An
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: apps/osp/Phone
 D: Applications
 M: Taeyun An
-B: tizen_2.0
 B: tizen
+B: tizen_2.0
 
 T: apps/osp/Settings
 D: Applications
 M: Taeyun An
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: apps/osp/VideoPlayer
 D: Applications
 M: Taeyun An
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: apps/web/browser
 D: Applications
@@ -1713,6 +1701,10 @@ T: apps/web/sample/TouchPaint
 D: Applications
 B: tizen
 
+T: contrib/leap-daemon
+D: Contrib / Motion Sensor
+B: contrib_ivi
+
 T: external/acpid
 D: System
 M: Myungjoo Ham
@@ -1720,14 +1712,14 @@ B: tizen_2.0
 B: tizen_2.1
 
 T: external/alsa-lib
-D: Multimedia
+D: Multimedia / Audio FW
 M: Byungwook Jang
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/alsa-utils
-D: Multimedia
+D: Multimedia / Audio FW
 M: Byungwook Jang
 B: tizen_2.0
 B: tizen_2.1
@@ -1740,7 +1732,7 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: external/avahi
-D: Network & Connectivity
+D: Network & Connectivity / WiFi
 M: Taesoo Jun
 M: Gangheok Kim
 B: tizen_2.0
@@ -1748,14 +1740,14 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: external/bash
-D: Base
+D: Base / Utilities
 M: Myungjoo Ham
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/binutils
-D: Base
+D: Base / Toolchain
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -1768,13 +1760,13 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: external/bootchart
-D: Base
+D: Base / Utilities
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/busybox
-D: Base
+D: Base / Package Management
 M: Myungjoo Ham
 B: tizen_2.0
 B: tizen_2.1
@@ -1787,7 +1779,7 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: external/bzip2
-D: Base
+D: Base / Compression
 M: Myungjoo Ham
 B: tizen_2.0
 B: tizen_2.1
@@ -1801,7 +1793,7 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: external/check
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -1825,7 +1817,7 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: external/cups
-D: System
+D: System / Utilities
 M: Taesoo Jun
 M: GangHeok Kim
 B: tizen_2.0
@@ -1833,7 +1825,7 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: external/cups-filters
-D: System
+D: System / Libraries
 M: Taesoo Jun
 M: GangHeok Kim
 B: tizen_2.0
@@ -1841,28 +1833,28 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: external/curl
-D: Base
+D: Base / Utilities
 M: Taesoo Jun
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/dbus
-D: System
+D: Base / IPC
 M: Myungjoo Ham
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/dbus-glib
-D: System
+D: Base / IPC
 M: Myungjoo Ham
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/dbus-python
-D: System
+D: Base / IPC
 M: Myungjoo Ham
 B: tizen_2.0
 B: tizen_2.1
@@ -1880,21 +1872,21 @@ B: tizen_2.0
 B: tizen_2.1
 
 T: external/dos2unix
-D: System
+D: System / Utilities
 M: Myungjoo Ham
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/dosfstools
-D: System
+D: System / Libraries
 M: Myungjoo Ham
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/eglibc
-D: Base
+D: Base / Libraries
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -1907,7 +1899,7 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: external/enchant
-D: System
+D: System / Libraries
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -1929,14 +1921,14 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: external/expat
-D: System
+D: System / Libraries
 M: Myungjoo Ham
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/file
-D: Base
+D: Base / Utilities
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -1949,74 +1941,74 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: external/fribidi
-D: System
+D: System / Libraries
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/fsync
-D: System
+D: System / Utilities
 M: Myungjoo Ham
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/gcd
-D: System
+D: System / Libraries
 M: Myungjoo Ham
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/gdb
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/geoclue
-D: System
+D: System / Utilities
 M: Myungjoo Ham
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/giflib
-D: Base
+D: Base / Libraries
 M: Jonghyuk Choi
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/glib-networking
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
 M: Taesoo Jun
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/glib2.0
-D: Base
+D: Base / IPC
 M: Myungjoo Ham
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/gmp
-D: System
+D: System / Libraries
 M: Myungjoo Ham
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/gtest
-D: Platform Development
+D: Platform Development / Utilities
 M: Yoonsoo Kim
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/hplip
-D: System
+D: System / Libraries
 M: Taesoo Jun
 M: Gangheok Kim
 B: tizen_2.0
@@ -2042,7 +2034,7 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: external/iniparser
-D: System
+D: System / Libraries
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -2054,7 +2046,7 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: external/iptables
-D: Security
+D: Network & Connectivity / Data Network
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -2066,7 +2058,7 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: external/lcms
-D: Network & Connectivity
+D: Graphics & UI Framework / Imaging
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -2084,13 +2076,13 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: external/libcap
-D: Base
+D: Base / Libraries
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/libdaemon
-D: Base
+D: Base / Libraries
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -2107,25 +2099,25 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: external/libgcrypt11
-D: Security
+D: Security / Cryptography
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/libgnutls26
-D: Security
+D: Security / Utilities
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/libgpg-error
-D: Security
+D: Security / Utilities
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/libidn
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -2137,13 +2129,13 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: external/libiri
-D: System
+D: System / Libraries
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/libjpeg-turbo
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Imaging
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -2155,29 +2147,29 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: external/libnl
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
 B: tizen_2.0
 B: tizen_2.1
 
 T: external/libnl2
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/libogg
-D: Multimedia
+D: Multimedia / Codec
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/liboil
-D: System
+D: System / Libraries
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/libpng
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Imaging
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -2195,65 +2187,65 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: external/libsndfile
-D: Multimedia
+D: Multimedia / Audio FW
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/libtasn1
-D: Security
+D: Security / Utilities
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/libtheora
-D: Multimedia
+D: Multimedia / Media Playback
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/libtiff
-D: Multimedia
+D: Multimedia / Imaging
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/libunwind
-D: Base
+D: Base / Libraries
 B: tizen_2.2
 
 T: external/libusb
-D: Base
+D: Base / Device Management
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/libusb-compat
-D: System
+D: Base / Device Management
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/libvorbis
-D: Multimedia
+D: Multimedia / Audio FW
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/libwbxml2
-D: System
+D: System / Libraries
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/libxml2
-D: System
+D: System / Libraries
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/libxslt
-D: System
+D: System / Libraries
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -2265,10 +2257,9 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: external/linux-firmware
-D: 
+D: Base / Hardware Adaptation
 B: tizen_2.0
 B: tizen_2.1
-C: Missing domain!
 
 T: external/lsb
 D: Base
@@ -2283,7 +2274,7 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: external/ltrace
-D: Base
+D: Base / Utilities
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -2305,10 +2296,9 @@ B: tizen_2.0
 B: tizen_2.1
 
 T: external/mingetty
-D: 
+D: Base / Utilities
 B: tizen_2.0
 B: tizen_2.1
-C: Missing domain!
 
 T: external/mkdevnodes
 D: Base
@@ -2327,25 +2317,25 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: external/nettle
-D: Security
+D: Security / Utilities
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/opencore-amr
-D: Multimedia
+D: Multimedia / Audio FW
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/openssh
-D: Security
+D: Platform Development / Utilities
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/pango1.0
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Fonts
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -2357,49 +2347,49 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: external/poppler
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Imaging
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/popt
-D: Base
+D: Base / Libraries
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/powertop
-D: System
+D: System / Utilities
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/prelink
-D: System
+D: System / Utilities
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/procps
-D: Base
+D: Base / Utilities
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/psmisc
-D: Base
+D: Base / Utilities
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/qemu
-D: Platform Development
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/qpdf
-D: System
+D: System / Libraries
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -2417,7 +2407,7 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: external/shadow-utils
-D: Base
+D: Base / Utilities
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -2429,13 +2419,13 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: external/speex
-D: Multimedia
+D: Multimedia / Audio FW
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/strace
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -2447,25 +2437,25 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: external/syslinux
-D: Base
+D: Base / Package Management
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/systemd
-D: Base
+D: Base / Startup
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/sysvinit
-D: Base
+D: Base / Startup
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/tizen-coreutils
-D: Base
+D: Base / Utilities
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -2477,13 +2467,13 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: external/udev
-D: Base
+D: Base / Libraries
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/udhcp
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -2495,7 +2485,7 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: external/usleep
-D: Base
+D: Base / Utilities
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -2507,13 +2497,13 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: external/vconfig
-D: Base
+D: Base / Utilities
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/vim
-D: System
+D: System / Utilities
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -2524,17 +2514,17 @@ B: tizen_2.0
 B: tizen_2.1
 
 T: external/xmlsec1
-D: Security
+D: Security / Utilities
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: external/xmlstarlet
-D: Security
+D: Base
 B: tizen_2.2
 
 T: external/zeromq
-D: Messaging
+D: Base
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -2552,25 +2542,25 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: framework/api/audio-io
-D: Multimedia
+D: Multimedia / Audio FW
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/api/bluetooth
-D: Network & Connectivity
+D: Network & Connectivity / Bluetooth
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/api/call
-D: Network & Connectivity
+D: Telephony / Telephony FW
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/api/camera
-D: Multimedia
+D: Multimedia / Media Camera
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -2582,84 +2572,84 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: framework/api/connection
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/api/device
-D: System
+D: Base / Device Management
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/api/efl-util
-D: Graphics & UI Framework
+D: Native API / Graphics & UI Framework
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/api/email
-D: Messaging
+D: Messaging / Email
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/api/face
-D: Graphics & UI Framework
+D: Native API / Graphics & UI Framework
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/api/favorites
-D: Network & Connectivity
+D: Web Framework / Web Runtime
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/api/geocoder
-D: Location
+D: Location / Geolocation
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/api/haptic
-D: Graphics & UI Framework
+D: Native API / Graphics & UI Framework
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/api/image-util
-D: Multimedia
+D: Multimedia / Imaging
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/api/location-manager
-D: Location
+D: Location / Geolocation
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/api/media-content
-D: Multimedia
+D: Multimedia / Media Content
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/api/media-key
-D: Multimedia
+D: Multimedia / Media Service
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/api/messages
-D: Messaging
+D: Messaging / Cellular
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/api/metadata-extractor
-D: Multimedia
+D: Multimedia / Media Content
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -2671,13 +2661,13 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: framework/api/network-info
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/api/nfc
-D: Network & Connectivity
+D: Network & Connectivity / NFC
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -2689,37 +2679,37 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: framework/api/player
-D: Multimedia
+D: Multimedia / Media Playback
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/api/poi
-D: Location
+D: Location / Geolocation
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/api/power
-D: System
+D: Base / Device Management
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/api/radio
-D: Multimedia
+D: Multimedia / Media Radio
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/api/recorder
-D: Multimedia
+D: Multimedia / Media Camera
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/api/route
-D: Location
+D: Location / Geolocation
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -2731,13 +2721,13 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: framework/api/sensor
-D: Graphics & UI Framework
+D: Native API / Graphics & UI Framework
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/api/serial
-D: Network & Connectivity
+D: Network & Connectivity / Serial
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -2749,7 +2739,7 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: framework/api/sound-manager
-D: Multimedia
+D: Multimedia / Audio FW
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -2767,55 +2757,55 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: framework/api/tethering
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/api/tone-player
-D: Multimedia
+D: Multimedia / Audio FW
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/api/url-download
-D: Web Framework
+D: Web Framework / Web Runtime
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/api/usb-accessory
-D: System
+D: Base
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/api/video-util
-D: Multimedia
+D: Multimedia / Media Playback
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/api/wav-player
-D: Multimedia
+D: Multimedia / Audio FW
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/api/wifi
-D: Network & Connectivity
+D: Network & Connectivity / WiFi
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/api/wifi-direct
-D: Network & Connectivity
+D: Network & Connectivity / WiFi
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/appfw/ail
-D: Multimedia
+D: App Framework
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -2961,7 +2951,7 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: framework/base/attr
-D: Base
+D: Base / Libraries
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -2975,13 +2965,13 @@ D: Base
 B: tizen_2.0
 
 T: framework/base/bundle
-D: Base
+D: Base / Libraries
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/base/default-files-tizen
-D: Base
+D: Base / File Systems
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -2993,25 +2983,25 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: framework/base/gconf-dbus
-D: Base
+D: Base / Libraries
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/base/libsqlfs
-D: Base
+D: Base / File Systems
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/base/rpm-installer
-D: Base
+D: Base / Package Management
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/base/sqlite3
-D: Base
+D: Base / Libraries
 B: tizen_2.0
 B: tizen_2.2
 
@@ -3022,7 +3012,7 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: framework/base/syspopup
-D: Base
+D: Base / Libraries
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -3033,43 +3023,43 @@ B: tizen_2.0
 B: tizen_2.1
 
 T: framework/connectivity/bluetooth-agent
-D: Network & Connectivity
+D: Network & Connectivity / Bluetooth
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/connectivity/bluetooth-frwk
-D: Network & Connectivity
+D: Network & Connectivity / Bluetooth
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/connectivity/bluetooth-share
-D: Network & Connectivity
+D: Network & Connectivity / Bluetooth
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/connectivity/bluez
-D: Network & Connectivity
+D: Network & Connectivity / Bluetooth
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/connectivity/connman
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/connectivity/data-router
-D: Network & Connectivity
+D: Network & Connectivity / Serial
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/connectivity/dnsmasq
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -3081,405 +3071,405 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: framework/connectivity/libnet-client
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/connectivity/libsoup2.4
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/connectivity/libwifi-direct
-D: Network & Connectivity
+D: Network & Connectivity / WiFi
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/connectivity/mobileap-agent
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/connectivity/neard
-D: Network & Connectivity
+D: Network & Connectivity / NFC
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/connectivity/neard-tizen-plugin
-D: Network & Connectivity
+D: Network & Connectivity / NFC
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/connectivity/neardal
-D: Network & Connectivity
+D: Network & Connectivity / NFC
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/connectivity/net-config
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/connectivity/nfc-manager
-D: Network & Connectivity
+D: Network & Connectivity / NFC
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/connectivity/obexd
-D: Network & Connectivity
+D: Network & Connectivity / Bluetooth
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/connectivity/wifi-direct-manager
-D: Network & Connectivity
+D: Network & Connectivity / WiFi
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/connectivity/wpasupplicant
-D: Network & Connectivity
+D: Network & Connectivity / WiFi
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/graphics/cairo
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Render Libraries
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/graphics/default-fonts-fc-sdk
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Fonts
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/graphics/default-fonts-sdk
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Fonts
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/graphics/fontconfig
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Fonts
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/graphics/freetype
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Fonts
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/graphics/opengl-es
-D: Graphics & UI Framework
+D: Graphics & UI Framework / GL
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/graphics/osmesa
-D: Graphics & UI Framework
+D: Graphics & UI Framework / GL
 B: tizen_2.0
 B: tizen_2.1
 
 T: framework/graphics/pixman
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Render Libraries
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/location/gps-manager
-D: Location
+D: Location / Geolocation
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/location/lbs-dbus
-D: Location
+D: Location / Geolocation
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/location/liblocation-appman
-D: Location
+D: Location / Geolocation
 B: tizen_2.0
 B: tizen_2.1
 
 T: framework/location/libslp-lbs-plugin-replay
-D: Location
+D: Location / Geolocation
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/location/libslp-location
-D: Location
+D: Location / Geolocation
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/location/location-module
-D: Location
+D: Location / Geolocation
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/location/ug-setting-location-efl
-D: Location
+D: Location / Geolocation
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/messaging/email-service
-D: Messaging
+D: Messaging / Email
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/messaging/msg-service
-D: Messaging
+D: Messaging / Cellular
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/alsa-scenario-0.2
-D: Multimedia
+D: Multimedia / Audio FW
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/alsa-scenario-scn-data-0
-D: Multimedia
+D: Multimedia / Audio FW
 B: tizen_2.0
 B: tizen_2.1
 
 T: framework/multimedia/audio-session-manager
-D: Multimedia
+D: Multimedia / Audio FW
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/avsystem
-D: Multimedia
+D: Multimedia / Audio FW
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/ffmpeg
-D: Multimedia
+D: Multimedia / Codec
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/gst-openmax
-D: Multimedia
+D: Multimedia / Media Service
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/gst-plugins-bad0.10
-D: Multimedia
+D: Multimedia / Codec
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/gst-plugins-base0.10
-D: Multimedia
+D: Multimedia / Codec
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/gst-plugins-ext0.10
-D: Multimedia
+D: Multimedia / Codec
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/gst-plugins-good0.10
-D: Multimedia
+D: Multimedia / Codec
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/gst-plugins-ugly0.10
-D: Multimedia
+D: Multimedia / Codec
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/gst-rtsp-server-wfd
-D: Multimedia
+D: Multimedia / Media Wireless Streaming
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/gstreamer-vaapi
-D: Multimedia
+D: Multimedia / Codec
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/gstreamer0.10
-D: Multimedia
+D: Multimedia / Media Service
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/gstreamer0.10-ffmpeg
-D: Multimedia
+D: Multimedia / Codec
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/libcamsrcjpegenc
-D: Multimedia
+D: Multimedia / Media Camera
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/libcamsrcjpegenc-sw-libjpeg
-D: Multimedia
+D: Multimedia / Media Camera
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/libexif
-D: Multimedia
+D: Multimedia / Imaging
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/libmedia-service
-D: Multimedia
+D: Multimedia / Media Content
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/libmedia-thumbnail
-D: Multimedia
+D: Multimedia / Media Content
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/libmm-camcorder
-D: Multimedia
+D: Multimedia / Media Camera
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/libmm-common
-D: Multimedia
+D: Multimedia / Media Service
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/libmm-fileinfo
-D: Multimedia
+D: Multimedia / Media Content
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/libmm-imgp-gstcs
-D: Multimedia
+D: Multimedia / Media Editing
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/libmm-log
-D: Multimedia
+D: Multimedia / Media Service
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/libmm-player
-D: Multimedia
+D: Multimedia / Media Playback
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/libmm-radio
-D: Multimedia
+D: Multimedia / Media Radio
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/libmm-session
-D: Multimedia
+D: Multimedia / Audio FW
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/libmm-sound
-D: Multimedia
+D: Multimedia / Audio FW
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/libmm-ta
-D: Multimedia
+D: Multimedia / Media Service
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/libmm-transcode
-D: Multimedia
+D: Multimedia / Media Editing
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/libmm-utility
-D: Multimedia
+D: Multimedia / Media Service
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/libmm-wfd
-D: Multimedia
+D: Multimedia / Media Wireless Streaming
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/libva
-D: Multimedia
+D: Multimedia / Codec
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/media-data-sdk
-D: Multimedia
+D: Multimedia / Media Service
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/media-server
-D: Multimedia
+D: Multimedia / Media Content
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/mmfw-sysconf
-D: Multimedia
+D: Multimedia / Media Service
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/openal-soft
-D: Multimedia
+D: Multimedia / Audio FW
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/multimedia/pulseaudio
-D: Multimedia
+D: Multimedia / Audio FW
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -3508,7 +3498,7 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: framework/osp/bluetooth
-D: Network & Connectivity
+D: Native API / Network & Connectivity
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -3531,13 +3521,13 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: framework/osp/connectivity-service
-D: Network & Connectivity
+D: Native API / Network & Connectivity
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/osp/content
-D: Social & Content
+D: Native API / Social & Content
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -3549,26 +3539,26 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: framework/osp/face
-D: Graphics & UI Framework
+D: Native API / Graphics & UI Framework
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: framework/osp/image
-D: Multimedia
+D: Native API / Multimedia
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/osp/image-core
-D: Multimedia
+D: Native API / Multimedia
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/osp/ime
-D: Graphics & UI Framework
+D: Native API / Graphics & UI Framework
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -3580,7 +3570,7 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: framework/osp/json
-D: Web Framework
+D: Native API / Web Framework
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -3592,41 +3582,41 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: framework/osp/locations
-D: Location
+D: Native API / Location
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/osp/media
-D: Multimedia
+D: Native API / Multimedia
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/osp/messaging
-D: Messaging
+D: Native API / Messaging
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/osp/net
-D: Network & Connectivity
+D: Native API / Network & Connectivity
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/osp/nfc
-D: Network & Connectivity
+D: Native API / Network & Connectivity
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/osp/secure-element
-D: Security
+D: Native API / Security
 B: tizen_2.2
 
 T: framework/osp/security-service
-D: Security
+D: Native API / Security
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -3638,13 +3628,13 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: framework/osp/social
-D: Social & Content
+D: Native API / Social & Content
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/osp/speech
-D: Graphics & UI Framework
+D: Native API / Graphics & UI Framework
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -3655,171 +3645,171 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: framework/osp/telephony
-D: Telephony
+D: Native API / Telephony
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/osp/uifw
-D: Graphics & UI Framework
+D: Native API / Graphics & UI Framework
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/osp/uix
-D: Graphics & UI Framework
+D: Native API / Graphics & UI Framework
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/osp/vision
-D: Graphics & UI Framework
+D: Native API / Graphics & UI Framework
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/osp/web
-D: Web Framework
+D: Native API / Web Framework
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/pim/calendar-service
-D: Social & Content
+D: Social & Content / PIM
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/pim/contacts-service
-D: Social & Content
+D: Social & Content / PIM
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/pim/libaccounts-svc
-D: Social & Content
+D: Social & Content / PIM
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/pim/pims-ipc
-D: Social & Content
+D: Social & Content / PIM
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/security/ca-certificates
-D: Security
+D: Security / Certificates
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/security/cert-svc
-D: Security
+D: Security / Certificates
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/security/cert-svc-ui
-D: Security
+D: Security / Certificates
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/security/csr-framework
-D: Security
+D: Security / Utilities
 B: tizen_2.0
 
 T: framework/security/drm-client
-D: Security
+D: Security / Digital Rights
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/security/drm-service-core-intel
-D: Security
+D: Security / Digital Rights
 B: tizen_2.0
 
 T: framework/security/drm-service-core-sapps
-D: Security
+D: Security / Digital Rights
 B: tizen_2.2
 
 T: framework/security/dukgenerator
-D: Security
+D: Security / Utilities
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/security/gnupg
-D: Security
+D: Security / Utilities
 B: tizen_2.0
 B: tizen_2.1
 
 T: framework/security/hash-signer
-D: Security
+D: Security / Utilities
 B: tizen_2.2
 
 T: framework/security/libcryptsvc
-D: Security
+D: Security / Cryptography
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/security/libprivilege-control
-D: Security
+D: Security / Application Privilege
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/security/openssl
-D: Security
+D: Security / Authentication
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/security/privacy-manager
-D: Security
+D: Security / Application Privilege
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/security/privacy-popup
-D: Security
+D: Security / Application Privilege
 B: tizen_2.2
 
 T: framework/security/privilege-checker
-D: Security
+D: Security / Application Privilege
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/security/secure-storage
-D: Security
+D: Security / Utilities
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/security/security-server
-D: Security
+D: Security / Application Privilege
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/security/smack
-D: Security
+D: Security / Smack
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/security/smack-privilege-config
-D: Security
+D: Security / Smack
 B: tizen_2.2
 
 T: framework/system/devman
-D: System
+D: Base / Device Management
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/system/dlog
-D: System
+D: System / Logging
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -3836,48 +3826,48 @@ D: SDK
 B: tizen_2.2
 
 T: framework/system/haptic-module-tizen
-D: System
+D: Base / Device Management
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/system/libdevice-node
-D: System
+D: Base / Device Management
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/system/libhaptic
-D: System
+D: Base / Device Management
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/system/libsf-common
-D: System
+D: System / Sensor Framework
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/system/libslp-pm
-D: System
+D: Base / Device Management
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/system/libslp-sensor
-D: System
+D: System / Sensor Framework
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/system/libslp-sysman
-D: System
+D: Base / Device Management
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/system/libsvi
-D: System
+D: Base / Device Management
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -3904,19 +3894,19 @@ D: SDK
 B: tizen_2.2
 
 T: framework/system/pciutils
-D: System
+D: System / Utilities
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/system/power-manager
-D: System
+D: Base / Device Management
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/system/rfkill
-D: System
+D: System / Utilities
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -3928,13 +3918,13 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: framework/system/sensor-framework
-D: System
+D: System / Sensor Framework
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/system/sensor-plugins
-D: System
+D: System / Sensor Framework
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -3952,7 +3942,7 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: framework/system/smartcard-service
-D: System
+D: System / Logging
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -3963,889 +3953,889 @@ B: tizen_2.0
 B: tizen_2.1
 
 T: framework/system/sync-agent
-D: System
+D: System / Libraries
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/system/sys-assert
-D: System
+D: System / Libraries
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/system/system-popup
-D: System
+D: Base / Device Management
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/system/system-server
-D: System
+D: Base / Device Management
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/system/usbutils
-D: System
+D: Base / Device Management
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/telephony/libslp-tapi
-D: Telephony
+D: Telephony / Telephony FW
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/telephony/libtcore
-D: Telephony
+D: Telephony / Telephony FW
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/telephony/tel-plugin-at_standard
-D: Telephony
+D: Telephony / Telephony FW
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/telephony/tel-plugin-atmodem
-D: Telephony
+D: Telephony / Telephony FW
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/telephony/tel-plugin-database
-D: Telephony
+D: Telephony / Telephony FW
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/telephony/tel-plugin-dbus_tapi
-D: Telephony
+D: Telephony / Telephony FW
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/telephony/tel-plugin-imc
-D: Telephony
+D: Telephony / Telephony FW
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/telephony/tel-plugin-imcmodem
-D: Telephony
+D: Telephony / Telephony FW
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/telephony/tel-plugin-indicator
-D: Telephony
+D: Telephony / Telephony FW
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/telephony/tel-plugin-mfld-blackbay
-D: Telephony
+D: Telephony / Telephony FW
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/telephony/tel-plugin-packetservice
-D: Telephony
+D: Telephony / Telephony FW
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/telephony/tel-plugin-vconf
-D: Telephony
+D: Telephony / Telephony FW
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/telephony/tel-plugin-vmodem
-D: Telephony
+D: Telephony / Telephony FW
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/telephony/telephony-daemon
-D: Telephony
+D: Telephony / Telephony FW
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/anthy
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Input Framework
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/cbhm
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/e17
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/e17-extra-config-modules
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/e17-extra-modules
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/e17-misc
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/ecore
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/edbus
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/edje
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/edje-multisense-plugin
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/eet
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/eeze
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/efl-assist
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 B: tizen_2.2
 
 T: framework/uifw/efl-theme-tizen
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/efreet
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/eina
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/eio
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/elementary
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/elm-misc
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/elm-modules
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/embryo
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/emotion
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/ethumb
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/evas
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/expedite
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/harfbuzz
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Fonts
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/ise-default
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Input Framework
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/ise-engine-anthy
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Input Framework
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/ise-engine-default
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Input Framework
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/ise-engine-hangul
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Input Framework
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/ise-engine-sunpinyin
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Input Framework
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/ise-engine-tables
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Input Framework
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/isf
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Input Framework
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/libhangul
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Input Framework
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/libscl-ui
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Input Framework
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/libtbm
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Buffer Management
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/voice/libttssmt
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Voice Framework
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/voice/stt
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Voice Framework
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/voice/tts
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Voice Framework
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/app/x11-apps
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/app/xbitmaps
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/app/xinit
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/app/xinput
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/app/xorg-launch-helper
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/app/xrestop
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/lib/libdmx
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/lib/libdri2
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/lib/libdrm
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/lib/libfontenc
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/lib/libice
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/lib/libpciaccess
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/lib/libsm
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/lib/libx11
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/lib/libxau
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/lib/libxaw
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/lib/libxcomposite
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/lib/libxcursor
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/lib/libxdamage
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/lib/libxdmcp
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/lib/libxext
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/lib/libxfixes
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/lib/libxfont
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/lib/libxft
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/lib/libxgesture
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/lib/libxi
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/lib/libxinerama
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/lib/libxkbfile
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/lib/libxmu
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/lib/libxpm
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/lib/libxrandr
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/lib/libxrender
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/lib/libxres
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/lib/libxscrnsaver
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/lib/libxt
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/lib/libxtst
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/lib/libxv
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/lib/libxvmc
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/lib/libxxf86dga
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/lib/libxxf86vm
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/lib/xtrans
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/libslp-utilx
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/proto/x11proto-bigreqs
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/proto/x11proto-composite
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/proto/x11proto-core
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/proto/x11proto-damage
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/proto/x11proto-dmx
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/proto/x11proto-dri2
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/proto/x11proto-fixes
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/proto/x11proto-fonts
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/proto/x11proto-gesture
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/proto/x11proto-input
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/proto/x11proto-kb
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/proto/x11proto-randr
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/proto/x11proto-record
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/proto/x11proto-render
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/proto/x11proto-resource
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/proto/x11proto-scrnsaver
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/proto/x11proto-video
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/proto/x11proto-xcmisc
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/proto/x11proto-xext
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/proto/x11proto-xf86bigfont
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/proto/x11proto-xf86dga
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/proto/x11proto-xf86dri
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/proto/x11proto-xf86vidmode
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/proto/x11proto-xinerama
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/proto/xorg-glproto
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 
 T: framework/uifw/xorg/server/xorg-server
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/util/x11-utils
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/util/x11-xkb-utils
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/util/x11-xserver-utils
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/util/xfonts-utils
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/util/xkeyboard-config
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/util/xorg-x11-filesystem
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 
 T: framework/uifw/xorg/util/xorg-x11-util-macros
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 
 T: framework/uifw/xorg/util/xorg-x11-xauth
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 
 T: framework/uifw/xorg/util/xutils-dev
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/xcb/libpthread-stubs
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/xcb/libxcb
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/xcb/xcb-proto
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/uifw/xorg/xcb/xcb-util
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/web/download-provider
-D: Web Framework
+D: Web Framework / Web Runtime
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/web/pcre
-D: Web Framework
+D: Base
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/web/web-provider
-D: Web Framework
+D: Web Framework / Web Runtime
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/web/web-ui-fw
-D: Web Framework
+D: Web Framework / Web UI FW
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/web/webkit-efl
-D: Web Framework
+D: Web Framework / Web Engine
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/web/wrt
-D: Web Framework
+D: Web Framework / Web Runtime
 B: tizen_2.2
 
 T: framework/web/wrt-commons
-D: Web Framework
+D: Web Framework / Web Runtime
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/web/wrt-installer
-D: Web Framework
+D: Web Framework / Web Runtime
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/web/wrt-plugins-common
-D: Web Framework
+D: Web Framework / Web Runtime
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/web/wrt-plugins-tizen
-D: Web Framework
+D: Web Framework / Web Runtime
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: framework/web/wrt-security
-D: Web Framework
+D: Web Framework / Web Runtime
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -4857,1323 +4847,1325 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: kernel/linux-3.0
-D: Base
+D: Base / Startup
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: kernel/u-boot
-D: Base
+D: Base / Startup
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 
 T: pkgs/a/alsa-scenario-files-0.0
-D: 
+D: Multimedia / Audio FW
 B: tizen_2.0
-C: Missing domain!
 
 T: pkgs/e/elektra
-D: 
+D: App Framework / Configuration
 B: tizen_2.0
-C: Missing domain!
 
 T: pkgs/m/mtools
-D: 
+D: Base / File Systems
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: pkgs/o/oma-ds-service
-D: 
+D: Social & Content / PIM
 B: tizen_2.0
-C: Missing domain!
 
 T: pkgs/xorg/lib/libxtrap
-D: 
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
-C: Missing domain!
 
 T: pkgs/xorg/lib/libxxf86misc
-D: 
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
-C: Missing domain!
 
 T: pkgs/xorg/proto/x11proto-fontcache
-D: 
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
-C: Missing domain!
 
 T: pkgs/xorg/proto/x11proto-trap
-D: 
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
-C: Missing domain!
 
 T: pkgs/xorg/proto/x11proto-xf86misc
-D: 
+D: Graphics & UI Framework / X Window System
 B: tizen_2.0
-C: Missing domain!
 
 T: platform/adaptation/device-config-touch
-D: System
+D: System / Hardware Adaptation
 B: tizen
 
 T: platform/adaptation/emulator/alsa-scenario-scn-data-0-emul
-D: SDK
+D: SDK / Emulator
 B: tizen
 
 T: platform/adaptation/emulator/device-manager-plugin-emul
-D: SDK
+D: SDK / Emulator
 B: tizen
 
 T: platform/adaptation/emulator/emulator-daemon
-D: SDK
+D: SDK / Emulator
 B: tizen
 
 T: platform/adaptation/emulator/emulator-plugin-accel
-D: SDK
+D: SDK / Emulator
 B: tizen
 
 T: platform/adaptation/emulator/emulator-plugin-accel-filter
-D: SDK
+D: SDK / Emulator
 B: tizen
 
 T: platform/adaptation/emulator/emulator-plugin-accel-proc
-D: SDK
+D: SDK / Emulator
 B: tizen
 
 T: platform/adaptation/emulator/emulator-plugin-geo
-D: SDK
+D: SDK / Emulator
 B: tizen
 
 T: platform/adaptation/emulator/emulator-plugin-geo-filter
-D: SDK
+D: SDK / Emulator
 B: tizen
 
 T: platform/adaptation/emulator/emulator-plugin-geo-proc
-D: SDK
+D: SDK / Emulator
 B: tizen
 
 T: platform/adaptation/emulator/emulator-plugin-gyro-pkgs
-D: SDK
+D: SDK / Emulator
 B: tizen
 
 T: platform/adaptation/emulator/emulator-plugin-light
-D: SDK
+D: SDK / Emulator
 B: tizen
 
 T: platform/adaptation/emulator/emulator-plugin-light-filter
-D: SDK
+D: SDK / Emulator
 B: tizen
 
 T: platform/adaptation/emulator/emulator-plugin-light-proc
-D: SDK
+D: SDK / Emulator
 B: tizen
 
 T: platform/adaptation/emulator/emulator-plugin-motion-proc
-D: SDK
+D: SDK / Emulator
 B: tizen
 
 T: platform/adaptation/emulator/emulator-plugin-nfc
-D: Network & Connectivity
+D: Network & Connectivity / NFC
 B: tizen
 
 T: platform/adaptation/emulator/emulator-plugin-proxi
-D: SDK
+D: SDK / Emulator
 B: tizen
 
 T: platform/adaptation/emulator/emulator-plugin-proxi-filter
-D: SDK
+D: SDK / Emulator
 B: tizen
 
 T: platform/adaptation/emulator/emulator-plugin-proxi-proc
-D: SDK
+D: SDK / Emulator
 B: tizen
 
 T: platform/adaptation/emulator/emulator-yagl
-D: SDK
+D: SDK / Emulator
 B: tizen
 
 T: platform/adaptation/emulator/gst-plugins-emulator
-D: SDK
+D: SDK / Emulator
 B: tizen
 
 T: platform/adaptation/emulator/libtbm-vigs
-D: SDK
+D: SDK / Emulator
 B: tizen
 
 T: platform/adaptation/emulator/sensor-daemon-emulator
-D: SDK
+D: SDK / Emulator
 B: tizen
 
 T: platform/adaptation/emulator/system-plugin-emulator
-D: SDK
+D: SDK / Emulator
 B: tizen
 
 T: platform/adaptation/emulator/vmodem-daemon-emulator
-D: SDK
+D: SDK / Emulator
 B: tizen
 
 T: platform/adaptation/emulator/xf86-misc-vigs
-D: SDK
+D: SDK / Emulator
 B: tizen
 
 T: platform/adaptation/emulator/xf86-video-vigs
-D: SDK
+D: SDK / Emulator
 B: tizen
 
 T: platform/adaptation/intel_clovertrail/alsa-scenario-scn-data-0-clovertrail
-D: Multimedia
+D: Multimedia / Audio FW
 B: tizen
 
 T: platform/adaptation/intel_clovertrail/charging-animation-clovertrail
-D: System
+D: System / Hardware Adaptation
 B: tizen
 
 T: platform/adaptation/intel_clovertrail/device-config-clovertrail
-D: System
+D: System / Hardware Adaptation
 B: tizen
 
 T: platform/adaptation/intel_clovertrail/device-manager-plugin-clovertrail
-D: System
+D: System / Hardware Adaptation
 B: tizen
 
 T: platform/adaptation/intel_clovertrail/mmfw-sysconf-clovertrail
-D: Multimedia
+D: Multimedia / Media Service
 B: tizen
 
 T: platform/adaptation/intel_clovertrail/model-config-clovertrail
-D: System
+D: System / Hardware Adaptation
 B: tizen
 
 T: platform/adaptation/intel_clovertrail/preos-runtime-clovertrail
-D: System
-B: tizen
-
-T: platform/adaptation/intel_clovertrail/pvr-bin-clovertrail
-D: Graphics & UI Framework
+D: System / Hardware Adaptation
 B: tizen
 
 T: platform/adaptation/intel_clovertrail/psb-headers
-D: Multimedia
+D: Multimedia / Codec
 B: tizen
 
 T: platform/adaptation/intel_clovertrail/psb-video-clovertrail
-D: Multimedia
+D: Multimedia / Codec
+B: tizen
+
+T: platform/adaptation/intel_clovertrail/pvr-bin-clovertrail
+D: Graphics & UI Framework / GL
 B: tizen
 
 T: platform/adaptation/intel_clovertrail/sensor-plugins-clovertrail-geek
-D: System
+D: System / Hardware Adaptation
 B: tizen
 
 T: platform/adaptation/intel_clovertrail/sound-plugin-hal-clovertrail
-D: Multimedia
+D: Multimedia / Audio FW
 B: tizen
 
 T: platform/adaptation/intel_clovertrail/systemd-bootmode-clovertrail
-D: System
+D: System / Hardware Adaptation
 B: tizen
 
 T: platform/adaptation/intel_clovertrail/tel-plugin-clovertrail-geek
-D: Telephony
+D: Telephony / Hardware Adaptation
 B: tizen
 
 T: platform/adaptation/intel_clovertrail/tel-plugin-vpc
-D: Telephony
+D: Telephony / Hardware Adaptation
 B: tizen
 
 T: platform/adaptation/intel_clovertrail/xorg-server-configs-clovertrail
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 
 T: platform/adaptation/intel_mfld/bootstub-mfld-blackbay
-D: 
+D: Base / Hardware Adaptation
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
-C: Missing domain!
 
 T: platform/adaptation/intel_mfld/device-configs-mfld-blackbay
-D: 
+D: Base / Hardware Adaptation
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
-C: Missing domain!
 
 T: platform/adaptation/intel_mfld/device-manager-plugin-mfld-blackbay
-D: 
+D: System / Hardware Adaptation
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
-C: Missing domain!
 
 T: platform/adaptation/intel_mfld/linux-firmware-mfld
-D: 
-B: tizen_2.1
+D: Base / Hardware Adaptation
 B: tizen
-C: Missing domain!
+B: tizen_2.1
 
 T: platform/adaptation/intel_mfld/mmfw-sysconf-mfld-blackbay
-D: 
+D: System / Hardware Adaptation
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
-C: Missing domain!
 
 T: platform/adaptation/intel_mfld/preos-runtime
-D: 
+D: Base / Hardware Adaptation
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
-C: Missing domain!
 
 T: platform/adaptation/intel_mfld/psb-headers
-D: 
+D: Graphics & UI Framework / GL
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
-C: Missing domain!
 
 T: platform/adaptation/intel_mfld/psb-video-mfld
-D: 
+D: Graphics & UI Framework / GL
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
-C: Missing domain!
 
 T: platform/adaptation/intel_mfld/pvr-bin-mdfld
-D: 
+D: Graphics & UI Framework / GL
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
-C: Missing domain!
 
 T: platform/adaptation/intel_mfld/xorg-server-configs-mfld-blackbay
-D: 
+D: Graphics & UI Framework / X Window System
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
+
+T: platform/adaptation/renesas_rcar/wayland-kms
+D: Graphics & UI Framework / Wayland Window System
 B: tizen
-C: Missing domain!
 
 T: platform/adaptation/samsung_exynos/libtbm-exynos4412
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Buffer Management
 B: tizen
 
 T: platform/adaptation/samsung_exynos/xf86-misc-exynos4412
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 
 T: platform/adaptation/samsung_exynos/xf86-video-exynos
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
+B: tizen
+
+T: platform/adaptation/samsung_exynos/device-manager-plugin-odroid
+D: System / Hardware Adaptation
 B: tizen
 
 T: platform/adaptation/system-plugin-ia-generic
-D: System
+D: System / Hardware Adaptation
 B: tizen
 
 T: platform/adaptation/xf86-input-evdevmultitouch
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Input Framework
 B: tizen
 
 T: platform/adaptation/xf86-input-gesture
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Input Framework
 B: tizen
 
 T: platform/adaptation/xf86-misc-emulfb
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 
 T: platform/adaptation/xf86-module-xdbg
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 
 T: platform/adaptation/xf86-video-emulfb
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 
 T: platform/core/api/app-manager
-D: App Framework
+D: App Framework / Application Launcher
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/api/application
-D: App Framework
+D: App Framework / Application Launcher
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/api/audio-io
-D: Multimedia
+D: Multimedia / Audio FW
 M: Byungwook Jang <bw.jang@samsung.com>
 I: Byungwook Jang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: Apache
 
 T: platform/core/api/bluetooth
-D: Network & Connectivity
+D: Network & Connectivity / Bluetooth
 M: Taesoo Jun <steve.jun@samsung.com>
 M: wu zheng <wu.zheng@intel.com>
 M: Pyun DoHyun <dh79.pyun@samsung.com>
 I: Dohyun Pyun
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/api/call
-D: Telephony
+D: Telephony / Telephony FW
 M: Caiwen Zhang <caiwen.zhang@intel.com>
 M: Jinmin Chung <jinmin@samsung.com>
 M: Oleg Zhurakivskyy <oleg.zhurakivskyy@intel.com>
 M: JooSeok Park <jooseok.park@samsung.com>
 I: Nicolas Bertrand
 R: Guillaume Zajac
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/api/camera
-D: Multimedia
+D: Multimedia / Media Camera
 M: Byungwook Jang <bw.jang@samsung.com>
 I: Byungwook Jang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 L: Apache-2.0
 
 T: platform/core/api/common
-D: System
+D: System / Libraries
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/api/connection
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 
 T: platform/core/api/device
-D: System
+D: Base / Device Management
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: Apache
 
 T: platform/core/api/efl-util
-D: Graphics & UI Framework
+D: Native API / Graphics & UI Framework
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/api/email
-D: Messaging
+D: Messaging / Email
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/api/face
-D: Graphics & UI Framework
+D: Native API / Graphics & UI Framework
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/api/favorites
-D: Web Framework
+D: Web Framework / Web Runtime
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: Apache
 
 T: platform/core/api/geocoder
-D: Location
+D: Location / Geolocation
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/api/haptic
-D: System
-B: tizen_2.1
+D: Base / Device Management
 B: tizen
+B: tizen_2.1
 L: Apache-2.0
 
 T: platform/core/api/image-util
-D: Multimedia
+D: Multimedia / Imaging
 M: hj kim <backto.kim@samsung.com>
 I: Byungwook Jang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: Apache
 
 T: platform/core/api/location-manager
-D: Location
+D: Location / Geolocation
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/api/media-content
-D: Multimedia
+D: Multimedia / Media Content
 M: hj kim <backto.kim@samsung.com>
 I: Byungwook Jang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/api/media-key
-D: System
+D: Graphics & UI Framework / Input Framework
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/api/messages
-D: Messaging
+D: Messaging / Cellular
 M: Changseok Oh <seok.oh@samsung.com>
 M: Zoltan Kis <zoltan.kis@intel.com>
 I: Nicolas Bertrand
 R: Ronald Tessier
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/api/metadata-extractor
-D: Multimedia
+D: Multimedia / Media Content
 M: hj kim <backto.kim@samsung.com>
 I: Byungwook Jang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: Apache
 
 T: platform/core/api/mime-type
-D: Multimedia
+D: Multimedia / Media Service
 M: Yan Yin
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/api/network-info
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
 M: Caiwen Zhang <caiwen.zhang@intel.com>
 M: Jinmin Chung <jinmin@samsung.com>
 M: Oleg Zhurakivskyy <oleg.zhurakivskyy@intel.com>
 M: JooSeok Park <jooseok.park@samsung.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/api/nfc
-D: Network & Connectivity
+D: Network & Connectivity / NFC
 M: Taesoo Jun <steve.jun@samsung.com>
 M: Arron Wang <arron.wang@intel.com>
 M: Youngjae Shin <yj99.shin@samsung.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/api/notification
-D: System
+D: App Framework / Notification
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Youngsub Ko
 R: Seungtaek Chung
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/api/package-manager
-D: App Framework
+D: App Framework / Application Installer
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/api/player
-D: Multimedia
+D: Multimedia / Media Playback
 M: Heechul Jeon <heechul.jeon@samsung.com>
 I: Byungwook Jang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: Apache
 
 T: platform/core/api/poi
-D: Location
+D: Location / Geolocation
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/api/power
-D: System
+D: System / Libraries
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: Apache
 
 T: platform/core/api/radio
-D: Multimedia
+D: Multimedia / Media Radio
 M: Byungwook Jang <bw.jang@samsung.com>
 I: Byungwook Jang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/api/recorder
-D: Multimedia
+D: Multimedia / Media Camera
 M: Byungwook Jang <bw.jang@samsung.com>
 I: Byungwook Jang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 L: Apache-2.0
 L: Apache
 
 T: platform/core/api/route
-D: Location
+D: Location / Geolocation
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/api/runtime-info
-D: System
+D: System / Libraries
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 R: Kyungmin Park
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/api/sensor
-D: Graphics & UI Framework
+D: Native API / Graphics & UI Framework
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 
 T: platform/core/api/serial
-D: Network & Connectivity
+D: Network & Connectivity / Serial
 M: Taesoo Jun <steve.jun@samsung.com>
 I: Dohyun Pyun
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: Apache
 
 T: platform/core/api/sim
-D: Telephony
+D: Telephony / Telephony FW
 M: Caiwen Zhang <caiwen.zhang@intel.com>
 M: Jinmin Chung <jinmin@samsung.com>
 M: Oleg Zhurakivskyy <oleg.zhurakivskyy@intel.com>
 M: JooSeok Park <jooseok.park@samsung.com>
 I: Nicolas Bertrand
 R: Guillaume Zajac
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/api/sound-manager
-D: Multimedia
+D: Multimedia / Audio FW
 M: Byungwook Jang <bw.jang@samsung.com>
 I: Byungwook Jang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: Apache
 
 T: platform/core/api/system-info
-D: System
+D: System / Libraries
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 R: Kyungmin Park
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: OSF
 
 T: platform/core/api/system-settings
-D: System
+D: System / Libraries
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/api/tethering
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
 M: zhang zhengguang <zhengguang.zhang@intel.com>
 M: Taesoo Jun <steve.jun@samsung.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: Apache
 
 T: platform/core/api/tone-player
-D: Multimedia
+D: Multimedia / Audio FW
 M: Byungwook Jang <bw.jang@samsung.com>
 I: Byungwook Jang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: Apache
 
 T: platform/core/api/url-download
-D: Web Framework
+D: Web Framework / Web Runtime
 M: InBum Chang <ibchang@samsung.com>
 I: Jungki Kwak
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: Apache
 
 T: platform/core/api/usb-accessory
-D: System
+D: Network & Connectivity / Serial
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: Apache
 
 T: platform/core/api/video-util
-D: Multimedia
+D: Multimedia / Media Playback
 M: hj kim <backto.kim@samsung.com>
 I: Byungwook Jang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: Apache
 
 T: platform/core/api/wav-player
-D: Multimedia
+D: Multimedia / Audio FW
 M: hj kim <backto.kim@samsung.com>
 I: Byungwook Jang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: Apache
 
 T: platform/core/api/wifi
-D: Network & Connectivity
+D: Network & Connectivity / WiFi
 M: zhang zhengguang <zhengguang.zhang@intel.com>
 M: Taesoo Jun <steve.jun@samsung.com>
 M: Jaehyun Kim <jeik01.kim@samsung.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: Apache
 
 T: platform/core/api/wifi-direct
-D: Network & Connectivity
+D: Network & Connectivity / WiFi
 M: zhang zhengguang <zhengguang.zhang@intel.com>
 M: Taesoo Jun <steve.jun@samsung.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/appfw/ail
-D: App Framework
+D: App Framework / Application Installer
 M: Dongeup Ham <dongeup.ham@samsung.com>
 I: Junsuk Oh
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/appfw/alarm-manager
-D: App Framework
+D: App Framework / Alarm
 M: hokwon Song <hokwon.song@samsung.com>
 I: Jae-ho Lee
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 L: Apache-2.0
 L: FSF
 
 T: platform/core/appfw/app-checker
-D: App Framework
+D: App Framework / Application Core
 M: Dongeup Ham <dongeup.ham@samsung.com>
 I: Jae-ho Lee
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 L: Apache-2.0
 
 T: platform/core/appfw/app-core
-D: App Framework
+D: App Framework / Application Core
 M: Sunwook Bae <sunwook45.bae@samsung.com>
 I: Jae-ho Lee
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/appfw/app-svc
-D: App Framework
+D: App Framework / Application Launcher
 M: Sunwook Bae <sunwook45.bae@samsung.com>
 I: Jae-ho Lee
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/appfw/app2sd
-D: App Framework
+D: App Framework / Application Installer
 M: Dongeup Ham <dongeup.ham@samsung.com>
 I: Junsuk Oh
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 L: Apache-2.0
 
 T: platform/core/appfw/appcore-agent
-D: App Framework
+D: App Framework / Application Core
 M: Sunwook Bae <sunwook45.bae@samsung.com>
 I: Jae-ho Lee
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/appfw/aul-1
-D: App Framework
+D: App Framework / Application Launcher
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/appfw/badge
-D: App Framework
+D: App Framework / Application Utility
 M: Youngjoo Park <yjoo93.park@samsung.com>
 I: Youngsub Ko
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/appfw/com-core
-D: App Framework
+D: App Framework / Application Communication
 M: Youngjoo Park <yjoo93.park@samsung.com>
 I: Sung-jae Park
-B: tizen_2.1
 B: tizen
+B: tizen_2.1
 L: Apache-2.0
 
 T: platform/core/appfw/heynoti
-D: App Framework
+D: App Framework / Notification
 M: Jong Sang Won
 I: Hyungdeuk Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/appfw/librua
-D: App Framework
+D: App Framework / Application Utility
 M: Jong Sang Won
 I: Hyungdeuk Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/appfw/libslp-db-util
-D: App Framework
+D: App Framework / Database
 M: Jong Sang Won
 I: Hyungdeuk Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/appfw/message-port
-D: App Framework
+D: App Framework / Application Communication
 M: Hyunbin Lee <hyunbin.lee@samsung.com>
 I: Sunwook Bae
-B: tizen_2.1
 B: tizen
+B: tizen_2.1
 L: Apache-2.0
 
+T: platform/core/appfw/notification-service
+D: App Framework / Notification
+B: tizen
+
 T: platform/core/appfw/pkgmgr-info
-D: App Framework
+D: App Framework / Application Installer
 M: Dongeup Ham <dongeup.ham@samsung.com>
 I: Junsuk Oh
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/appfw/shortcut
-D: App Framework
+D: App Framework / Application Utility
 M: Youngjoo Park <yjoo93.park@samsung.com>
 I: Sung-jae Park
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: Flora-1.1
 
 T: platform/core/appfw/slp-pkgmgr
-D: App Framework
+D: App Framework / Application Installer
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/appfw/sppc
-D: App Framework
+D: App Framework / Notification
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: platform/core/appfw/status
-D: App Framework
+D: App Framework / Application Core
 M: Youngjoo Park <yjoo93.park@samsung.com>
 I: Youngsub Ko
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
+T: platform/core/appfw/tizen-platform-config
+D: Base / File Systems
+B: tizen
+
+T: platform/core/appfw/tizen-platform-wrapper
+D: Base / File Systems
+B: tizen
+
 T: platform/core/appfw/ui-gadget-1
-D: App Framework
+D: App Framework / Application Core
 M: Jong Sang Won
 I: Hyungdeuk Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/appfw/vconf
-D: App Framework
+D: App Framework / Configuration
 M: Jong Sang Won
 I: Hyungdeuk Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/appfw/vconf-internal-keys
-D: App Framework
+D: App Framework / Configuration
 M: Jong Sang Won
 I: Hyungdeuk Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/appfw/xdgmime
-D: App Framework
+D: App Framework / Application Launcher
 M: Brad Peters <brad.t.peters@intel.com>
 I: Hyungdeuk Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: AFL-2.0
 L: LGPL-2.0+
 L: LGPL-2.1+
 
 T: platform/core/base/bundle
-D: App Framework
+D: App Framework / Application Launcher
 M: Sunwook Bae <sunwook45.bae@samsung.com>
 I: Jae-ho Lee
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/base/default-files-tizen
-D: System
+D: System / File Systems
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 
 T: platform/core/base/gconf-dbus
-D: System
+D: System / Utilities
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Hyungdeuk Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: See-doc(OTHER)
 L: LGPL-2.0+
 
 T: platform/core/base/libsqlfs
-D: System
+D: System / File Systems
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Hyungdeuk Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: LGPL-2.1+
 L: FSF
 
 T: platform/core/base/rpm-installer
-D: App Framework
+D: App Framework / Application Installer
 M: Dongeup Ham <dongeup.ham@samsung.com>
 I: Junsuk Oh
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/base/sys-string-0
-D: System
+D: System / Logging
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/base/syspopup
-D: App Framework
+D: App Framework / Notification
 M: Jong Sang Won
 I: Hyungdeuk Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/connectivity/bluetooth-agent
-D: Network & Connectivity
+D: Network & Connectivity / Bluetooth
 M: Taesoo Jun <steve.jun@samsung.com>
 M: wu zheng <wu.zheng@intel.com>
 M: Pyun DoHyun <dh79.pyun@samsung.com>
 I: Dohyun Pyun
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/connectivity/bluetooth-frwk
-D: Network & Connectivity
+D: Network & Connectivity / Bluetooth
 M: Taesoo Jun <steve.jun@samsung.com>
 M: wu zheng <wu.zheng@intel.com>
 M: Pyun DoHyun <dh79.pyun@samsung.com>
 I: Dohyun Pyun
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/connectivity/bluetooth-share
-D: Network & Connectivity
+D: Network & Connectivity / Bluetooth
 M: Taesoo Jun <steve.jun@samsung.com>
 M: wu zheng <wu.zheng@intel.com>
 M: Pyun DoHyun <dh79.pyun@samsung.com>
 I: Dohyun Pyun
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/connectivity/bluetooth-tools
-D: Network & Connectivity
+D: Network & Connectivity / Bluetooth
 M: Wu Zheng <wu.zheng@intel.com>
 B: tizen
 
 T: platform/core/connectivity/data-router
-D: Network & Connectivity
+D: Network & Connectivity / Serial
 M: zhang zhengguang <zhengguang.zhang@intel.com>
 M: Taesoo Jun <steve.jun@samsung.com>
 I: Dohyun Pyun
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/connectivity/libnet-client
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
 M: zhang zhengguang <zhengguang.zhang@intel.com>
 M: Taesoo Jun <steve.jun@samsung.com>
 M: Jaehyun Kim <jeik01.kim@samsung.com>
 I: Jaehyun Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: platform/core/connectivity/libwifi-direct
-D: Network & Connectivity
+D: Network & Connectivity / WiFi
 M: zhang zhengguang <zhengguang.zhang@intel.com>
 M: Taesoo Jun <steve.jun@samsung.com>
 I: Gibyoung Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/connectivity/mobileap-agent
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
 M: zhang zhengguang <zhengguang.zhang@intel.com>
 M: Taesoo Jun <steve.jun@samsung.com>
 I: Jaehyun Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: platform/core/connectivity/neard-tizen-plugin
-D: Network & Connectivity
+D: Network & Connectivity / NFC
 M: Taesoo Jun <steve.jun@samsung.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: MIT-style
 L: Apache-2.0
 
 T: platform/core/connectivity/net-config
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
 M: zhang zhengguang <zhengguang.zhang@intel.com>
 M: Taesoo Jun <steve.jun@samsung.com>
 M: Jaehyun Kim <jeik01.kim@samsung.com>
 I: Jaehyun Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/connectivity/nfc-manager
-D: Network & Connectivity
+D: Network & Connectivity / NFC
 M: Taesoo Jun <steve.jun@samsung.com>
 M: Arron Wang <arron.wang@intel.com>
 M: Youngjae Shin <yj99.shin@samsung.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: platform/core/connectivity/nfc-manager-neard
-D: Network & Connectivity
+D: Network & Connectivity / NFC
 B: tizen
 
 T: platform/core/connectivity/smartcard-plugin-nfc
-D: Network & Connectivity
+D: Network & Connectivity / NFC
 M: Taesoo Jun
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: Apache
 
 T: platform/core/connectivity/smartcard-plugin-uicc
-D: Network & Connectivity
+D: Network & Connectivity / NFC
 M: Taesoo Jun
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: Apache
 
 T: platform/core/connectivity/smartcard-service
-D: Network & Connectivity
+D: Network & Connectivity / NFC
 M: Taesoo Jun
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/connectivity/wifi-direct-manager
-D: Network & Connectivity
+D: Network & Connectivity / WiFi
 M: zhang zhengguang <zhengguang.zhang@intel.com>
 M: Taesoo Jun <steve.jun@samsung.com>
 I: Gibyoung Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/graphics/default-fonts-fc-sdk
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Fonts
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/graphics/default-fonts-sdk
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Fonts
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Trademark-ref
 L: Apache-2.0
 
 T: platform/core/graphics/opengl-es
-D: Graphics & UI Framework
+D: Graphics & UI Framework / GL
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/location/gps-manager
-D: Location
+D: Location / Geolocation
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/location/lbs-dbus
-D: Location
+D: Location / Geolocation
 M: Jin Ho Choi
 I: Chanil Byun
-B: tizen_2.1
 B: tizen
+B: tizen_2.1
 L: Apache-2.0
 
 T: platform/core/location/liblocation-appman
-D: Location
+D: Location / Geolocation
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 
 T: platform/core/location/libslp-location
-D: Location
+D: Location / Geolocation
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/location/location-module
-D: Location
+D: Location / Geolocation
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/location/ug-setting-location-efl
-D: Location
+D: Location / Geolocation
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: platform/core/messaging/email-service
-D: Messaging
+D: Messaging / Email
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/messaging/msg-service
-D: Messaging
+D: Messaging / Cellular
 M: Changseok Oh <seok.oh@samsung.com>
 I: Nicolas Bertrand
 R: Zoltan Kis
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: platform/core/multimedia/alsa-scenario-0.2
-D: Multimedia
+D: Multimedia / Audio FW
 M: vivian zhang <vivian.zhang@intel.com>
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Joonyoung Shim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: FSF
 L: LGPL-2.0+
 
 T: platform/core/multimedia/audio-session-manager
-D: Multimedia
+D: Multimedia / Audio FW
 M: vivian zhang <vivian.zhang@intel.com>
 M: Byungwook Jang <bw.jang@samsung.com>
 I: Byungwook Jang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/multimedia/avsystem
-D: Multimedia
+D: Multimedia / Audio FW
 M: vivian zhang <vivian.zhang@intel.com>
 M: Byungwook Jang <bw.jang@samsung.com>
 I: Byungwook Jang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/multimedia/gst-plugins-ext0.10
-D: Multimedia
+D: Multimedia / Codec
 M: Byungwook Jang <bw.jang@samsung.com>
 I: Byungwook Jang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: LGPL-2.1+
 L: GPL-with-autoconf-exception
 L: FSF
 
 T: platform/core/multimedia/gst-rtsp-server-wfd
-D: Multimedia
+D: Multimedia / Media Wireless Streaming
 M: YAN YIN <yan.yin@intel.com>
 M: Byungwook Jang <bw.jang@samsung.com>
 I: Byungwook Jang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: LGPL-2.0+
 
 T: platform/core/multimedia/libcamsrcjpegenc
-D: Multimedia
+D: Multimedia / Media Camera
 M: yan zhang <yan.y.zhang@intel.com>
 M: Byungwook Jang <bw.jang@samsung.com>
 I: Byungwook Jang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: FSF
 
 T: platform/core/multimedia/libcamsrcjpegenc-sw-libjpeg
-D: Multimedia
+D: Multimedia / Media Camera
 M: yan zhang <yan.y.zhang@intel.com>
 M: Byungwook Jang <bw.jang@samsung.com>
 I: Byungwook Jang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: FSF
 L: Apache-2.0
 L: GPL-2.0-with-autoconf-exception
@@ -6182,59 +6174,59 @@ L: Apache
 L: X11
 
 T: platform/core/multimedia/libmedia-service
-D: Multimedia
+D: Multimedia / Media Content
 M: hj kim <backto.kim@samsung.com>
 I: Byungwook Jang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: BSD-style
 
 T: platform/core/multimedia/libmedia-thumbnail
-D: Multimedia
+D: Multimedia / Media Content
 M: hj kim <backto.kim@samsung.com>
 I: Byungwook Jang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/multimedia/libmm-camcorder
-D: Multimedia
+D: Multimedia / Media Camera
 M: Byungwook Jang <bw.jang@samsung.com>
 I: Byungwook Jang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/multimedia/libmm-common
-D: Multimedia
+D: Multimedia / Media Service
 M: Byungwook Jang <bw.jang@samsung.com>
 I: Byungwook Jang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 L: Apache-2.0
 
 T: platform/core/multimedia/libmm-fileinfo
-D: Multimedia
+D: Multimedia / Media Content
 M: hj kim <backto.kim@samsung.com>
 I: Byungwook Jang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/multimedia/libmm-imgp-gstcs
-D: Multimedia
+D: Multimedia / Media Editing
 M: hj kim <backto.kim@samsung.com>
 I: Byungwook Jang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: FSF
 L: Public-domain
@@ -6242,368 +6234,387 @@ L: Apache
 L: X11
 
 T: platform/core/multimedia/libmm-log
-D: Multimedia
+D: Multimedia / Media Service
 M: Byungwook Jang <bw.jang@samsung.com>
 I: Byungwook Jang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: FSF
 L: Apache-2.0
 
 T: platform/core/multimedia/libmm-player
-D: Multimedia
+D: Multimedia / Media Playback
 M: Heechul Jeon <heechul.jeon@samsung.com>
 I: Byungwook Jang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/multimedia/libmm-radio
-D: Multimedia
+D: Multimedia / Media Radio
 M: Byungwook Jang <bw.jang@samsung.com>
 I: Byungwook Jang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/multimedia/libmm-session
-D: Multimedia
+D: Multimedia / Audio FW
 M: Byungwook Jang <bw.jang@samsung.com>
 I: Byungwook Jang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/multimedia/libmm-sound
-D: Multimedia
+D: Multimedia / Audio FW
 M: vivian zhang <vivian.zhang@intel.com>
 M: Byungwook Jang <bw.jang@samsung.com>
 I: Byungwook Jang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/multimedia/libmm-ta
-D: Multimedia
+D: Multimedia / Media Service
 M: Byungwook Jang <bw.jang@samsung.com>
 I: Byungwook Jang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: FSF
 L: Apache-2.0
 
 T: platform/core/multimedia/libmm-transcode
-D: Multimedia
+D: Multimedia / Media Editing
 M: hj kim <backto.kim@samsung.com>
 I: Byungwook Jang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/multimedia/libmm-utility
-D: Multimedia
+D: Multimedia / Media Service
 M: hj kim <backto.kim@samsung.com>
 I: Byungwook Jang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/multimedia/libmm-wfd
-D: Multimedia
+D: Multimedia / Media Wireless Streaming
 M: Byungwook Jang <bw.jang@samsung.com>
 I: Byungwook Jang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/multimedia/media-data-sdk
-D: Multimedia
+D: Multimedia / Media Service
 M: hj kim <backto.kim@samsung.com>
 I: Byungwook Jang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: CC-BY
 L: GPL
 L: CCPL
 L: Apache-2.0
 
 T: platform/core/multimedia/media-server
-D: Multimedia
+D: Multimedia / Media Content
 M: hj kim <backto.kim@samsung.com>
 I: Byungwook Jang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/multimedia/mmfw-sysconf
-D: Multimedia
+D: Multimedia / Media Service
 M: Byungwook Jang <bw.jang@samsung.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: LGPL-2.1+
 L: LGPL-2.0+
 
 T: platform/core/pim/calendar-service
-D: Social & Content
+D: Social & Content / PIM
 M: Doosoon Choi
 I: Tw123.kim
 R: Jae Pil Choi
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/pim/contacts-service
-D: Social & Content
+D: Social & Content / PIM
 M: Doosoon Choi
 I: Donghee Ye
 R: Ensung Park
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/pim/libaccounts-svc
-D: Social & Content
+D: Social & Content / PIM
 M: Jong Sang Won
 I: Dawon Kang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/pim/pims-ipc
-D: Social & Content
+D: Social & Content / PIM
 M: Doosoon Choi
 I: Jeesun Kim
 R: Jae Pil Choi
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/security/cert-svc
-D: Security
+D: Security / Certificates
 M: Casey Schaufler <casey.schaufler@intel.com>
 I: Kyungwoo Noh
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/security/cert-svc-ui
-D: Security
+D: Security / Certificates
 M: Casey Schaufler <casey.schaufler@intel.com>
 I: Seungmin Yu
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
+L: Apache-2.0
+
+T: platform/core/security/cynara
+D: Security / Application Privilege
 B: tizen
 L: Apache-2.0
 
 T: platform/core/security/default-ac-domains
-D: Security
+D: Security / Smack
 B: tizen
 
 T: platform/core/security/drm-client
-D: Security
+D: Security / Digital Rights
 M: Dongeup Ham <dongeup.ham@samsung.com>
 I: Hakjoo Ko
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/security/drm-service-core-intel
-D: Security
+D: Security / Digital Rights
 M: Casey Schaufler <casey.schaufler@intel.com>
-B: tizen_2.0
 B: tizen
+B: tizen_2.0
 L: LGPL-2.1+
 L: Flora-1.0
 
 T: platform/core/security/drm-service-core-tizen
-D: Security
+D: Security / Digital Rights
 B: tizen
 
 T: platform/core/security/dukgenerator
-D: Security
+D: Security / Certificates
 M: Casey Schaufler <casey.schaufler@intel.com>
 I: Kyungwoo Noh
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: Apache
 
 T: platform/core/security/hash-signer
-D: Security
+D: Security / Certificates
 M: Casey Schaufler <casey.schaufler@intel.com>
 R: Jaewon Lee
 B: tizen
 L: Apache-2.0
 
 T: platform/core/security/libcryptsvc
-D: Security
+D: Security / Cryptography
 M: Casey Schaufler <casey.schaufler@intel.com>
 I: Kyungwoo Noh
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: Flora-1.1
 
 T: platform/core/security/libprivilege-control
-D: Security
+D: Security / Application Privilege
 M: Bumjin Im <bj.im@samsung.com>
 R: Kidong Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/security/privacy-manager
-D: Security
+D: Security / Application Privilege
 M: Yoonsoo Kim <ys71.kim@samsung.com>
-B: tizen_2.1
 B: tizen
+B: tizen_2.1
 L: Apache-2.0
 
 T: platform/core/security/privacy-popup
-D: Security
+D: Security / Application Privilege
 M: Yoonsoo Kim <ys71.kim@samsung.com>
 R: Jaewon Lee
 B: tizen
 L: Apache-2.0
 
 T: platform/core/security/privilege-checker
-D: Security
+D: Security / Application Privilege
 M: Yoonsoo Kim <ys71.kim@samsung.com>
 R: Jaewon Lee
 B: tizen
 L: Apache-2.0
 
 T: platform/core/security/secure-storage
-D: Security
+D: Security / Application Privilege
 M: Casey Schaufler <casey.schaufler@intel.com>
 I: Seungmin Yu
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
+L: Apache-2.0
+
+T: platform/core/security/security-containers
+D: Security / Utilities
+B: tizen
+L: Apache-2.0
+
+T: platform/core/security/security-manager
+D: Security / Application Privilege
 B: tizen
 L: Apache-2.0
 
 T: platform/core/security/security-server
-D: Security
+D: Security / Application Privilege
 M: Bumjin Im <bj.im@samsung.com>
 R: Kidong Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/system/devman
-D: System
+D: Base / Device Management
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Jiyoung Yun
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/system/dlog
-D: System
+D: System / Logging
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: platform/core/system/haptic-module-tizen
-D: System
+D: Base / Device Management
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Jiyoung Yun
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: Apache
 
 T: platform/core/system/libdevice-node
-D: System
+D: Base / Device Management
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Jiyoung Yun
-B: tizen_2.1
 B: tizen
+B: tizen_2.1
 L: Apache-2.0
 
 T: platform/core/system/libhaptic
-D: System
+D: Base / Device Management
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Jiyoung Yun
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/system/libsf-common
-D: System
+D: System / Sensor Framework
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Juhyun Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/system/libslp-pm
-D: System
+D: Base / Device Management
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Jiyoung Yun
 R: Seunghun Pi
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/system/libslp-sensor
-D: System
+D: System / Sensor Framework
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Juhyun Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/system/libslp-sysman
-D: System
+D: Base / Device Management
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/system/libsvi
-D: System
+D: Base / Device Management
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
+T: platform/core/system/libtlm-nfc
+D: System / User Management
+B: tizen
+
 T: platform/core/system/locales-init
-D: App Framework
+D: App Framework / Application Utility
 M: hokwon Song <hokwon.song@samsung.com>
 I: Kwanwoo Nam
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: GPL-2.0
 
@@ -6612,28 +6623,28 @@ D: System
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Joo-hark Park
 R: Woojin Yun
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/system/oma-ds-agent
-D: System
+D: Social & Content / PIM
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Joo-hark Park
 R: Woojin Yun
-B: tizen_2.1
 B: tizen
+B: tizen_2.1
 L: Apache-2.0
 
 T: platform/core/system/power-manager
-D: System
+D: Base / Device Management
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Juhyun Kim
 R: Seunghun Pi
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/system/sdbd
@@ -6641,46 +6652,46 @@ D: System
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Yoonki Park
 R: Ho Namkoong
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/system/sensor-framework
-D: System
+D: System / Sensor Framework
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Juhyun Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/system/svi-data
-D: System
+D: Graphics & UI Framework / Input Framework
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: Apache
 
 T: platform/core/system/sync-agent
-D: System
+D: System / Libraries
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Joo-hark Park
 R: Woojin Yun
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/system/sys-assert
-D: System
+D: System / Libraries
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Taeyoung Kim
 R: Juho Son
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: Apache
 
@@ -6688,23 +6699,27 @@ T: platform/core/system/system-popup
 D: System
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Taeyoung Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/system/system-server
-D: System
+D: Base / Device Management
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Taeyoung Kim
 R: Gi-yeol Ok
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
+T: platform/core/system/tlm
+D: System / User Management
+B: tizen
+
 T: platform/core/telephony/libtapi
-D: Telephony
+D: Telephony / Telephony FW
 M: Caiwen Zhang <caiwen.zhang@intel.com>
 M: Jinmin Chung <jinmin@samsung.com>
 M: Oleg Zhurakivskyy <oleg.zhurakivskyy@intel.com>
@@ -6712,13 +6727,17 @@ M: JooSeok Park <jooseok.park@samsung.com>
 I: Nicolas Bertrand
 I: Jooseok.park
 R: Guillaume Zajac
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
+T: platform/core/telephony/libtapi-legacy
+D: Telephony / Telephony FW
+B: tizen
+
 T: platform/core/telephony/libtcore
-D: Telephony
+D: Telephony / Telephony FW
 M: Caiwen Zhang <caiwen.zhang@intel.com>
 M: Jinmin Chung <jinmin@samsung.com>
 M: Oleg Zhurakivskyy <oleg.zhurakivskyy@intel.com>
@@ -6726,13 +6745,13 @@ M: JooSeok Park <jooseok.park@samsung.com>
 I: Nicolas Bertrand
 I: Jooseok.park
 R: Guillaume Zajac
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/telephony/tel-plugin-at_standard
-D: Telephony
+D: Telephony / Telephony FW
 M: Caiwen Zhang <caiwen.zhang@intel.com>
 M: Jinmin Chung <jinmin@samsung.com>
 M: Oleg Zhurakivskyy <oleg.zhurakivskyy@intel.com>
@@ -6740,12 +6759,12 @@ M: JooSeok Park <jooseok.park@samsung.com>
 I: Nicolas Bertrand
 I: Jooseok.park
 R: Guillaume Zajac
-B: tizen_2.1
 B: tizen
+B: tizen_2.1
 L: Apache-2.0
 
 T: platform/core/telephony/tel-plugin-atmodem
-D: Telephony
+D: Telephony / Telephony FW
 M: Caiwen Zhang <caiwen.zhang@intel.com>
 M: Jinmin Chung <jinmin@samsung.com>
 M: Oleg Zhurakivskyy <oleg.zhurakivskyy@intel.com>
@@ -6753,13 +6772,13 @@ M: JooSeok Park <jooseok.park@samsung.com>
 I: Nicolas Bertrand
 I: Jooseok.park
 R: Guillaume Zajac
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/telephony/tel-plugin-database
-D: Telephony
+D: Telephony / Telephony FW
 M: Caiwen Zhang <caiwen.zhang@intel.com>
 M: Jinmin Chung <jinmin@samsung.com>
 M: Oleg Zhurakivskyy <oleg.zhurakivskyy@intel.com>
@@ -6767,13 +6786,13 @@ M: JooSeok Park <jooseok.park@samsung.com>
 I: Nicolas Bertrand
 I: Jooseok.park
 R: Guillaume Zajac
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/telephony/tel-plugin-dbus_tapi
-D: Telephony
+D: Telephony / Telephony FW
 M: Caiwen Zhang <caiwen.zhang@intel.com>
 M: Jinmin Chung <jinmin@samsung.com>
 M: Oleg Zhurakivskyy <oleg.zhurakivskyy@intel.com>
@@ -6781,13 +6800,13 @@ M: JooSeok Park <jooseok.park@samsung.com>
 I: Nicolas Bertrand
 I: Jooseok.park
 R: Guillaume Zajac
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/telephony/tel-plugin-imc
-D: Telephony
+D: Telephony / Telephony FW
 M: Caiwen Zhang <caiwen.zhang@intel.com>
 M: Jinmin Chung <jinmin@samsung.com>
 M: Oleg Zhurakivskyy <oleg.zhurakivskyy@intel.com>
@@ -6795,13 +6814,13 @@ M: JooSeok Park <jooseok.park@samsung.com>
 I: Nicolas Bertrand
 I: Jooseok.park
 R: Guillaume Zajac
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/telephony/tel-plugin-imcmodem
-D: Telephony
+D: Telephony / Telephony FW
 M: Caiwen Zhang <caiwen.zhang@intel.com>
 M: Jinmin Chung <jinmin@samsung.com>
 M: Oleg Zhurakivskyy <oleg.zhurakivskyy@intel.com>
@@ -6809,39 +6828,39 @@ M: JooSeok Park <jooseok.park@samsung.com>
 I: Nicolas Bertrand
 I: Jooseok.park
 R: Guillaume Zajac
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/telephony/tel-plugin-indicator
-D: Telephony
+D: Telephony / Telephony FW
 M: Caiwen Zhang <caiwen.zhang@intel.com>
 M: Jinmin Chung <jinmin@samsung.com>
 M: Oleg Zhurakivskyy <oleg.zhurakivskyy@intel.com>
 M: JooSeok Park <jooseok.park@samsung.com>
 I: Nicolas Bertrand
 R: Guillaume Zajac
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/telephony/tel-plugin-packetservice
-D: Telephony
+D: Telephony / Telephony FW
 M: Caiwen Zhang <caiwen.zhang@intel.com>
 M: Jinmin Chung <jinmin@samsung.com>
 M: Oleg Zhurakivskyy <oleg.zhurakivskyy@intel.com>
 M: JooSeok Park <jooseok.park@samsung.com>
 I: Nicolas Bertrand
 R: Guillaume Zajac
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/telephony/tel-plugin-vconf
-D: Telephony
+D: Telephony / Telephony FW
 M: Caiwen Zhang <caiwen.zhang@intel.com>
 M: Jinmin Chung <jinmin@samsung.com>
 M: Oleg Zhurakivskyy <oleg.zhurakivskyy@intel.com>
@@ -6849,13 +6868,13 @@ M: JooSeok Park <jooseok.park@samsung.com>
 I: Nicolas Bertrand
 I: Jooseok.park
 R: Guillaume Zajac
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/telephony/tel-plugin-vmodem
-D: Telephony
+D: Telephony / Telephony FW
 M: Caiwen Zhang <caiwen.zhang@intel.com>
 M: Jinmin Chung <jinmin@samsung.com>
 M: Oleg Zhurakivskyy <oleg.zhurakivskyy@intel.com>
@@ -6863,13 +6882,13 @@ M: JooSeok Park <jooseok.park@samsung.com>
 I: Nicolas Bertrand
 I: Jooseok.park
 R: Guillaume Zajac
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/telephony/telephony-daemon
-D: Telephony
+D: Telephony / Telephony FW
 M: Caiwen Zhang <caiwen.zhang@intel.com>
 M: Jinmin Chung <jinmin@samsung.com>
 M: Oleg Zhurakivskyy <oleg.zhurakivskyy@intel.com>
@@ -6877,720 +6896,720 @@ M: JooSeok Park <jooseok.park@samsung.com>
 I: Nicolas Bertrand
 I: Jooseok.park
 R: Guillaume Zajac
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/uifw/anthy
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Input Framework
 M: Sehwan Park <sehwan@samsung.com>
 I: Ji-hoon Lee
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: LGPL-2.0+
 L: FSF
 
 T: platform/core/uifw/e17
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 M: Sangjin Lee <lsj119@samsung.com>
 M: Gustavo Barbieri <gustavo.barbieri@intel.com>
 I: Gwanglim Lee
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 L: Public-domain
 
 T: platform/core/uifw/e17-extra-config-modules
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 M: Jongmin Lee <jm105.lee@samsung.com>
 I: Sungho Kwak
 R: Myoungwoon Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: BSD
 L: Apache
 
 T: platform/core/uifw/e17-extra-modules
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 M: Sangjin Lee <lsj119@samsung.com>
 I: Gwanglim Lee
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 L: FSF
 L: BSD-2-Clause
 
 T: platform/core/uifw/e17-misc
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 M: Sangjin Lee <lsj119@samsung.com>
 I: Gwanglim Lee
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: BSD
 L: BSD-2-Clause
 
 T: platform/core/uifw/edje-multisense-plugin
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 M: Jongmin Lee <jm105.lee@samsung.com>
 I: Sungho Kwak
 R: Myoungwoon Kim
-B: tizen_2.1
 B: tizen
+B: tizen_2.1
 L: Public-domain(C)
 L: FSF
 L: BSD-2-Clause
 L: GPL-2.0-with-autoconf-exception
 
 T: platform/core/uifw/efl-assist
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 B: tizen
 
 T: platform/core/uifw/efl-theme-tizen
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 M: Bruno Dilly <bruno.dilly@intel.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/uifw/elm-misc
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 M: Jongmin Lee
 I: Sungho Kwak
 R: Myoungwoon Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: LGPL-2.1+
 L: LGPL-2.1
 
 T: platform/core/uifw/ise-default
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Input Framework
 M: Sehwan Park <sehwan@samsung.com>
 I: Ji-hoon Lee
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: platform/core/uifw/ise-engine-anthy
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Input Framework
 M: Sehwan Park <sehwan@samsung.com>
 I: Ji-hoon Lee
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: GPL
 L: LGPL-2.0+
 L: GPL-with-autoconf-exception
 
 T: platform/core/uifw/ise-engine-default
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Input Framework
 M: Sehwan Park <sehwan@samsung.com>
 I: Ji-hoon Lee
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: GPL-with-autoconf-exception
 L: Apache-2.0
 L: NOT-public-domain
 
 T: platform/core/uifw/ise-engine-hangul
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Input Framework
 M: Sehwan Park <sehwan@samsung.com>
 I: Jihoon Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: LGPL-2.0+
 L: GPL
 
 T: platform/core/uifw/ise-engine-sunpinyin
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Input Framework
 M: Sehwan Park <sehwan@samsung.com>
 I: Ji-hoon Lee
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: LGPL-2.1
 L: CDDL-1.0
 
 T: platform/core/uifw/ise-engine-tables
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Input Framework
 M: Sehwan Park <sehwan@samsung.com>
 I: Ji-hoon Lee
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: GPL
 L: GPL-with-autoconf-exception
 
 T: platform/core/uifw/isf
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Input Framework
 M: Sehwan Park <sehwan@samsung.com>
 I: Jihoon Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: LGPL-2.0+
 L: LGPL-2.1+
 
 T: platform/core/uifw/libdmx
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Sung-jin Park
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: MIT-style
 
 T: platform/core/uifw/libdri2
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Sung-jin Park
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: MIT-style
 
 T: platform/core/uifw/libhangul
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Input Framework
 M: Sehwan Park <sehwan@samsung.com>
 M: Philippe Coval <philippe.coval@open.eurogiciel.org>
 I: Jihoon Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: LGPL-2.1+
 L: FSF
 
 T: platform/core/uifw/libscl-ui
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Input Framework
 M: Sehwan Park <sehwan@samsung.com>
 I: Ji-hoon Lee
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 
 T: platform/core/uifw/libslp-utilx
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Gwanglim Lee
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/uifw/libtbm
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Buffer Management
 M: Sangjin Lee <lsj119@samsung.com>
 I: Soochan Lim
-B: tizen_2.1
 B: tizen
+B: tizen_2.1
 L: MIT-style
 
 T: platform/core/uifw/libttssmt
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Voice Framework
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 L: GPL
 
 T: platform/core/uifw/stt
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Voice Framework
 M: Sehwan Park <sehwan@samsung.com>
 I: Dongyeol Lee
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/core/uifw/tts
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Voice Framework
 M: Sehwan Park <sehwan@samsung.com>
 I: Dongyeol Lee
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/framework/native/app-controls
-D: App Framework
+D: Native API / App Framework
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/framework/native/app-service
-D: App Framework
+D: Native API / App Framework
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: Flora-1.1
 
 T: platform/framework/native/appfw
-D: App Framework
+D: Native API / App Framework
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/framework/native/appwidget-service
-D: App Framework
-B: tizen_2.1
+D: Native API / App Framework
 B: tizen
+B: tizen_2.1
 L: Flora-1.1
 
 T: platform/framework/native/bluetooth
-D: Network & Connectivity
+D: Native API / Network & Connectivity
 M: Deokhyun Kim <dukan.kim@samsung.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/framework/native/certificate-selector
-D: Security
+D: Native API / Security
 B: tizen
 
 T: platform/framework/native/channel-service
-D: App Framework
+D: Native API / App Framework
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/framework/native/common-service
-D: App Framework
+D: Native API / App Framework
 M: hokwon Song <hokwon.song@samsung.com>
-B: tizen_2.1
 B: tizen
+B: tizen_2.1
 L: Apache-2.0
 
 T: platform/framework/native/compat
-D: App Framework
+D: Native API / App Framework
 M: Yoonsoo Kim <ys71.kim@samsung.com>
 R: Hojun Jaygarl
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/framework/native/connectivity-service
-D: Network & Connectivity
+D: Native API / Network & Connectivity
 M: Deokhyun Kim <dukan.kim@samsung.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: Flora-1.1
 
 T: platform/framework/native/content
-D: Social & Content
+D: Native API / Social & Content
 M: Jaehwa Shin <jaehwa.shin@samsung.com>
 I: Hansang Lee
 R: Jae-hwa Shin
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/framework/native/env-config
-D: App Framework
+D: Native API / App Framework
 M: Hyunbin Lee <hyunbin.lee@samsung.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: Apache
 
 T: platform/framework/native/face
-D: Graphics & UI Framework
+D: Native API / Graphics & UI Framework
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: Flora-1.1
 
 T: platform/framework/native/image
-D: Multimedia
+D: Native API / Multimedia
 M: KyungYoun Won <ky99.won@samsung.com>
 I: Eonseok Lee
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/framework/native/image-core
-D: Multimedia
+D: Native API / Multimedia
 M: KyungYoun Won <ky99.won@samsung.com>
 I: Eonseok Lee
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/framework/native/ime
-D: Graphics & UI Framework
+D: Native API / Graphics & UI Framework
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/framework/native/installer
-D: App Framework
+D: Native API / App Framework
 M: Dongeup Ham <dongeup.ham@samsung.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/framework/native/json
 D: System
 M: bermjin cho <chobj@samsung.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/framework/native/loader
-D: App Framework
+D: Native API / App Framework
 M: Sunwook Bae <sunwook45.bae@samsung.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: Apache
 
 T: platform/framework/native/locations
-D: Location
+D: Native API / Location
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/framework/native/media
-D: Multimedia
+D: Native API / Multimedia
 M: KyungYoun Won <ky99.won@samsung.com>
 I: Eonseok Lee
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 L: Apache-2.0
 
 T: platform/framework/native/messaging
-D: Messaging
+D: Messaging / Cellular
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/framework/native/net
-D: Network & Connectivity
+D: Native API / Network & Connectivity
 M: byounghui lim <byounghui.lim@samsung.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: Flora-1.1
 
 T: platform/framework/native/nfc
-D: Network & Connectivity
+D: Native API / Network & Connectivity
 M: woowon park <woowon.park@samsung.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/framework/native/secure-element
-D: Security
+D: Native API / Security
 M: Yoonsoo Kim <ys71.kim@samsung.com>
 R: Jaewon Lee
 B: tizen
 L: Apache-2.0
 
 T: platform/framework/native/security-service
-D: Security
+D: Native API / Security
 M: Yoonsoo Kim <ys71.kim@samsung.com>
 R: Jaewon Lee
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/framework/native/shell
-D: App Framework
+D: Native API / App Framework
 M: SeungWon Lee <lsw2000.lee@samsung.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Flora-1.1
 L: Apache-2.0
 
 T: platform/framework/native/social
-D: Social & Content
+D: Native API / Social & Content
 M: Jaehwa Shin <jaehwa.shin@samsung.com>
 I: Hansang Lee
 R: Jae-hwa Shin
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/framework/native/speech
-D: Graphics & UI Framework
+D: Native API / Graphics & UI Framework
 M: KyungYoun Won <ky99.won@samsung.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: Apache
 
 T: platform/framework/native/sys-config
-D: App Framework
+D: Native API / App Framework
 M: Sunwook Bae <sunwook45.bae@samsung.com>
-B: tizen_2.1
 B: tizen
+B: tizen_2.1
 L: Apache-2.0
 
 T: platform/framework/native/telephony
-D: Telephony
+D: Native API / Telephony
 M: EUN HYE KIM <eh1112.kim@samsung.com>
 M: Oleg Zhurakivskyy <oleg.zhurakivskyy@intel.com>
 M: Caiwen Zhang <caiwen.zhang@intel.com>
 I: Nicolas Bertrand
 R: Guillaume Zajac
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/framework/native/uifw
-D: Graphics & UI Framework
+D: Native API / Graphics & UI Framework
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/framework/native/uix
-D: Graphics & UI Framework
+D: Native API / Graphics & UI Framework
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: Flora-1.0
 
 T: platform/framework/native/vision
-D: Graphics & UI Framework
-B: tizen_2.1
+D: Native API / Graphics & UI Framework
 B: tizen
+B: tizen_2.1
 L: Apache-2.0
 L: Flora-1.1
 
 T: platform/framework/native/web
-D: Web Framework
+D: Native API / Web Framework
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/framework/web/crosswalk
-D: Web Framework
+D: Web Framework / Crosswalk
 B: tizen
 L: BSD
 
 T: platform/framework/web/data-provider-master
-D: Web Framework
+D: Applications
 M: Youngjoo Park <yjoo93.park@samsung.com>
 I: Jungki Kwak
-B: tizen_2.1
 B: tizen
+B: tizen_2.1
 L: Flora-1.0
 
 T: platform/framework/web/data-provider-slave
-D: Web Framework
-B: tizen_2.1
+D: Applications
 B: tizen
+B: tizen_2.1
 
 T: platform/framework/web/download-provider
-D: Web Framework
+D: Network & Connectivity / Data Network
 M: InBum Chang <ibchang@samsung.com>
 I: Kwangmin Bang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/framework/web/heap-monitor
-D: Web Framework
-B: tizen_2.1
+D: Web Framework / Web Runtime
 B: tizen
+B: tizen_2.1
 
 T: platform/framework/web/livebox
-D: Web Framework
-B: tizen_2.1
+D: Applications
 B: tizen
+B: tizen_2.1
 
 T: platform/framework/web/livebox-cpp
-D: Web Framework
-B: tizen_2.1
+D: Applications
 B: tizen
+B: tizen_2.1
 
 T: platform/framework/web/livebox-edje
-D: Web Framework
-B: tizen_2.1
+D: Applications
 B: tizen
+B: tizen_2.1
 
 T: platform/framework/web/livebox-service
-D: Web Framework
-B: tizen_2.1
+D: Applications
 B: tizen
+B: tizen_2.1
 
 T: platform/framework/web/livebox-viewer
-D: Web Framework
-B: tizen_2.1
+D: Applications
 B: tizen
+B: tizen_2.1
 
 T: platform/framework/web/provider
-D: Web Framework
-B: tizen_2.1
+D: Applications
 B: tizen
+B: tizen_2.1
 
 T: platform/framework/web/tizen-extensions-crosswalk
-D: Web Framework
+D: Web Framework / Crosswalk
 B: tizen
 L: BSD
 
 T: platform/framework/web/web-provider
-D: Web Framework
-B: tizen_2.1
+D: Web Framework / Web Runtime
 B: tizen
+B: tizen_2.1
 L: Flora-1.1
 
 T: platform/framework/web/web-ui-fw
-D: Web Framework
+D: Web Framework / Web UI FW
 M: Youmin Ha <youmin.ha@samsung.com>
 I: Youmin Ha
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: MIT-style
 L: Dual-license
 L: GPL-2.0
 L: MIT
 
 T: platform/framework/web/webkit-efl
-D: Web Framework
+D: Web Framework / Web Engine
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: platform/framework/web/wrt
-D: Web Framework
+D: Web Framework / Web Runtime
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 
 T: platform/framework/web/wrt-commons
-D: Web Framework
+D: Web Framework / Web Runtime
 M: Ming Jin <ming79.jin@samsung.com>
 I: Tae-jeong Lee
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/framework/web/wrt-installer
-D: Web Framework
+D: Web Framework / Web Runtime
 M: Ming Jin <ming79.jin@samsung.com>
 I: Soyoung Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/framework/web/wrt-plugins-common
-D: Web Framework
+D: Web Framework / Web Runtime
 M: Ming Jin <ming79.jin@samsung.com>
 I: Tae-jeong Lee
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/framework/web/wrt-plugins-tizen
-D: Web Framework
+D: Web Framework / Web Runtime
 M: hobum kwon <hobum.kwon@samsung.com>
 I: Choi Dongjin
 R: Woongsuk Cho
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/framework/web/wrt-security
-D: Web Framework
+D: Web Framework / Web Runtime
 M: Yoonsoo Kim <ys71.kim@samsung.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/kernel/kernel-clovertrail
-B: tizen
 D: System
+B: tizen
 L: GPL
 L: GPL-2.0
 
 T: platform/kernel/kernel-mfld-blackbay
 D: System
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 
 T: platform/kernel/linux-3.10
-D: System
+D: System / Hardware Adaptation
 B: tizen
 
 T: platform/upstream/SDL
-D: System
+D: System / Libraries
 B: tizen
 L: LGPL-2.1+
 L: LGPL-2.0+
 
 T: platform/upstream/acl
-D: Security
+D: Security / Utilities
 M: Bumjin Im <bj.im@samsung.com>
 B: tizen
 L: GPL
 L: LGPL-2.1+
 
 T: platform/upstream/acpid
-D: System
+D: Base / Hardware Adaptation
 M: Patrick Mccarty
 B: tizen
 L: GPL
 
 T: platform/upstream/adns
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
 M: Taesoo Jun <steve.jun@samsung.com>
 B: tizen
 L: GPL
 
 T: platform/upstream/alsa-lib
-D: Multimedia
+D: Multimedia / Audio FW
 M: vivian zhang <vivian.zhang@intel.com>
 M: Byungwook Jang <bw.jang@samsung.com>
 I: Byungwook Jang
@@ -7599,7 +7618,7 @@ L: LGPL-2.1+
 L: FSF
 
 T: platform/upstream/alsa-plugins
-D: Multimedia
+D: Multimedia / Audio FW
 M: vivian zhang <vivian.zhang@intel.com>
 M: Byungwook Jang <bw.jang@samsung.com>
 B: tizen
@@ -7608,7 +7627,7 @@ L: FSF
 L: LGPL-2.0+
 
 T: platform/upstream/alsa-utils
-D: Multimedia
+D: Multimedia / Audio FW
 M: vivian zhang <vivian.zhang@intel.com>
 M: Byungwook Jang <bw.jang@samsung.com>
 I: Byungwook Jang
@@ -7617,7 +7636,7 @@ L: GPL
 L: FSF
 
 T: platform/upstream/asciidoc
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/aspell
@@ -7628,12 +7647,12 @@ L: GFDL-1.1+
 L: FSF
 
 T: platform/upstream/atk
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Input Framework
 B: tizen
 L: LGPL-2.0+
 
 T: platform/upstream/attr
-D: App Framework
+D: App Framework / Application Utility
 M: Brad Peters <brad.t.peters@intel.com>
 I: Hyunbin Lee
 B: tizen
@@ -7641,7 +7660,7 @@ L: GPL
 L: LGPL-2.1+
 
 T: platform/upstream/augeas
-D: Base
+D: Base / Libraries
 M: Junfeng dong <junfeng.dong@intel.com>
 I: Jung-hee Choi
 R: Jungmin Cho
@@ -7652,25 +7671,25 @@ L: GPL-3.0+
 L: LGPL-2.0
 
 T: platform/upstream/autoconf
-D: Platform Development
+D: Platform Development / Compiler
 B: tizen
 
 T: platform/upstream/autoconf213
-D: Platform Development
+D: Platform Development / Compiler
 B: tizen
 
 T: platform/upstream/automake
-D: Platform Development
+D: Platform Development / Compiler
 B: tizen
 
 T: platform/upstream/avahi
-D: Network & Connectivity
+D: Network & Connectivity / WiFi
 M: Taesoo Jun <steve.jun@samsung.com>
 M: GangHeok Kim <gangheok.kim@samsung.com>
 I: Gangheok Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: LGPL-2.1+
 L: LGPL-2.0+
 L: FSF
@@ -7680,7 +7699,7 @@ D: Base
 B: tizen
 
 T: platform/upstream/bash
-D: Base
+D: Base / Utilities
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Piotr Bereza
 R: Walyong Cho
@@ -7688,20 +7707,20 @@ B: tizen
 L: GPL-3.0+
 
 T: platform/upstream/bc
-D: Base
+D: Base / Utilities
 B: tizen
 L: GPL
 L: FSF
 
 T: platform/upstream/bdftopcf
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Fonts
 B: tizen
 L: OpenGroup
 L: MIT-style
 L: FSF
 
 T: platform/upstream/bigreqsproto
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: FSF
 L: OpenGroup
@@ -7710,7 +7729,7 @@ L: X11
 L: MIT-style
 
 T: platform/upstream/binutils
-D: Base
+D: Base / Toolchain
 M: Junfeng dong <junfeng.dong@intel.com>
 I: Bogon Kim
 R: Jungmin Cho
@@ -7718,11 +7737,11 @@ B: tizen
 L: GPL-3.0+
 
 T: platform/upstream/bison
-D: Platform Development
+D: Platform Development / Compiler
 B: tizen
 
 T: platform/upstream/bluez
-D: Network & Connectivity
+D: Network & Connectivity / Bluetooth
 M: Taesoo Jun <steve.jun@samsung.com>
 M: wu zheng <wu.zheng@intel.com>
 M: Pyun DoHyun <dh79.pyun@samsung.com>
@@ -7732,36 +7751,36 @@ L: GPL
 L: LGPL-2.1+
 
 T: platform/upstream/boost
-D: Base
+D: System / Libraries
 M: Yoonsoo Kim <ys71.kim@samsung.com>
 R: Hojun Jaygarl
 B: tizen
 L: BSL-1.0
 
 T: platform/upstream/boost-jam
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/bootchart
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/btrfs-progs
-D: Base
+D: Base / File Systems
 M: Patrick McCarty <patrick.mccarty@intel.com>
 B: tizen
 L: GPL-2.0
 
 T: platform/upstream/build
-D: Platform Development
+D: Platform Development / Build
 B: tizen
 
 T: platform/upstream/build-compare
-D: Platform Development
+D: Platform Development / Build
 B: tizen
 
 T: platform/upstream/busybox
-D: Base
+D: Base / Utilities
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Piotr Bereza
 R: Walyong Cho
@@ -7769,12 +7788,16 @@ B: tizen
 L: GPL-2.0
 L: GPL
 
+T: platform/upstream/buxton
+D: App Framework / Configuration
+B: tizen
+
 T: platform/upstream/byacc
-D: Platform Development
+D: Platform Development / Compiler
 B: tizen
 
 T: platform/upstream/bzip2
-D: Base
+D: Base / Compression
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Piotr Bereza
 R: Walyong Cho
@@ -7783,7 +7806,7 @@ L: See-file(LICENSE)
 L: BSD-style
 
 T: platform/upstream/c-ares
-D: Base
+D: Base / Libraries
 M: Taesoo Jun <steve.jun@samsung.com>
 I: Jaehyun Kim
 B: tizen
@@ -7791,7 +7814,7 @@ L: BSD-style
 L: GPL
 
 T: platform/upstream/ca-certificates
-D: Security
+D: Security / Certificates
 M: Casey Schaufler <casey.schaufler@intel.com>
 B: tizen
 L: GPL-2.0
@@ -7799,7 +7822,7 @@ L: GPL
 L: GPL-2.0+
 
 T: platform/upstream/ca-certificates-mozilla
-D: Security
+D: Security / Certificates
 M: Casey Schaufler <casey.schaufler@intel.com>
 B: tizen
 L: MPL
@@ -7811,7 +7834,7 @@ L: Dual-license
 L: MIT
 
 T: platform/upstream/cairo
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Render Libraries
 M: Zhigang Gong <zhigang.gong@intel.com>
 B: tizen
 L: MIT-style
@@ -7819,43 +7842,43 @@ L: LGPL-2.1
 L: MPL-1.1
 
 T: platform/upstream/cantarell-fonts
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Fonts
 B: tizen
 L: FSF
 L: OFL-1.1
 
 T: platform/upstream/ccache
-D: Platform Development
+D: Platform Development / Compiler
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 
 T: platform/upstream/cdrkit
-D: Multimedia
+D: Multimedia / Media Content
 M: Peter Zhu <peter.j.zhu@intel.com>
 B: tizen
 L: GPL-2.0
 L: GPL
 
 T: platform/upstream/check
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/chromium
-D: App Framework
+D: Native API / App Framework
 M: Hyunbin Lee <hyunbin.lee@samsung.com>
 I: Sunwook Bae
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: BSD
 
 T: platform/upstream/chrpath
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/cloog
-D: Base
+D: Base / Toolchain
 M: Junfeng dong <junfeng.dong@intel.com>
 I: Bogon Kim
 R: Jungmin Cho
@@ -7863,21 +7886,21 @@ B: tizen
 L: GPL
 
 T: platform/upstream/cloog-isl
-D: Base
+D: Base / Toolchain
 B: tizen
 
 T: platform/upstream/cmake
-D: Platform Development
+D: Platform Development / Compiler
 B: tizen
 
 T: platform/upstream/compositeproto
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: MIT-style
 L: FSF
 
 T: platform/upstream/connman
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
 M: zhang zhengguang <zhengguang.zhang@intel.com>
 M: Taesoo Jun <steve.jun@samsung.com>
 M: Jaehyun Kim <jeik01.kim@samsung.com>
@@ -7886,7 +7909,7 @@ B: tizen
 L: GPL-2.0
 
 T: platform/upstream/coreutils
-D: Base
+D: Base / Toolchain
 M: Patrick McCarty <patrick.mccarty@intel.com>
 R: Jungmin Cho
 B: tizen
@@ -7894,38 +7917,38 @@ L: GPL-3.0+
 L: FSF
 
 T: platform/upstream/corewatcher
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/cpio
-D: Base
+D: Base / Compression
 B: tizen
 L: GPL-3.0+
 L: FSF
 
 T: platform/upstream/crda
-D: Base
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/createrepo
-D: Platform Development
+D: Platform Development / Build
 B: tizen
 
 T: platform/upstream/cscope
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/csr-framework
-D: Base
-B: tizen_2.0
+D: Security / Utilities
 B: tizen
+B: tizen_2.0
 
 T: platform/upstream/ctags
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/cups
-D: System
+D: System / Utilities
 M: Taesoo Jun <steve.jun@samsung.com>
 M: GangHeok Kim <gangheok.kim@samsung.com>
 I: Gangheok Kim
@@ -7935,19 +7958,19 @@ L: GPL
 L: Trademark-ref
 
 T: platform/upstream/cups-filters
-D: System
+D: System / Libraries
 M: Taesoo Jun <steve.jun@samsung.com>
 M: GangHeok Kim <gangheok.kim@samsung.com>
 I: Gangheok Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: MIT-style
 L: GPL
 L: MIT
 
 T: platform/upstream/curl
-D: Base
+D: Base / Utilities
 M: Taesoo Jun <steve.jun@samsung.com>
 M: GangHeok Kim <gangheok.kim@samsung.com>
 I: Gangheok Kim
@@ -7956,7 +7979,7 @@ L: MIT-style
 L: GPL
 
 T: platform/upstream/damageproto
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: MIT-style
 L: FSF
@@ -7964,7 +7987,7 @@ L: X11
 L: Public-domain
 
 T: platform/upstream/dash
-D: Base
+D: Base / Utilities
 B: tizen
 L: BSD
 
@@ -7973,7 +7996,7 @@ D: Base
 B: tizen
 
 T: platform/upstream/db4
-D: Base
+D: Base / Package Management
 M: Junfeng dong <junfeng.dong@intel.com>
 I: Gwangho Hwang
 R: Jungmin Cho
@@ -7981,7 +8004,7 @@ B: tizen
 L: See-file(LICENSE)
 
 T: platform/upstream/dbus
-D: Base
+D: Base / IPC
 M: Thiago Macieira <thiago.macieira@intel.com>
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 B: tizen
@@ -7989,7 +8012,7 @@ L: GPL
 L: AFL-2.1
 
 T: platform/upstream/dbus-glib
-D: Base
+D: Base / IPC
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 B: tizen
 L: AFL-2.1
@@ -7997,49 +8020,53 @@ L: GPL
 L: FSF
 
 T: platform/upstream/dbus-python
-D: Base
+D: Base / IPC
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 B: tizen
 L: MIT-style
 L: FSF
 
 T: platform/upstream/dejavu-fonts
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Fonts
 B: tizen
 L: Bitstream
 L: Public-domain(C)
 
 T: platform/upstream/deltarpm
-D: Base
+D: Platform Development / Utilities
 B: tizen
 L: BSD
 
 T: platform/upstream/desktop-file-utils
-D: System
+D: System / Libraries
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 B: tizen
 L: GPL
 L: FSF
 
 T: platform/upstream/device-mapper
-D: Base
+D: Base / File Systems
 M: william douglas <william.douglas@intel.com>
 B: tizen
 L: LGPL-2.1
 L: GPL-2.0
 
 T: platform/upstream/diffutils
-D: Platform Development
+D: Platform Development / Utilities
+B: tizen
+
+T: platform/upstream/dLeyna
+D: Automotive / DLNA
 B: tizen
 
 T: platform/upstream/dmidecode
-D: System
+D: Base / Hardware Adaptation
 M: Patrick McCarty <patrick.mccarty@intel.com>
 B: tizen
 L: GPL
 
 T: platform/upstream/dmxproto
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: MIT-style
 L: FSF
@@ -8047,43 +8074,43 @@ L: Public-domain
 L: X11
 
 T: platform/upstream/dnsmasq
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
 M: Taesoo Jun <steve.jun@samsung.com>
 I: Jaehyun Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: GPL
 L: GPL-2.0
 L: Public-domain
 L: GPL-2.0:3.0
 
 T: platform/upstream/docbook-xsl
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/docbook-xsl-stylesheets
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/docbook_4
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/dos2unix
-D: Social & Content
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/dosfstools
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/doxygen
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/dracut
-D: Base
+D: Base / Hardware Adaptation
 M: william douglas <william.douglas@intel.com>
 B: tizen
 L: LGPL-2.1+
@@ -8091,7 +8118,7 @@ L: GPL-2.0
 L: GPL
 
 T: platform/upstream/dri2proto
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: MIT-style
 L: X11
@@ -8099,7 +8126,7 @@ L: Public-domain
 L: FSF
 
 T: platform/upstream/e2fsprogs
-D: Base
+D: Base / File Systems
 M: william douglas <william.douglas@intel.com>
 I: Gwangho Hwang
 R: Jungmin Cho
@@ -8109,11 +8136,11 @@ L: LGPL-2.0
 L: LGPL-2.0+
 
 T: platform/upstream/econnman
-D: Social & Content
+D: Graphics & UI Framework / EFL
 B: tizen
 
 T: platform/upstream/ecore
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 M: Jongmin Lee <jm105.lee@samsung.com>
 M: Lucas De Marchi <lucas.demarchi@intel.com>
 I: Sungho Kwak
@@ -8122,12 +8149,16 @@ B: tizen
 L: FSF
 L: Public-domain
 
+T: platform/upstream/ecryptfs-utils
+D: Base / File Systems
+B: tizen
+
 T: platform/upstream/ed
-D: Platform Development
+D: Platform Development / Build
 B: tizen
 
 T: platform/upstream/edbus
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 M: Lucas De Marchi <lucas.demarchi@intel.com>
 I: Sungho Kwak
 R: Myoungwoon Kim
@@ -8137,7 +8168,7 @@ L: Public-domain(C)
 L: BSD
 
 T: platform/upstream/edje
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 M: Jongmin Lee <jm105.lee@samsung.com>
 M: Bruno Dilly <bruno.dilly@intel.com>
 I: Sungho Kwak
@@ -8148,7 +8179,7 @@ L: GPL
 L: Public-domain(C)
 
 T: platform/upstream/eet
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 M: Jongmin Lee <jm105.lee@samsung.com>
 M: Gustavo Barbieri <gustavo.barbieri@intel.com>
 I: Sungho Kwak
@@ -8160,7 +8191,7 @@ L: Public-domain(C)
 L: Public-domain
 
 T: platform/upstream/eeze
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 M: Jongmin Lee <jm105.lee@samsung.com>
 M: Lucas De Marchi <lucas.demarchi@intel.com>
 I: Sungho Kwak
@@ -8171,17 +8202,17 @@ L: Public-domain(C)
 L: BSD
 
 T: platform/upstream/efi-shell
-D: Base
+D: Base / Hardware Adaptation
 M: william douglas <william.douglas@intel.com>
 B: tizen
 L: BSD
 
 T: platform/upstream/efl
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 B: tizen
 
 T: platform/upstream/efreet
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 M: Iván Briano <ivan.briano@intel.com>
 M: Jongmin Lee <jm105.lee@samsung.com>
 I: Sungho Kwak
@@ -8191,7 +8222,7 @@ L: FSF
 L: Public-domain(C)
 
 T: platform/upstream/eina
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 M: Jongmin Lee <jm105.lee@samsung.com>
 M: Gustavo Barbieri <gustavo.barbieri@intel.com>
 I: Sungho Kwak
@@ -8201,7 +8232,7 @@ L: LGPL-2.1+
 L: FSF
 
 T: platform/upstream/eio
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 M: Jongmin Lee <jm105.lee@samsung.com>
 M: Lucas De Marchi <lucas.demarchi@intel.com>
 I: Sungho Kwak
@@ -8211,11 +8242,11 @@ L: LGPL-2.1+
 L: FSF
 
 T: platform/upstream/eldbus
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 B: tizen
 
 T: platform/upstream/elementary
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 M: Gustavo Lima Chaves <gustavo.lima.chaves@intel.com>
 I: Sungho Kwak
 R: Myoungwoon Kim
@@ -8223,7 +8254,7 @@ B: tizen
 L: FSF
 
 T: platform/upstream/elfutils
-D: Base
+D: Base / Toolchain
 M: william douglas <william.douglas@intel.com>
 I: Bogon Kim
 R: Jungmin Cho
@@ -8232,11 +8263,11 @@ L: LGPL-3.0+
 L: GPL-3.0+
 
 T: platform/upstream/emacs
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/embryo
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 M: Jongmin Lee <jm105.lee@samsung.com>
 M: Bruno Dilly <bruno.dilly@intel.com>
 I: Sungho Kwak
@@ -8247,7 +8278,7 @@ L: FSF
 L: Public-domain(C)
 
 T: platform/upstream/emotion
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 M: Gustavo Lima Chaves <gustavo.lima.chaves@intel.com>
 I: Sungho Kwak
 R: Myoungwoon Kim
@@ -8257,13 +8288,13 @@ L: Public-domain(C)
 L: BSD
 
 T: platform/upstream/emulator-macros
-D: SDK
+D: SDK / Emulator
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 
 T: platform/upstream/enchant
-D: System
+D: System / Libraries
 B: tizen
 L: LGPL-2.1+
 L: FSF
@@ -8272,7 +8303,7 @@ L: LGPL
 L: BSD-2-Clause
 
 T: platform/upstream/enlightenment
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 M: Sangjin Lee <lsj119@samsung.com>
 M: Gustavo Barbieri <gustavo.barbieri@intel.com>
 B: tizen
@@ -8280,29 +8311,29 @@ L: FSF
 L: Public-domain
 
 T: platform/upstream/epson-inkjet-printer-escpr
-D: System
+D: Network & Connectivity / Printing
 M: Taesoo Jun <steve.jun@samsung.com>
 M: GangHeok Kim <gangheok.kim@samsung.com>
 I: Gangheok Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: GPL
 
 T: platform/upstream/epson-laser-printer-escpage
-D: System
+D: Network & Connectivity / Printing
 M: Taesoo Jun <steve.jun@samsung.com>
 M: GangHeok Kim <gangheok.kim@samsung.com>
 I: Gangheok Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: MIT-style
 L: GPL
 L: FSF
 
 T: platform/upstream/ethumb
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 M: Jongmin Lee <jm105.lee@samsung.com>
 M: Gustavo Lima Chaves <gustavo.lima.chaves@intel.com>
 I: Sungho Kwak
@@ -8312,7 +8343,7 @@ L: FSF
 L: LGPL-2.1+
 
 T: platform/upstream/evas
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 M: Iván Briano <ivan.briano@intel.com>
 M: Jongmin Lee <jm105.lee@samsung.com>
 I: Sungho Kwak
@@ -8321,23 +8352,23 @@ B: tizen
 L: FSF
 
 T: platform/upstream/evolution-data-server
-D: Social & Content
+D: Social & Content / GNOME
 M: Patrick Ohly <patrick.ohly@intel.com>
 B: tizen
 
 T: platform/upstream/expat
-D: Base
+D: Base / Libraries
 B: tizen
 L: See-file(COPYING)
 L: MIT-style
 L: Trademark-ref
 
 T: platform/upstream/expect
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/expedite
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 M: Iván Briano <ivan.briano@intel.com>
 M: Jongmin Lee <jm105.lee@samsung.com>
 I: Sungho Kwak
@@ -8348,23 +8379,23 @@ L: FSF
 L: BSD
 
 T: platform/upstream/fakeroot
-D: Platform Development
+D: Platform Development / Utilities
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 
 T: platform/upstream/fdupes
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/ffmpeg
-D: Multimedia
+D: Multimedia / Codec
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 
 T: platform/upstream/file
-D: Base
+D: Base / Utilities
 M: Patrick McCarty <patrick.mccarty@intel.com>
 B: tizen
 L: BSD-style
@@ -8372,7 +8403,7 @@ L: FSF
 L: BSD-2-Clause
 
 T: platform/upstream/filesystem
-D: Base
+D: Base / File Systems
 M: Patrick McCarty <patrick.mccarty@intel.com>
 I: Bogon Kim
 R: Jungmin Cho
@@ -8380,11 +8411,11 @@ B: tizen
 L: Public-domain
 
 T: platform/upstream/findutils
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/fixesproto
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: MIT-style
 L: XFree86
@@ -8393,26 +8424,26 @@ L: Public-domain
 L: X11
 
 T: platform/upstream/flac
-D: Multimedia
+D: Multimedia / Audio FW
 B: tizen
 
 T: platform/upstream/flex
-D: Platform Development
+D: Platform Development / Compiler
 B: tizen
 
 T: platform/upstream/folks
-D: Social & Content
+D: Social & Content / GNOME
 M: Patrick Ohly <patrick.ohly@intel.com>
 B: tizen
 
 T: platform/upstream/font-util
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Fonts
 B: tizen
 L: Unicode
 L: MIT-style
 
 T: platform/upstream/fontcacheproto
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: BSD-2-Clause
 L: X11
@@ -8420,12 +8451,12 @@ L: Public-domain
 L: FSF
 
 T: platform/upstream/fontconfig
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Fonts
 B: tizen
 L: MIT-style
 
 T: platform/upstream/fontsproto
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: OpenGroup
 L: BSD-style
@@ -8434,41 +8465,45 @@ L: X11
 L: XFree86
 
 T: platform/upstream/freealut
-D: Multimedia
+D: Multimedia / Audio FW
 M: Byungwook Jang <bw.jang@samsung.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: FSF
 L: LGPL
 
 T: platform/upstream/freeglut
-D: Graphics & UI Framework
+D: Graphics & UI Framework / GL
 B: tizen
 L: MIT-style
 L: FSF
 
+T: platform/upstream/freerdp
+D: Graphics & UI Framework / Wayland Window System
+B: tizen
+
 T: platform/upstream/freetype2
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Fonts
 B: tizen
 L: FTL
 
 T: platform/upstream/fribidi
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Fonts
 B: tizen
 L: LGPL-2.1+
 
 T: platform/upstream/fsync
-D: System
+D: System / Utilities
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: GPL
 L: UnclassifiedLicense
 L: GPL-2.0
 
 T: platform/upstream/fuse
-D: System
+D: Base / File Systems
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Hyungdeuk Kim
 B: tizen
@@ -8477,7 +8512,7 @@ L: GPL
 L: FSF
 
 T: platform/upstream/gawk
-D: Base
+D: Base / Utilities
 M: Patrick McCarty <patrick.mccarty@intel.com>
 I: Seokhyun Kim
 R: Jungmin Cho
@@ -8488,7 +8523,7 @@ L: Public-domain
 L: GPL
 
 T: platform/upstream/gcc
-D: Base
+D: Base / Toolchain
 M: Junfeng dong <junfeng.dong@intel.com>
 I: Jaemin Park
 R: Jungmin Cho
@@ -8497,7 +8532,7 @@ L: GPL-3.0+
 L: GPL-3.0
 
 T: platform/upstream/gcc47
-D: Base
+D: Base / Toolchain
 M: Junfeng dong <junfeng.dong@intel.com>
 B: tizen
 L: GPL-3.0+
@@ -8507,35 +8542,35 @@ L: GPL-3.0-with-GCC-exception
 L: Gov't-rights
 
 T: platform/upstream/gcc48
-D: Base
+D: Base / Toolchain
 B: tizen
 
 T: platform/upstream/gccmakedep
-D: Base
+D: Base / Toolchain
 B: tizen
 
 T: platform/upstream/gcd
-D: System
+D: System / Libraries
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Moochang Kim
 R: Jungmin Cho
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 L: MIT-style
 L: BSD-style
 
 T: platform/upstream/gcr
-D: Security
+D: Security / Utilities
 B: tizen
 
 T: platform/upstream/gdb
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/gdbm
-D: Base
+D: Base / Libraries
 M: Junfeng dong <junfeng.dong@intel.com>
 I: Moochang Kim
 R: Jungmin Cho
@@ -8545,20 +8580,20 @@ L: GPL
 L: FSF
 
 T: platform/upstream/gdk-pixbuf
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Buffer Management
 B: tizen
 L: LGPL-2.0+
 L: FSF
 
 T: platform/upstream/geoclue
-D: Location
+D: Location / Geolocation
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: LGPL-2.0+
 
 T: platform/upstream/gettext
-D: Base
+D: System / Libraries
 M: Junfeng dong <junfeng.dong@intel.com>
 I: Seokhyun Kim
 R: Jungmin Cho
@@ -8568,33 +8603,33 @@ L: LGPL-2.0+
 L: FSF
 
 T: platform/upstream/giflib
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Imaging
 B: tizen
 L: FSF
 
 T: platform/upstream/git
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/glib
-D: Base
+D: Base / IPC
 B: tizen
 
 T: platform/upstream/glib-networking
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
 M: zhang zhengguang <zhengguang.zhang@intel.com>
 M: Taesoo Jun <steve.jun@samsung.com>
 B: tizen
 L: LGPL-2.0+
 
 T: platform/upstream/glibc
-D: Base
+D: Base / Toolchain
 M: Junfeng dong <junfeng.dong@intel.com>
 B: tizen
 L: LGPL-2.1+
 
 T: platform/upstream/glproto
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: SGI-B-2.0
 L: X11
@@ -8602,13 +8637,13 @@ L: Public-domain
 L: FSF
 
 T: platform/upstream/gmp
-D: Base
+D: Base / Toolchain
 M: Junfeng dong <junfeng.dong@intel.com>
 B: tizen
 L: LGPL-3.0+
 
 T: platform/upstream/gnome-common
-D: System
+D: Platform Development / Utilities
 M: Patrick McCarty <patrick.mccarty@intel.com>
 B: tizen
 L: FSF
@@ -8619,7 +8654,7 @@ L: X11
 L: LGPL-2.1
 
 T: platform/upstream/gnu-efi
-D: Base
+D: Base / Hardware Adaptation
 M: Junfeng dong <junfeng.dong@intel.com>
 B: tizen
 L: BSD-3-Clause
@@ -8627,7 +8662,7 @@ L: GPL
 L: BSD-2-Clause
 
 T: platform/upstream/gnutls
-D: Security
+D: Security / Utilities
 M: Casey Schaufler <casey.schaufler@intel.com>
 B: tizen
 L: BSD-lite
@@ -8636,70 +8671,82 @@ L: LGPL-3.0+
 L: FSF
 
 T: platform/upstream/gobject-introspection
-D: System
+D: System / Libraries
 B: tizen
 L: LGPL-2.0+
 L: GPL
 
 T: platform/upstream/google-droid-fonts
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Fonts
 B: tizen
 L: Apache-2.0
 
 T: platform/upstream/gperf
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/gpg2
-D: Security
+D: Security / Utilities
 M: Casey Schaufler <casey.schaufler@intel.com>
 B: tizen
 L: GPL-3.0+
 L: FSF
 
 T: platform/upstream/gpgme
-D: Security
+D: Security / Utilities
 M: Casey Schaufler <casey.schaufler@intel.com>
 B: tizen
 L: LGPL-2.1+
 L: FSF
 
 T: platform/upstream/gptfdisk
-D: Base
+D: Base / File Systems
 M: william douglas <william.douglas@intel.com>
 B: tizen
 L: GPL-2.0
 L: GPL
 
 T: platform/upstream/grep
-D: Base
+D: Base / Utilities
 B: tizen
 L: GPL-3.0+
 L: FSF
 L: GPL-3.0
 
 T: platform/upstream/groff
-D: Platform Development
+D: Platform Development / Utilities
+B: tizen
+
+T: platform/upstream/gsignond
+D: Security / Accounts
+B: tizen
+
+T: platform/upstream/gsignond-plugin-oauth
+D: Security / Accounts
+B: tizen
+
+T: platform/upstream/gsignond-plugin-sasl
+D: Security / Accounts
 B: tizen
 
 T: platform/upstream/gst-common
-D: Multimedia
+D: Multimedia / Media Service
 B: tizen
 
 T: platform/upstream/gst-libav
-D: Multimedia
+D: Multimedia / Codec
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 
 T: platform/upstream/gst-omx
-D: Multimedia
+D: Multimedia / Media Service
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 
 T: platform/upstream/gst-plugins-bad
-D: Multimedia
+D: Multimedia / Codec
 M: Heechul Jeon <heechul.jeon@samsung.com>
 M: YAN YIN <yan.yin@intel.com>
 I: Byungwook Jang
@@ -8708,7 +8755,7 @@ L: LGPL-2.0+
 L: MIT-style
 
 T: platform/upstream/gst-plugins-base
-D: Multimedia
+D: Multimedia / Codec
 M: Heechul Jeon <heechul.jeon@samsung.com>
 M: YAN YIN <yan.yin@intel.com>
 I: Byungwook Jang
@@ -8716,7 +8763,7 @@ B: tizen
 L: LGPL-2.0+
 
 T: platform/upstream/gst-plugins-good
-D: Multimedia
+D: Multimedia / Codec
 M: Heechul Jeon <heechul.jeon@samsung.com>
 M: YAN YIN <yan.yin@intel.com>
 I: Byungwook Jang
@@ -8724,11 +8771,11 @@ B: tizen
 L: LGPL-2.0+
 
 T: platform/upstream/gst-plugins-ugly
-D: Multimedia
+D: Multimedia / Codec
 B: tizen
 
 T: platform/upstream/gstreamer
-D: Multimedia
+D: Multimedia / Media Service
 M: Heechul Jeon <heechul.jeon@samsung.com>
 M: YAN YIN <yan.yin@intel.com>
 I: Byungwook Jang
@@ -8736,7 +8783,7 @@ B: tizen
 L: LGPL-2.0+
 
 T: platform/upstream/gstreamer-vaapi
-D: Multimedia
+D: Multimedia / Codec
 M: halley zhao <halley.zhao@intel.com>
 M: Peter Zhu <peter.j.zhu@intel.com>
 B: tizen
@@ -8744,22 +8791,38 @@ L: LGPL-2.1+
 L: LGPL-2.0+
 
 T: platform/upstream/gtest
-D: Base
-B: tizen_2.1
+D: Platform Development / Utilities
 B: tizen
+B: tizen_2.1
 
 T: platform/upstream/gtk-doc
-D: Platform Development
+D: Platform Development / Utilities
+B: tizen
+
+T: platform/upstream/gumd
+D: System / User Management
 B: tizen
 
 T: platform/upstream/gummiboot
-D: Base
+D: Base / Hardware Adaptation
 M: william douglas <william.douglas@intel.com>
 B: tizen
 L: LGPL-2.1+
 
+T: platform/upstream/GUPnP
+D: Automotive / DLNA
+B: tizen
+
+platform/upstream/GUPnP-AV
+D: Automotive / DLNA
+B: tizen
+
+platform/upstream/GUPnP-DLNA
+D: Automotive / DLNA
+B: tizen
+
 T: platform/upstream/gzip
-D: Base
+D: Base / Compression
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Piotr Bereza
 R: Walyong Cho
@@ -8768,45 +8831,45 @@ L: GPL-3.0+
 L: FSF
 
 T: platform/upstream/hardlink
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/harfbuzz
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Fonts
 B: tizen
 L: BSD-style
 
 T: platform/upstream/help2man
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/hostname
-D: Base
+D: Base / Utilities
 B: tizen
 L: GPL
 L: GPL-2.0
 
 T: platform/upstream/hplip
-D: System
+D: Network & Connectivity / Printing
 M: Taesoo Jun <steve.jun@samsung.com>
 M: GangHeok Kim <gangheok.kim@samsung.com>
 I: Gangheok Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: MIT-style
 L: GPL
 L: BSD-3-Clause
 
 T: platform/upstream/hunspell
-D: System
+D: Platform Development / Utilities
 B: tizen
 L: LGPL-2.0+
 L: FSF
 L: GPL
 
 T: platform/upstream/hwdata
-D: System
+D: System / Libraries
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Piotr Bereza
 R: Walyong Cho
@@ -8818,17 +8881,25 @@ L: Artistic-1.0
 L: GPL-2.0+
 
 T: platform/upstream/ibus
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Input Framework
+B: tizen
+
+T: platform/upstream/ibus-hangul
+D: Graphics & UI Framework / Input Framework
+B: tizen
+
+T: platform/upstream/ibus-libpinyin
+D: Graphics & UI Framework / Input Framework
 B: tizen
 
 T: platform/upstream/icecream
-D: Platform Development
+D: Platform Development / Compiler
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 
 T: platform/upstream/icu
-D: App Framework
+D: App Framework / Application Utility
 M: hokwon Song <hokwon.song@samsung.com>
 I: Hokwon Song
 B: tizen
@@ -8840,15 +8911,15 @@ D: Graphics & UI Framework
 B: tizen
 
 T: platform/upstream/image-configurations
-D: Platform Development
+D: Platform Development / Build
 B: tizen
 
 T: platform/upstream/imake
-D: Platform Development
+D: Platform Development / Compiler
 B: tizen
 
 T: platform/upstream/iniparser
-D: System
+D: System / Libraries
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Piotr Bereza
 R: Walyong Cho
@@ -8857,7 +8928,7 @@ L: MIT
 L: MIT-style
 
 T: platform/upstream/inputproto
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: OpenGroup
 L: BSD-style
@@ -8866,18 +8937,18 @@ L: FSF
 L: X11
 
 T: platform/upstream/intltool
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/iproute2
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
 M: zhang zhengguang <zhengguang.zhang@intel.com>
 M: Taesoo Jun <steve.jun@samsung.com>
 B: tizen
 L: GPL
 
 T: platform/upstream/iptables
-D: Security
+D: Security / Utilities
 M: zhang zhengguang <zhengguang.zhang@intel.com>
 M: Taesoo Jun <steve.jun@samsung.com>
 I: Jaehyun Kim
@@ -8887,7 +8958,7 @@ L: GPL-2.0
 L: FSF
 
 T: platform/upstream/iputils
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
 M: zhang zhengguang <zhengguang.zhang@intel.com>
 M: Taesoo Jun <steve.jun@samsung.com>
 B: tizen
@@ -8897,69 +8968,73 @@ L: GPL-2.0
 L: GPL
 
 T: platform/upstream/isl
-D: Base
+D: Base / Libraries
 B: tizen
 
 T: platform/upstream/iso-codes
-D: Platform Development
+D: Platform Development / Utilities
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 
 T: platform/upstream/iso_ent
-D: System
+D: Platform Development / Build
 B: tizen
 
 T: platform/upstream/jasper
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Imaging
 B: tizen
 L: MIT-style
 L: FSF
 
+T: platform/upstream/js
+D: Web Framework / Web Engine
+B: tizen
+
 T: platform/upstream/json-c
-D: Base
+D: System / Libraries
 B: tizen
 L: MIT-style
 L: MIT
 
 T: platform/upstream/json-glib
-D: Base
+D: Base / Utilities
 B: tizen
 L: FSF
 L: LGPL-2.1+
 
 T: platform/upstream/kbd
-D: Base
+D: Base / Utilities
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 B: tizen
 L: GPL-with-autoconf-exception
 L: GPL
 
 T: platform/upstream/kbproto
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: BSD-style
 L: FSF
 
 T: platform/upstream/kernel-adaptation-pc
-D: Base
+D: Base / Hardware Adaptation
 M: william douglas <william.douglas@intel.com>
 B: tizen
 L: GPL
 L: GPL-2.0
 
 T: platform/upstream/keyutils
-D: Security
+D: Security / Utilities
 M: Casey Schaufler <casey.schaufler@intel.com>
 B: tizen
 L: GPL
 
 T: platform/upstream/kickstarter
-D: Platform Development
+D: Platform Development / Build
 B: tizen
 
 T: platform/upstream/kmod
-D: Base
+D: Base / Utilities
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Piotr Bereza
 R: Walyong Cho
@@ -8968,38 +9043,38 @@ L: GPL
 L: LGPL-2.1+
 
 T: platform/upstream/krb5
-D: Security
+D: Security / Cryptography
 M: Casey Schaufler <casey.schaufler@intel.com>
 B: tizen
 L: BSD-style
 
 T: platform/upstream/lcms2
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Imaging
 B: tizen
 L: MIT-style
 L: FSF
 
 T: platform/upstream/less
-D: Social & Content
+D: Base / Utilities
 B: tizen
 
 T: platform/upstream/leveldb
-D: System
+D: App Framework / Configuration
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 R: Kim Jiyeon
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: BSD
 
 T: platform/upstream/libGLU
-D: Graphics & UI Framework
+D: Graphics & UI Framework / GL
 B: tizen
 L: SGI-B-2.0
 L: SGI-B-1.1
 
 T: platform/upstream/libICE
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Sung-jin Park
 B: tizen
@@ -9007,7 +9082,7 @@ L: OpenGroup
 L: FSF
 
 T: platform/upstream/libSM
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Sung-jin Park
 B: tizen
@@ -9016,7 +9091,7 @@ L: MIT-style
 L: FSF
 
 T: platform/upstream/libX11
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Sung-jin Park
 B: tizen
@@ -9025,7 +9100,7 @@ L: OpenGroup
 L: X11-style
 
 T: platform/upstream/libXScrnSaver
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Sung-jin Park
 B: tizen
@@ -9035,7 +9110,7 @@ L: X11
 L: XFree86
 
 T: platform/upstream/libXau
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Sung-jin Park
 B: tizen
@@ -9044,7 +9119,7 @@ L: MIT-style
 L: FSF
 
 T: platform/upstream/libXaw
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Sung-jin Park
 B: tizen
@@ -9052,7 +9127,7 @@ L: OpenGroup
 L: BSD-style
 
 T: platform/upstream/libXcomposite
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Sung-jin Park
 B: tizen
@@ -9060,7 +9135,7 @@ L: MIT-style
 L: FSF
 
 T: platform/upstream/libXcursor
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Sung-jin Park
 B: tizen
@@ -9068,7 +9143,7 @@ L: MIT-style
 L: FSF
 
 T: platform/upstream/libXdamage
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Sung-jin Park
 B: tizen
@@ -9076,7 +9151,7 @@ L: MIT-style
 L: FSF
 
 T: platform/upstream/libXdmcp
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Sung-jin Park
 B: tizen
@@ -9084,7 +9159,7 @@ L: OpenGroup
 L: FSF
 
 T: platform/upstream/libXext
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Sung-jin Park
 B: tizen
@@ -9092,7 +9167,7 @@ L: MIT-style
 L: OpenGroup
 
 T: platform/upstream/libXfixes
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Sung-jin Park
 B: tizen
@@ -9101,7 +9176,7 @@ L: XFree86
 L: FSF
 
 T: platform/upstream/libXfont
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Sung-jin Park
 B: tizen
@@ -9110,7 +9185,7 @@ L: MIT-style
 L: FSF
 
 T: platform/upstream/libXfontcache
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 B: tizen
 L: MIT-style
@@ -9119,7 +9194,7 @@ L: BSD-2-Clause
 L: XFree86
 
 T: platform/upstream/libXft
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Sung-jin Park
 B: tizen
@@ -9127,7 +9202,7 @@ L: MIT-style
 L: FSF
 
 T: platform/upstream/libXgesture
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Sung-jin Park
 B: tizen
@@ -9135,7 +9210,7 @@ L: MIT-style
 L: GPL-2.0
 
 T: platform/upstream/libXi
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Sung-jin Park
 B: tizen
@@ -9144,7 +9219,7 @@ L: BSD-style
 L: MIT-style
 
 T: platform/upstream/libXinerama
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Sung-jin Park
 B: tizen
@@ -9153,18 +9228,18 @@ L: FSF
 L: OpenGroup
 
 T: platform/upstream/libXmu
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Sung-jin Park
 B: tizen
 L: OpenGroup
 
 T: platform/upstream/libXp
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 
 T: platform/upstream/libXpm
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Sung-jin Park
 B: tizen
@@ -9172,7 +9247,7 @@ L: MIT-style
 L: FSF
 
 T: platform/upstream/libXrandr
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Sung-jin Park
 B: tizen
@@ -9180,7 +9255,7 @@ L: MIT-style
 L: FSF
 
 T: platform/upstream/libXrender
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Sung-jin Park
 B: tizen
@@ -9188,7 +9263,7 @@ L: MIT-style
 L: FSF
 
 T: platform/upstream/libXres
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Sung-jin Park
 B: tizen
@@ -9196,7 +9271,7 @@ L: MIT-style
 L: FSF
 
 T: platform/upstream/libXt
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Sung-jin Park
 B: tizen
@@ -9206,7 +9281,7 @@ L: BSD-style
 L: MIT-style
 
 T: platform/upstream/libXtst
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Sung-jin Park
 B: tizen
@@ -9216,7 +9291,7 @@ L: OpenGroup
 L: X11
 
 T: platform/upstream/libXv
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Sung-jin Park
 B: tizen
@@ -9225,7 +9300,7 @@ L: MIT-style
 L: BSD-style
 
 T: platform/upstream/libXvMC
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Sung-jin Park
 B: tizen
@@ -9233,7 +9308,7 @@ L: FSF
 L: MIT-style
 
 T: platform/upstream/libXxf86dga
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Sung-jin Park
 B: tizen
@@ -9242,7 +9317,7 @@ L: XFree86
 L: MIT-style
 
 T: platform/upstream/libXxf86misc
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 B: tizen
 L: FSF
@@ -9250,7 +9325,7 @@ L: XFree86
 L: MIT-style
 
 T: platform/upstream/libXxf86vm
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Sung-jin Park
 B: tizen
@@ -9258,12 +9333,12 @@ L: MIT-style
 L: FSF
 
 T: platform/upstream/libaio
-D: System
+D: Base / Libraries
 B: tizen
 L: LGPL-2.0+
 
 T: platform/upstream/libarchive
-D: Base
+D: System / Libraries
 M: Patrick McCarty <patrick.mccarty@intel.com>
 I: Seokhyun Kim
 R: Jungmin Cho
@@ -9271,7 +9346,7 @@ B: tizen
 L: BSD-2-Clause
 
 T: platform/upstream/libassuan
-D: Security
+D: Security / Utilities
 M: Casey Schaufler <casey.schaufler@intel.com>
 B: tizen
 L: LGPL-2.1+
@@ -9279,28 +9354,28 @@ L: FSF
 L: LGPL-3.0+
 
 T: platform/upstream/libasyncns
-D: System
+D: Base / Libraries
 B: tizen
 L: LGPL-2.1+
 L: FSF
 
 T: platform/upstream/libatasmart
-D: Base
+D: Base / Libraries
 B: tizen
 
 T: platform/upstream/libav
-D: Multimedia
+D: Multimedia / Codec
 B: tizen
 
 T: platform/upstream/libbullet
-D: Graphics & UI Framework
+D: System / Libraries
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Zlib
 
 T: platform/upstream/libcap
-D: Base
+D: Base / Libraries
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Piotr Bereza
 R: Chanho Park
@@ -9313,7 +9388,7 @@ L: GPL-2.0
 L: BSD
 
 T: platform/upstream/libcap-ng
-D: Base
+D: Base / Libraries
 M: Patrick McCarty <patrick.mccarty@intel.com>
 B: tizen
 L: LGPL-2.1+
@@ -9321,7 +9396,7 @@ L: GPL
 L: FSF
 
 T: platform/upstream/libdaemon
-D: Base
+D: Base / Libraries
 M: Taesoo Jun <steve.jun@samsung.com>
 M: GangHeok Kim <gangheok.kim@samsung.com>
 I: Gangheok Kim
@@ -9330,34 +9405,34 @@ L: LGPL-2.1+
 L: FSF
 
 T: platform/upstream/libdatrie
-D: Base
+D: System / Libraries
 B: tizen
 L: LGPL-2.1+
 L: FSF
 
 T: platform/upstream/libdrm
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Buffer Management
 M: Sangjin Lee <lsj119@samsung.com>
 I: Sung-jin Park
 B: tizen
 L: MIT-style
 
 T: platform/upstream/libedit
-D: Base
+D: System / Libraries
 B: tizen
 
 T: platform/upstream/libelf0
-D: Base
+D: Base / Toolchain
 B: tizen
 L: LGPL-2.0+
 
 T: platform/upstream/libevent
-D: Base
+D: Base / Libraries
 B: tizen
 L: BSD-2-Clause
 
 T: platform/upstream/libexif
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Imaging
 M: JongHyuk Choi <jhchoi.choi@samsung.com>
 I: Byungwook Jang
 B: tizen
@@ -9365,19 +9440,19 @@ L: LGPL-2.0+
 L: UnclassifiedLicense
 
 T: platform/upstream/libffi
-D: Base
+D: System / Libraries
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 
 T: platform/upstream/libflac
 D: Base
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 
 T: platform/upstream/libfontenc
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Fonts
 M: Sangjin Lee <lsj119@samsung.com>
 I: Sung-jin Park
 B: tizen
@@ -9385,7 +9460,7 @@ L: MIT-style
 L: FSF
 
 T: platform/upstream/libgcrypt
-D: Security
+D: Security / Cryptography
 M: Casey Schaufler <casey.schaufler@intel.com>
 I: Gwangho Hwang
 R: Jungmin Cho
@@ -9394,26 +9469,34 @@ L: LGPL-2.1+
 L: FSF
 
 T: platform/upstream/libgee
-D: Platform Development
+D: Automotive / DLNA
 M: Philippe Coval <philippe.coval@open.eurogiciel.org>
 B: tizen
 
 T: platform/upstream/libgpg-error
-D: Security
+D: Security / Utilities
 M: Casey Schaufler <casey.schaufler@intel.com>
 I: Kyungwoo Noh
 B: tizen
 L: FSF
 L: LGPL-2.1+
 
+T: platform/upstream/libgsasl
+D: Security / Authentication
+B: tizen
+
+T: platform/upstream/libgsignon-glib
+D: Security / Accounts
+B: tizen
+
 T: platform/upstream/libical
-D: Social & Content
+D: Social & Content / GNOME
 B: tizen
 L: MPL-1.0
 L: LGPL-2.1
 
 T: platform/upstream/libidn
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
 M: zhang zhengguang <zhengguang.zhang@intel.com>
 M: Taesoo Jun <steve.jun@samsung.com>
 I: Jaesung Ku
@@ -9424,25 +9507,25 @@ L: BSD-lite
 L: LGPL-3.0+
 
 T: platform/upstream/libijs
-D: System
+D: Multimedia / Imaging
 M: Taesoo Jun <steve.jun@samsung.com>
 M: GangHeok Kim <gangheok.kim@samsung.com>
 I: Gangheok Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: MIT-style
 L: MIT
 
 T: platform/upstream/libiri
-D: System
+D: System / Libraries
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Yunchan Cho
 B: tizen
 L: BSD-2-Clause
 
 T: platform/upstream/libjpeg-turbo
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Imaging
 M: JongHyuk Choi <jhchoi.choi@samsung.com>
 M: yan zhang <yan.y.zhang@intel.com>
 I: Byungwook Jang
@@ -9451,12 +9534,12 @@ L: IJG
 L: BSD-3-Clause
 
 T: platform/upstream/libjpeg6
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Imaging
 B: tizen
 L: IJG
 
 T: platform/upstream/libksba
-D: Security
+D: Security / Utilities
 M: Casey Schaufler <casey.schaufler@intel.com>
 B: tizen
 L: LGPL-3.0+
@@ -9464,22 +9547,26 @@ L: GPL-3.0+
 L: FSF
 
 T: platform/upstream/libmnl
-D: Security
+D: Network & Connectivity / Data Network
 M: Arron Wang <arron.wang@intel.com>
 B: tizen
 L: Public-domain
 L: FSF
 L: LGPL-2.1+
 
+T: platform/upstream/libmp4v2
+D: Multimedia / Codec
+B: tizen
+
 T: platform/upstream/libnetfilter_conntrack
-D: Security
+D: Network & Connectivity / Data Network
 M: zhang zhengguang <zhengguang.zhang@intel.com>
 B: tizen
 L: GPL
 L: FSF
 
 T: platform/upstream/libnfnetlink
-D: Security
+D: Network & Connectivity / Data Network
 M: zhang zhengguang <zhengguang.zhang@intel.com>
 B: tizen
 L: FSF
@@ -9488,28 +9575,28 @@ L: X11
 L: Public-domain
 
 T: platform/upstream/libnl1
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
 M: Taesoo Jun <steve.jun@samsung.com>
 B: tizen
 L: LGPL-2.1
 
 T: platform/upstream/libnl2
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
 M: zhang zhengguang <zhengguang.zhang@intel.com>
 M: Taesoo Jun <steve.jun@samsung.com>
 I: Gibyoung Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: LGPL-2.1
 
 T: platform/upstream/libnl3
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
 B: tizen
 L: LGPL-2.1
 
 T: platform/upstream/libogg
-D: Multimedia
+D: Multimedia / Codec
 M: vivian zhang <vivian.zhang@intel.com>
 M: Byungwook Jang <bw.jang@samsung.com>
 I: Byungwook Jang
@@ -9520,7 +9607,7 @@ L: Trademark-ref
 L: Public-domain
 
 T: platform/upstream/liboil
-D: System
+D: System / Libraries
 M: JongHyuk Choi <jhchoi.choi@samsung.com>
 I: Byungwook Jang
 B: tizen
@@ -9528,13 +9615,13 @@ L: BSD-2-Clause
 L: FSF
 
 T: platform/upstream/libpcap
-D: Base
+D: Network & Connectivity / Data Network
 B: tizen
 L: BSD
 L: BSD-2-Clause
 
 T: platform/upstream/libpciaccess
-D: Base
+D: Graphics & UI Framework / Buffer Management
 M: Sangjin Lee <lsj119@samsung.com>
 I: Sung-jin Park
 B: tizen
@@ -9542,18 +9629,22 @@ L: MIT-style
 L: FSF
 
 T: platform/upstream/libphonenumber
-D: Social & Content
+D: Social & Content / GNOME
 M: Patrick Ohly <patrick.ohly@intel.com>
 B: tizen
 
+T: platform/upstream/libpinyin
+D: Graphics & UI Framework / Input Framework
+B: tizen
+
 T: platform/upstream/libpipeline
-D: Base
+D: System / Libraries
 B: tizen
 L: GPL-3.0+
 L: FSF
 
 T: platform/upstream/libpng
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Imaging
 M: JongHyuk Choi <jhchoi.choi@samsung.com>
 I: Byungwook Jang
 B: tizen
@@ -9564,7 +9655,7 @@ L: Zlib
 L: Dual-license
 
 T: platform/upstream/libpthread-stubs
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Boram Park
 B: tizen
@@ -9575,12 +9666,12 @@ L: FSF
 
 T: platform/upstream/libremix
 D: Base
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 
 T: platform/upstream/libsecret
-D: Security
+D: Security / Utilities
 B: tizen
 
 T: platform/upstream/libsmi
@@ -9588,7 +9679,7 @@ D: System
 B: tizen
 
 T: platform/upstream/libsndfile
-D: Multimedia
+D: Multimedia / Audio FW
 M: Byungwook Jang <bw.jang@samsung.com>
 I: Byungwook Jang
 B: tizen
@@ -9596,18 +9687,18 @@ L: LGPL-2.1+
 L: GPL
 
 T: platform/upstream/libsolv
-D: Base
+D: Base / Package Management
 B: tizen
 L: BSD
 
 T: platform/upstream/libsoup
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
 M: Taesoo Jun <steve.jun@samsung.com>
 B: tizen
 L: LGPL-2.0+
 
 T: platform/upstream/libtasn1
-D: Security
+D: Security / Utilities
 M: Arron Wang <arron.wang@intel.com>
 B: tizen
 L: GPL-3.0+
@@ -9616,34 +9707,34 @@ L: BSD-lite
 L: LGPL-2.1+
 
 T: platform/upstream/libthai
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Fonts
 B: tizen
 L: LGPL-2.1+
 L: FSF
 
 T: platform/upstream/libtheora
-D: Multimedia
+D: Multimedia / Media Playback
 M: Byungwook Jang <bw.jang@samsung.com>
 I: Byungwook Jang
 B: tizen
 L: BSD
 
 T: platform/upstream/libtirpc
-D: System
+D: System / Libraries
 B: tizen
 
 T: platform/upstream/libtool
-D: Platform Development
+D: Platform Development / Compiler
 B: tizen
 
 T: platform/upstream/libunistring
-D: System
+D: Base / Libraries
 B: tizen
 L: LGPL-3.0+
 L: GPL-3.0+
 
 T: platform/upstream/libunwind
-D: Base
+D: Base / Libraries
 M: william douglas <william.douglas@intel.com>
 I: Seokhyun Kim
 R: Jungmin Cho
@@ -9651,7 +9742,7 @@ B: tizen
 L: MIT-style
 
 T: platform/upstream/libusb
-D: Base
+D: Base / Device Management
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Taeyoung Kim
 B: tizen
@@ -9659,25 +9750,25 @@ L: LGPL-2.1+
 L: FSF
 
 T: platform/upstream/libusb-compat
-D: System
+D: Base / Device Management
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Taeyoung Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: LGPL-2.1+
 L: FSF
 L: BSD
 
 T: platform/upstream/libva
-D: Multimedia
+D: Multimedia / Codec
 M: halley zhao <halley.zhao@intel.com>
 M: hj kim <backto.kim@samsung.com>
 B: tizen
 L: MIT-style
 
 T: platform/upstream/libva-intel-driver
-D: Multimedia
+D: Multimedia / Codec
 M: halley zhao <halley.zhao@intel.com>
 M: Peter Zhu <peter.j.zhu@intel.com>
 B: tizen
@@ -9686,7 +9777,7 @@ L: MIT-style
 L: Apache-2.0
 
 T: platform/upstream/libvorbis
-D: Multimedia
+D: Multimedia / Audio FW
 M: vivian zhang <vivian.zhang@intel.com>
 M: Byungwook Jang <bw.jang@samsung.com>
 I: Byungwook Jang
@@ -9695,7 +9786,7 @@ L: BSD
 L: FSF
 
 T: platform/upstream/libvpx
-D: Multimedia
+D: Multimedia / Codec
 M: YAN YIN <yan.yin@intel.com>
 M: Byungwook Jang <bw.jang@samsung.com>
 B: tizen
@@ -9704,7 +9795,7 @@ L: GPL
 L: Google-BSD
 
 T: platform/upstream/libwbxml2
-D: System
+D: System / Libraries
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 R: Woojin Yun
 B: tizen
@@ -9713,14 +9804,14 @@ L: LGPL-2.1+
 L: See-file(COPYING)
 
 T: platform/upstream/libwsbm
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Buffer Management
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: MIT-style
 
 T: platform/upstream/libxcb
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Boram Park
 B: tizen
@@ -9728,7 +9819,7 @@ L: MIT-style
 L: FSF
 
 T: platform/upstream/libxkbcommon
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Soochan Lim
 B: tizen
@@ -9736,7 +9827,7 @@ L: MIT-style
 L: BSD-style
 
 T: platform/upstream/libxkbfile
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Sung-jin Park
 B: tizen
@@ -9745,20 +9836,20 @@ L: MIT-style
 L: FSF
 
 T: platform/upstream/libxml2
-D: Base
+D: Base / Libraries
 B: tizen
 L: See-doc(OTHER)
 L: MIT-style
 
 T: platform/upstream/libxslt
-D: Base
+D: Base / Libraries
 B: tizen
 L: See-doc(OTHER)
 L: FSF
 L: Trademark-ref
 
 T: platform/upstream/libzio
-D: Base
+D: Base / Compression
 B: tizen
 L: GPL
 L: GPL-2.0
@@ -9766,12 +9857,12 @@ L: Public-domain
 L: GPL-2.0+
 
 T: platform/upstream/libzip
-D: Base
+D: Base / Compression
 B: tizen
 L: BSD-2-Clause
 
 T: platform/upstream/libzypp
-D: Base
+D: Base / Package Management
 M: Junfeng dong <junfeng.dong@intel.com>
 B: tizen
 L: YaST(SuSE)
@@ -9779,22 +9870,22 @@ L: GPL-2.0
 L: GPL
 
 T: platform/upstream/libzypp-bindings
-D: Platform Development
+D: Base / Package Management
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 
 T: platform/upstream/lightmediascanner
-D: Multimedia
+D: Multimedia / Media Content
 B: tizen
 
 T: platform/upstream/links
-D: System
+D: Platform Development / Utilities
 B: tizen
 L: GPL
 
 T: platform/upstream/linux-firmware
-D: System
+D: Base / Hardware Adaptation
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 B: tizen
 L: GPL
@@ -9803,11 +9894,11 @@ L: BSD-style
 L: MIT-style
 
 T: platform/upstream/linux-glibc-devel
-D: Platform Development
+D: Base / Utilities
 B: tizen
 
 T: platform/upstream/lksctp-tools
-D: System
+D: Base / Libraries
 B: tizen
 L: GPL
 L: FSF
@@ -9815,30 +9906,34 @@ L: LGPL-2.1
 L: UnclassifiedLicense
 
 T: platform/upstream/llvm
-D: Platform Development
+D: Platform Development / Compiler
+B: tizen
+
+T: platform/upstream/lrzsz
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/lsb
-D: Base
+D: Base / Startup
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Piotr Bereza
 R: Walyong Cho
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: GPL-2.0
 L: BSD-2-Clause
 
 T: platform/upstream/lsof
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/ltrace
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/lua
-D: Base
+D: Base / Libraries
 M: Junfeng dong <junfeng.dong@intel.com>
 I: Gwangho Hwang
 R: Jungmin Cho
@@ -9846,71 +9941,71 @@ B: tizen
 L: See-doc(OTHER)
 
 T: platform/upstream/lzo
-D: Base
+D: Base / Compression
 B: tizen
 L: GPL
 
 T: platform/upstream/lzop
-D: Base
+D: Base / Compression
 M: Junfeng dong <junfeng.dong@intel.com>
 I: Gwangho Hwang
 R: Jungmin Cho
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: GPL
 
 T: platform/upstream/m4
-D: Platform Development
+D: Platform Development / Compiler
 B: tizen
 
 T: platform/upstream/make
-D: Platform Development
+D: Platform Development / Compiler
 B: tizen
 
 T: platform/upstream/makedepend
-D: Platform Development
+D: Platform Development / Compiler
 B: tizen
 
 T: platform/upstream/man-db
-D: Social & Content
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/mesa
-D: Graphics & UI Framework
+D: Graphics & UI Framework / GL
 B: tizen
 L: MIT-style
 
 T: platform/upstream/meta-base
-D: Platform Development
+D: Platform Development / Build
 B: tizen
 
 T: platform/upstream/meta-common
-D: Platform Development
+D: Platform Development / Build
 B: tizen
 
 T: platform/upstream/meta-generic
-D: Platform Development
+D: Platform Development / Build
 B: tizen
 
 T: platform/upstream/mic
-D: Platform Development
+D: Platform Development / Build
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 
 T: platform/upstream/mkfontdir
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Fonts
 B: tizen
 
 T: platform/upstream/mkfontscale
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Fonts
 B: tizen
 L: MIT-style
 L: FSF
 
 T: platform/upstream/mobile-broadband-provider-info
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
 M: Caiwen Zhang <caiwen.zhang@intel.com>
 B: tizen
 L: Public-domain
@@ -9918,11 +10013,11 @@ L: X11
 L: FSF
 
 T: platform/upstream/monotype-fonts
-D: Base
+D: Graphics & UI Framework / Fonts
 B: tizen
 
 T: platform/upstream/mpc
-D: Base
+D: Base / Toolchain
 M: Junfeng dong <junfeng.dong@intel.com>
 I: Seokhyun Kim
 R: Jungmin Cho
@@ -9930,7 +10025,7 @@ B: tizen
 L: LGPL-3.0+
 
 T: platform/upstream/mpfr
-D: Base
+D: Base / Toolchain
 M: Junfeng dong <junfeng.dong@intel.com>
 I: Seokhyun Kim
 R: Jungmin Cho
@@ -9938,47 +10033,47 @@ B: tizen
 L: LGPL-3.0+
 
 T: platform/upstream/mtdev
-D: System
+D: Graphics & UI Framework / Input Framework
 B: tizen
 L: MIT
 L: FSF
 
 T: platform/upstream/mtools
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/multipath-tools
-D: System
+D: Base / File Systems
 B: tizen
 L: GPL
 L: GPL-2.0
 
 T: platform/upstream/nano
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/nasm
-D: Platform Development
+D: Platform Development / Compiler
 B: tizen
 
 T: platform/upstream/ncurses
-D: Base
+D: Base / Libraries
 M: Patrick McCarty <patrick.mccarty@intel.com>
 B: tizen
 L: MIT-style
 
 T: platform/upstream/neard
-D: Network & Connectivity
+D: Network & Connectivity / NFC
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 
 T: platform/upstream/neardal
-D: Network & Connectivity
+D: Network & Connectivity / NFC
 B: tizen
 
 T: platform/upstream/net-tools
-D: Base
+D: Base / Utilities
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Piotr Bereza
 R: Walyong Cho
@@ -9986,17 +10081,21 @@ B: tizen
 L: GPL
 
 T: platform/upstream/nettle
-D: Security
+D: Security / Utilities
 M: Gyungyoung Kim <gyuyoung.kim@samsung.com>
 B: tizen
 L: LGPL-2.1+
 
+T: platform/upstream/ninja
+D: Platform Development / Build
+B: tizen
+
 T: platform/upstream/nodejs
-D: Web Framework
+D: Web Framework / Web UI FW
 B: tizen
 
 T: platform/upstream/nspr
-D: Security
+D: Base / Libraries
 M: Casey Schaufler <casey.schaufler@intel.com>
 I: Seokhyun Kim
 R: Jungmin Cho
@@ -10004,7 +10103,7 @@ B: tizen
 L: MPL
 
 T: platform/upstream/nss
-D: Security
+D: Security / Utilities
 M: Casey Schaufler <casey.schaufler@intel.com>
 I: Seokhyun Kim
 R: Jungmin Cho
@@ -10015,12 +10114,12 @@ L: MPL-1.1
 L: Dual-license
 
 T: platform/upstream/nss-mdns
-D: Base
+D: Base / Libraries
 B: tizen
 L: LGPL-2.0+
 
 T: platform/upstream/obexd
-D: Network & Connectivity
+D: Network & Connectivity / Bluetooth
 M: Taesoo Jun <steve.jun@samsung.com>
 M: Wu Zheng <wu.zheng@intel.com>
 M: Pyun DoHyun <dh79.pyun@samsung.com>
@@ -10030,7 +10129,7 @@ L: GPL
 L: GPL-2.0
 
 T: platform/upstream/ofono
-D: Telephony
+D: Telephony / Cellular FW
 M: Denis Kenzior <denis.kenzior@intel.com>
 M: Wu Zheng <wu.zheng@intel.com>
 I: Nicolas Bertrand
@@ -10039,32 +10138,32 @@ B: tizen
 L: GPL-2.0
 
 T: platform/upstream/openal-soft
-D: Multimedia
+D: Multimedia / Audio FW
 M: Byungwook Jang <bw.jang@samsung.com>
 B: tizen
 L: LGPL-2.0+
 
 T: platform/upstream/openconnect
-D: Security
+D: Security / Authentication
 M: zhang zhengguang <zhengguang.zhang@intel.com>
 B: tizen
 L: LGPL-2.1
 
 T: platform/upstream/opencore-amr
-D: Multimedia
+D: Multimedia / Audio FW
 M: Byungwook Jang <bw.jang@samsung.com>
 I: Byungwook Jang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/upstream/opengl-es-virtual-drv
-D: Graphics & UI Framework
+D: Graphics & UI Framework / GL
 B: tizen
 
 T: platform/upstream/openssh
-D: Security
+D: Security / Authentication
 M: Casey Schaufler <casey.schaufler@intel.com>
 I: Seokhyun Kim
 R: Jungmin Cho
@@ -10075,7 +10174,7 @@ L: Public-domain
 L: BSD-lite
 
 T: platform/upstream/openssl
-D: Security
+D: Security / Authentication
 M: Casey Schaufler <casey.schaufler@intel.com>
 I: Kyungwoo Noh
 B: tizen
@@ -10083,35 +10182,35 @@ L: OpenSSL
 L: BSD-style
 
 T: platform/upstream/oprofile
-D: SDK
+D: SDK / Dynamic analysis
 B: tizen
 
 T: platform/upstream/orc
-D: Multimedia
+D: Multimedia / Media Service
 M: Peter Zhu <peter.j.zhu@intel.com>
 B: tizen
 L: FSF
 L: BSD-2-Clause
 
 T: platform/upstream/p11-kit
-D: System
+D: System / Libraries
 B: tizen
 L: BSD-2-Clause
 L: FSF
 
 T: platform/upstream/package-groups
-D: Platform Development
+D: Platform Development / Build
 B: tizen
 
 T: platform/upstream/pacrunner
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
 M: zhang zhengguang <zhengguang.zhang@intel.com>
 B: tizen
 L: GPL-2.0
 L: GPL
 
 T: platform/upstream/pam
-D: Security
+D: Security / Authentication
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Piotr Bereza
 R: Walyong Cho
@@ -10122,31 +10221,31 @@ L: Dual-license
 L: FSF
 
 T: platform/upstream/pango
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Fonts
 B: tizen
 L: LGPL-2.0+
 
 T: platform/upstream/parted
-D: System
+D: Platform Development / Utilities
 M: william douglas <william.douglas@intel.com>
 B: tizen
 L: GPL-3.0+
 L: FSF
 
 T: platform/upstream/patch
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/patchelf
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/pattern-tools
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/pbzip2
-D: Base
+D: Base / Compression
 B: tizen
 L: BSD-style
 L: BSD
@@ -10158,7 +10257,7 @@ B: tizen
 L: GPL-2.0
 
 T: platform/upstream/pciutils
-D: Base
+D: Base / Utilities
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Hwang
 I: Jae-young
@@ -10166,7 +10265,7 @@ B: tizen
 L: GPL
 
 T: platform/upstream/pcre
-D: Base
+D: System / Libraries
 M: Patrick McCarty <patrick.mccarty@intel.com>
 I: Yunchan Cho
 B: tizen
@@ -10175,116 +10274,120 @@ L: BSD-2-Clause
 L: Google-BSD
 
 T: platform/upstream/perl
-D: Platform Development
+D: Platform Development / Perl
 B: tizen
 
 T: platform/upstream/perl-Crypt-SSLeay
-D: Platform Development
+D: Platform Development / Perl
 B: tizen
 
 T: platform/upstream/perl-Devel-Symdump
-D: Platform Development
+D: Platform Development / Perl
 B: tizen
 
 T: platform/upstream/perl-Error
-D: Platform Development
+D: Platform Development / Perl
 B: tizen
 
 T: platform/upstream/perl-HTML-Parser
-D: Platform Development
+D: Platform Development / Perl
 B: tizen
 
 T: platform/upstream/perl-HTML-Tagset
-D: Platform Development
+D: Platform Development / Perl
 B: tizen
 
 T: platform/upstream/perl-Net-DBus
-D: Platform Development
+D: Platform Development / Perl
 B: tizen
 
 T: platform/upstream/perl-Pod-Coverage
-D: Platform Development
+D: Platform Development / Perl
 B: tizen
 
 T: platform/upstream/perl-Switch
-D: Platform Development
+D: Platform Development / Perl
 B: tizen
 
 T: platform/upstream/perl-Test-Pod
-D: Platform Development
+D: Platform Development / Perl
 B: tizen
 
 T: platform/upstream/perl-Test-Pod-Coverage
-D: Platform Development
+D: Platform Development / Perl
 B: tizen
 
 T: platform/upstream/perl-TimeDate
-D: Platform Development
+D: Platform Development / Perl
 B: tizen
 
 T: platform/upstream/perl-URI
-D: Platform Development
+D: Platform Development / Perl
 B: tizen
 
 T: platform/upstream/perl-WWW-Curl
-D: Platform Development
+D: Platform Development / Perl
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 
 T: platform/upstream/perl-X11-Protocol
-D: Platform Development
+D: Platform Development / Perl
 B: tizen
 
 T: platform/upstream/perl-XML-Parser
-D: Platform Development
+D: Platform Development / Perl
 B: tizen
 
 T: platform/upstream/perl-XML-Simple
-D: Platform Development
+D: Platform Development / Perl
 B: tizen
 
 T: platform/upstream/perl-XML-Twig
-D: Platform Development
+D: Platform Development / Perl
 B: tizen
 
 T: platform/upstream/perl-YAML
-D: Platform Development
+D: Platform Development / Perl
 B: tizen
 
 T: platform/upstream/perl-gettext
-D: Platform Development
+D: Platform Development / Perl
 B: tizen
 
 T: platform/upstream/perl-libwww-perl
-D: Platform Development
+D: Platform Development / Perl
 B: tizen
 
 T: platform/upstream/php
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/pixman
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Fonts
 B: tizen
 L: MIT-style
 L: XFree86
 
 T: platform/upstream/pkg-config
-D: Base
+D: Platform Development / Build
 M: Patrick McCarty <patrick.mccarty@intel.com>
 I: Jinkun Jang
 B: tizen
 L: LGPL-2.0+
 
 T: platform/upstream/plymouth
-D: System
+D: Base / Startup
+B: tizen
+
+T: platform/upstream/polkit
+D: System / Libraries
 B: tizen
 L: GPL
 L: FSF
 
 T: platform/upstream/poppler
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Imaging
 M: Taesoo Jun <steve.jun@samsung.com>
 M: GangHeok Kim <gangheok.kim@samsung.com>
 I: Gangheok Kim
@@ -10293,12 +10396,12 @@ L: GPL
 L: GPL-2.0
 
 T: platform/upstream/poppler-data
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Imaging
 B: tizen
 L: BSD-3-Clause
 
 T: platform/upstream/popt
-D: Base
+D: Base / Libraries
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Piotr Bereza
 R: Walyong Cho
@@ -10308,7 +10411,7 @@ L: Public-domain
 L: See-file(COPYING)
 
 T: platform/upstream/powertop
-D: System
+D: System / Utilities
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Donghwa Lee
 B: tizen
@@ -10316,7 +10419,7 @@ L: GPL-2.0
 L: FSF
 
 T: platform/upstream/ppl
-D: Base
+D: Platform Development / Build
 M: Junfeng dong <junfeng.dong@intel.com>
 I: Jaemin Park
 R: Jungmin Cho
@@ -10324,11 +10427,11 @@ B: tizen
 L: GPL-3.0+
 
 T: platform/upstream/prelink
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/procps-ng
-D: Base
+D: Base / Utilities
 M: Patrick McCarty <patrick.mccarty@intel.com>
 B: tizen
 L: LGPL-2.1+
@@ -10336,19 +10439,19 @@ L: GPL
 L: FSF
 
 T: platform/upstream/protobuf
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/psb-headers
-D: Graphics & UI Framework
+D: Graphics & UI Framework / GL
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: GPL-2.0
 L: MIT-style
 
 T: platform/upstream/psmisc
-D: Base
+D: Base / Utilities
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Piotr Bereza
 R: Walyong Cho
@@ -10357,12 +10460,12 @@ L: GPL
 L: FSF
 
 T: platform/upstream/pth
-D: Base
+D: Base / Libraries
 B: tizen
 L: LGPL-2.1+
 
 T: platform/upstream/pulseaudio
-D: Multimedia
+D: Multimedia / Audio FW
 M: Jaska Uimonen <jaska.uimonen@intel.com>
 M: Byungwook Jang <bw.jang@samsung.com>
 I: Byungwook Jang
@@ -10370,218 +10473,226 @@ B: tizen
 L: LGPL-2.1+
 
 T: platform/upstream/pwdutils
-D: Security
+D: Security / Authentication
 M: Casey Schaufler <casey.schaufler@intel.com>
 B: tizen
 L: GPL-2.0
 L: FSF
 
 T: platform/upstream/pygobject2
-D: Base
+D: Platform Development / Python
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 
 T: platform/upstream/python
-D: Platform Development
+D: Platform Development / Python
 B: tizen
 
 T: platform/upstream/python-Cheetah
-D: Platform Development
+D: Platform Development / Python
 B: tizen
 
 T: platform/upstream/python-M2Crypto
-D: Platform Development
+D: Platform Development / Python
 B: tizen
 
 T: platform/upstream/python-PyYAML
-D: Platform Development
+D: Platform Development / Python
 B: tizen
 
 T: platform/upstream/python-ZSI
-D: Platform Development
+D: Platform Development / Python
 B: tizen
 
 T: platform/upstream/python-cairo
-D: Platform Development
+D: Platform Development / Python
 B: tizen
 
 T: platform/upstream/python-coverage
-D: Platform Development
+D: Platform Development / Python
 B: tizen
 
 T: platform/upstream/python-distribute
-D: Platform Development
+D: Platform Development / Python
 B: tizen
 
 T: platform/upstream/python-ecore
-D: Platform Development
+D: Platform Development / Python
 B: tizen
 
 T: platform/upstream/python-edbus
-D: Platform Development
+D: Platform Development / Python
 B: tizen
 
 T: platform/upstream/python-edje
-D: Platform Development
+D: Platform Development / Python
 B: tizen
 
 T: platform/upstream/python-elementary
-D: Graphics & UI Framework
+D: Graphics & UI Framework / EFL
 M: Philippe Coval <philippe.coval@open.eurogiciel.org>
 B: tizen
 L: LGPL-3.0+
 
 T: platform/upstream/python-evas
-D: Platform Development
+D: Platform Development / Python
 B: tizen
 
 T: platform/upstream/python-gobject
-D: Platform Development
+D: Platform Development / Python
 B: tizen
 
 T: platform/upstream/python-gpgme
-D: Platform Development
+D: Platform Development / Python
 B: tizen
 
 T: platform/upstream/python-iniparse
-D: Platform Development
+D: Platform Development / Python
 B: tizen
 
 T: platform/upstream/python-lxml
-D: Platform Development
+D: Platform Development / Python
 B: tizen
 
 T: platform/upstream/python-markdown
-D: Platform Development
+D: Platform Development / Python
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 
 T: platform/upstream/python-nose
-D: Platform Development
+D: Platform Development / Python
 B: tizen
 
 T: platform/upstream/python-pyOpenSSL
-D: Platform Development
+D: Platform Development / Python
 B: tizen
 
 T: platform/upstream/python-pycurl
-D: Platform Development
+D: Platform Development / Python
 B: tizen
 
 T: platform/upstream/python-pygments
-D: Platform Development
+D: Platform Development / Python
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 
 T: platform/upstream/python-setuptools
-D: Platform Development
+D: Platform Development / Python
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 
 T: platform/upstream/python-sqlite
-D: Base
+D: Platform Development / Python
 B: tizen
 
 T: platform/upstream/python-urlgrabber
-D: Platform Development
+D: Platform Development / Python
 B: tizen
 
 T: platform/upstream/python-yaml
-D: Platform Development
+D: Platform Development / Python
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
+
+T: platform/upstream/pythonrequests
+D: Platform Development / Python
 B: tizen
 
 T: platform/upstream/qemu
-D: Platform Development
+D: Platform Development / Build
 M: Junfeng dong <junfeng.dong@intel.com>
 B: tizen
 
 T: platform/upstream/qemu-accel
-D: Platform Development
+D: Platform Development / Build
 M: Junfeng dong <junfeng.dong@intel.com>
 B: tizen
 
 T: platform/upstream/qpdf
-D: System
+D: System / Libraries
 M: Taesoo Jun <steve.jun@samsung.com>
 M: GangHeok Kim <gangheok.kim@samsung.com>
 I: Gangheok Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Artistic-1.0
 L: FSF
 
 T: platform/upstream/qtbase
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Qt
 M: Tomasz Olszak <olszak.tomasz@gmail.com>
 B: tizen
 
-T: platform/upstream/qtwayland
-D: Graphics & UI Framework
+T: platform/upstream/qtchooser
+D: Graphics & UI Framework / Qt
 M: Tomasz Olszak <olszak.tomasz@gmail.com>
 B: tizen
 
-T: platform/upstream/qttools
-D: Graphics & UI Framework
+T: platform/upstream/qtdeclarative
+D: Graphics & UI Framework / Qt
 M: Tomasz Olszak <olszak.tomasz@gmail.com>
 B: tizen
 
-T: platform/upstream/qtsensors
-D: Graphics & UI Framework
+T: platform/upstream/qtgraphicaleffects
+D: Graphics & UI Framework / Qt
 M: Tomasz Olszak <olszak.tomasz@gmail.com>
 B: tizen
 
-T: platform/upstream/qtquickcontrols-tizen
-D: Graphics & UI Framework
+T: platform/upstream/qtimageformats
+D: Graphics & UI Framework / Qt
 M: Tomasz Olszak <olszak.tomasz@gmail.com>
 B: tizen
 
+T: platform/upstream/qtmultimedia
+D: Graphics & UI Framework / Qt
+B: tizen
+
 T: platform/upstream/qtquickcontrols
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Qt
 M: Tomasz Olszak <olszak.tomasz@gmail.com>
 B: tizen
 
-T: platform/upstream/qtdeclarative
-D: Graphics & UI Framework
+T: platform/upstream/qtquickcontrols-tizen
+D: Graphics & UI Framework / Qt
 M: Tomasz Olszak <olszak.tomasz@gmail.com>
 B: tizen
 
-T: platform/upstream/qtgraphicaleffects
-D: Graphics & UI Framework
+T: platform/upstream/qtsensors
+D: Graphics & UI Framework / Qt
 M: Tomasz Olszak <olszak.tomasz@gmail.com>
 B: tizen
 
-T: platform/upstream/qtimageformats
-D: Graphics & UI Framework
+T: platform/upstream/qttools
+D: Graphics & UI Framework / Qt
 M: Tomasz Olszak <olszak.tomasz@gmail.com>
 B: tizen
 
-T: platform/upstream/qtxmlpatterns
-D: Graphics & UI Framework
+T: platform/upstream/qtwayland
+D: Graphics & UI Framework / Qt
 M: Tomasz Olszak <olszak.tomasz@gmail.com>
 B: tizen
 
-T: platform/upstream/qtchooser
-D: Graphics & UI Framework
+T: platform/upstream/qtxmlpatterns
+D: Graphics & UI Framework / Qt
 M: Tomasz Olszak <olszak.tomasz@gmail.com>
 B: tizen
 
 T: platform/upstream/ragel
-D: System
+D: Platform Development / Build
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: GPL
 L: LGPL-2.1+
 
 T: platform/upstream/randrproto
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: MIT-style
 L: FSF
@@ -10589,30 +10700,30 @@ L: Public-domain
 L: X11
 
 T: platform/upstream/raptor
-D: System
+D: System / Libraries
 B: tizen
 L: Apache-2.0
 L: LGPL-2.1+
 L: FSF
 
 T: platform/upstream/re2
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/re2c
-D: System
+D: System / Libraries
 B: tizen
 L: Public-domain
 L: PHP-3.01
 L: GPL-2.0-with-bison-exception
 
 T: platform/upstream/readline
-D: Base
+D: Base / Libraries
 B: tizen
 L: GPL
 
 T: platform/upstream/recordproto
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Piotr Bereza
 R: Walyong Cho
@@ -10623,7 +10734,7 @@ L: X11
 L: Public-domain
 
 T: platform/upstream/remix
-D: Multimedia
+D: Multimedia / Audio FW
 M: Peter Zhu <peter.j.zhu@intel.com>
 B: tizen
 L: LGPL-2.0+
@@ -10631,7 +10742,7 @@ L: FSF
 L: UnclassifiedLicense
 
 T: platform/upstream/renderproto
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: MIT-style
 L: X11
@@ -10639,7 +10750,7 @@ L: Public-domain
 L: FSF
 
 T: platform/upstream/resourceproto
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Taeyoung Kim
 R: Vineet Uprari
@@ -10650,7 +10761,7 @@ L: X11
 L: MIT-style
 
 T: platform/upstream/rfkill
-D: Network & Connectivity
+D: Network & Connectivity / WiFi
 M: zhang zhengguang <zhengguang.zhang@intel.com>
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Jaehoon Chung
@@ -10658,7 +10769,7 @@ B: tizen
 L: MIT-style
 
 T: platform/upstream/rng-tools
-D: System
+D: Base / Utilities
 M: Junfeng dong <junfeng.dong@intel.com>
 I: Jaehoon Chung
 B: tizen
@@ -10667,52 +10778,52 @@ L: GPL-2.0
 L: FSF
 
 T: platform/upstream/rpm
-D: Base
+D: Base / Package Management
 M: Junfeng dong <junfeng.dong@intel.com>
 B: tizen
 L: See-file(LICENSE)
 
 T: platform/upstream/rpmlint
-D: Platform Development
+D: Platform Development / Build
 B: tizen
 
 T: platform/upstream/rpmlint-mini
-D: Platform Development
+D: Platform Development / Build
 B: tizen
 
 T: platform/upstream/rpmlint-tizen
-D: Platform Development
+D: Platform Development / Build
 B: tizen
 
 T: platform/upstream/rpmorphan
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/rsync
-D: Base
+D: Platform Development / Utilities
 M: Patrick McCarty <patrick.mccarty@intel.com>
 B: tizen
 L: GPL-3.0+
 L: GPL
 
 T: platform/upstream/ruby
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/sbc
-D: Multimedia
+D: Multimedia / Media Service
 B: tizen
 
 T: platform/upstream/scons
-D: Platform Development
+D: Platform Development / Compiler
 B: tizen
 
 T: platform/upstream/screen
-D: Social & Content
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/scrnsaverproto
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: X11
 L: FSF
@@ -10720,7 +10831,7 @@ L: Public-domain
 L: X11-style
 
 T: platform/upstream/sed
-D: Base
+D: Base / Utilities
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Piotr Bereza
 R: Walyong Cho
@@ -10730,14 +10841,14 @@ L: FSF
 L: See-doc(OTHER)
 
 T: platform/upstream/sessreg
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: MIT-style
 L: OpenGroup
 L: FSF
 
 T: platform/upstream/setup
-D: Base
+D: Base / File Systems
 M: Patrick McCarty <patrick.mccarty@intel.com>
 I: Moochang Kim
 R: Jungmin Cho
@@ -10747,7 +10858,7 @@ L: GPL
 L: GPL-2.0
 
 T: platform/upstream/setxkbmap
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: FSF
 L: MIT-style
@@ -10756,24 +10867,27 @@ L: Public-domain
 L: X11
 
 T: platform/upstream/sgml-common
-D: Platform Development
+D: Platform Development / Utilities
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 
 T: platform/upstream/sgml-skel
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/shared-mime-info
-D: App Framework
+D: App Framework / Application Utility
 M: Brad Peters <brad.t.peters@intel.com>
 I: Hyungdeuk Kim
 B: tizen
-L: 
+
+T: platform/upstream/signonui-efl
+D: Security / Accounts
+B: tizen
 
 T: platform/upstream/smack
-D: Security
+D: Security / Smack
 M: Bumjin Im <bj.im@samsung.com>
 M: Casey Schaufler <casey.schaufler@intel.com>
 R: Kidong Kim
@@ -10781,17 +10895,17 @@ B: tizen
 L: LGPL-2.1
 
 T: platform/upstream/snapper
-D: System
+D: System / Software Update
 M: william douglas <william.douglas@intel.com>
 B: tizen
 L: GPL
 
 T: platform/upstream/spec-cleaner
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/speex
-D: Multimedia
+D: Multimedia / Audio FW
 M: Byungwook Jang <bw.jang@samsung.com>
 I: Byungwook Jang
 B: tizen
@@ -10800,7 +10914,7 @@ L: FSF
 L: BSD-2-Clause
 
 T: platform/upstream/sqlite
-D: Base
+D: App Framework / Database
 M: Junfeng dong <junfeng.dong@intel.com>
 B: tizen
 L: See-doc(OTHER)
@@ -10808,7 +10922,7 @@ L: Public-domain
 L: FSF
 
 T: platform/upstream/squashfs
-D: Base
+D: Base / File Systems
 B: tizen
 L: GPL
 
@@ -10817,33 +10931,33 @@ D: Base
 B: tizen
 
 T: platform/upstream/strace
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/sudo
-D: Base
+D: Base / Utilities
 B: tizen
 L: MIT-style
 L: Public-domain
 
 T: platform/upstream/swig
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/swup
-D: System
+D: System / Software Update
 M: william douglas <william.douglas@intel.com>
 B: tizen
 L: GPL-2.0
 L: Public-domain
 
 T: platform/upstream/syncevolution
-D: Social & Content
+D: Social & Content / GNOME
 M: Patrick Ohly <patrick.ohly@intel.com>
 B: tizen
 
 T: platform/upstream/sysfsutils
-D: Base
+D: Base / File Systems
 B: tizen
 L: GPL-2.0
 L: LGPL-2.1+
@@ -10851,7 +10965,7 @@ L: FSF
 L: GPL
 
 T: platform/upstream/syslinux
-D: Base
+D: Base / Startup
 M: william douglas <william.douglas@intel.com>
 B: tizen
 L: GPL
@@ -10859,15 +10973,15 @@ L: MIT-style
 L: GPL-2.0
 
 T: platform/upstream/sysprof
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/system-installer
-D: System
+D: System / Utilities
 B: tizen
 
 T: platform/upstream/systemd
-D: Base
+D: Base / Startup
 M: Auke Kok <auke-jan.h.kok@intel.com>
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Piotr Bereza
@@ -10876,13 +10990,13 @@ B: tizen
 L: LGPL-2.1+
 
 T: platform/upstream/sysvinit
-D: Base
+D: Base / Startup
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 
 T: platform/upstream/tar
-D: Base
+D: Base / Compression
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Piotr Bereza
 R: Walyong Cho
@@ -10891,50 +11005,50 @@ L: GPL-3.0+
 L: FSF
 
 T: platform/upstream/tcl
-D: Base
+D: Platform Development / Utilities
 B: tizen
 L: See-doc(OTHER)
 
 T: platform/upstream/tcpdump
-D: System
+D: Platform Development / Utilities
 B: tizen
 L: BSD
 L: BSD-style
 
 T: platform/upstream/tdb
-D: System
+D: App Framework / Database
 B: tizen
 
 T: platform/upstream/terminology
-D: Social & Content
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/texinfo
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/tiff
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Fonts
 B: tizen
 L: SGI
 L: SGI-style
 L: FSF
 
 T: platform/upstream/time
-D: Base
+D: Platform Development / Utilities
 B: tizen
 L: GPL
 L: FSF
 L: GNU-Manpages
 
 T: platform/upstream/tizen-branding-default
-D: System
+D: Base / Startup
 M: Junfeng dong <junfeng.dong@intel.com>
 B: tizen
 L: GPL-2.0
 
 T: platform/upstream/tizen-release
-D: Base
+D: Base / Package Management
 M: Junfeng dong <junfeng.dong@intel.com>
 I: Jung-hee Choi
 R: Jungmin Cho
@@ -10946,18 +11060,18 @@ D: Base
 B: tizen
 
 T: platform/upstream/tolua++
-D: Base
+D: Base / Libraries
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: UnclassifiedLicense
 
 T: platform/upstream/tree
-D: Social & Content
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/tzdata
-D: Base
+D: Base / Toolchain
 M: william douglas <william.douglas@intel.com>
 I: Gwangho Hwang
 R: Jungmin Cho
@@ -10965,51 +11079,51 @@ B: tizen
 L: Public-domain
 
 T: platform/upstream/udhcp
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: GPL
 
 T: platform/upstream/udisks2
-D: Base
+D: System / Utilities
 B: tizen
 
 T: platform/upstream/uim
-D: Network & Connectivity
+D: Network & Connectivity / Bluetooth
 M: wu zheng <wu.zheng@intel.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: GPL
 L: GPL-2.0
 
 T: platform/upstream/unifdef
-D: Platform Development
+D: Platform Development / Utilities
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 
 T: platform/upstream/unzip
-D: Base
+D: Base / Compression
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 B: tizen
 L: info-zip
 L: Public-domain
 
 T: platform/upstream/update-alternatives
-D: Base
+D: Base / Utilities
 B: tizen
 L: GPL
 
 T: platform/upstream/update-desktop-files
-D: System
+D: App Framework / Application Installer
 B: tizen
 L: GPL-2.0
 
 T: platform/upstream/usbutils
-D: Base
+D: Base / Device Management
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Taeyoung Kim
 B: tizen
@@ -11017,7 +11131,7 @@ L: GPL
 L: FSF
 
 T: platform/upstream/user-session-units
-D: System
+D: Base / Startup
 M: Patrick McCarty <patrick.mccarty@intel.com>
 B: tizen
 L: LGPL-2.1+
@@ -11026,17 +11140,17 @@ L: GPL-2.0
 L: GPL
 
 T: platform/upstream/usleep
-D: Base
+D: Base / Utilities
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Piotr Bereza
 R: Walyong Cho
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: GPL-2.0
 
 T: platform/upstream/utempter
-D: Security
+D: Security / Utilities
 M: Casey Schaufler <casey.schaufler@intel.com>
 B: tizen
 L: GPL
@@ -11044,7 +11158,7 @@ L: LGPL-2.0+
 L: LGPL
 
 T: platform/upstream/uthash
-D: Security
+D: Platform Development / Utilities
 M: Casey Schaufler <casey.schaufler@intel.com>
 I: Gwangho Hwang
 R: Jungmin Cho
@@ -11054,7 +11168,7 @@ L: BSD-style
 L: GPL
 
 T: platform/upstream/util-linux
-D: Base
+D: Base / Utilities
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Piotr Bereza
 R: Walyong Cho
@@ -11064,48 +11178,48 @@ L: LGPL
 L: BSD
 
 T: platform/upstream/util-macros
-D: System
+D: Base / Utilities
 B: tizen
 L: MIT-style
 L: FSF
 
 T: platform/upstream/uw-imap-toolkit
-D: Messaging
+D: Messaging / Email
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: Apache-2.0
 
 T: platform/upstream/v4l-utils
-D: Multimedia
+D: Multimedia / Media Camera
 B: tizen
 
 T: platform/upstream/v8
-D: System
+D: Web Framework / Web Runtime
 B: tizen
 L: BSD-3-Clause
 L: BSD
 
 T: platform/upstream/vala
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/valgrind
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/vconfig
-D: Base
+D: Base / Utilities
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Piotr Bereza
 R: Walyong Cho
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: GPL
 
 T: platform/upstream/videoproto
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: BSD-style
 L: MIT-style
@@ -11114,11 +11228,11 @@ L: Public-domain
 L: X11
 
 T: platform/upstream/vim
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/vpnc
-D: Security
+D: Network & Connectivity / Data Network
 M: zhang zhengguang <zhengguang.zhang@intel.com>
 B: tizen
 L: GPL
@@ -11126,32 +11240,32 @@ L: BSD-2-Clause
 L: GPL-2.0
 
 T: platform/upstream/wayland
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Wayland Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Soochan Lim
 B: tizen
 L: MIT-style
 
 T: platform/upstream/wdiff
-D: Platform Development
-B: tizen
-
-T: platform/upstream/weston
-D: Graphics & UI Framework
-M: Sangjin Lee <lsj119@samsung.com>
-I: Soochan Lim
+D: Platform Development / Utilities
 B: tizen
-L: MIT-style
 
 T: platform/upstream/weekeyboard
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Input Framework
 M: Juan Zhao <juan.j.zhao@intel.com>
 I: Philippe Coval <philippe.coval@open.eurogiciel.org>
 B: tizen
 L: Apache-2.0
 
+T: platform/upstream/weston
+D: Graphics & UI Framework / Wayland Window System
+M: Sangjin Lee <lsj119@samsung.com>
+I: Soochan Lim
+B: tizen
+L: MIT-style
+
 T: platform/upstream/wget
-D: Base
+D: Platform Development / Utilities
 M: Patrick McCarty <patrick.mccarty@intel.com>
 B: tizen
 L: GPL-3.0+
@@ -11159,7 +11273,7 @@ L: FSF
 L: GPL-3.0
 
 T: platform/upstream/which
-D: Base
+D: Platform Development / Utilities
 M: Patrick McCarty <patrick.mccarty@intel.com>
 I: Gwangho Hwang
 R: Jungmin Cho
@@ -11169,36 +11283,36 @@ L: GPL-3.0+
 L: LGPL-2.0+
 
 T: platform/upstream/wireless-regdb
-D: System
+D: Network & Connectivity / WiFi
 B: tizen
 
 T: platform/upstream/wpa_supplicant
-D: Network & Connectivity
+D: Network & Connectivity / WiFi
 M: zhang zhengguang <zhengguang.zhang@intel.com>
 M: Taesoo Jun <steve.jun@samsung.com>
 B: tizen
 L: BSD
 
 T: platform/upstream/x11proto-gesture
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 
 T: platform/upstream/x86info
-D: System
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: GPL-2.0
 
 T: platform/upstream/xauth
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: OpenGroup
 L: MIT-style
 L: FSF
 
 T: platform/upstream/xbitmaps
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Boram Park
 B: tizen
@@ -11209,7 +11323,7 @@ L: X11
 L: MIT-style
 
 T: platform/upstream/xcb-proto
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Boram Park
 B: tizen
@@ -11217,7 +11331,7 @@ L: MIT-style
 L: FSF
 
 T: platform/upstream/xcb-util
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Boram Park
 B: tizen
@@ -11225,12 +11339,12 @@ L: FSF
 L: MIT-style
 
 T: platform/upstream/xcb-util-keysyms
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: FSF
 
 T: platform/upstream/xcmiscproto
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: FSF
 L: OpenGroup
@@ -11239,7 +11353,7 @@ L: X11
 L: MIT-style
 
 T: platform/upstream/xconsole
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: OpenGroup
 L: MIT-style
@@ -11248,49 +11362,48 @@ L: Public-domain
 L: X11
 
 T: platform/upstream/xdelta1
-D: Base
+D: Graphics & UI Framework / X Window System
 B: tizen
 
 T: platform/upstream/xdg-user-dirs
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
-L: 
 
 T: platform/upstream/xdg-utils
-D: System
+D: System / Libraries
 M: Patrick McCarty <patrick.mccarty@intel.com>
 B: tizen
 L: MIT-style
 L: Trademark-ref
 
 T: platform/upstream/xdpyinfo
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 
 T: platform/upstream/xev
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 
 T: platform/upstream/xextproto
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: OpenGroup
 L: MIT-style
 L: BSD-style
 
 T: platform/upstream/xeyes
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 
 T: platform/upstream/xf86-input-evdev
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: MIT-style
 L: FSF
 L: XFree86
 
 T: platform/upstream/xf86-input-keyboard
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: MIT-style
 L: XFree86
@@ -11298,42 +11411,42 @@ L: FSF
 L: GPL
 
 T: platform/upstream/xf86-input-synaptics
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: MIT-style
 
 T: platform/upstream/xf86-video-cirrus
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: MIT-style
 L: FSF
 L: XFree86
 
 T: platform/upstream/xf86-video-fbdev
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: MIT-style
 L: FSF
 
 T: platform/upstream/xf86-video-intel
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: MIT-style
 
 T: platform/upstream/xf86-video-vesa
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: MIT-style
 L: FSF
 
 T: platform/upstream/xf86-video-vmware
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: MIT-style
 L: FSF
 
 T: platform/upstream/xf86bigfontproto
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: XFree86
 L: FSF
@@ -11342,7 +11455,7 @@ L: X11
 L: MIT-style
 
 T: platform/upstream/xf86dgaproto
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: X11
 L: MIT-style
@@ -11350,7 +11463,7 @@ L: Public-domain
 L: FSF
 
 T: platform/upstream/xf86driproto
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: MIT-style
 L: FSF
@@ -11358,7 +11471,7 @@ L: X11
 L: Public-domain
 
 T: platform/upstream/xf86miscproto
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: XFree86
 L: FSF
@@ -11367,7 +11480,7 @@ L: X11
 L: MIT-style
 
 T: platform/upstream/xf86vidmodeproto
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: MIT-style
 L: FSF
@@ -11375,7 +11488,7 @@ L: X11
 L: Public-domain
 
 T: platform/upstream/xhost
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: FSF
 L: MIT-style
@@ -11383,7 +11496,7 @@ L: Public-domain
 L: X11
 
 T: platform/upstream/xineramaproto
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: FSF
 L: MIT-style
@@ -11392,7 +11505,7 @@ L: OpenGroup
 L: X11
 
 T: platform/upstream/xinit
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Boram Park
 B: tizen
@@ -11401,7 +11514,7 @@ L: FSF
 L: OpenGroup
 
 T: platform/upstream/xinput
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Boram Park
 B: tizen
@@ -11409,33 +11522,33 @@ L: MIT-style
 L: FSF
 
 T: platform/upstream/xkbcomp
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: BSD-style
 
 T: platform/upstream/xkbevd
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: BSD-style
 L: MIT-style
 L: FSF
 
 T: platform/upstream/xkbprint
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: BSD-style
 L: MIT-style
 L: FSF
 
 T: platform/upstream/xkbutils
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: BSD-style
 L: MIT-style
 L: FSF
 
 T: platform/upstream/xkeyboard-config
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Boram Park
 B: tizen
@@ -11446,19 +11559,19 @@ L: Trademark-ref
 L: OpenGroup
 
 T: platform/upstream/xkill
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 
 T: platform/upstream/xlsatoms
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 
 T: platform/upstream/xmlcharent
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/xmlsec1
-D: Security
+D: Security / Utilities
 M: Gyungyoung Kim <gyuyoung.kim@samsung.com>
 I: Cecil Lim
 B: tizen
@@ -11466,31 +11579,31 @@ L: See-doc(OTHER)
 L: FSF
 
 T: platform/upstream/xmlstarlet
-D: Security
+D: Base / Libraries
 M: Casey Schaufler <casey.schaufler@intel.com>
 R: Jaewon Lee
 B: tizen
 L: MIT
 
 T: platform/upstream/xmlto
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/xmodmap
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: OpenGroup
 L: MIT-style
 L: FSF
 
 T: platform/upstream/xorg-cf-files
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: See-doc(OTHER)
 L: FSF
 
 T: platform/upstream/xorg-launch-helper
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Sung-jin Park
 B: tizen
@@ -11499,7 +11612,7 @@ L: BSD-lite
 L: GPL-2.0+
 
 T: platform/upstream/xorg-server
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Soochan Lim
 B: tizen
@@ -11509,25 +11622,25 @@ L: OpenGroup
 L: XFree86
 
 T: platform/upstream/xprop
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 
 T: platform/upstream/xproto
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: OpenGroup
 L: BSD-style
 L: FSF
 
 T: platform/upstream/xrandr
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: MIT-style
 L: FSF
 L: XFree86
 
 T: platform/upstream/xrdb
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: MIT-style
 L: FSF
@@ -11538,18 +11651,18 @@ L: X11
 L: MIT
 
 T: platform/upstream/xrestop
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 
 T: platform/upstream/xset
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: OpenGroup
 L: MIT-style
 L: FSF
 
 T: platform/upstream/xsetroot
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: OpenGroup
 L: MIT-style
@@ -11558,13 +11671,13 @@ L: Public-domain
 L: X11
 
 T: platform/upstream/xterm
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: MIT-style
 L: BSD-style
 
 T: platform/upstream/xtrans
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Sung-jin Park
 B: tizen
@@ -11574,23 +11687,23 @@ L: MIT-style
 L: FSF
 
 T: platform/upstream/xvinfo
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 
 T: platform/upstream/xwd
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 
 T: platform/upstream/xwininfo
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 
 T: platform/upstream/xwud
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 
 T: platform/upstream/xz
-D: Base
+D: Base / Compression
 M: Junfeng dong <junfeng.dong@intel.com>
 I: Gwangho Hwang
 R: Jungmin Cho
@@ -11598,23 +11711,23 @@ B: tizen
 L: Public-domain
 
 T: platform/upstream/yaml
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/yasm
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/yum
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/yum-metadata-parser
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/zeromq
-D: Messaging
+D: System / Libraries
 M: Sang-Hun Chung <sanghun.chung@samsung.com>
 I: Jeesun Kim
 R: Jae Pil Choi
@@ -11624,7 +11737,7 @@ L: LGPL-3.0+
 L: GPL
 
 T: platform/upstream/zip
-D: Base
+D: Base / Compression
 M: Junfeng dong <junfeng.dong@intel.com>
 I: Jaemin Park
 R: Jungmin Cho
@@ -11633,7 +11746,7 @@ L: info-zip
 L: Public-domain
 
 T: platform/upstream/zlib
-D: Base
+D: Base / Compression
 M: Junfeng dong <junfeng.dong@intel.com>
 I: Jaemin Park
 R: Jungmin Cho
@@ -11650,96 +11763,182 @@ L: GPL-2.0
 L: MIT
 
 T: platform/upstream/zypper
-D: Base
+D: Base / Package Management
 M: Junfeng dong <junfeng.dong@intel.com>
 I: Jaemin Park
 R: Jungmin Cho
 B: tizen
-L: 
 
 T: platform/upstream/zypper-plugin
-D: System
+D: Base / Package Management
 B: tizen
 
 T: pre-built/toolchain-arm
-D: 
-B: tizen_2.1
-B: tizen_2.2
-B: tizen
-C: Missing domain!
+D: SCM / GBS Metadata
 
 T: pre-built/toolchain-x86
-D: 
-B: tizen_2.1
-B: tizen_2.2
+D: SCM / GBS Metadata
+
+T: pre-built/toolchain-x86_64
+D: SCM / GBS Metadata
+
+T: profile/common/desktop-skin
+D: SCM / Common Configuration
+B: tizen
+
+T: profile/common/kernel-common
+D: SCM / Common Configuration
+B: tizen
+
+T: profile/common/meta
+D: SCM / Common Configuration
+B: tizen
+
+T: profile/common/weston-common
+D: Graphics & UI Framework / Wayland Window System
+B: tizen
+
+T: profile/common/wrt-widgets
+D: Web Framework / Web Runtime
+B: tizen
+
+T: profile/extras/intel-gpu-tools
+D: Platform Development / Utilities
+B: tizen
+
+T: profile/generic/model/config
+D: SCM / Common Configuration
 B: tizen
-C: Missing domain!
 
 T: profile/ivi/GSSDP
-D: Automotive
+D: Automotive / DLNA
 B: tizen
 
 T: profile/ivi/GUPnP
-D: Automotive
+D: Automotive / DLNA
 M: Rusty Lynch <rusty.lynch@intel.com>
 B: tizen
 
 T: profile/ivi/GUPnP-AV
-D: Automotive
+D: Automotive / DLNA
 M: Rusty Lynch <rusty.lynch@intel.com>
 B: tizen
 
 T: profile/ivi/GUPnP-DLNA
-D: Automotive
+D: Automotive / DLNA
 M: Rusty Lynch <rusty.lynch@intel.com>
 B: tizen
 
 T: profile/ivi/GhostCluster
-D: Automotive
+D: Automotive / Sample Apps
 M: Rusty Lynch <rusty.lynch@intel.com>
 B: tizen
 
 T: profile/ivi/MediaPlayer
-D: Automotive
+D: Automotive / Sample Apps
 M: Brian Jones <brian.j.jones@intel.com>
 B: tizen
 
+T: profile/ivi/Modello_AMBSimulator
+D: Automotive / Modello
+B: tizen
+
+T: profile/ivi/Modello_Appmanager
+D: Automotive / Modello
+B: tizen
+
+T: profile/ivi/Modello_Common
+D: Automotive / Modello
+B: tizen
+
+T: profile/ivi/Modello_Dashboard
+D: Automotive / Modello
+B: tizen
+
+T: profile/ivi/Modello_Homescreen
+D: Automotive / Modello
+B: tizen
+
+T: profile/ivi/Modello_Hvac
+D: Automotive / Modello
+B: tizen
+
+T: profile/ivi/Modello_Installer
+D: Automotive / Modello
+B: tizen
+
+T: profile/ivi/Modello_Multimediaplayer
+D: Automotive / Modello
+B: tizen
+
+T: profile/ivi/Modello_Nav
+D: Automotive / Modello
+B: tizen
+
+T: profile/ivi/Modello_Phone
+D: Automotive / Modello
+B: tizen
+
+T: profile/ivi/Modello_SDL
+D: Automotive / Modello
+B: tizen
+
 T: profile/ivi/OpenAVB
-D: Automotive
+D: Automotive / Ethernet AVB
 M: Rusty Lynch <rusty.lynch@intel.com>
 B: tizen
 
 T: profile/ivi/SettingsApp
-D: Automotive
+D: Automotive / Sample Apps
 M: Jimmy Huang <jimmy.huang@intel.com>
 B: tizen
 
+T: profile/ivi/apr
+D: Automotive / GENIVI
+B: tizen
+
+T: profile/ivi/apr-util
+D: Automotive / GENIVI
+B: tizen
+
 T: profile/ivi/automotive-message-broker
-D: Automotive
+D: Automotive / Automotive Message Broker
+B: tizen
+
+T: profile/ivi/can-utils
+D: Automotive / Automotive Message Broker
+B: tizen
+
+T: profile/ivi/common-api-dbus-runtime
+D: Automotive / GENIVI
+B: tizen
+
+T: profile/ivi/common-api-runtime
+D: Automotive / GENIVI
 B: tizen
 
 T: profile/ivi/cowhide
-D: Automotive
+D: Automotive / ICO Homescreen
 B: tizen
 
 T: profile/ivi/dLeyna
-D: Automotive
+D: Automotive / DLNA
 B: tizen
 
 T: profile/ivi/dlt-daemon
-D: Automotive
+D: Automotive / GENIVI
 B: tizen
 
 T: profile/ivi/efl-theme-tizen
-D: Automotive
+D: Automotive / ICO Homescreen
 B: tizen
 
 T: profile/ivi/festival
-D: Automotive
+D: Automotive / Speech
 B: tizen
 
 T: profile/ivi/genivi/genivi-audio-manager
-D: Automotive
+D: Automotive / GENIVI
 B: tizen
 
 T: profile/ivi/gsignond
@@ -11751,61 +11950,61 @@ D: Automotive
 B: tizen
 
 T: profile/ivi/ico-uxf-device-input-controller
-D: Automotive
+D: Automotive / ICO Homescreen
 B: tizen
 
 T: profile/ivi/ico-uxf-homescreen
-D: Automotive
+D: Automotive / ICO Homescreen
 B: tizen
 
 T: profile/ivi/ico-uxf-homescreen-sample-apps
-D: Automotive
+D: Automotive / ICO Homescreen
 B: tizen
 
 T: profile/ivi/ico-uxf-pulse-plugin
-D: Automotive
+D: Automotive / ICO Homescreen
 B: tizen
 
 T: profile/ivi/ico-uxf-utilities
-D: Automotive
+D: Automotive / ICO Homescreen
 B: tizen
 
 T: profile/ivi/ico-uxf-weston-plugin
-D: Automotive
+D: Automotive / ICO Homescreen
 B: tizen
 
 T: profile/ivi/ico-vic-amb-plugin
-D: Automotive
+D: Automotive / ICO Homescreen
 B: tizen
 
 T: profile/ivi/ico-vic-carsimulator
-D: Automotive
+D: Automotive / ICO Homescreen
 B: tizen
 
 T: profile/ivi/image-configurations
-D: Automotive
+D: Automotive / Configuration
 B: tizen
 
 T: profile/ivi/ivi-repos
-D: Automotive
+D: Automotive / Configuration
 M: Rusty Lynch <rusty.lynch@intel.com>
 B: tizen
 
 T: profile/ivi/ivi-repos-x86_64
-D: Automotive
+D: Automotive / Configuration
 M: Rusty Lynch <rusty.lynch@intel.com>
 B: tizen
 
 T: profile/ivi/kernel-x86-ivi
-D: Automotive
+D: Automotive / Hardware Adaption
 B: tizen
 
 T: profile/ivi/lemolo
-D: Automotive
+D: Automotive / Sample Apps
 B: tizen
 
 T: profile/ivi/libgee
-D: Automotive
+D: Automotive / DLNA
 B: tizen
 
 T: profile/ivi/libgsignon-glib
@@ -11813,36 +12012,64 @@ D: Automotive
 B: tizen
 
 T: profile/ivi/libwebsockets
-D: Automotive
+D: System / Libraries
+B: tizen
+
+T: profile/ivi/log4cxx
+D: Automotive / GENIVI
+B: tizen
+
+T: profile/ivi/message-port
+D: App Framework / Application Utility
 B: tizen
 
 T: profile/ivi/meta-ivi
-D: Automotive
+D: Automotive / Configuration
 B: tizen
 
 T: profile/ivi/meta-panda
-D: Automotive
+D: Automotive / Configuration
 B: tizen
 
 T: profile/ivi/murphy
-D: Automotive
+D: Automotive / Resource Policy
+B: tizen
+
+T: profile/ivi/node-startup-controller
+D: Automotive / GENIVI
+B: tizen
+
+T: profile/ivi/node-state-manager
+D: Automotive / GENIVI
 B: tizen
 
 T: profile/ivi/notification-service
-D: Automotive
+D: Automotive / ICO Homescreen
 B: tizen
 
 T: profile/ivi/opencv
-D: Automotive
+D: Automotive / Automotive Message Broker
 M: Rusty Lynch <rusty.lynch@intel.com>
 B: tizen
 
 T: profile/ivi/package-groups
-D: Automotive
+D: Automotive / Configuration
+B: tizen
+
+T: profile/ivi/persistence-common-object
+D: Automotive / GENIVI
+B: tizen
+
+T: profile/ivi/persistence-client-library
+D: Automotive / GENIVI
+B: tizen
+
+T: profile/ivi/phoned
+D: Automotive / Modello
 B: tizen
 
 T: profile/ivi/pocketsphinx
-D: Automotive
+D: Automotive / Speech
 B: tizen
 
 T: profile/ivi/psplash
@@ -11850,48 +12077,48 @@ D: Automotive
 B: tizen
 
 T: profile/ivi/pulseaudio-module-murphy-ivi
-D: Automotive
+D: Automotive / Resource Policy
 B: tizen
 
 T: profile/ivi/release-repos
-D: Automotive
+D: Automotive / Configuration
 B: tizen
 
 T: profile/ivi/release-repos-x86_64
-D: Automotive
+D: Automotive / Configuration
 M: Rusty Lynch <rusty.lynch@intel.com>
 B: tizen
 
 T: profile/ivi/rygel
-D: Automotive
+D: Automotive / DLNA
 B: tizen
 
 T: profile/ivi/saythis
-D: Automotive
+D: Automotive / Sample Apps
 B: tizen
 
 T: profile/ivi/sdk/web-ide-resources
-D: SDK
+D: SDK / Common IDE
 B: tizen
 
 T: profile/ivi/sdk/web-sample-build
-D: SDK
+D: SDK / Common IDE
 B: tizen
 
 T: profile/ivi/settings-daemon
-D: Automotive
+D: Automotive / Sample Apps
 B: tizen
 
-T: profile/ivi/setup-ivi
-D: Automotive
+T: profile/ivi/setup-efi-ivi
+D: Automotive / Configuration
 B: tizen
 
-T: profile/ivi/setup-efi-ivi
-D: Automotive
+T: profile/ivi/setup-ivi
+D: Automotive / Configuration
 B: tizen
 
 T: profile/ivi/setup-mbr-ivi
-D: Automotive
+D: Automotive / Configuration
 B: tizen
 
 T: profile/ivi/signonui-efl
@@ -11899,206 +12126,224 @@ D: Automotive
 B: tizen
 
 T: profile/ivi/smartdevicelink
-D: Automotive
+D: Automotive / GENIVI
 B: tizen
 
 T: profile/ivi/speech-recognition
-D: Automotive
+D: Automotive / Speech
 M: Krisztian Litkey <krisztian.litkey@intel.com>
 B: tizen
 
 T: profile/ivi/sphinxbase
-D: Automotive
+D: Automotive / Speech
 M: Rusty Lynch <rusty.lynch@intel.com>
 B: tizen
 
+T: profile/ivi/syslinux
+D: Base / Startup
+B: tizen
+
+T: profile/ivi/udev-rules
+D: Base / Device Management
+B: tizen
+
+T: profile/ivi/wayland-ivi-extension
+D: Graphics & UI Framework / Wayland Window System
+B: tizen
+
 T: profile/ivi/weekeyboard
 D: Automotive
 M: Philippe Coval <philippe.coval@open.eurogiciel.org>
 B: tizen
 
+T: profile/ivi/weston-ivi
+D: Automotive / ICO Homescreen
+B: tizen
+
+T: profile/ivi/weston-ivi-shell
+D: Automotive / ICO Homescreen
+B: tizen
+
 T: profile/ivi/wrt-plugins-ivi
-D: Automotive
+D: Automotive / Automotive Web API
 B: tizen
 
 T: profile/mobile/alsa-scenario-scn-data-0-mfld
-D: System
+D: Mobile / Hardware Adaptation
 B: tizen
 
 T: profile/mobile/device-config-touch
-D: System
+D: Mobile / Hardware Adaptation
 B: tizen
 
 T: profile/mobile/ecore
-D: Graphics & UI Framework
-B: tizen_2.2
+D: Mobile / EFL
 B: tizen
+B: tizen_2.2
 
 T: profile/mobile/edbus
-D: Graphics & UI Framework
+D: Mobile / EFL
 B: tizen
 
 T: profile/mobile/edje
-D: Graphics & UI Framework
+D: Mobile / EFL
 B: tizen
 
 T: profile/mobile/eet
-D: Graphics & UI Framework
+D: Mobile / EFL
 B: tizen
 
 T: profile/mobile/eeze
-D: Graphics & UI Framework
+D: Mobile / EFL
 B: tizen
 
 T: profile/mobile/efreet
-D: Graphics & UI Framework
+D: Mobile / EFL
 B: tizen
 
 T: profile/mobile/eina
-D: Graphics & UI Framework
+D: Mobile / EFL
 B: tizen
 
 T: profile/mobile/eio
-D: Graphics & UI Framework
+D: Mobile / EFL
 B: tizen
 
 T: profile/mobile/elementary
-D: Graphics & UI Framework
+D: Mobile / EFL
 B: tizen
 
 T: profile/mobile/embryo
-D: Graphics & UI Framework
+D: Mobile / EFL
 B: tizen
 
 T: profile/mobile/emotion
-D: Graphics & UI Framework
+D: Mobile / EFL
 B: tizen
 
 T: profile/mobile/ethumb
-D: Graphics & UI Framework
+D: Mobile / EFL
 B: tizen
 
 T: profile/mobile/evas
-D: Graphics & UI Framework
-B: tizen_2.2
+D: Mobile / EFL
 B: tizen
+B: tizen_2.2
 
 T: profile/mobile/expedite
-D: Graphics & UI Framework
+D: Mobile / EFL
 B: tizen
 
 T: profile/mobile/gst-openmax0.10
-D: 
+D: Mobile / Gstreamer
 B: tizen
-C: Missing domain!
 
 T: profile/mobile/gst-plugins-bad0.10
-D: Multimedia
+D: Mobile / Gstreamer
 B: tizen
 
 T: profile/mobile/gst-plugins-base0.10
-D: Multimedia
+D: Mobile / Gstreamer
 B: tizen
 
 T: profile/mobile/gst-plugins-ext0.10
-D: Multimedia
+D: Mobile / Gstreamer
 B: tizen
 
 T: profile/mobile/gst-plugins-good0.10
-D: Multimedia
+D: Mobile / Gstreamer
 B: tizen
 
 T: profile/mobile/gst-plugins-ugly0.10
-D: Multimedia
+D: Mobile / Gstreamer
 B: tizen
 
 T: profile/mobile/gstreamer-vaapi
-D: Multimedia
+D: Mobile / Gstreamer
 B: tizen
 
 T: profile/mobile/gstreamer0.10
-D: Multimedia
+D: Mobile / Gstreamer
 B: tizen
 
 T: profile/mobile/gstreamer0.10-ffmpeg
-D: Multimedia
+D: Mobile / Gstreamer
 B: tizen
 
 T: profile/mobile/image-configurations
-D: Platform Development
+D: Mobile / Configuration
 B: tizen
 
 T: profile/mobile/libmm-player
-D: Multimedia
+D: Mobile / Gstreamer
 B: tizen
 
 T: profile/mobile/libva
-D: 
+D: Mobile / Gstreamer
 B: tizen
-C: Missing domain!
 
 T: profile/mobile/meta-mobile
-D: Platform Development
+D: Mobile / Configuration
 B: tizen
 
 T: profile/mobile/model/config-emulator
-D: Platform Development
+D: Mobile / Configuration
 B: tizen_2.2
 
 T: profile/mobile/model/config-rd-210
-D: Platform Development
+D: Mobile / Configuration
 B: tizen_2.2
 
 T: profile/mobile/model/config-rd-pq
-D: Platform Development
+D: Mobile / Configuration
 B: tizen_2.2
 
 T: profile/mobile/package-groups
-D: Platform Development
+D: Mobile / Configuration
 B: tizen
 
 T: profile/mobile/sdk/native-ide-resources
-D: SDK
+D: SDK / Native IDE
 B: tizen
 
 T: profile/mobile/sdk/native-sample-build
-D: SDK
+D: SDK / Native IDE
 B: tizen
 
 T: profile/mobile/sdk/native-template
-D: SDK
+D: SDK / Native IDE
 B: tizen
 
 T: profile/mobile/sdk/platform-sample-build
-D: SDK
+D: SDK / Native IDE
 B: tizen
 
 T: profile/mobile/sdk/platform-template
-D: SDK
+D: SDK / Native IDE
 B: tizen
 
 T: profile/mobile/sdk/web-ide-resources
-D: SDK
+D: SDK / Common IDE
 B: tizen
 
 T: profile/mobile/sdk/web-sample-build
-D: SDK
+D: SDK / Common IDE
 B: tizen
 
 T: profile/mobile/sdk/web-template
-D: SDK
+D: SDK / Common IDE
 B: tizen
 
 T: profile/mobile/tizen-mobile-session
-D: System
+D: Mobile / Hardware Adaptation
 B: tizen
 
 T: profile/mobile/x2w
-D: Graphics & UI Framework
+D: Mobile / X Window System
 B: tizen
 
 T: profile/mobile/xorg-x11-drv-evdev-multitouch
-D: Graphics & UI Framework
+D: Mobile / X Window System
 B: tizen
 
 T: samples/native/AccountApp
@@ -12633,90 +12878,104 @@ B: tizen_2.1
 
 T: samples/web/TizenWinset
 D: Applications
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: samples/web/TouchPaint
 D: Applications
 B: tizen_2.2
 
+T: scm/git-obs-mapping
+D: SCM / Backend Services Configuration
+
+T: scm/manifest
+D: SCM / GBS Metadata
+
+T: scm/meta/build-config
+D: SCM / GBS Metadata
+
+T: scm/meta/gbs-config
+D: SCM / GBS Metadata
+
+T: scm/meta/snapshot-repo-conf
+D: SCM / Backend Services Configuration
+
 T: sdk/alsa-scenario-scn-data-0-emul
-D: SDK
+D: SDK / Emulator
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
-L: 
 
 T: sdk/build/meta-emulator-tools
-D: SDK
+D: SDK / Emulator
 I: Jun Tian
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 L: Apache
 L: Apache-2.0
 
 T: sdk/build/meta-sdk-dev-tools
-D: SDK
+D: SDK / SDK package management
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/build/meta-tizen-components
-D: SDK
+D: SDK / SDK package management
 R: Jackie Wu
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/build/meta-tizen-documents
-D: SDK
+D: SDK / SDK package management
 R: Jackie Wu
 R: Xu Zhang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/build/meta-tizen-ide
-D: SDK
+D: SDK / SDK package management
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/build/meta-tizen-installtype
-D: SDK
+D: SDK / SDK package management
 R: Jackie Wu
 R: Xu Zhang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/build/pde-build
-D: SDK
+D: SDK / Common IDE
 M: Kangho Kim <kh5325.kim@samsung.com>
 I: Taeyoung Son
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/build/version-manager
-D: SDK
+D: SDK / SDK package management
 M: Kangho Kim <kh5325.kim@samsung.com>
 I: Taeyoung Son
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/crash-worker-sdk
 D: SDK
@@ -12733,11 +12992,11 @@ B: tizen_2.0
 B: tizen_2.1
 
 T: sdk/device-manager-plugin-emul
-D: SDK
+D: SDK / Emulator
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/doc/content
 D: SDK
@@ -12746,21 +13005,25 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: sdk/doc/doc-tools
-D: SDK
+D: SDK / Documents
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/doc/sdk-info
-D: SDK
+D: SDK / Documents
 M: Sungho Park <chywoo.park@samsung.com>
 I: Jinsil Lee
 R: Jackie Wu
 R: Donghoon Hyun
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
+
+T: sdk/doc/ivi
+D: SDK / Documents
 B: tizen
 
 T: sdk/dynamic-analyzer/dynamic-analysis-ide-eplugin
@@ -12790,218 +13053,218 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: sdk/emulator-daemon
-D: SDK
+D: SDK / Emulator
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/emulator-plugin-accel
-D: SDK
+D: SDK / Emulator
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/emulator-plugin-accel-filter
-D: SDK
+D: SDK / Emulator
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/emulator-plugin-accel-proc
-D: SDK
+D: SDK / Emulator
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/emulator-plugin-geo
-D: SDK
+D: SDK / Emulator
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/emulator-plugin-geo-filter
-D: SDK
+D: SDK / Emulator
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/emulator-plugin-geo-proc
-D: SDK
+D: SDK / Emulator
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/emulator-plugin-gyro-pkgs
-D: SDK
+D: SDK / Emulator
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/emulator-plugin-light
-D: SDK
+D: SDK / Emulator
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/emulator-plugin-light-filter
-D: SDK
+D: SDK / Emulator
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/emulator-plugin-light-proc
-D: SDK
+D: SDK / Emulator
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/emulator-plugin-motion-proc
-D: SDK
+D: SDK / Emulator
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/emulator-plugin-proxi
-D: SDK
+D: SDK / Emulator
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/emulator-plugin-proxi-filter
-D: SDK
+D: SDK / Emulator
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/emulator-plugin-proxi-proc
-D: SDK
+D: SDK / Emulator
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/emulator/emulator-control-panel
-D: SDK
+D: SDK / Emulator
 B: tizen
 
 T: sdk/emulator/emulator-img
-D: SDK
+D: SDK / Emulator
 I: Jun Tian
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 L: Apache
 L: Apache-2.0
 
 T: sdk/emulator/emulator-kernel
-D: SDK
+D: SDK / Emulator
 I: Jun Tian
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 L: GPL
 L: GPL-2.0
 
 T: sdk/emulator/emulator-manager
-D: SDK
+D: SDK / Emulator
 M: Yeongkyoon Lee <yeongkyoon.lee@samsung.com>
 I: Seokyeon Hwang
 I: Jun Tian
 R: Jihye Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 L: GPL
 
 T: sdk/emulator/emulator-storages
-D: SDK
+D: SDK / Emulator
 M: Yeongkyoon Lee <yeongkyoon.lee@samsung.com>
 I: Seokyeon Hwang
 I: Jun Tian
 R: Jihye Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 L: BSD
 L: LGPL
 L: GPL-2.0
 L: GPL-2.0+
 
 T: sdk/emulator/emulator-test
-D: SDK
+D: SDK / Emulator
 M: Yeongkyoon Lee
 I: SeokYeon Hwang
 R: Jihye Kim
 B: tizen
 
 T: sdk/emulator/event-injector
-D: SDK
+D: SDK / Emulator
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 L: Apache-2.0
 
 T: sdk/emulator/eventinjector-eplugin
-D: SDK
+D: SDK / Emulator
 M: Yeongkyoon Lee <yeongkyoon.lee@samsung.com>
 I: Seokyeon Hwang
 R: Jihye Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/emulator/qemu
-D: SDK
+D: SDK / Emulator
 I: Jun Tian
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 L: MIT-style
 L: LGPL-2.1+
 L: GPL
 
 T: sdk/emulator/vgabios
-D: SDK
+D: SDK / Emulator
 R: Jun Tian
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 L: LGPL-2.0+
 L: LGPL
 L: Public-domain
 
 T: sdk/gst-plugins-emulator
-D: SDK
-B: tizen_2.2
+D: SDK / Emulator
 B: tizen
+B: tizen_2.2
 
 T: sdk/gstreamer0.10-ffmpeg-emulator
-D: SDK
+D: SDK / Emulator
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 L: LGPL-2.1+
 
 T: sdk/ide/assignmenttracing-eplugin
@@ -13020,127 +13283,127 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: sdk/ide/codecoverage-eplugin
-D: SDK
+D: SDK / Native IDE
 M: Kangho Kim <kh5325.kim@samsung.com>
 I: Gun Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/ide/common-eplugin
-D: SDK
+D: SDK / Common IDE
 M: Kangho Kim <kh5325.kim@samsung.com>
 I: Bon Yong Lee
 R: Changhyun Lee
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/ide/dynamic-analysis-ide-eplugin
-D: SDK
+D: SDK / Dynamic analysis
 B: tizen
 
 T: sdk/ide/eventinjector-eplugin
-D: SDK
+D: SDK / Emulator
 B: tizen
 
 T: sdk/ide/js-assignmenttracing-eplugin
-D: SDK
+D: SDK / Common IDE
 M: Harry Hyeongseok Heo <hyeongseok.heo@samsung.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/ide/jsdt-extension-eplugin
-D: SDK
+D: SDK / Common IDE
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/ide/native-eplugin
-D: SDK
+D: SDK / Native IDE
 M: Kangho Kim <kh5325.kim@samsung.com>
 I: Yoonki Park
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/ide/native-ext-eplugin
-D: SDK
+D: SDK / Native IDE
 M: Shinjae Lee <poiema@samsung.com>
 I: Daesung Ha
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/ide/native-platform-sample
-D: SDK
+D: SDK / Native IDE
 M: DongHee Yang <donghee.yang@samsung.com>
 I: Donghyuk Yang
 R: Taejun Ha
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/ide/native-sample
-D: SDK
+D: SDK / Native IDE
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
-B: tizen
 
 T: sdk/ide/nativeappcommon-eplugin
-D: SDK
+D: SDK / Native IDE
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/ide/nativecommon-eplugin
-D: SDK
+D: SDK / Native IDE
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/ide/nativeplatform-eplugin
-D: SDK
+D: SDK / Native IDE
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/ide/product
-D: SDK
+D: SDK / Common IDE
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/ide/profiler-eplugin
-D: SDK
+D: SDK / Dynamic analysis
 M: Kangho Kim <kh5325.kim@samsung.com>
 I: Jaewon Lim
 R: Woojin Jung
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/ide/unittest-eplugin
-D: SDK
+D: SDK / Native IDE
 M: Kangho Kim <kh5325.kim@samsung.com>
 I: Gun Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/ide/web-sample
 D: SDK
@@ -13151,44 +13414,44 @@ D: SDK
 B: tizen_2.0
 
 T: sdk/ide/web-ui-builder-eplugin
-D: SDK
+D: SDK / Web UI builder
 B: tizen
 
 T: sdk/ide/web-ui-builder-test
-D: SDK
+D: SDK / Web UI builder
 B: tizen
 
 T: sdk/ide/webapp-eplugin
-D: SDK
+D: SDK / Common IDE
 R: Xu Zhang
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/ide/websimulator-eplugin
-D: SDK
+D: SDK / Web simulator
 M: Jason Hu <jia-cheng.hu@intel.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/installer/install-manager
-D: SDK
+D: SDK / SDK package management
 M: DongHee Yang <donghee.yang@samsung.com>
 I: Yongsung Kim
 R: Jackie Wu
 R: Shihyun Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 L: Apache-2.0
 L: EPL-1.0
 
 T: sdk/nfc-plugin-emul
-D: SDK
+D: SDK / Emulator
 M: Taesoo Jun <steve.jun@samsung.com>
 M: Youngjae Shin <yj99.shin@samsung.com>
 B: tizen_2.0
@@ -13196,92 +13459,92 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: sdk/sensor-daemon-emulator
-D: SDK
+D: SDK / Emulator
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 L: Apache-2.0
 
 T: sdk/simulator-opengl
-D: SDK
+D: SDK / Emulator
 M: Yeongkyoon Lee <yeongkyoon.lee@samsung.com>
 I: Sangjin Kim
 R: Giwoong Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 L: MIT-style
 
 T: sdk/system-plugin-emulator
-D: SDK
+D: SDK / Emulator
 M: Yeongkyoon Lee <yeongkyoon.lee@samsung.com>
 I: Seokyeon Hwang
 R: Jihye Kim
+B: tizen
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 L: Apache-2.0
 
 T: sdk/target/dynamic-analysis-manager
-D: SDK
+D: SDK / Dynamic analysis
 B: tizen
 
 T: sdk/target/dynamic-analysis-probe
-D: SDK
+D: SDK / Dynamic analysis
 B: tizen
 
 T: sdk/target/sdbd
-D: SDK
+D: SDK / Command line tools
 B: tizen
 
 T: sdk/tools/certificate-generator
-D: SDK
+D: SDK / Command line tools
 M: Shinjae Lee <poiema@samsung.com>
 R: Hyunwoo Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/tools/cli
-D: SDK
+D: SDK / Command line tools
 B: tizen
 
 T: sdk/tools/dynamic-analyzer
-D: SDK
+D: SDK / Dynamic analysis
 B: tizen
 
 T: sdk/tools/gcc-4.5
-D: SDK
+D: SDK / Native build system
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/tools/gdb-7.2
-D: SDK
+D: SDK / Native build system
 B: tizen_2.0
 
 T: sdk/tools/gdb-7.5
-D: SDK
+D: SDK / Native build system
+B: tizen
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/tools/image-creator
-D: SDK
+D: SDK / Native build system
 M: DongHee Yang <donghee.yang@samsung.com>
 I: Taejun Ha
 R: Jiil Hyoun
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/tools/llvm-3.1
-D: SDK
+D: SDK / Command line tools
 M: DongHee Yang <donghee.yang@samsung.com>
 I: Taejun Ha
 R: Jiil Hyoun
@@ -13289,41 +13552,41 @@ B: tizen_2.0
 B: tizen_2.2
 
 T: sdk/tools/mingw
-D: SDK
+D: SDK / Native build system
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/tools/native-app-rootstrap
-D: SDK
+D: SDK / Native build system
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/tools/native-ui-builder
-D: SDK
+D: SDK / Native UI builder
 M: Shinjae Lee <poiema@samsung.com>
 I: Daeyoung Know
 R: Muneer Ahmed
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/tools/native-ui-effect-builder
-D: SDK
+D: SDK / Native UI builder
 M: Daeyoung Ryu <karzia@samsung.com>
 I: Dmitriy Korba(surc)
 R: Sang Hee Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/tools/oprofile
-D: SDK
+D: SDK / Command line tools
 M: juyoung kim <j0.kim@samsung.com>
 I: Jaewon Lim
 R: Woojin Jung
@@ -13332,78 +13595,78 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: sdk/tools/platform-dev-rootstrap
-D: SDK
+D: SDK / Native build system
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/tools/sbi-plugins
-D: SDK
+D: SDK / Native build system
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/tools/sdb
-D: SDK
+D: SDK / Command line tools
 M: Kangho Kim <kh5325.kim@samsung.com>
 I: Yoonki Park
 R: Ho Namkoong
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/tools/sdblib
-D: SDK
+D: SDK / Command line tools
 B: tizen_2.0
 
 T: sdk/tools/sdk-build
-D: SDK
+D: SDK / SDK package management
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/tools/smart-build-interface
-D: SDK
+D: SDK / Native build system
 M: DongHee Yang <donghee.yang@samsung.com>
 I: Taejun Ha
 R: Shihyun Kim
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/tools/toolchain-dev-rootstrap
-D: SDK
+D: SDK / Native build system
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/tools/ui-customizer
-D: SDK
+D: SDK / Native UI builder
 M: Shinjae Lee <poiema@samsung.com>
 I: Saket Sinha
 R: Muneer Ahmed
-B: tizen_2.2
 B: tizen
+B: tizen_2.2
 
 T: sdk/tools/unittest-framework
-D: SDK
+D: SDK / Native IDE
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/tools/upstream/oprofile
-D: SDK
+D: SDK / Dynamic analysis
 B: tizen
 
 T: sdk/tools/upstream/valgrind
-D: SDK
+D: SDK / Dynamic analysis
 B: tizen
 
 T: sdk/tools/valgrind
@@ -13416,19 +13679,19 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: sdk/tools/web-app-checker
-D: SDK
+D: SDK / Command line tools
 B: tizen
 
 T: sdk/tools/web-simulator
-D: SDK
+D: SDK / Web simulator
 M: Jason Hu <jia-cheng.hu@intel.com>
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
 
 T: sdk/ui-builder/web-ui-builder-eplugin
-D: SDK
+D: SDK / Web UI builder
 M: Changyeon Lee <changyeon.lee@samsung.com>
 I: Gyeong Min Ju
 R: Nakyoung Choi
@@ -13437,33 +13700,46 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: sdk/vmodem-daemon-emulator
-D: SDK
+D: SDK / Emulator
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
+
+T: test/common/common-sanity-suite
+D: Testing
 B: tizen
 
-T: test
-D: 
-B: tizen_2.1
-C: Missing domain!
+T: test/ivi/ivi-sanity-suite
+D: Testing / IVI
+B: tizen
+
+T: test/tools/common-suite-launcher
+D: Testing
+B: tizen
+
+T: test/tools/testkitlite
+D: Testing
+B: tizen
+
+T: test/tools/testkitstub
+D: Testing
+B: tizen
 
 T: toolchains/autoconf
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: toolchains/automake
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: toolchains/bash-x86
-D: System
+D: System / Utilities
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -13475,33 +13751,31 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/build
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: toolchains/build-compare
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: toolchains/bzip2-libs-x86
-D: Base
+D: Base / Compression
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/bzip2-x86
-D: Base
+D: Base / Compression
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/c-ares-x86
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
 B: tizen_2.0
 B: tizen_2.1
 
@@ -13512,7 +13786,7 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/cloog
-D: Base
+D: Base / Toolchain
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -13542,7 +13816,7 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/cpio
-D: Base
+D: Base / Compression
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -13565,13 +13839,13 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/diffutils
-D: Base
+D: Base / Utilities
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/diffutils-x86
-D: Base
+D: Base / Utilities
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -13599,7 +13873,7 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/e2fsprogs
-D: Base
+D: Base / File Systems
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -13611,43 +13885,43 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/eglibc-arm
-D: Base
+D: Base / Toolchain
 B: tizen_2.2
 
 T: toolchains/eglibc-devel-arm
-D: Base
+D: Base / Toolchain
 B: tizen_2.2
 
 T: toolchains/eglibc-headers-arm
-D: Base
+D: Base / Toolchain
 B: tizen_2.2
 
 T: toolchains/eglibc-x86
-D: Base
+D: Base / Toolchain
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/elfutils
-D: Base
+D: Base / Toolchain
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/elfutils-libelf-x86
-D: Base
+D: Base / Toolchain
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/elfutils-libs-x86
-D: Base
+D: Base / Toolchain
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/elfutils-x86
-D: Base
+D: Base / Toolchain
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -13659,7 +13933,7 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/expat-x86
-D: Base
+D: Base / Libraries
 B: tizen_2.0
 B: tizen_2.1
 
@@ -13688,7 +13962,7 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/filesystem
-D: Base
+D: Base / File Systems
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -13706,7 +13980,7 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/flex
-D: Base
+D: Base / Utilities
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -13724,7 +13998,7 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/gcc
-D: Base
+D: Base / Toolchain
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -13758,25 +14032,25 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/grep
-D: System
+D: System / Utilities
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/grep-x86
-D: System
+D: System / Utilities
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/groff
-D: Base
+D: Base / Compression
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/gzip
-D: Base
+D: Base / Compression
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -13793,7 +14067,7 @@ B: tizen_2.0
 B: tizen_2.1
 
 T: toolchains/hwdata
-D: Base
+D: Base / Libraries
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -13827,69 +14101,66 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/kmod
-D: System
+D: System / Utilities
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/less
-D: Base
+D: Base / Utilities
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/libacl-x86
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: toolchains/libarchive
-D: Base
+D: Base / Toolchain
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/libarchive-x86
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: toolchains/libattr-x86
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: toolchains/libcap-x86
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/libcurl-x86
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
 B: tizen_2.0
 B: tizen_2.1
 
 T: toolchains/libffi
-D: Base
+D: Base / Toolchain
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/libfile-x86
-D: Base
+D: Base / Toolchain
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/libgcc-x86
-D: Base
+D: Base / Toolchain
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -13907,7 +14178,7 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/libstdc++-x86
-D: Base
+D: Base / Toolchain
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -13919,11 +14190,10 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/libwsbm
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: toolchains/libxml2-x86
 D: App Framework
@@ -13931,11 +14201,10 @@ B: tizen_2.0
 B: tizen_2.1
 
 T: toolchains/libzypp
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: toolchains/llvm
 D: Base
@@ -13956,12 +14225,12 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/lzo
-D: Base
+D: Base / Compression
 B: tizen_2.0
 B: tizen_2.1
 
 T: toolchains/lzop
-D: Base
+D: Base / Compression
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -13973,33 +14242,31 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/make
-D: Base
+D: Base / Toolchain
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/make-x86
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: toolchains/mpc
-D: Base
+D: Base / Toolchain
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/mpc-x86
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: toolchains/mpclib
-D: Base
+D: Base / Toolchain
 B: tizen_2.0
 B: tizen_2.1
 
@@ -14010,18 +14277,16 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/mpfr-x86
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: toolchains/ncurses-libs-x86
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: toolchains/nodejs
 D: Base
@@ -14030,9 +14295,8 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/nodejs-x86
-D: 
+D: Platform Development / Build
 B: tizen_2.2
-C: Missing domain!
 
 T: toolchains/nspr
 D: Base
@@ -14041,11 +14305,10 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/nspr-x86
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: toolchains/nss
 D: Base
@@ -14054,28 +14317,25 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/nss-softokn-freebl-x86
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: toolchains/nss-x86
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: toolchains/openssl-x86
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: toolchains/pam
-D: Base
+D: Base / Utilities
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -14087,11 +14347,10 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/patch-x86
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: toolchains/patchelf
 D: Base
@@ -14172,26 +14431,24 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/pkgconfig-x86
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
-C: Missing domain!
 
 T: toolchains/polkit
-D: Base
+D: Base / Utilities
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/popt-x86
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: toolchains/ppl
-D: Base
+D: Base / Toolchain
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -14245,11 +14502,10 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/python-urlgrabber
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: toolchains/python-yaml
 D: Base
@@ -14258,43 +14514,37 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/qemu.x86_64
-D: 
+D: Platform Development / Build
 B: tizen_2.2
-C: Missing domain!
 
 T: toolchains/readline
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
-C: Missing domain!
 
 T: toolchains/rpm
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: toolchains/rpm-build-x86
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: toolchains/rpm-libs-x86
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: toolchains/rpm-x86
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: toolchains/ruby
 D: Base
@@ -14303,17 +14553,16 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/sed
-D: Base
+D: Base / Utilities
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/sed-x86
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: toolchains/setup
 D: Base
@@ -14339,24 +14588,22 @@ B: tizen_2.0
 B: tizen_2.1
 
 T: toolchains/sqlite-x86
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: toolchains/tar
-D: Base
+D: Base / Compression
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/tar-x86
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: toolchains/texinfo
 D: Base
@@ -14365,17 +14612,15 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/tizen-accelerator
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: toolchains/tizen-cross-armv7l-sysroot
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
-C: Missing domain!
 
 T: toolchains/tizen-mobile-session
 D: Base
@@ -14384,7 +14629,7 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/tizen-release
-D: Platform Development
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -14408,7 +14653,7 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/unzip
-D: Base
+D: Base / Compression
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -14426,36 +14671,34 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/xz
-D: Base
+D: Base / Compression
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/xz-libs-x86
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: toolchains/zip
-D: Base
+D: Base / Compression
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/zlib
-D: Base
+D: Base / Compression
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 
 T: toolchains/zlib-x86
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: toolchains/zypper
 D: Base
@@ -14464,126 +14707,111 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: tools/apitrace
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
-C: Missing domain!
+
+T: tools/bmap-tools
+D: Platform Development / Utilities
+B: tizen
 
 T: tools/buildtest
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: tools/depanneur
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
-C: Missing domain!
 
 T: tools/desktop-file-utils
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
-C: Missing domain!
 
 T: tools/device-configs
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
-C: Missing domain!
 
 T: tools/ext4-utils
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
-C: Missing domain!
 
 T: tools/gbs
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
-C: Missing domain!
 
 T: tools/image-configurations
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: tools/kickstarter
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: tools/lthor
-D: 
+D: Platform Development / Utilities
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
-C: Missing domain!
 
 T: tools/mic
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: tools/mic-bootstrap
-D: 
+D: Platform Development / Utilities
+B: tizen
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-B: tizen
-C: Missing domain!
 
 T: tools/nasm
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: tools/net-tools
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: tools/obs-build
-D: 
+D: Platform Development / Build
 B: tizen_2.0
-C: Missing domain!
 
 T: tools/obs-tools
-D: 
+D: Platform Development / Build
 B: tizen_2.0
-C: Missing domain!
 
 T: tools/package-groups
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: tools/pkg-config
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!
 
 T: tools/util-linux
-D: 
+D: Platform Development / Build
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
-C: Missing domain!