-SET(LOCAL_IMAGES_DIR ${ROOT_SRC_DIR}/demo/images)
-SET(LOCAL_MODELS_DIR ${ROOT_SRC_DIR}/demo/models)
-SET(LOCAL_SCRIPTS_DIR ${ROOT_SRC_DIR}/demo/scripts)
-
-SET(IMAGES_DIR ${APP_DATA_DIR}/images/)
-SET(MODELS_DIR ${APP_DATA_DIR}/models/)
-SET(SCRIPTS_DIR ${APP_DATA_DIR}/scripts/)
-SET(LOCALE_DIR ${PREFIX}/share/locale)
-
-SET(DALI_IMAGE_DIR \\"${IMAGES_DIR}\\")
-SET(DALI_MODEL_DIR \\"${MODELS_DIR}\\")
-SET(DALI_SCRIPT_DIR \\"${SCRIPTS_DIR}\\")
-SET(DALI_EXAMPLE_BIN \\"${BINDIR}/\\")
-SET(DALI_LOCALE_DIR \\"${LOCALE_DIR}\\")
-SET(DALI_LANG \\"${LANG}\\")
-
-FILE(GLOB LOCAL_IMAGES_PNG RELATIVE "${LOCAL_IMAGES_DIR}" "${LOCAL_IMAGES_DIR}/*.png")
-FILE(GLOB LOCAL_IMAGES_JPG RELATIVE "${LOCAL_IMAGES_DIR}" "${LOCAL_IMAGES_DIR}/*.jpg")
-FILE(GLOB LOCAL_IMAGES_GIF RELATIVE "${LOCAL_IMAGES_DIR}" "${LOCAL_IMAGES_DIR}/*.gif")
-FILE(GLOB LOCAL_IMAGES_BMP RELATIVE "${LOCAL_IMAGES_DIR}" "${LOCAL_IMAGES_DIR}/*.bmp")
-FILE(GLOB LOCAL_IMAGES_ICO RELATIVE "${LOCAL_IMAGES_DIR}" "${LOCAL_IMAGES_DIR}/*.ico")
+IF(DEFINED DALI_APP_RES_DIR)
+ SET(APP_DATA_RES_DIR ${DALI_APP_RES_DIR})
+ELSE()
+ SET(APP_DATA_RES_DIR ${PREFIX}/share/com.samsung.dali-demo/res)
+ENDIF()
+
+MESSAGE( STATUS "CMAKE_BUILD_TYPE: " ${CMAKE_BUILD_TYPE} )
+if(CMAKE_BUILD_TYPE MATCHES Debug)
+ MESSAGE("Setting variable: DEBUG_ENABLED")
+ SET(DEBUG_ENABLED "1")
+ENDIF()
+
+SET(RESOURCE_DIR ${ROOT_SRC_DIR}/resources)
+SET(LOCAL_IMAGES_DIR ${RESOURCE_DIR}/images)
+SET(LOCAL_GAME_DIR ${RESOURCE_DIR}/game)
+SET(LOCAL_VIDEOS_DIR ${RESOURCE_DIR}/videos)
+SET(LOCAL_MODELS_DIR ${RESOURCE_DIR}/models)
+SET(LOCAL_SCRIPTS_DIR ${RESOURCE_DIR}/scripts)
+SET(LOCAL_SHADERS_DIR ${RESOURCE_DIR}/shaders)
+IF(NOT DEFINED LOCAL_STYLE_DIR)
+ SET(LOCAL_STYLE_DIR ${RESOURCE_DIR}/style)
+ENDIF()
+
+SET(IMAGES_DIR ${APP_DATA_RES_DIR}/images/)
+SET(GAME_DIR ${APP_DATA_RES_DIR}/game/)
+SET(VIDEOS_DIR ${APP_DATA_RES_DIR}/videos/)
+SET(MODELS_DIR ${APP_DATA_RES_DIR}/models/)
+SET(SCRIPTS_DIR ${APP_DATA_RES_DIR}/scripts/)
+SET(SHADERS_DIR ${APP_DATA_RES_DIR}/shaders/)
+SET(STYLE_DIR ${APP_DATA_RES_DIR}/style/)
+
+IF(NOT DEFINED LOCALE_DIR)
+ SET(LOCALE_DIR ${PREFIX}/share/locale)
+ENDIF()
+
+SET(DEMO_GAME_DIR \\"${GAME_DIR}\\")
+SET(DEMO_IMAGE_DIR \\"${IMAGES_DIR}\\")
+SET(DEMO_VIDEO_DIR \\"${VIDEOS_DIR}\\")
+SET(DEMO_MODEL_DIR \\"${MODELS_DIR}\\")
+SET(DEMO_SCRIPT_DIR \\"${SCRIPTS_DIR}\\")
+SET(DEMO_SHADER_DIR \\"${SHADERS_DIR}\\")
+SET(DEMO_STYLE_DIR \\"${STYLE_DIR}\\")
+SET(DEMO_THEME_PATH \\"${STYLE_DIR}demo-theme.json\\")
+SET(DEMO_EXAMPLE_BIN \\"${BINDIR}/\\")
+SET(DEMO_LOCALE_DIR \\"${LOCALE_DIR}\\")
+SET(DEMO_LANG \\"${LANG}\\")
+
+SET(DEMO_STYLE_IMAGE_DIR ${STYLE_DIR}/images)
+
+FILE(GLOB LOCAL_IMAGES_PNG RELATIVE "${LOCAL_IMAGES_DIR}" "${LOCAL_IMAGES_DIR}/*.png")
+FILE(GLOB LOCAL_IMAGES_JPG RELATIVE "${LOCAL_IMAGES_DIR}" "${LOCAL_IMAGES_DIR}/*.jpg")
+FILE(GLOB LOCAL_IMAGES_GIF RELATIVE "${LOCAL_IMAGES_DIR}" "${LOCAL_IMAGES_DIR}/*.gif")
+FILE(GLOB LOCAL_IMAGES_BMP RELATIVE "${LOCAL_IMAGES_DIR}" "${LOCAL_IMAGES_DIR}/*.bmp")
+FILE(GLOB LOCAL_IMAGES_ICO RELATIVE "${LOCAL_IMAGES_DIR}" "${LOCAL_IMAGES_DIR}/*.ico")