Import subdomain information from subdoaminworksheet-v13.xlsx

Change-Id: I9cd98cc774165193484ce2d9df6377004a038054

diff --git a/git-trees b/git-trees
index 2057d84..a0a7454 100644 (file)
--- a/git-trees
+++ b/git-trees
@@ -1,64 +1,64 @@
 
 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_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
 
@@ -69,68 +69,68 @@ 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_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
@@ -167,7 +167,7 @@ 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
@@ -203,7 +203,7 @@ B: tizen
 C: Missing domain!
 
 T: adaptation/intel_mfld/psb-headers
-D: Graphics & UI Framework
+D: Graphics & UI Framework / GL
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -260,37 +260,37 @@ 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
@@ -301,57 +301,57 @@ 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,7 +363,7 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: apps/core/preloaded/app-selector
-D: App Framework
+D: App Framework / Application Launcher
 B: tizen_2.0
 B: tizen_2.1
 B: tizen
@@ -1720,14 +1720,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 +1740,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 +1748,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 +1768,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 +1787,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 +1801,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 +1825,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 +1833,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 +1841,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 +1880,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 +1907,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 +1929,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 +1949,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 +2042,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 +2054,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 +2066,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 +2084,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
@@ -2101,31 +2101,31 @@ B: tizen_2.0
 B: tizen_2.1
 
 T: external/libflac
-D: Multimedia
+D: Graphics & UI Framework
 B: tizen_2.0
 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 +2137,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,35 +2155,35 @@ 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
 
 T: external/libremix
-D: Multimedia
+D: Graphics & UI Framework
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -2195,65 +2195,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
@@ -2283,7 +2283,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
@@ -2327,25 +2327,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 +2357,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 +2417,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 +2429,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 +2447,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 +2477,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 +2495,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 +2507,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 +2524,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 +2552,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 +2582,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 +2671,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 +2689,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 +2731,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 +2749,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 +2767,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 +2961,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 +2975,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 +2993,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 +3022,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 +3033,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 +3081,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 +3508,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 +3531,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 +3549,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_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 +3580,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 +3592,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 +3638,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 +3655,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 +3836,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 +3904,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 +3928,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 +3952,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 +3963,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,13 +4857,13 @@ 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_2.0
 B: tizen_2.1
 B: tizen
@@ -4916,175 +4916,175 @@ 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
+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
+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
@@ -5157,57 +5157,57 @@ 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/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_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_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_2.0
@@ -5217,7 +5217,7 @@ 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>
@@ -5228,7 +5228,7 @@ 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>
@@ -5241,7 +5241,7 @@ 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_2.0
@@ -5258,13 +5258,13 @@ B: tizen
 L: Apache-2.0
 
 T: platform/core/api/connection
-D: Network & Connectivity
+D: Network & Connectivity / Data Network
 B: tizen_2.0
 B: tizen_2.1
 B: tizen
 
 T: platform/core/api/device
-D: System
+D: Base / Device Management
 B: tizen_2.0
 B: tizen_2.1
 B: tizen
@@ -5272,28 +5272,28 @@ L: Apache-2.0
 L: Apache
 
 T: platform/core/api/efl-util
-D: Graphics & UI Framework
+D: Native API / Graphics & UI Framework
 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_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_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_2.0
 B: tizen_2.1
 B: tizen
@@ -5301,20 +5301,20 @@ L: Apache-2.0
 L: Apache
 
 T: platform/core/api/geocoder
-D: Location
+D: Location / Geolocation
 B: tizen_2.0
 B: tizen_2.1
 B: tizen
 L: Apache-2.0
 
 T: platform/core/api/haptic
-D: System
+D: Base / Device Management
 B: tizen_2.1
 B: tizen
 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_2.0
@@ -5324,14 +5324,14 @@ L: Apache-2.0
 L: Apache
 
 T: platform/core/api/location-manager
-D: Location
+D: Location / Geolocation
 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_2.0
@@ -5347,7 +5347,7 @@ 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
@@ -5358,7 +5358,7 @@ 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_2.0
@@ -5368,7 +5368,7 @@ L: Apache-2.0
 L: Apache
 
 T: platform/core/api/mime-type
-D: Multimedia
+D: Multimedia / Media Service
 M: Yan Yin
 B: tizen_2.0
 B: tizen_2.1
@@ -5376,7 +5376,7 @@ 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>
@@ -5387,7 +5387,7 @@ 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>
@@ -5407,14 +5407,14 @@ B: tizen
 L: Apache-2.0
 
 T: platform/core/api/package-manager
-D: App Framework
+D: App Framework / Application Installer
 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_2.0
@@ -5424,14 +5424,14 @@ L: Apache-2.0
 L: Apache
 
 T: platform/core/api/poi
-D: Location
+D: Location / Geolocation
 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_2.0
 B: tizen_2.1
 B: tizen
@@ -5439,7 +5439,7 @@ 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_2.0
@@ -5448,7 +5448,7 @@ 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_2.0
@@ -5459,7 +5459,7 @@ L: Apache-2.0
 L: Apache
 
 T: platform/core/api/route
-D: Location
+D: Location / Geolocation
 B: tizen_2.0
 B: tizen_2.1
 B: tizen
@@ -5475,13 +5475,13 @@ B: tizen
 L: Apache-2.0
 
 T: platform/core/api/sensor
-D: Graphics & UI Framework
+D: Native API / Graphics & UI Framework
 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_2.0
@@ -5491,7 +5491,7 @@ 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>
@@ -5504,7 +5504,7 @@ 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_2.0
@@ -5531,7 +5531,7 @@ 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_2.0
@@ -5541,7 +5541,7 @@ 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_2.0
@@ -5551,7 +5551,7 @@ 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_2.0
@@ -5561,7 +5561,7 @@ L: Apache-2.0
 L: Apache
 
 T: platform/core/api/usb-accessory
-D: System
+D: Base
 B: tizen_2.0
 B: tizen_2.1
 B: tizen
@@ -5569,7 +5569,7 @@ 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_2.0
@@ -5579,7 +5579,7 @@ 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_2.0
@@ -5589,7 +5589,7 @@ 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>
@@ -5600,7 +5600,7 @@ 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_2.0
@@ -5609,7 +5609,7 @@ 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_2.0
@@ -5618,7 +5618,7 @@ 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_2.0
@@ -5629,7 +5629,7 @@ 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_2.0
@@ -5639,7 +5639,7 @@ 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_2.0
@@ -5648,7 +5648,7 @@ 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_2.0
@@ -5657,7 +5657,7 @@ 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_2.0
@@ -5667,7 +5667,7 @@ 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_2.0
@@ -5676,14 +5676,14 @@ B: tizen
 L: Apache-2.0
 
 T: platform/core/appfw/aul-1
-D: App Framework
+D: App Framework / Application Launcher
 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_2.0
@@ -5692,7 +5692,7 @@ 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
@@ -5700,7 +5700,7 @@ B: tizen
 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_2.0
@@ -5709,7 +5709,7 @@ 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_2.0
@@ -5718,7 +5718,7 @@ 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_2.0
@@ -5727,7 +5727,7 @@ 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
@@ -5735,7 +5735,7 @@ B: tizen
 L: Apache-2.0
 
 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_2.0
@@ -5744,7 +5744,7 @@ 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_2.0
@@ -5754,21 +5754,21 @@ L: Apache-2.0
 L: Flora-1.1
 
 T: platform/core/appfw/slp-pkgmgr
-D: App Framework
+D: App Framework / Application Installer
 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_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_2.0
@@ -5777,7 +5777,7 @@ B: tizen
 L: Apache-2.0
 
 T: platform/core/appfw/ui-gadget-1
-D: App Framework
+D: App Framework / Application Core
 M: Jong Sang Won
 I: Hyungdeuk Kim
 B: tizen_2.0
@@ -5786,7 +5786,7 @@ 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_2.0
@@ -5795,7 +5795,7 @@ 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_2.0
@@ -5804,7 +5804,7 @@ 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_2.0
@@ -5815,7 +5815,7 @@ 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_2.0
@@ -5824,13 +5824,13 @@ B: tizen
 L: Apache-2.0
 
 T: platform/core/base/default-files-tizen
-D: System
+D: System / File Systems
 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_2.0
@@ -5840,7 +5840,7 @@ 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_2.0
@@ -5850,7 +5850,7 @@ 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_2.0
@@ -5866,7 +5866,7 @@ 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_2.0
@@ -5875,7 +5875,7 @@ 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>
@@ -5886,7 +5886,7 @@ 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>
@@ -5897,7 +5897,7 @@ 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>
@@ -5908,12 +5908,12 @@ 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
@@ -5923,7 +5923,7 @@ 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>
@@ -5934,7 +5934,7 @@ 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
@@ -5944,7 +5944,7 @@ 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
@@ -5954,7 +5954,7 @@ 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_2.0
 B: tizen_2.1
@@ -5963,7 +5963,7 @@ 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>
@@ -5974,7 +5974,7 @@ 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>
@@ -5984,11 +5984,11 @@ 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_2.0
 B: tizen_2.1
@@ -5997,7 +5997,7 @@ 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_2.0
 B: tizen_2.1
@@ -6006,7 +6006,7 @@ L: Apache-2.0
 L: Apache
 
 T: platform/core/connectivity/smartcard-service
-D: Network & Connectivity
+D: Network & Connectivity / NFC
 M: Taesoo Jun
 B: tizen_2.0
 B: tizen_2.1
@@ -6014,7 +6014,7 @@ 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
@@ -6024,14 +6024,14 @@ 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_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_2.0
 B: tizen_2.1
 B: tizen
@@ -6039,21 +6039,21 @@ L: Trademark-ref
 L: Apache-2.0
 
 T: platform/core/graphics/opengl-es
-D: Graphics & UI Framework
+D: Graphics & UI Framework / GL
 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_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
@@ -6061,41 +6061,41 @@ B: tizen
 L: Apache-2.0
 
 T: platform/core/location/liblocation-appman
-D: Location
+D: Location / Geolocation
 B: tizen_2.0
 B: tizen_2.1
 B: tizen
 
 T: platform/core/location/libslp-location
-D: Location
+D: Location / Geolocation
 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_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_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_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
@@ -6105,7 +6105,7 @@ 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
@@ -6116,7 +6116,7 @@ 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
@@ -6126,7 +6126,7 @@ 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
@@ -6136,7 +6136,7 @@ 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_2.0
@@ -6147,7 +6147,7 @@ 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
@@ -6157,7 +6157,7 @@ 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
@@ -6168,7 +6168,7 @@ 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
@@ -6183,7 +6183,7 @@ 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_2.0
@@ -6193,7 +6193,7 @@ 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_2.0
@@ -6202,7 +6202,7 @@ 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_2.0
@@ -6211,7 +6211,7 @@ 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_2.0
@@ -6221,7 +6221,7 @@ 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_2.0
@@ -6230,7 +6230,7 @@ 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_2.0
@@ -6243,7 +6243,7 @@ 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_2.0
@@ -6253,7 +6253,7 @@ 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_2.0
@@ -6262,7 +6262,7 @@ 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_2.0
@@ -6271,7 +6271,7 @@ 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_2.0
@@ -6280,7 +6280,7 @@ 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
@@ -6290,7 +6290,7 @@ 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_2.0
@@ -6300,7 +6300,7 @@ 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_2.0
@@ -6309,7 +6309,7 @@ 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_2.0
@@ -6318,7 +6318,7 @@ 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_2.0
@@ -6327,7 +6327,7 @@ 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_2.0
@@ -6339,7 +6339,7 @@ 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_2.0
@@ -6348,7 +6348,7 @@ 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_2.0
 B: tizen_2.1
@@ -6357,7 +6357,7 @@ 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
@@ -6367,7 +6367,7 @@ 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
@@ -6377,7 +6377,7 @@ 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_2.0
@@ -6386,7 +6386,7 @@ 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
@@ -6396,7 +6396,7 @@ 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_2.0
@@ -6405,7 +6405,7 @@ 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_2.0
@@ -6414,11 +6414,11 @@ 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_2.0
@@ -6427,7 +6427,7 @@ 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
@@ -6435,11 +6435,11 @@ 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_2.0
@@ -6449,14 +6449,14 @@ 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_2.0
@@ -6466,7 +6466,7 @@ 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_2.0
@@ -6475,28 +6475,28 @@ 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
 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_2.0
@@ -6505,7 +6505,7 @@ 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_2.0
@@ -6514,7 +6514,7 @@ 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_2.0
@@ -6523,14 +6523,14 @@ B: tizen
 L: Apache-2.0
 
 T: platform/core/system/dlog
-D: System
+D: System / Logging
 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_2.0
@@ -6540,7 +6540,7 @@ 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
@@ -6548,7 +6548,7 @@ B: tizen
 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_2.0
@@ -6557,7 +6557,7 @@ 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_2.0
@@ -6566,7 +6566,7 @@ 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
@@ -6576,7 +6576,7 @@ 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_2.0
@@ -6585,21 +6585,21 @@ B: tizen
 L: Apache-2.0
 
 T: platform/core/system/libslp-sysman
-D: System
+D: Base / Device Management
 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_2.0
 B: tizen_2.1
 B: tizen
 L: Apache-2.0
 
 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_2.0
@@ -6628,7 +6628,7 @@ B: tizen
 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
@@ -6648,7 +6648,7 @@ 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_2.0
@@ -6665,7 +6665,7 @@ 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
@@ -6675,7 +6675,7 @@ 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
@@ -6695,7 +6695,7 @@ 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
@@ -6705,7 +6705,7 @@ B: tizen
 L: Apache-2.0
 
 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>
@@ -6719,7 +6719,7 @@ B: tizen
 L: Apache-2.0
 
 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>
@@ -6733,7 +6733,7 @@ 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>
@@ -6746,7 +6746,7 @@ B: tizen
 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>
@@ -6760,7 +6760,7 @@ 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>
@@ -6774,7 +6774,7 @@ 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>
@@ -6788,7 +6788,7 @@ 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>
@@ -6802,7 +6802,7 @@ 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>
@@ -6816,7 +6816,7 @@ 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>
@@ -6829,7 +6829,7 @@ 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>
@@ -6842,7 +6842,7 @@ 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>
@@ -6856,7 +6856,7 @@ 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>
@@ -6870,7 +6870,7 @@ 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>
@@ -6884,7 +6884,7 @@ 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_2.0
@@ -6894,7 +6894,7 @@ 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
@@ -6905,7 +6905,7 @@ 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
@@ -6917,7 +6917,7 @@ 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_2.0
@@ -6928,7 +6928,7 @@ 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_2.0
@@ -6938,7 +6938,7 @@ 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
@@ -6950,11 +6950,11 @@ 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_2.0
 B: tizen_2.1
@@ -6962,7 +6962,7 @@ 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
@@ -6973,7 +6973,7 @@ 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_2.0
@@ -6982,7 +6982,7 @@ 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_2.0
@@ -6993,7 +6993,7 @@ 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_2.0
@@ -7004,7 +7004,7 @@ 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_2.0
@@ -7014,7 +7014,7 @@ 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_2.0
@@ -7024,7 +7024,7 @@ 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_2.0
@@ -7034,7 +7034,7 @@ 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_2.0
@@ -7044,7 +7044,7 @@ 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_2.0
@@ -7053,7 +7053,7 @@ 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_2.0
@@ -7062,7 +7062,7 @@ 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
@@ -7073,7 +7073,7 @@ 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_2.0
@@ -7082,7 +7082,7 @@ 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_2.0
@@ -7091,7 +7091,7 @@ 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
@@ -7099,7 +7099,7 @@ B: tizen
 L: MIT-style
 
 T: platform/core/uifw/libttssmt
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Voice Framework
 B: tizen_2.0
 B: tizen_2.1
 B: tizen
@@ -7107,7 +7107,7 @@ 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_2.0
@@ -7116,7 +7116,7 @@ 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_2.0
@@ -7125,14 +7125,14 @@ B: tizen
 L: Apache-2.0
 
 T: platform/framework/native/app-controls
-D: App Framework
+D: Native API / App Framework
 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_2.0
 B: tizen_2.1
 B: tizen
@@ -7140,20 +7140,20 @@ L: Apache-2.0
 L: Flora-1.1
 
 T: platform/framework/native/appfw
-D: App Framework
+D: Native API / App Framework
 B: tizen_2.0
 B: tizen_2.1
 B: tizen
 L: Apache-2.0
 
 T: platform/framework/native/appwidget-service
-D: App Framework
+D: Native API / App Framework
 B: tizen_2.1
 B: tizen
 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_2.0
 B: tizen_2.1
@@ -7161,25 +7161,25 @@ 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_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
 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_2.0
@@ -7188,7 +7188,7 @@ 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_2.0
 B: tizen_2.1
@@ -7197,7 +7197,7 @@ 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
@@ -7207,7 +7207,7 @@ 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_2.0
 B: tizen_2.1
@@ -7216,7 +7216,7 @@ L: Apache-2.0
 L: Apache
 
 T: platform/framework/native/face
-D: Graphics & UI Framework
+D: Native API / Graphics & UI Framework
 B: tizen_2.0
 B: tizen_2.1
 B: tizen
@@ -7224,7 +7224,7 @@ 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_2.0
@@ -7233,7 +7233,7 @@ 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_2.0
@@ -7242,14 +7242,14 @@ B: tizen
 L: Apache-2.0
 
 T: platform/framework/native/ime
-D: Graphics & UI Framework
+D: Native API / Graphics & UI Framework
 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_2.0
 B: tizen_2.1
@@ -7265,7 +7265,7 @@ 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_2.0
 B: tizen_2.1
@@ -7274,14 +7274,14 @@ L: Apache-2.0
 L: Apache
 
 T: platform/framework/native/locations
-D: Location
+D: Native API / Location
 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_2.0
@@ -7291,14 +7291,14 @@ B: tizen
 L: Apache-2.0
 
 T: platform/framework/native/messaging
-D: Messaging
+D: Messaging / Cellular
 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_2.0
 B: tizen_2.1
@@ -7307,7 +7307,7 @@ 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_2.0
 B: tizen_2.1
@@ -7315,14 +7315,14 @@ 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_2.0
@@ -7331,7 +7331,7 @@ 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_2.0
 B: tizen_2.1
@@ -7340,7 +7340,7 @@ 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
@@ -7350,7 +7350,7 @@ 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_2.0
 B: tizen_2.1
@@ -7359,14 +7359,14 @@ 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
 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>
@@ -7378,14 +7378,14 @@ B: tizen
 L: Apache-2.0
 
 T: platform/framework/native/uifw
-D: Graphics & UI Framework
+D: Native API / Graphics & UI Framework
 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_2.0
 B: tizen_2.1
 B: tizen
@@ -7393,26 +7393,26 @@ L: Apache-2.0
 L: Flora-1.0
 
 T: platform/framework/native/vision
-D: Graphics & UI Framework
+D: Native API / Graphics & UI Framework
 B: tizen_2.1
 B: tizen
 L: Apache-2.0
 L: Flora-1.1
 
 T: platform/framework/native/web
-D: Web Framework
+D: Native API / Web Framework
 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
@@ -7420,12 +7420,12 @@ B: tizen
 L: Flora-1.0
 
 T: platform/framework/web/data-provider-slave
-D: Web Framework
+D: Applications
 B: tizen_2.1
 B: tizen
 
 T: platform/framework/web/download-provider
-D: Web Framework
+D: Applications
 M: InBum Chang <ibchang@samsung.com>
 I: Kwangmin Bang
 B: tizen_2.0
@@ -7434,53 +7434,53 @@ B: tizen
 L: Apache-2.0
 
 T: platform/framework/web/heap-monitor
-D: Web Framework
+D: Applications
 B: tizen_2.1
 B: tizen
 
 T: platform/framework/web/livebox
-D: Web Framework
+D: Applications
 B: tizen_2.1
 B: tizen
 
 T: platform/framework/web/livebox-cpp
-D: Web Framework
+D: Applications
 B: tizen_2.1
 B: tizen
 
 T: platform/framework/web/livebox-edje
-D: Web Framework
+D: Applications
 B: tizen_2.1
 B: tizen
 
 T: platform/framework/web/livebox-service
-D: Web Framework
+D: Applications
 B: tizen_2.1
 B: tizen
 
 T: platform/framework/web/livebox-viewer
-D: Web Framework
+D: Applications
 B: tizen_2.1
 B: tizen
 
 T: platform/framework/web/provider
-D: Web Framework
+D: Applications
 B: tizen_2.1
 B: tizen
 
 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
+D: Web Framework / Web Runtime
 B: tizen_2.1
 B: tizen
 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_2.0
@@ -7492,20 +7492,20 @@ L: GPL-2.0
 L: MIT
 
 T: platform/framework/web/webkit-efl
-D: Web Framework
+D: Web Framework / Web Engine
 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_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_2.0
@@ -7514,7 +7514,7 @@ 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_2.0
@@ -7523,7 +7523,7 @@ 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_2.0
@@ -7532,7 +7532,7 @@ 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
@@ -7542,7 +7542,7 @@ 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_2.0
 B: tizen_2.1
@@ -7562,7 +7562,7 @@ B: tizen_2.1
 B: tizen
 
 T: platform/kernel/linux-3.10
-D: System
+D: System / Hardware Adaptation
 B: tizen
 
 T: platform/upstream/SDL
@@ -7572,7 +7572,7 @@ 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
@@ -7585,13 +7585,13 @@ 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
@@ -7600,7 +7600,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
@@ -7609,7 +7609,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
@@ -7618,7 +7618,7 @@ L: GPL
 L: FSF
 
 T: platform/upstream/asciidoc
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/aspell
@@ -7629,12 +7629,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
@@ -7653,19 +7653,19 @@ 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
@@ -7681,7 +7681,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
@@ -7689,20 +7689,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
@@ -7711,7 +7711,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
@@ -7719,11 +7719,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>
@@ -7740,11 +7740,11 @@ 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
@@ -7754,15 +7754,15 @@ 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
@@ -7771,11 +7771,11 @@ L: GPL-2.0
 L: GPL
 
 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
@@ -7792,7 +7792,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
@@ -7800,7 +7800,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
@@ -7812,7 +7812,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
@@ -7820,30 +7820,30 @@ 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_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_2.0
@@ -7852,11 +7852,11 @@ 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
@@ -7864,21 +7864,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>
@@ -7887,7 +7887,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
@@ -7895,11 +7895,11 @@ 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
@@ -7909,11 +7909,11 @@ D: Base
 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
@@ -7922,11 +7922,11 @@ B: tizen_2.0
 B: tizen
 
 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
@@ -7936,7 +7936,7 @@ 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
@@ -7948,7 +7948,7 @@ 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
@@ -7957,7 +7957,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
@@ -7982,7 +7982,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
@@ -7990,7 +7990,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
@@ -7998,14 +7998,14 @@ 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)
@@ -8030,7 +8030,7 @@ L: LGPL-2.1
 L: GPL-2.0
 
 T: platform/upstream/diffutils
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/dmidecode
@@ -8040,7 +8040,7 @@ 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
@@ -8048,7 +8048,7 @@ 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_2.0
@@ -8060,27 +8060,27 @@ 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: System
+D: Base
 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
@@ -8092,7 +8092,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
@@ -8100,7 +8100,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
@@ -8110,11 +8110,11 @@ L: LGPL-2.0
 L: LGPL-2.0+
 
 T: platform/upstream/econnman
-D: Network & Connectivity
+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
@@ -8124,11 +8124,11 @@ L: FSF
 L: Public-domain
 
 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
@@ -8138,7 +8138,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
@@ -8149,7 +8149,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
@@ -8161,7 +8161,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
@@ -8178,11 +8178,11 @@ 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
@@ -8192,7 +8192,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
@@ -8202,7 +8202,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
@@ -8212,11 +8212,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
@@ -8224,7 +8224,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
@@ -8233,11 +8233,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
@@ -8248,7 +8248,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
@@ -8264,7 +8264,7 @@ B: tizen_2.1
 B: tizen
 
 T: platform/upstream/enchant
-D: System
+D: System / Libraries
 B: tizen
 L: LGPL-2.1+
 L: FSF
@@ -8273,7 +8273,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
@@ -8303,7 +8303,7 @@ 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
@@ -8313,7 +8313,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
@@ -8322,23 +8322,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
@@ -8349,23 +8349,23 @@ L: FSF
 L: BSD
 
 T: platform/upstream/fakeroot
-D: Platform Development
+D: Platform Development / Utilities
 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_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
@@ -8373,7 +8373,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
@@ -8381,11 +8381,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
@@ -8394,26 +8394,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
@@ -8421,12 +8421,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
@@ -8435,7 +8435,7 @@ L: X11
 L: XFree86
 
 T: platform/upstream/freealut
-D: Multimedia
+D: Multimedia / Audio FW
 M: Byungwook Jang <bw.jang@samsung.com>
 B: tizen_2.0
 B: tizen_2.1
@@ -8444,23 +8444,23 @@ 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/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_2.0
 B: tizen_2.1
 B: tizen
@@ -8489,7 +8489,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
@@ -8498,7 +8498,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+
@@ -8508,15 +8508,15 @@ 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
@@ -8528,15 +8528,15 @@ 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
@@ -8546,13 +8546,13 @@ 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_2.0
 B: tizen_2.1
 B: tizen
@@ -8569,33 +8569,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
@@ -8603,7 +8603,7 @@ 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+
@@ -8628,7 +8628,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
@@ -8643,23 +8643,23 @@ 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+
@@ -8673,34 +8673,34 @@ 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/gst-common
-D: Multimedia
+D: Multimedia / Media Service
 B: tizen
 
 T: platform/upstream/gst-libav
-D: Multimedia
+D: Multimedia / Codec
 B: tizen_2.0
 B: tizen_2.1
 B: tizen
 
 T: platform/upstream/gst-omx
-D: Multimedia
+D: Multimedia / Media Service
 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
@@ -8709,7 +8709,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
@@ -8717,7 +8717,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
@@ -8725,11 +8725,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
@@ -8737,7 +8737,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
@@ -8750,7 +8750,7 @@ B: tizen_2.1
 B: tizen
 
 T: platform/upstream/gtk-doc
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/gummiboot
@@ -8760,7 +8760,7 @@ B: tizen
 L: LGPL-2.1+
 
 T: platform/upstream/gzip
-D: Base
+D: Base / Compression
 M: Myungjoo Ham <myungjoo.ham@samsung.com>
 I: Piotr Bereza
 R: Walyong Cho
@@ -8769,16 +8769,16 @@ 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
@@ -8807,7 +8807,7 @@ 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
@@ -8819,17 +8819,17 @@ 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/icecream
-D: Platform Development
+D: Platform Development / Compiler
 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
@@ -8841,15 +8841,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
@@ -8858,7 +8858,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
@@ -8867,18 +8867,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
@@ -8888,7 +8888,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
@@ -8902,7 +8902,7 @@ D: Base
 B: tizen
 
 T: platform/upstream/iso-codes
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen_2.0
 B: tizen_2.1
 B: tizen
@@ -8912,7 +8912,7 @@ D: System
 B: tizen
 
 T: platform/upstream/jasper
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Imaging
 B: tizen
 L: MIT-style
 L: FSF
@@ -8924,43 +8924,43 @@ 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
@@ -8969,19 +8969,19 @@ 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: System
+D: Platform Development
 B: tizen
 
 T: platform/upstream/leveldb
@@ -8994,13 +8994,13 @@ 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
@@ -9008,7 +9008,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
@@ -9017,7 +9017,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
@@ -9026,7 +9026,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
@@ -9036,7 +9036,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
@@ -9045,7 +9045,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
@@ -9053,7 +9053,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
@@ -9061,7 +9061,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
@@ -9069,7 +9069,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
@@ -9077,7 +9077,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
@@ -9085,7 +9085,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
@@ -9093,7 +9093,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
@@ -9102,7 +9102,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
@@ -9111,7 +9111,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
@@ -9120,7 +9120,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
@@ -9128,7 +9128,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
@@ -9136,7 +9136,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
@@ -9145,7 +9145,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
@@ -9154,18 +9154,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
@@ -9173,7 +9173,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
@@ -9181,7 +9181,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
@@ -9189,7 +9189,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
@@ -9197,7 +9197,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
@@ -9207,7 +9207,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
@@ -9217,7 +9217,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
@@ -9226,7 +9226,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
@@ -9234,7 +9234,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
@@ -9243,7 +9243,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
@@ -9251,7 +9251,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
@@ -9272,7 +9272,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+
@@ -9290,7 +9290,7 @@ D: Base
 B: tizen
 
 T: platform/upstream/libav
-D: Multimedia
+D: Multimedia / Codec
 B: tizen
 
 T: platform/upstream/libbullet
@@ -9301,7 +9301,7 @@ 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
@@ -9322,7 +9322,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
@@ -9337,7 +9337,7 @@ 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
@@ -9348,7 +9348,7 @@ D: Base
 B: tizen
 
 T: platform/upstream/libelf0
-D: Base
+D: Base / Toolchain
 B: tizen
 L: LGPL-2.0+
 
@@ -9358,7 +9358,7 @@ 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
@@ -9372,13 +9372,13 @@ B: tizen_2.1
 B: tizen
 
 T: platform/upstream/libflac
-D: Multimedia
+D: Base
 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
@@ -9386,7 +9386,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
@@ -9395,12 +9395,12 @@ L: LGPL-2.1+
 L: FSF
 
 T: platform/upstream/libgee
-D: Platform Development
+D: System
 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
@@ -9408,13 +9408,13 @@ L: FSF
 L: LGPL-2.1+
 
 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
@@ -9436,14 +9436,14 @@ 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
@@ -9452,12 +9452,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+
@@ -9465,7 +9465,7 @@ 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
@@ -9473,14 +9473,14 @@ L: FSF
 L: LGPL-2.1+
 
 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
@@ -9489,13 +9489,13 @@ 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
@@ -9505,12 +9505,12 @@ 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
@@ -9521,7 +9521,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
@@ -9543,7 +9543,7 @@ 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
 
@@ -9554,7 +9554,7 @@ 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
@@ -9565,7 +9565,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,13 +9575,13 @@ L: Public-domain
 L: FSF
 
 T: platform/upstream/libremix
-D: Multimedia
+D: Base
 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
@@ -9589,7 +9589,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
@@ -9602,13 +9602,13 @@ 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+
@@ -9617,13 +9617,13 @@ 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
@@ -9634,7 +9634,7 @@ D: System
 B: tizen
 
 T: platform/upstream/libtool
-D: Platform Development
+D: Platform Development / Compiler
 B: tizen
 
 T: platform/upstream/libunistring
@@ -9652,7 +9652,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
@@ -9660,7 +9660,7 @@ 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_2.0
@@ -9671,14 +9671,14 @@ 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
@@ -9687,7 +9687,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
@@ -9696,7 +9696,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
@@ -9705,7 +9705,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
@@ -9714,14 +9714,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_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
@@ -9729,7 +9729,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
@@ -9737,7 +9737,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
@@ -9746,7 +9746,7 @@ L: MIT-style
 L: FSF
 
 T: platform/upstream/libxml2
-D: Base
+D: Base / Libraries
 B: tizen
 L: See-doc(OTHER)
 L: MIT-style
@@ -9767,7 +9767,7 @@ L: Public-domain
 L: GPL-2.0+
 
 T: platform/upstream/libzip
-D: Base
+D: Base / Compression
 B: tizen
 L: BSD-2-Clause
 
@@ -9780,13 +9780,13 @@ L: GPL-2.0
 L: GPL
 
 T: platform/upstream/libzypp-bindings
-D: Platform Development
+D: System
 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
@@ -9804,7 +9804,7 @@ L: BSD-style
 L: MIT-style
 
 T: platform/upstream/linux-glibc-devel
-D: Platform Development
+D: Base
 B: tizen
 
 T: platform/upstream/lksctp-tools
@@ -9816,7 +9816,7 @@ L: LGPL-2.1
 L: UnclassifiedLicense
 
 T: platform/upstream/llvm
-D: Platform Development
+D: Platform Development / Compiler
 B: tizen
 
 T: platform/upstream/lsb
@@ -9831,11 +9831,11 @@ 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
@@ -9847,12 +9847,12 @@ 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
@@ -9862,15 +9862,15 @@ 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
@@ -9878,40 +9878,40 @@ D: Platform Development
 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_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
@@ -9923,7 +9923,7 @@ D: Base
 B: tizen
 
 T: platform/upstream/mpc
-D: Base
+D: Base / Toolchain
 M: Junfeng dong <junfeng.dong@intel.com>
 I: Seokhyun Kim
 R: Jungmin Cho
@@ -9931,7 +9931,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
@@ -9945,7 +9945,7 @@ L: MIT
 L: FSF
 
 T: platform/upstream/mtools
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/multipath-tools
@@ -9955,11 +9955,11 @@ 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
@@ -9969,17 +9969,17 @@ B: tizen
 L: MIT-style
 
 T: platform/upstream/neard
-D: Network & Connectivity
+D: Network & Connectivity / NFC
 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
@@ -9987,17 +9987,17 @@ 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/nodejs
-D: Web Framework
+D: Web Framework / Web UI FW
 B: tizen
 
 T: platform/upstream/nspr
-D: Security
+D: Base
 M: Casey Schaufler <casey.schaufler@intel.com>
 I: Seokhyun Kim
 R: Jungmin Cho
@@ -10005,7 +10005,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
@@ -10021,7 +10021,7 @@ 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>
@@ -10031,7 +10031,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
@@ -10040,19 +10040,19 @@ 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_2.0
@@ -10061,11 +10061,11 @@ 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
@@ -10076,7 +10076,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
@@ -10084,11 +10084,11 @@ 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
@@ -10101,18 +10101,18 @@ 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
@@ -10123,7 +10123,7 @@ L: Dual-license
 L: FSF
 
 T: platform/upstream/pango
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Fonts
 B: tizen
 L: LGPL-2.0+
 
@@ -10135,19 +10135,19 @@ 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
@@ -10159,7 +10159,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
@@ -10176,97 +10176,97 @@ 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_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
@@ -10285,7 +10285,7 @@ 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
@@ -10294,12 +10294,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
@@ -10309,7 +10309,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
@@ -10325,11 +10325,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+
@@ -10337,11 +10337,11 @@ 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_2.0
 B: tizen_2.1
 B: tizen
@@ -10349,7 +10349,7 @@ 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
@@ -10363,7 +10363,7 @@ 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
@@ -10371,7 +10371,7 @@ 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
@@ -10384,101 +10384,101 @@ 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_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_2.0
 B: tizen_2.1
 B: tizen
 
 T: platform/upstream/python-setuptools
-D: Platform Development
+D: Platform Development / Python
 B: tizen_2.0
 B: tizen_2.1
 B: tizen
@@ -10488,27 +10488,27 @@ D: Base
 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_2.0
 B: tizen_2.1
 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
@@ -10519,57 +10519,57 @@ 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/qtchooser
-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
+D: Graphics & UI Framework / Qt
 M: Tomasz Olszak <olszak.tomasz@gmail.com>
 B: tizen
 
 T: platform/upstream/qtgraphicaleffects
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Qt
 M: Tomasz Olszak <olszak.tomasz@gmail.com>
 B: tizen
 
 T: platform/upstream/qtimageformats
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Qt
 M: Tomasz Olszak <olszak.tomasz@gmail.com>
 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/qtquickcontrols-tizen
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Qt
 M: Tomasz Olszak <olszak.tomasz@gmail.com>
 B: tizen
 
 T: platform/upstream/qtsensors
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Qt
 M: Tomasz Olszak <olszak.tomasz@gmail.com>
 B: tizen
 
 T: platform/upstream/qttools
-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
+D: Graphics & UI Framework / Qt
 M: Tomasz Olszak <olszak.tomasz@gmail.com>
 B: tizen
 
 T: platform/upstream/qtxmlpatterns
-D: Graphics & UI Framework
+D: Graphics & UI Framework / Qt
 M: Tomasz Olszak <olszak.tomasz@gmail.com>
 B: tizen
 
@@ -10582,7 +10582,7 @@ 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
@@ -10597,7 +10597,7 @@ L: LGPL-2.1+
 L: FSF
 
 T: platform/upstream/re2
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/re2c
@@ -10613,7 +10613,7 @@ 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
@@ -10624,7 +10624,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+
@@ -10632,7 +10632,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
@@ -10640,7 +10640,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
@@ -10651,7 +10651,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
@@ -10668,25 +10668,25 @@ 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
@@ -10697,15 +10697,15 @@ 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
@@ -10713,7 +10713,7 @@ D: Platform Development
 B: tizen
 
 T: platform/upstream/scrnsaverproto
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 L: X11
 L: FSF
@@ -10721,7 +10721,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
@@ -10731,7 +10731,7 @@ 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
@@ -10748,7 +10748,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
@@ -10757,23 +10757,23 @@ L: Public-domain
 L: X11
 
 T: platform/upstream/sgml-common
-D: Platform Development
+D: Platform Development / Utilities
 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
 
 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
@@ -10787,11 +10787,11 @@ 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
@@ -10808,7 +10808,7 @@ L: Public-domain
 L: FSF
 
 T: platform/upstream/squashfs
-D: Base
+D: Base / File Systems
 B: tizen
 L: GPL
 
@@ -10817,7 +10817,7 @@ D: Base
 B: tizen
 
 T: platform/upstream/strace
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/sudo
@@ -10827,7 +10827,7 @@ L: MIT-style
 L: Public-domain
 
 T: platform/upstream/swig
-D: Platform Development
+D: Platform Development / Utilities
 B: tizen
 
 T: platform/upstream/swup
@@ -10838,12 +10838,12 @@ 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+
@@ -10859,7 +10859,7 @@ 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
@@ -10867,7 +10867,7 @@ D: System
 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 +10876,13 @@ B: tizen
 L: LGPL-2.1+
 
 T: platform/upstream/sysvinit
-D: Base
+D: Base / Startup
 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
@@ -10910,11 +10910,11 @@ D: Platform Development
 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
@@ -10965,7 +10965,7 @@ 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_2.0
 B: tizen_2.1
@@ -10977,7 +10977,7 @@ D: Base
 B: tizen
 
 T: platform/upstream/uim
-D: Network & Connectivity
+D: Network & Connectivity / Bluetooth
 M: wu zheng <wu.zheng@intel.com>
 B: tizen_2.0
 B: tizen_2.1
@@ -10986,13 +10986,13 @@ L: GPL
 L: GPL-2.0
 
 T: platform/upstream/unifdef
-D: Platform Development
+D: Platform Development / Utilities
 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
@@ -11009,7 +11009,7 @@ 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
@@ -11026,7 +11026,7 @@ 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
@@ -11036,7 +11036,7 @@ 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 +11044,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 +11054,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
@@ -11070,14 +11070,14 @@ L: MIT-style
 L: FSF
 
 T: platform/upstream/uw-imap-toolkit
-D: Messaging
+D: Messaging / Email
 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
@@ -11087,15 +11087,15 @@ 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
@@ -11105,7 +11105,7 @@ 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 +11114,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,25 +11126,25 @@ 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
+D: Platform Development / Utilities
 B: tizen
 
 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
+D: Graphics & UI Framework / Wayland Window System
 M: Sangjin Lee <lsj119@samsung.com>
 I: Soochan Lim
 B: tizen
@@ -11173,14 +11173,14 @@ D: System
 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_2.0
 B: tizen_2.1
 B: tizen
@@ -11191,14 +11191,14 @@ 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 +11209,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 +11217,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 +11225,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 +11239,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
@@ -11252,7 +11252,7 @@ D: Base
 B: tizen
 
 T: platform/upstream/xdg-user-dirs
-D: Graphics & UI Framework
+D: Graphics & UI Framework / X Window System
 B: tizen
 
 T: platform/upstream/xdg-utils
@@ -11263,33 +11263,33 @@ 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
@@ -11297,42 +11297,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
@@ -11341,7 +11341,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
@@ -11349,7 +11349,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
@@ -11357,7 +11357,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
@@ -11366,7 +11366,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
@@ -11374,7 +11374,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
@@ -11382,7 +11382,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
@@ -11391,7 +11391,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
@@ -11400,7 +11400,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
@@ -11408,33 +11408,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
@@ -11445,19 +11445,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
@@ -11465,31 +11465,31 @@ L: See-doc(OTHER)
 L: FSF
 
 T: platform/upstream/xmlstarlet
-D: Security
+D: Base
 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
@@ -11498,7 +11498,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
@@ -11508,25 +11508,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
@@ -11537,18 +11537,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
@@ -11557,13 +11557,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
@@ -11573,23 +11573,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
@@ -11597,23 +11597,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: Base
 M: Sang-Hun Chung <sanghun.chung@samsung.com>
 I: Jeesun Kim
 R: Jae Pil Choi
@@ -11623,7 +11623,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
@@ -11632,7 +11632,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
@@ -11674,315 +11674,315 @@ 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/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/automotive-message-broker
-D: Automotive
+D: Automotive / Automotive Message Broker
 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
-D: Automotive
+D: Automotive / <gSSO. Move to Security domain>
 B: tizen
 
 T: profile/ivi/gsignond-plugin-oauth
-D: Automotive
+D: Automotive / <gSSO. Move to Security domain>
 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
-D: Automotive
+D: Automotive / <gSSO. Move to Security domain>
 B: tizen
 
 T: profile/ivi/libwebsockets
-D: Automotive
+D: Automotive / <Move to Connectivity domain>
 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/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/pocketsphinx
-D: Automotive
+D: Automotive / Speech
 B: tizen
 
 T: profile/ivi/psplash
-D: Automotive
+D: Automotive / <remove>
 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-efi-ivi
-D: Automotive
+D: Automotive / Configuration
 B: tizen
 
 T: profile/ivi/setup-ivi
-D: Automotive
+D: Automotive / Configuration
 B: tizen
 
 T: profile/ivi/setup-mbr-ivi
-D: Automotive
+D: Automotive / Configuration
 B: tizen
 
 T: profile/ivi/signonui-efl
-D: Automotive
+D: Automotive / <gSSO. Move to Security domain>
 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/weekeyboard
-D: Automotive
+D: Automotive / <remove. Duplicate with platform/upstream/weekeyboard>
 M: Philippe Coval <philippe.coval@open.eurogiciel.org>
 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
+D: Mobile / EFL
 B: tizen_2.2
 B: tizen
 
 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
+D: Mobile / EFL
 B: tizen_2.2
 B: tizen
 
 T: profile/mobile/expedite
-D: Graphics & UI Framework
+D: Mobile / EFL
 B: tizen
 
 T: profile/mobile/gst-openmax0.10
@@ -11991,43 +11991,43 @@ 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
@@ -12036,67 +12036,67 @@ 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
@@ -12641,14 +12641,14 @@ D: Applications
 B: tizen_2.2
 
 T: sdk/alsa-scenario-scn-data-0-emul
-D: SDK
+D: SDK / Emulator
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
 B: tizen
 
 T: sdk/build/meta-emulator-tools
-D: SDK
+D: SDK / Emulator
 I: Jun Tian
 B: tizen_2.0
 B: tizen_2.1
@@ -12658,14 +12658,14 @@ L: Apache
 L: Apache-2.0
 
 T: sdk/build/meta-sdk-dev-tools
-D: SDK
+D: SDK / SDK package management
 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_2.0
 B: tizen_2.1
@@ -12673,7 +12673,7 @@ 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_2.0
@@ -12682,14 +12682,14 @@ B: tizen_2.2
 B: tizen
 
 T: sdk/build/meta-tizen-ide
-D: SDK
+D: SDK / SDK package management
 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_2.0
@@ -12698,7 +12698,7 @@ 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_2.0
@@ -12707,7 +12707,7 @@ 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_2.0
@@ -12730,7 +12730,7 @@ B: tizen_2.0
 B: tizen_2.1
 
 T: sdk/device-manager-plugin-emul
-D: SDK
+D: SDK / Emulator
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -12743,14 +12743,14 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: sdk/doc/doc-tools
-D: SDK
+D: SDK / Documents
 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
@@ -12787,116 +12787,116 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: sdk/emulator-daemon
-D: SDK
+D: SDK / Emulator
 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_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_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_2.0
 B: tizen_2.1
 B: tizen_2.2
 B: tizen
 
 T: sdk/emulator-plugin-geo
-D: SDK
+D: SDK / Emulator
 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_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_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_2.0
 B: tizen_2.1
 B: tizen_2.2
 B: tizen
 
 T: sdk/emulator-plugin-light
-D: SDK
+D: SDK / Emulator
 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_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_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_2.0
 B: tizen_2.1
 B: tizen_2.2
 B: tizen
 
 T: sdk/emulator-plugin-proxi
-D: SDK
+D: SDK / Emulator
 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_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_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_2.0
 B: tizen_2.1
@@ -12906,7 +12906,7 @@ L: Apache
 L: Apache-2.0
 
 T: sdk/emulator/emulator-kernel
-D: SDK
+D: SDK / Emulator
 I: Jun Tian
 B: tizen_2.0
 B: tizen_2.1
@@ -12916,7 +12916,7 @@ 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
@@ -12928,7 +12928,7 @@ 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
@@ -12942,14 +12942,14 @@ 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_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -12957,7 +12957,7 @@ 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
@@ -12967,7 +12967,7 @@ B: tizen_2.2
 B: tizen
 
 T: sdk/emulator/qemu
-D: SDK
+D: SDK / Emulator
 I: Jun Tian
 B: tizen_2.0
 B: tizen_2.1
@@ -12978,7 +12978,7 @@ L: LGPL-2.1+
 L: GPL
 
 T: sdk/emulator/vgabios
-D: SDK
+D: SDK / Emulator
 R: Jun Tian
 B: tizen_2.0
 B: tizen_2.1
@@ -12989,12 +12989,12 @@ L: LGPL
 L: Public-domain
 
 T: sdk/gst-plugins-emulator
-D: SDK
+D: SDK / Emulator
 B: tizen_2.2
 B: tizen
 
 T: sdk/gstreamer0.10-ffmpeg-emulator
-D: SDK
+D: SDK / Emulator
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -13017,7 +13017,7 @@ 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_2.0
@@ -13026,7 +13026,7 @@ 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
@@ -13036,15 +13036,15 @@ 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_2.0
 B: tizen_2.1
@@ -13052,14 +13052,14 @@ B: tizen_2.2
 B: tizen
 
 T: sdk/ide/jsdt-extension-eplugin
-D: SDK
+D: SDK / Common IDE
 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_2.0
@@ -13068,7 +13068,7 @@ 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_2.0
@@ -13077,7 +13077,7 @@ 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
@@ -13087,41 +13087,41 @@ B: tizen_2.2
 B: tizen
 
 T: sdk/ide/native-sample
-D: SDK
+D: SDK / Native IDE
 B: tizen_2.0
 B: tizen_2.1
 B: tizen
 
 T: sdk/ide/nativeappcommon-eplugin
-D: SDK
+D: SDK / Native IDE
 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_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_2.0
 B: tizen_2.1
 B: tizen_2.2
 B: tizen
 
 T: sdk/ide/product
-D: SDK
+D: SDK / Common IDE
 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
@@ -13131,7 +13131,7 @@ 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_2.0
@@ -13148,15 +13148,15 @@ 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_2.0
 B: tizen_2.1
@@ -13164,7 +13164,7 @@ 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_2.0
 B: tizen_2.1
@@ -13172,7 +13172,7 @@ 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
@@ -13193,7 +13193,7 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: sdk/sensor-daemon-emulator
-D: SDK
+D: SDK / Emulator
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -13201,7 +13201,7 @@ 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
@@ -13212,7 +13212,7 @@ 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
@@ -13222,19 +13222,19 @@ 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_2.0
@@ -13243,15 +13243,15 @@ 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_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -13262,13 +13262,13 @@ D: SDK
 B: tizen_2.0
 
 T: sdk/tools/gdb-7.5
-D: SDK
+D: SDK / Native build system
 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
@@ -13286,21 +13286,21 @@ B: tizen_2.0
 B: tizen_2.2
 
 T: sdk/tools/mingw
-D: SDK
+D: SDK / Native build system
 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_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
@@ -13310,7 +13310,7 @@ 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
@@ -13329,21 +13329,21 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: sdk/tools/platform-dev-rootstrap
-D: SDK
+D: SDK / Native build system
 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_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
@@ -13357,14 +13357,14 @@ D: SDK
 B: tizen_2.0
 
 T: sdk/tools/sdk-build
-D: SDK
+D: SDK / SDK package management
 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
@@ -13374,14 +13374,14 @@ B: tizen_2.2
 B: tizen
 
 T: sdk/tools/toolchain-dev-rootstrap
-D: SDK
+D: SDK / Native build system
 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
@@ -13389,18 +13389,18 @@ B: tizen_2.2
 B: tizen
 
 T: sdk/tools/unittest-framework
-D: SDK
+D: SDK / Native IDE
 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
@@ -13413,11 +13413,11 @@ 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_2.0
 B: tizen_2.1
@@ -13434,7 +13434,7 @@ B: tizen_2.1
 B: tizen_2.2
 
 T: sdk/vmodem-daemon-emulator
-D: SDK
+D: SDK / Emulator
 B: tizen_2.0
 B: tizen_2.1
 B: tizen_2.2
@@ -13460,7 +13460,7 @@ 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
@@ -13486,19 +13486,19 @@ 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
 
@@ -13509,7 +13509,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
@@ -13539,7 +13539,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
@@ -13562,13 +13562,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
@@ -13596,7 +13596,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
@@ -13608,43 +13608,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
@@ -13656,7 +13656,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
 
@@ -13685,7 +13685,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
@@ -13703,7 +13703,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
@@ -13721,7 +13721,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
@@ -13755,25 +13755,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
@@ -13790,7 +13790,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
@@ -13824,13 +13824,13 @@ 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
@@ -13843,7 +13843,7 @@ 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
@@ -13863,30 +13863,30 @@ 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
@@ -13904,7 +13904,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
@@ -13953,12 +13953,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
@@ -13970,7 +13970,7 @@ 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
@@ -13983,7 +13983,7 @@ 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
@@ -13996,7 +13996,7 @@ B: tizen_2.2
 C: Missing domain!
 
 T: toolchains/mpclib
-D: Base
+D: Base / Toolchain
 B: tizen_2.0
 B: tizen_2.1
 
@@ -14072,7 +14072,7 @@ 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
@@ -14175,7 +14175,7 @@ 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
@@ -14188,7 +14188,7 @@ 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
@@ -14300,7 +14300,7 @@ 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
@@ -14343,7 +14343,7 @@ 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
@@ -14381,7 +14381,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
@@ -14405,7 +14405,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
@@ -14423,7 +14423,7 @@ 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
@@ -14436,13 +14436,13 @@ 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