From: Youngjae Shin <yj99.shin@samsung.com>
Date: Thu, 2 Jul 2020 06:48:31 +0000 (+0900)
Subject: change a directory structure
X-Git-Tag: accepted/tizen/unified/20200715.002122~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e40f5ab38a4a60ee07794ffc7ad3c53143b69290;p=apps%2Fnative%2Fug-bluetooth-efl.git

change a directory structure

Change-Id: I3a21143bd12c5b6e21649d716e7ab9845924d27b
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9822820..979723a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,8 +16,8 @@ SET(TABLEDIR "${RESDIR}/tables/${PROJECT_NAME}")
 IF("$ENV{CFLAGS}" MATCHES "-DTIZEN_TEST_EMUL")
 ADD_SUBDIRECTORY(emulator)
 ELSE()
-ADD_SUBDIRECTORY(common)
+ADD_SUBDIRECTORY(standard)
 ENDIF()
 
-ADD_SUBDIRECTORY(po)
-ADD_SUBDIRECTORY(data)
+ADD_SUBDIRECTORY(res/po)
+ADD_SUBDIRECTORY(res)
diff --git a/LICENSE b/LICENSE
old mode 100755
new mode 100644
diff --git a/emulator/CMakeLists.txt b/emulator/CMakeLists.txt
index 8e8fcd0..1a0ffca 100644
--- a/emulator/CMakeLists.txt
+++ b/emulator/CMakeLists.txt
@@ -1,13 +1,13 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
 SET(SRCS
-src/ui/bt-main-ug.c
-src/ui/bt-widget.c
-src/ui/bt-main-view.c
-src/libraries/bt-util.c
-src/libraries/bt-callback.c
-src/libraries/bt-event-manager.c
-src/libraries/bt-emulator-api.c
+bt-main-ug.c
+bt-widget.c
+bt-main-view.c
+bt-util.c
+bt-callback.c
+bt-event-manager.c
+bt-emulator-api.c
 )
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
@@ -53,8 +53,8 @@ ADD_DEFINITIONS("-DIMAGEDIR=\"${IMAGEDIR}\"")
 ADD_DEFINITIONS("-DBT_USE_PLATFORM_DBG")
 #ADD_DEFINITIONS("-D__TIZEN_OPEN__")
 
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/ug-bluetooth-efl.xml DESTINATION /usr/share/packages/)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/images/ug-bluetooth-efl.png DESTINATION /usr/share/icons/default/small)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/ug-bluetooth-efl.xml DESTINATION /usr/share/packages/)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/images/ug-bluetooth-efl.png DESTINATION /usr/share/icons/default/small)
 
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION 0.1.0)
@@ -62,8 +62,8 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS})
 
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/ug/lib)
 
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/images/ug-bluetooth-efl.png DESTINATION ${IMAGEDIR})
-INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/data/images/ DESTINATION ${IMAGEDIR} FILES_MATCHING PATTERN "*.png")
-INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/data/images/ DESTINATION ${IMAGEDIR} FILES_MATCHING PATTERN "*.jpg")
-INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/data/help/ DESTINATION ${HELPDIR} FILES_MATCHING PATTERN "*help_*")
-INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/tables/WVGA/ DESTINATION ${TABLEDIR} FILES_MATCHING PATTERN "*.xml")
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/images/ug-bluetooth-efl.png DESTINATION ${IMAGEDIR})
+INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/images/ DESTINATION ${IMAGEDIR} FILES_MATCHING PATTERN "*.png")
+INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/images/ DESTINATION ${IMAGEDIR} FILES_MATCHING PATTERN "*.jpg")
+INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/help/ DESTINATION ${HELPDIR} FILES_MATCHING PATTERN "*help_*")
+INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/tables/WVGA/ DESTINATION ${TABLEDIR} FILES_MATCHING PATTERN "*.xml")
diff --git a/emulator/src/libraries/bt-callback.c b/emulator/bt-callback.c
similarity index 100%
rename from emulator/src/libraries/bt-callback.c
rename to emulator/bt-callback.c
diff --git a/emulator/src/libraries/bt-emulator-api.c b/emulator/bt-emulator-api.c
similarity index 100%
rename from emulator/src/libraries/bt-emulator-api.c
rename to emulator/bt-emulator-api.c
diff --git a/emulator/src/libraries/bt-event-manager.c b/emulator/bt-event-manager.c
similarity index 100%
rename from emulator/src/libraries/bt-event-manager.c
rename to emulator/bt-event-manager.c
diff --git a/emulator/src/ui/bt-main-ug.c b/emulator/bt-main-ug.c
similarity index 100%
rename from emulator/src/ui/bt-main-ug.c
rename to emulator/bt-main-ug.c
diff --git a/emulator/src/ui/bt-main-view.c b/emulator/bt-main-view.c
similarity index 100%
rename from emulator/src/ui/bt-main-view.c
rename to emulator/bt-main-view.c
diff --git a/emulator/src/libraries/bt-util.c b/emulator/bt-util.c
similarity index 100%
rename from emulator/src/libraries/bt-util.c
rename to emulator/bt-util.c
diff --git a/emulator/src/ui/bt-widget.c b/emulator/bt-widget.c
similarity index 100%
rename from emulator/src/ui/bt-widget.c
rename to emulator/bt-widget.c
diff --git a/packaging/ug-bluetooth-efl.spec b/packaging/ug-bluetooth-efl.spec
index 88060fc..82ef17a 100644
--- a/packaging/ug-bluetooth-efl.spec
+++ b/packaging/ug-bluetooth-efl.spec
@@ -76,7 +76,7 @@ UI gadget about the bluetooth for emulator
 # ==> The usage of "profile" in this spec file is allowed only for excluding TV profile
 #   from unified building.
 %if "%{?profile}" == "tv"
-cp %SOURCE1 common/include/contacts.h
+cp %SOURCE1 standard/include/contacts.h
 %endif
 
 LDFLAGS="$LDFLAGS -Wl,-z -Wl,nodelete"
@@ -85,7 +85,7 @@ export CFLAGS_BASE="${CFLAGS}"
 export CXXFLAGS_BASE="${CXXFLAGS}"
 export FFLAGS_BASE="${FFLAGS}"
 
-# Uncomment to disable BT_HOG of mobile. (refer to the end of common/include/bt-util.h)
+# Uncomment to disable BT_HOG of mobile. (refer to the end of standard/include/bt-util.h)
 # Without TIZEN_FEATURE_DISBALE_BT_HOG, BT_HOG is enabled for mobile.
 #export CFLAGS+=" -DTIZEN_FEATURE_DISABLE_BT_HOG"
 
diff --git a/data/CMakeLists.txt b/res/CMakeLists.txt
similarity index 98%
rename from data/CMakeLists.txt
rename to res/CMakeLists.txt
index afa1af8..4e912cf 100644
--- a/data/CMakeLists.txt
+++ b/res/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(TARGET "theme_2.3")
+SET(TARGET "edje")
 
 ADD_CUSTOM_TARGET(bluetooth_images.edj
                 COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/images/WVGA
diff --git a/data/theme_2.3/bluetooth_genlist.edc b/res/edje/bluetooth_genlist.edc
similarity index 100%
rename from data/theme_2.3/bluetooth_genlist.edc
rename to res/edje/bluetooth_genlist.edc
diff --git a/data/theme_2.3/bluetooth_image_macro.edc b/res/edje/bluetooth_image_macro.edc
similarity index 100%
rename from data/theme_2.3/bluetooth_image_macro.edc
rename to res/edje/bluetooth_image_macro.edc
diff --git a/data/theme_2.3/bluetooth_images.edc b/res/edje/bluetooth_images.edc
similarity index 100%
rename from data/theme_2.3/bluetooth_images.edc
rename to res/edje/bluetooth_images.edc
diff --git a/data/theme_2.3/main_layout.edc b/res/edje/main_layout.edc
similarity index 100%
rename from data/theme_2.3/main_layout.edc
rename to res/edje/main_layout.edc
diff --git a/data/help/A01-4_help_icon_bluetooth.png b/res/help/A01-4_help_icon_bluetooth.png
similarity index 100%
rename from data/help/A01-4_help_icon_bluetooth.png
rename to res/help/A01-4_help_icon_bluetooth.png
diff --git a/data/help/A01-4_help_icon_setting.png b/res/help/A01-4_help_icon_setting.png
similarity index 100%
rename from data/help/A01-4_help_icon_setting.png
rename to res/help/A01-4_help_icon_setting.png
diff --git a/data/help/help_ic_bluetooth.png b/res/help/help_ic_bluetooth.png
similarity index 100%
rename from data/help/help_ic_bluetooth.png
rename to res/help/help_ic_bluetooth.png
diff --git a/data/help/help_ic_settings.png b/res/help/help_ic_settings.png
similarity index 100%
rename from data/help/help_ic_settings.png
rename to res/help/help_ic_settings.png
diff --git a/data/help/help_settings_bluetooth.xml b/res/help/help_settings_bluetooth.xml
similarity index 100%
rename from data/help/help_settings_bluetooth.xml
rename to res/help/help_settings_bluetooth.xml
diff --git a/data/help/help_toggle_button.png b/res/help/help_toggle_button.png
similarity index 100%
rename from data/help/help_toggle_button.png
rename to res/help/help_toggle_button.png
diff --git a/data/images/B03_download_complete.png b/res/images/B03_download_complete.png
similarity index 100%
rename from data/images/B03_download_complete.png
rename to res/images/B03_download_complete.png
diff --git a/data/images/B03_upload_complete.png b/res/images/B03_upload_complete.png
similarity index 100%
rename from data/images/B03_upload_complete.png
rename to res/images/B03_upload_complete.png
diff --git a/data/images/WVGA/bluetooth_btn_bg.png b/res/images/WVGA/bluetooth_btn_bg.png
similarity index 100%
rename from data/images/WVGA/bluetooth_btn_bg.png
rename to res/images/WVGA/bluetooth_btn_bg.png
diff --git a/data/images/WVGA/bluetooth_btn_icon_info.png b/res/images/WVGA/bluetooth_btn_icon_info.png
similarity index 100%
rename from data/images/WVGA/bluetooth_btn_icon_info.png
rename to res/images/WVGA/bluetooth_btn_icon_info.png
diff --git a/data/images/WVGA/buluetooth_Device_type_icon_activated.png b/res/images/WVGA/buluetooth_Device_type_icon_activated.png
similarity index 100%
rename from data/images/WVGA/buluetooth_Device_type_icon_activated.png
rename to res/images/WVGA/buluetooth_Device_type_icon_activated.png
diff --git a/data/images/WVGA/buluetooth_Device_type_icon_camera.png b/res/images/WVGA/buluetooth_Device_type_icon_camera.png
similarity index 100%
rename from data/images/WVGA/buluetooth_Device_type_icon_camera.png
rename to res/images/WVGA/buluetooth_Device_type_icon_camera.png
diff --git a/data/images/WVGA/buluetooth_Device_type_icon_computer.png b/res/images/WVGA/buluetooth_Device_type_icon_computer.png
similarity index 100%
rename from data/images/WVGA/buluetooth_Device_type_icon_computer.png
rename to res/images/WVGA/buluetooth_Device_type_icon_computer.png
diff --git a/data/images/WVGA/buluetooth_Device_type_icon_display.png b/res/images/WVGA/buluetooth_Device_type_icon_display.png
similarity index 100%
rename from data/images/WVGA/buluetooth_Device_type_icon_display.png
rename to res/images/WVGA/buluetooth_Device_type_icon_display.png
diff --git a/data/images/WVGA/buluetooth_Device_type_icon_gaming.png b/res/images/WVGA/buluetooth_Device_type_icon_gaming.png
similarity index 100%
rename from data/images/WVGA/buluetooth_Device_type_icon_gaming.png
rename to res/images/WVGA/buluetooth_Device_type_icon_gaming.png
diff --git a/data/images/WVGA/buluetooth_Device_type_icon_headphone.png b/res/images/WVGA/buluetooth_Device_type_icon_headphone.png
similarity index 100%
rename from data/images/WVGA/buluetooth_Device_type_icon_headphone.png
rename to res/images/WVGA/buluetooth_Device_type_icon_headphone.png
diff --git a/data/images/WVGA/buluetooth_Device_type_icon_headset.png b/res/images/WVGA/buluetooth_Device_type_icon_headset.png
similarity index 100%
rename from data/images/WVGA/buluetooth_Device_type_icon_headset.png
rename to res/images/WVGA/buluetooth_Device_type_icon_headset.png
diff --git a/data/images/WVGA/buluetooth_Device_type_icon_keyboard.png b/res/images/WVGA/buluetooth_Device_type_icon_keyboard.png
similarity index 100%
rename from data/images/WVGA/buluetooth_Device_type_icon_keyboard.png
rename to res/images/WVGA/buluetooth_Device_type_icon_keyboard.png
diff --git a/data/images/WVGA/buluetooth_Device_type_icon_medical.png b/res/images/WVGA/buluetooth_Device_type_icon_medical.png
similarity index 100%
rename from data/images/WVGA/buluetooth_Device_type_icon_medical.png
rename to res/images/WVGA/buluetooth_Device_type_icon_medical.png
diff --git a/data/images/WVGA/buluetooth_Device_type_icon_mobilephone.png b/res/images/WVGA/buluetooth_Device_type_icon_mobilephone.png
similarity index 100%
rename from data/images/WVGA/buluetooth_Device_type_icon_mobilephone.png
rename to res/images/WVGA/buluetooth_Device_type_icon_mobilephone.png
diff --git a/data/images/WVGA/buluetooth_Device_type_icon_mouse.png b/res/images/WVGA/buluetooth_Device_type_icon_mouse.png
similarity index 100%
rename from data/images/WVGA/buluetooth_Device_type_icon_mouse.png
rename to res/images/WVGA/buluetooth_Device_type_icon_mouse.png
diff --git a/data/images/WVGA/buluetooth_Device_type_icon_multimedia.png b/res/images/WVGA/buluetooth_Device_type_icon_multimedia.png
similarity index 100%
rename from data/images/WVGA/buluetooth_Device_type_icon_multimedia.png
rename to res/images/WVGA/buluetooth_Device_type_icon_multimedia.png
diff --git a/data/images/WVGA/buluetooth_Device_type_icon_network_infrastructure.png b/res/images/WVGA/buluetooth_Device_type_icon_network_infrastructure.png
similarity index 100%
rename from data/images/WVGA/buluetooth_Device_type_icon_network_infrastructure.png
rename to res/images/WVGA/buluetooth_Device_type_icon_network_infrastructure.png
diff --git a/data/images/WVGA/buluetooth_Device_type_icon_printer.png b/res/images/WVGA/buluetooth_Device_type_icon_printer.png
similarity index 100%
rename from data/images/WVGA/buluetooth_Device_type_icon_printer.png
rename to res/images/WVGA/buluetooth_Device_type_icon_printer.png
diff --git a/data/images/WVGA/buluetooth_Device_type_icon_storage.png b/res/images/WVGA/buluetooth_Device_type_icon_storage.png
similarity index 100%
rename from data/images/WVGA/buluetooth_Device_type_icon_storage.png
rename to res/images/WVGA/buluetooth_Device_type_icon_storage.png
diff --git a/data/images/WVGA/buluetooth_Device_type_icon_unknown.png b/res/images/WVGA/buluetooth_Device_type_icon_unknown.png
similarity index 100%
rename from data/images/WVGA/buluetooth_Device_type_icon_unknown.png
rename to res/images/WVGA/buluetooth_Device_type_icon_unknown.png
diff --git a/data/images/WVGA/buluetooth_Device_type_icon_wrist.png b/res/images/WVGA/buluetooth_Device_type_icon_wrist.png
similarity index 100%
rename from data/images/WVGA/buluetooth_Device_type_icon_wrist.png
rename to res/images/WVGA/buluetooth_Device_type_icon_wrist.png
diff --git a/data/images/bluetooth_activated.png b/res/images/bluetooth_activated.png
similarity index 100%
rename from data/images/bluetooth_activated.png
rename to res/images/bluetooth_activated.png
diff --git a/data/images/noti_download_complete.png b/res/images/noti_download_complete.png
similarity index 100%
rename from data/images/noti_download_complete.png
rename to res/images/noti_download_complete.png
diff --git a/data/images/noti_download_failed.png b/res/images/noti_download_failed.png
similarity index 100%
rename from data/images/noti_download_failed.png
rename to res/images/noti_download_failed.png
diff --git a/data/images/noti_upload_complete.png b/res/images/noti_upload_complete.png
similarity index 100%
rename from data/images/noti_upload_complete.png
rename to res/images/noti_upload_complete.png
diff --git a/data/images/noti_upload_failed.png b/res/images/noti_upload_failed.png
similarity index 100%
rename from data/images/noti_upload_failed.png
rename to res/images/noti_upload_failed.png
diff --git a/data/images/ug-bluetooth-efl.png b/res/images/ug-bluetooth-efl.png
similarity index 100%
rename from data/images/ug-bluetooth-efl.png
rename to res/images/ug-bluetooth-efl.png
diff --git a/po/CMakeLists.txt b/res/po/CMakeLists.txt
similarity index 100%
rename from po/CMakeLists.txt
rename to res/po/CMakeLists.txt
diff --git a/po/POTFILES.in b/res/po/POTFILES.in
old mode 100755
new mode 100644
similarity index 100%
rename from po/POTFILES.in
rename to res/po/POTFILES.in
diff --git a/po/ar.po b/res/po/ar.po
similarity index 100%
rename from po/ar.po
rename to res/po/ar.po
diff --git a/po/as.po b/res/po/as.po
similarity index 100%
rename from po/as.po
rename to res/po/as.po
diff --git a/po/az.po b/res/po/az.po
similarity index 100%
rename from po/az.po
rename to res/po/az.po
diff --git a/po/bg.po b/res/po/bg.po
similarity index 100%
rename from po/bg.po
rename to res/po/bg.po
diff --git a/po/bn.po b/res/po/bn.po
similarity index 100%
rename from po/bn.po
rename to res/po/bn.po
diff --git a/po/ca.po b/res/po/ca.po
similarity index 100%
rename from po/ca.po
rename to res/po/ca.po
diff --git a/po/cs.po b/res/po/cs.po
similarity index 100%
rename from po/cs.po
rename to res/po/cs.po
diff --git a/po/da.po b/res/po/da.po
similarity index 100%
rename from po/da.po
rename to res/po/da.po
diff --git a/po/de.po b/res/po/de.po
similarity index 100%
rename from po/de.po
rename to res/po/de.po
diff --git a/po/el_GR.po b/res/po/el_GR.po
similarity index 100%
rename from po/el_GR.po
rename to res/po/el_GR.po
diff --git a/po/en.po b/res/po/en.po
similarity index 100%
rename from po/en.po
rename to res/po/en.po
diff --git a/po/en_PH.po b/res/po/en_PH.po
similarity index 100%
rename from po/en_PH.po
rename to res/po/en_PH.po
diff --git a/po/en_US.po b/res/po/en_US.po
similarity index 100%
rename from po/en_US.po
rename to res/po/en_US.po
diff --git a/po/es_ES.po b/res/po/es_ES.po
old mode 100755
new mode 100644
similarity index 100%
rename from po/es_ES.po
rename to res/po/es_ES.po
diff --git a/po/es_US.po b/res/po/es_US.po
similarity index 100%
rename from po/es_US.po
rename to res/po/es_US.po
diff --git a/po/et.po b/res/po/et.po
similarity index 100%
rename from po/et.po
rename to res/po/et.po
diff --git a/po/eu.po b/res/po/eu.po
similarity index 100%
rename from po/eu.po
rename to res/po/eu.po
diff --git a/po/fi.po b/res/po/fi.po
similarity index 100%
rename from po/fi.po
rename to res/po/fi.po
diff --git a/po/fr.po b/res/po/fr.po
similarity index 100%
rename from po/fr.po
rename to res/po/fr.po
diff --git a/po/fr_CA.po b/res/po/fr_CA.po
similarity index 100%
rename from po/fr_CA.po
rename to res/po/fr_CA.po
diff --git a/po/ga.po b/res/po/ga.po
similarity index 100%
rename from po/ga.po
rename to res/po/ga.po
diff --git a/po/gl.po b/res/po/gl.po
similarity index 100%
rename from po/gl.po
rename to res/po/gl.po
diff --git a/po/gu.po b/res/po/gu.po
similarity index 100%
rename from po/gu.po
rename to res/po/gu.po
diff --git a/po/hi.po b/res/po/hi.po
similarity index 100%
rename from po/hi.po
rename to res/po/hi.po
diff --git a/po/hr.po b/res/po/hr.po
similarity index 100%
rename from po/hr.po
rename to res/po/hr.po
diff --git a/po/hu.po b/res/po/hu.po
similarity index 100%
rename from po/hu.po
rename to res/po/hu.po
diff --git a/po/hy.po b/res/po/hy.po
similarity index 100%
rename from po/hy.po
rename to res/po/hy.po
diff --git a/po/id.po b/res/po/id.po
similarity index 100%
rename from po/id.po
rename to res/po/id.po
diff --git a/po/is.po b/res/po/is.po
old mode 100755
new mode 100644
similarity index 100%
rename from po/is.po
rename to res/po/is.po
diff --git a/po/it_IT.po b/res/po/it_IT.po
similarity index 100%
rename from po/it_IT.po
rename to res/po/it_IT.po
diff --git a/po/ja_JP.po b/res/po/ja_JP.po
similarity index 100%
rename from po/ja_JP.po
rename to res/po/ja_JP.po
diff --git a/po/ka.po b/res/po/ka.po
similarity index 100%
rename from po/ka.po
rename to res/po/ka.po
diff --git a/po/kk.po b/res/po/kk.po
similarity index 100%
rename from po/kk.po
rename to res/po/kk.po
diff --git a/po/km.po b/res/po/km.po
similarity index 100%
rename from po/km.po
rename to res/po/km.po
diff --git a/po/kn.po b/res/po/kn.po
similarity index 100%
rename from po/kn.po
rename to res/po/kn.po
diff --git a/po/ko_KR.po b/res/po/ko_KR.po
similarity index 100%
rename from po/ko_KR.po
rename to res/po/ko_KR.po
diff --git a/po/lo.po b/res/po/lo.po
similarity index 100%
rename from po/lo.po
rename to res/po/lo.po
diff --git a/po/lt.po b/res/po/lt.po
similarity index 100%
rename from po/lt.po
rename to res/po/lt.po
diff --git a/po/lv.po b/res/po/lv.po
similarity index 100%
rename from po/lv.po
rename to res/po/lv.po
diff --git a/po/mk.po b/res/po/mk.po
similarity index 100%
rename from po/mk.po
rename to res/po/mk.po
diff --git a/po/ml.po b/res/po/ml.po
similarity index 100%
rename from po/ml.po
rename to res/po/ml.po
diff --git a/po/mn_MN.po b/res/po/mn_MN.po
similarity index 100%
rename from po/mn_MN.po
rename to res/po/mn_MN.po
diff --git a/po/mr.po b/res/po/mr.po
similarity index 100%
rename from po/mr.po
rename to res/po/mr.po
diff --git a/po/ms.po b/res/po/ms.po
similarity index 100%
rename from po/ms.po
rename to res/po/ms.po
diff --git a/po/my.po b/res/po/my.po
similarity index 100%
rename from po/my.po
rename to res/po/my.po
diff --git a/po/nb.po b/res/po/nb.po
similarity index 100%
rename from po/nb.po
rename to res/po/nb.po
diff --git a/po/ne.po b/res/po/ne.po
similarity index 100%
rename from po/ne.po
rename to res/po/ne.po
diff --git a/po/nl.po b/res/po/nl.po
similarity index 100%
rename from po/nl.po
rename to res/po/nl.po
diff --git a/po/or.po b/res/po/or.po
similarity index 100%
rename from po/or.po
rename to res/po/or.po
diff --git a/po/pa.po b/res/po/pa.po
similarity index 100%
rename from po/pa.po
rename to res/po/pa.po
diff --git a/po/pl.po b/res/po/pl.po
similarity index 100%
rename from po/pl.po
rename to res/po/pl.po
diff --git a/po/pt_BR.po b/res/po/pt_BR.po
similarity index 100%
rename from po/pt_BR.po
rename to res/po/pt_BR.po
diff --git a/po/pt_PT.po b/res/po/pt_PT.po
similarity index 100%
rename from po/pt_PT.po
rename to res/po/pt_PT.po
diff --git a/po/ro.po b/res/po/ro.po
similarity index 100%
rename from po/ro.po
rename to res/po/ro.po
diff --git a/po/ru_RU.po b/res/po/ru_RU.po
similarity index 100%
rename from po/ru_RU.po
rename to res/po/ru_RU.po
diff --git a/po/si.po b/res/po/si.po
similarity index 100%
rename from po/si.po
rename to res/po/si.po
diff --git a/po/sk.po b/res/po/sk.po
similarity index 100%
rename from po/sk.po
rename to res/po/sk.po
diff --git a/po/sl.po b/res/po/sl.po
similarity index 100%
rename from po/sl.po
rename to res/po/sl.po
diff --git a/po/sr.po b/res/po/sr.po
similarity index 100%
rename from po/sr.po
rename to res/po/sr.po
diff --git a/po/sv.po b/res/po/sv.po
similarity index 100%
rename from po/sv.po
rename to res/po/sv.po
diff --git a/po/ta.po b/res/po/ta.po
similarity index 100%
rename from po/ta.po
rename to res/po/ta.po
diff --git a/po/te.po b/res/po/te.po
similarity index 100%
rename from po/te.po
rename to res/po/te.po
diff --git a/po/th.po b/res/po/th.po
similarity index 100%
rename from po/th.po
rename to res/po/th.po
diff --git a/po/tl.po b/res/po/tl.po
similarity index 100%
rename from po/tl.po
rename to res/po/tl.po
diff --git a/po/tr_TR.po b/res/po/tr_TR.po
similarity index 100%
rename from po/tr_TR.po
rename to res/po/tr_TR.po
diff --git a/po/uk.po b/res/po/uk.po
similarity index 100%
rename from po/uk.po
rename to res/po/uk.po
diff --git a/po/ur.po b/res/po/ur.po
similarity index 100%
rename from po/ur.po
rename to res/po/ur.po
diff --git a/po/uz.po b/res/po/uz.po
similarity index 100%
rename from po/uz.po
rename to res/po/uz.po
diff --git a/po/vi.po b/res/po/vi.po
similarity index 100%
rename from po/vi.po
rename to res/po/vi.po
diff --git a/po/zh_CN.po b/res/po/zh_CN.po
similarity index 100%
rename from po/zh_CN.po
rename to res/po/zh_CN.po
diff --git a/po/zh_HK.po b/res/po/zh_HK.po
similarity index 100%
rename from po/zh_HK.po
rename to res/po/zh_HK.po
diff --git a/po/zh_TW.po b/res/po/zh_TW.po
similarity index 100%
rename from po/zh_TW.po
rename to res/po/zh_TW.po
diff --git a/tables/HD/ug-bluetooth-efl_ChangeableColorTable.xml b/res/tables/HD/ug-bluetooth-efl_ChangeableColorTable.xml
similarity index 100%
rename from tables/HD/ug-bluetooth-efl_ChangeableColorTable.xml
rename to res/tables/HD/ug-bluetooth-efl_ChangeableColorTable.xml
diff --git a/tables/HD/ug-bluetooth-efl_FontInfoTable.xml b/res/tables/HD/ug-bluetooth-efl_FontInfoTable.xml
similarity index 100%
rename from tables/HD/ug-bluetooth-efl_FontInfoTable.xml
rename to res/tables/HD/ug-bluetooth-efl_FontInfoTable.xml
diff --git a/tables/WVGA/ug-bluetooth-efl_ChangeableColorTable.xml b/res/tables/WVGA/ug-bluetooth-efl_ChangeableColorTable.xml
similarity index 100%
rename from tables/WVGA/ug-bluetooth-efl_ChangeableColorTable.xml
rename to res/tables/WVGA/ug-bluetooth-efl_ChangeableColorTable.xml
diff --git a/tables/WVGA/ug-bluetooth-efl_FontInfoTable.xml b/res/tables/WVGA/ug-bluetooth-efl_FontInfoTable.xml
similarity index 100%
rename from tables/WVGA/ug-bluetooth-efl_FontInfoTable.xml
rename to res/tables/WVGA/ug-bluetooth-efl_FontInfoTable.xml
diff --git a/data/ug-bluetooth-efl.xml b/res/ug-bluetooth-efl.xml
similarity index 100%
rename from data/ug-bluetooth-efl.xml
rename to res/ug-bluetooth-efl.xml
diff --git a/common/CMakeLists.txt b/standard/CMakeLists.txt
similarity index 65%
rename from common/CMakeLists.txt
rename to standard/CMakeLists.txt
index 38b7932..10ae30f 100644
--- a/common/CMakeLists.txt
+++ b/standard/CMakeLists.txt
@@ -1,14 +1,14 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
 SET(SRCS
-src/ui/bt-main-ug.c
-src/ui/bt-widget.c
-src/ui/bt-main-view.c
-src/ui/bt-profile-view.c
-src/libraries/bt-util.c
-src/libraries/bt-callback.c
-src/libraries/bt-ipc-handler.c
-src/libraries/bt-net-connection.c
+bt-main-ug.c
+bt-widget.c
+bt-main-view.c
+bt-profile-view.c
+bt-util.c
+bt-callback.c
+bt-ipc-handler.c
+bt-net-connection.c
 )
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
@@ -87,8 +87,8 @@ ADD_DEFINITIONS("-DIMAGEDIR=\"${IMAGEDIR}\"")
 ADD_DEFINITIONS("-DBT_USE_PLATFORM_DBG")
 #ADD_DEFINITIONS("-D__TIZEN_OPEN__")
 
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/ug-bluetooth-efl.xml DESTINATION /usr/share/packages/)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/images/ug-bluetooth-efl.png DESTINATION /usr/share/icons/default/small)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/ug-bluetooth-efl.xml DESTINATION /usr/share/packages/)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/images/ug-bluetooth-efl.png DESTINATION /usr/share/icons/default/small)
 
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION 0.1.0)
@@ -96,8 +96,8 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS})
 
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/ug/lib)
 
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/images/ug-bluetooth-efl.png DESTINATION ${IMAGEDIR})
-INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/data/images/ DESTINATION ${IMAGEDIR} FILES_MATCHING PATTERN "*.png")
-INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/data/images/ DESTINATION ${IMAGEDIR} FILES_MATCHING PATTERN "*.jpg")
-INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/data/help/ DESTINATION ${HELPDIR} FILES_MATCHING PATTERN "*help_*")
-INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/tables/WVGA/ DESTINATION ${TABLEDIR} FILES_MATCHING PATTERN "*.xml")
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/images/ug-bluetooth-efl.png DESTINATION ${IMAGEDIR})
+INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/images/ DESTINATION ${IMAGEDIR} FILES_MATCHING PATTERN "*.png")
+INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/images/ DESTINATION ${IMAGEDIR} FILES_MATCHING PATTERN "*.jpg")
+INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/help/ DESTINATION ${HELPDIR} FILES_MATCHING PATTERN "*help_*")
+INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/tables/WVGA/ DESTINATION ${TABLEDIR} FILES_MATCHING PATTERN "*.xml")
diff --git a/common/src/libraries/bt-callback.c b/standard/bt-callback.c
similarity index 100%
rename from common/src/libraries/bt-callback.c
rename to standard/bt-callback.c
diff --git a/common/src/libraries/bt-ipc-handler.c b/standard/bt-ipc-handler.c
similarity index 100%
rename from common/src/libraries/bt-ipc-handler.c
rename to standard/bt-ipc-handler.c
diff --git a/common/src/ui/bt-main-ug.c b/standard/bt-main-ug.c
similarity index 100%
rename from common/src/ui/bt-main-ug.c
rename to standard/bt-main-ug.c
diff --git a/common/src/ui/bt-main-view.c b/standard/bt-main-view.c
similarity index 100%
rename from common/src/ui/bt-main-view.c
rename to standard/bt-main-view.c
diff --git a/common/src/libraries/bt-net-connection.c b/standard/bt-net-connection.c
similarity index 100%
rename from common/src/libraries/bt-net-connection.c
rename to standard/bt-net-connection.c
diff --git a/common/src/ui/bt-profile-view.c b/standard/bt-profile-view.c
similarity index 100%
rename from common/src/ui/bt-profile-view.c
rename to standard/bt-profile-view.c
diff --git a/common/src/libraries/bt-util.c b/standard/bt-util.c
similarity index 100%
rename from common/src/libraries/bt-util.c
rename to standard/bt-util.c
diff --git a/common/src/ui/bt-widget.c b/standard/bt-widget.c
similarity index 100%
rename from common/src/ui/bt-widget.c
rename to standard/bt-widget.c
diff --git a/common/include/bt-callback.h b/standard/include/bt-callback.h
similarity index 100%
rename from common/include/bt-callback.h
rename to standard/include/bt-callback.h
diff --git a/common/include/bt-debug.h b/standard/include/bt-debug.h
similarity index 100%
rename from common/include/bt-debug.h
rename to standard/include/bt-debug.h
diff --git a/common/include/bt-ipc-handler.h b/standard/include/bt-ipc-handler.h
similarity index 100%
rename from common/include/bt-ipc-handler.h
rename to standard/include/bt-ipc-handler.h
diff --git a/common/include/bt-main-ug.h b/standard/include/bt-main-ug.h
similarity index 100%
rename from common/include/bt-main-ug.h
rename to standard/include/bt-main-ug.h
diff --git a/common/include/bt-main-view.h b/standard/include/bt-main-view.h
similarity index 100%
rename from common/include/bt-main-view.h
rename to standard/include/bt-main-view.h
diff --git a/common/include/bt-net-connection.h b/standard/include/bt-net-connection.h
similarity index 100%
rename from common/include/bt-net-connection.h
rename to standard/include/bt-net-connection.h
diff --git a/common/include/bt-profile-view.h b/standard/include/bt-profile-view.h
similarity index 100%
rename from common/include/bt-profile-view.h
rename to standard/include/bt-profile-view.h
diff --git a/common/include/bt-resource.h b/standard/include/bt-resource.h
similarity index 100%
rename from common/include/bt-resource.h
rename to standard/include/bt-resource.h
diff --git a/common/include/bt-string-define.h b/standard/include/bt-string-define.h
similarity index 100%
rename from common/include/bt-string-define.h
rename to standard/include/bt-string-define.h
diff --git a/common/include/bt-type-define.h b/standard/include/bt-type-define.h
similarity index 100%
rename from common/include/bt-type-define.h
rename to standard/include/bt-type-define.h
diff --git a/common/include/bt-util.h b/standard/include/bt-util.h
similarity index 100%
rename from common/include/bt-util.h
rename to standard/include/bt-util.h
diff --git a/common/include/bt-wearable.h b/standard/include/bt-wearable.h
similarity index 100%
rename from common/include/bt-wearable.h
rename to standard/include/bt-wearable.h
diff --git a/common/include/bt-widget.h b/standard/include/bt-widget.h
similarity index 100%
rename from common/include/bt-widget.h
rename to standard/include/bt-widget.h