From 7f3c6db9d5efcc65b8f2519f3f96e252c824c02f Mon Sep 17 00:00:00 2001
From: Igor Olshevskyi <i.olshevskyi@samsung.com>
Date: Fri, 11 Aug 2017 09:58:00 +0300
Subject: [PATCH] TizenRefApp-9096 [Call UI] Update UCL library

Change-Id: Ib0ad8d859015e058413830ab4ed72b1abb41db6f
---
 .cproject                                     | 14 ++++----
 call-ui/common.h                              |  4 +++
 call-ui/model/impl/IncomingCall.h             |  6 ++--
 call-ui/presenters/Instance.cpp               |  4 +--
 call-ui/presenters/base/Page.cpp              | 21 +++++++----
 call-ui/presenters/base/Page.h                | 11 +++---
 call-ui/presenters/dialogs/AcceptDialog.cpp   |  4 +--
 .../presenters/misc/AccessoryPresenter.cpp    |  9 +++--
 call-ui/presenters/misc/CallInfoPresenter.cpp |  5 ++-
 .../presenters/misc/IndicatorPresenter.cpp    |  7 +++-
 .../presenters/misc/MoreOptionsPresenter.cpp  |  9 ++---
 .../presenters/misc/RejectMsgPresenter.cpp    | 12 +++----
 call-ui/presenters/misc/common.h              |  6 ++--
 call-ui/presenters/pages/KeypadPage.cpp       |  5 ++-
 call-ui/presenters/pages/MainPage.cpp         |  4 +--
 call-ui/presenters/pages/common.h             |  6 ++--
 call-ui/view/AcceptRejectWidget.cpp           |  9 ++---
 call-ui/view/Slider.cpp                       |  3 +-
 call-ui/view/VolumeControl.cpp                |  1 -
 call-ui/view/helpers.cpp                      |  5 ++-
 project_def.prop                              |  4 +--
 ucl/{inc => include}/ucl/appfw/IInstance.h    |  0
 .../ucl/appfw/IInstanceAppControlExt.h        |  0
 .../ucl/appfw/IInstanceContext.h              |  0
 .../ucl/appfw/InstanceManagerBase.h           |  0
 .../ucl/appfw/SysEventProvider.h              |  0
 .../ucl/appfw/SysEventProvider.hpp            |  0
 ucl/{inc => include}/ucl/appfw/UIApp.h        |  0
 ucl/{inc => include}/ucl/appfw/helpers.h      |  0
 ucl/{inc => include}/ucl/appfw/types.h        |  0
 ucl/{inc => include}/ucl/config.h             |  0
 ucl/{inc => include}/ucl/gui/EdjeWidget.h     |  2 +-
 ucl/{inc => include}/ucl/gui/EdjeWidget.hpp   |  0
 ucl/{inc => include}/ucl/gui/ElmWidget.h      |  4 +--
 ucl/{inc => include}/ucl/gui/ElmWidget.hpp    |  0
 ucl/{inc => include}/ucl/gui/Genlist.h        |  2 +-
 ucl/{inc => include}/ucl/gui/Genlist.hpp      |  2 +-
 ucl/{inc => include}/ucl/gui/GenlistItem.h    |  0
 ucl/{inc => include}/ucl/gui/GenlistItem.hpp  |  0
 ucl/{inc => include}/ucl/gui/Layout.h         |  2 +-
 ucl/{inc => include}/ucl/gui/Layout.hpp       |  2 +-
 ucl/{inc => include}/ucl/gui/NaviItem.h       |  0
 ucl/{inc => include}/ucl/gui/NaviItem.hpp     |  0
 ucl/{inc => include}/ucl/gui/Naviframe.h      |  0
 ucl/{inc => include}/ucl/gui/Naviframe.hpp    |  0
 ucl/{inc => include}/ucl/gui/StyledWidget.h   |  2 +-
 ucl/{inc => include}/ucl/gui/StyledWidget.hpp |  0
 ucl/{inc => include}/ucl/gui/Theme.h          |  0
 ucl/{inc => include}/ucl/gui/Theme.hpp        |  0
 ucl/{inc => include}/ucl/gui/Widget.h         |  4 +--
 ucl/{inc => include}/ucl/gui/Widget.hpp       |  0
 ucl/{inc => include}/ucl/gui/WidgetItem.h     |  0
 ucl/{inc => include}/ucl/gui/WidgetItem.hpp   |  0
 ucl/{inc => include}/ucl/gui/Window.h         |  0
 ucl/{inc => include}/ucl/gui/Window.hpp       |  0
 ucl/{inc => include}/ucl/gui/helpers.h        |  0
 ucl/{inc => include}/ucl/gui/helpers.hpp      |  0
 ucl/{inc => include}/ucl/gui/stdTheme.h       |  0
 .../ucl/gui/stdTheme/common.h                 |  0
 .../ucl/gui/stdTheme/layout.h                 |  0
 .../ucl/gui/stdTheme/naviframe.h              |  0
 ucl/{inc => include}/ucl/gui/types.h          |  0
 ucl/{inc => include}/ucl/gui/types.hpp        |  0
 ucl/{inc => include}/ucl/misc/Aspect.h        |  0
 ucl/{inc => include}/ucl/misc/Aspect.hpp      |  0
 ucl/{inc => include}/ucl/misc/AutoHandle.h    |  0
 ucl/{inc => include}/ucl/misc/CString.h       |  0
 ucl/{inc => include}/ucl/misc/CString.hpp     |  0
 ucl/{inc => include}/ucl/misc/ConstCString.h  |  0
 .../ucl/misc/ConstCString.hpp                 |  0
 ucl/{inc => include}/ucl/misc/Event.h         |  0
 ucl/{inc => include}/ucl/misc/Event.hpp       |  0
 ucl/{inc => include}/ucl/misc/HashMap.h       |  0
 ucl/{inc => include}/ucl/misc/HashMap.hpp     |  0
 ucl/{inc => include}/ucl/misc/RefCountAware.h |  0
 .../ucl/misc/RefCountAware.hpp                |  0
 ucl/{inc => include}/ucl/misc/TString.h       |  0
 ucl/{inc => include}/ucl/misc/TString.hpp     |  0
 ucl/{inc => include}/ucl/misc/Timeout.h       |  0
 ucl/{inc => include}/ucl/misc/Variant.h       |  0
 ucl/{inc => include}/ucl/misc/Variant.hpp     |  0
 ucl/{inc => include}/ucl/mvp/GuiPresenter.h   |  0
 .../ucl/mvp/ListItemPresenter.h               |  9 +++--
 ucl/{inc => include}/ucl/mvp/ListPresenter.h  |  0
 ucl/{inc => include}/ucl/mvp/types.h          |  0
 ucl/{inc => include}/ucl/util/delegation.h    |  0
 .../ucl/util/delegation/BaseDelegate.h        |  0
 .../ucl/util/delegation/BaseDelegate.hpp      |  0
 .../ucl/util/delegation/BaseDelegate2.h       |  0
 .../ucl/util/delegation/BaseDelegate2.hpp     |  0
 .../ucl/util/delegation/Callback.h            |  0
 .../ucl/util/delegation/Callback.hpp          |  0
 .../ucl/util/delegation/Delegate.h            |  0
 .../ucl/util/delegation/Delegate.hpp          |  0
 .../ucl/util/delegation/Delegate2.h           |  0
 .../ucl/util/delegation/Delegate2.hpp         |  0
 .../ucl/util/delegation/helpers.h             |  0
 .../ucl/util/delegation/macro.h               |  0
 .../ucl/util/delegation/shortMacro.h          |  0
 ucl/{inc => include}/ucl/util/helpers.h       | 11 ++++++
 ucl/{inc => include}/ucl/util/helpers.hpp     |  0
 ucl/{inc => include}/ucl/util/logging.h       |  0
 ucl/{inc => include}/ucl/util/memory.h        |  0
 .../ucl/util/memory/BaseRef.h                 |  0
 .../ucl/util/memory/BaseRef.hpp               |  0
 .../ucl/util/memory/IRefCountObj.h            |  0
 .../ucl/util/memory/RefCountObj.h             |  0
 .../ucl/util/memory/RefCountObj.hpp           |  0
 .../ucl/util/memory/RefCounterMT.h            |  0
 .../ucl/util/memory/RefCounterMT.hpp          |  0
 .../ucl/util/memory/RefCounterST.h            |  0
 .../ucl/util/memory/RefCounterST.hpp          |  0
 .../ucl/util/memory/ReffedObj.h               |  0
 .../ucl/util/memory/ReffedObj.hpp             |  0
 .../ucl/util/memory/SharedRef.h               |  0
 .../ucl/util/memory/SharedRef.hpp             |  0
 .../ucl/util/memory/WeakRef.h                 |  0
 .../ucl/util/memory/WeakRef.hpp               |  0
 .../ucl/util/memory/helpers.h                 | 25 +++++++++++++
 ucl/{inc => include}/ucl/util/memory/macro.h  |  0
 ucl/{inc => include}/ucl/util/shortLogs.h     |  0
 .../ucl/util/smartDelegation.h                |  0
 .../ucl/util/smartDelegation/WeakDelegate.h   |  0
 .../ucl/util/smartDelegation/WeakDelegate.hpp |  0
 .../ucl/util/smartDelegation/macro.h          |  0
 .../ucl/util/smartDelegation/shortMacro.h     |  0
 ucl/{inc => include}/ucl/util/threading.h     |  0
 .../ucl/util/threading/CondVar.h              |  0
 .../ucl/util/threading/CondVar.hpp            |  0
 .../ucl/util/threading/Mutex.h                |  0
 .../ucl/util/threading/Mutex.hpp              |  0
 .../ucl/util/threading/MutexLock.h            |  0
 .../ucl/util/threading/MutexLock.hpp          |  0
 .../ucl/util/threading/Thread.h               |  0
 .../ucl/util/threading/Thread.hpp             |  0
 ucl/{inc => include}/ucl/util/types.h         |  0
 ucl/{inc => include}/ucl/util/types/Result.h  |  0
 .../ucl/util/types/Result.hpp                 |  0
 .../ucl/util/types/baseTypes.h                |  0
 .../ucl/util/types/classTypes.h               |  0
 .../appfw/InstanceManagerBase.cpp             |  0
 .../appfw/SysEventProvider.cpp                |  0
 ucl/{src => source}/appfw/UIApp.cpp           |  1 -
 ucl/{src/mvp => source/appfw}/common.h        |  8 ++---
 ucl/{src => source}/appfw/helpers.cpp         |  0
 ucl/{src => source}/common.h                  |  6 ++--
 ucl/{src => source}/gui/EdjeWidget.cpp        |  0
 ucl/{src => source}/gui/ElmWidget.cpp         |  0
 ucl/{src => source}/gui/Genlist.cpp           |  0
 ucl/{src => source}/gui/Layout.cpp            |  0
 ucl/{src => source}/gui/NaviItem.cpp          |  0
 ucl/{src => source}/gui/Naviframe.cpp         |  2 +-
 ucl/{src => source}/gui/Widget.cpp            |  0
 ucl/{src => source}/gui/WidgetItem.cpp        |  0
 ucl/{src => source}/gui/Window.cpp            |  0
 ucl/{src => source}/gui/common.h              |  8 ++---
 ucl/{src => source}/misc/Timeout.cpp          |  0
 ucl/{src => source}/misc/Variant.cpp          |  2 +-
 ucl/{src/appfw => source/misc}/common.h       |  8 ++---
 ucl/{src => source}/mvp/GuiPresenter.cpp      |  0
 ucl/{src => source}/mvp/ListItemPresenter.cpp | 36 ++++++++++---------
 ucl/{src => source}/mvp/ListPresenter.cpp     |  6 ++--
 ucl/{src/misc => source/mvp}/common.h         |  8 ++---
 ucl/{src => source}/util/logging.cpp          |  0
 ucl/{src => source}/util/types/Result.cpp     |  0
 165 files changed, 173 insertions(+), 126 deletions(-)
 rename ucl/{inc => include}/ucl/appfw/IInstance.h (100%)
 rename ucl/{inc => include}/ucl/appfw/IInstanceAppControlExt.h (100%)
 rename ucl/{inc => include}/ucl/appfw/IInstanceContext.h (100%)
 rename ucl/{inc => include}/ucl/appfw/InstanceManagerBase.h (100%)
 rename ucl/{inc => include}/ucl/appfw/SysEventProvider.h (100%)
 rename ucl/{inc => include}/ucl/appfw/SysEventProvider.hpp (100%)
 rename ucl/{inc => include}/ucl/appfw/UIApp.h (100%)
 rename ucl/{inc => include}/ucl/appfw/helpers.h (100%)
 rename ucl/{inc => include}/ucl/appfw/types.h (100%)
 rename ucl/{inc => include}/ucl/config.h (100%)
 rename ucl/{inc => include}/ucl/gui/EdjeWidget.h (95%)
 rename ucl/{inc => include}/ucl/gui/EdjeWidget.hpp (100%)
 rename ucl/{inc => include}/ucl/gui/ElmWidget.h (92%)
 rename ucl/{inc => include}/ucl/gui/ElmWidget.hpp (100%)
 rename ucl/{inc => include}/ucl/gui/Genlist.h (98%)
 rename ucl/{inc => include}/ucl/gui/Genlist.hpp (99%)
 rename ucl/{inc => include}/ucl/gui/GenlistItem.h (100%)
 rename ucl/{inc => include}/ucl/gui/GenlistItem.hpp (100%)
 rename ucl/{inc => include}/ucl/gui/Layout.h (96%)
 rename ucl/{inc => include}/ucl/gui/Layout.hpp (98%)
 rename ucl/{inc => include}/ucl/gui/NaviItem.h (100%)
 rename ucl/{inc => include}/ucl/gui/NaviItem.hpp (100%)
 rename ucl/{inc => include}/ucl/gui/Naviframe.h (100%)
 rename ucl/{inc => include}/ucl/gui/Naviframe.hpp (100%)
 rename ucl/{inc => include}/ucl/gui/StyledWidget.h (93%)
 rename ucl/{inc => include}/ucl/gui/StyledWidget.hpp (100%)
 rename ucl/{inc => include}/ucl/gui/Theme.h (100%)
 rename ucl/{inc => include}/ucl/gui/Theme.hpp (100%)
 rename ucl/{inc => include}/ucl/gui/Widget.h (97%)
 rename ucl/{inc => include}/ucl/gui/Widget.hpp (100%)
 rename ucl/{inc => include}/ucl/gui/WidgetItem.h (100%)
 rename ucl/{inc => include}/ucl/gui/WidgetItem.hpp (100%)
 rename ucl/{inc => include}/ucl/gui/Window.h (100%)
 rename ucl/{inc => include}/ucl/gui/Window.hpp (100%)
 rename ucl/{inc => include}/ucl/gui/helpers.h (100%)
 rename ucl/{inc => include}/ucl/gui/helpers.hpp (100%)
 rename ucl/{inc => include}/ucl/gui/stdTheme.h (100%)
 rename ucl/{inc => include}/ucl/gui/stdTheme/common.h (100%)
 rename ucl/{inc => include}/ucl/gui/stdTheme/layout.h (100%)
 rename ucl/{inc => include}/ucl/gui/stdTheme/naviframe.h (100%)
 rename ucl/{inc => include}/ucl/gui/types.h (100%)
 rename ucl/{inc => include}/ucl/gui/types.hpp (100%)
 rename ucl/{inc => include}/ucl/misc/Aspect.h (100%)
 rename ucl/{inc => include}/ucl/misc/Aspect.hpp (100%)
 rename ucl/{inc => include}/ucl/misc/AutoHandle.h (100%)
 rename ucl/{inc => include}/ucl/misc/CString.h (100%)
 rename ucl/{inc => include}/ucl/misc/CString.hpp (100%)
 rename ucl/{inc => include}/ucl/misc/ConstCString.h (100%)
 rename ucl/{inc => include}/ucl/misc/ConstCString.hpp (100%)
 rename ucl/{inc => include}/ucl/misc/Event.h (100%)
 rename ucl/{inc => include}/ucl/misc/Event.hpp (100%)
 rename ucl/{inc => include}/ucl/misc/HashMap.h (100%)
 rename ucl/{inc => include}/ucl/misc/HashMap.hpp (100%)
 rename ucl/{inc => include}/ucl/misc/RefCountAware.h (100%)
 rename ucl/{inc => include}/ucl/misc/RefCountAware.hpp (100%)
 rename ucl/{inc => include}/ucl/misc/TString.h (100%)
 rename ucl/{inc => include}/ucl/misc/TString.hpp (100%)
 rename ucl/{inc => include}/ucl/misc/Timeout.h (100%)
 rename ucl/{inc => include}/ucl/misc/Variant.h (100%)
 rename ucl/{inc => include}/ucl/misc/Variant.hpp (100%)
 rename ucl/{inc => include}/ucl/mvp/GuiPresenter.h (100%)
 rename ucl/{inc => include}/ucl/mvp/ListItemPresenter.h (92%)
 rename ucl/{inc => include}/ucl/mvp/ListPresenter.h (100%)
 rename ucl/{inc => include}/ucl/mvp/types.h (100%)
 rename ucl/{inc => include}/ucl/util/delegation.h (100%)
 rename ucl/{inc => include}/ucl/util/delegation/BaseDelegate.h (100%)
 rename ucl/{inc => include}/ucl/util/delegation/BaseDelegate.hpp (100%)
 rename ucl/{inc => include}/ucl/util/delegation/BaseDelegate2.h (100%)
 rename ucl/{inc => include}/ucl/util/delegation/BaseDelegate2.hpp (100%)
 rename ucl/{inc => include}/ucl/util/delegation/Callback.h (100%)
 rename ucl/{inc => include}/ucl/util/delegation/Callback.hpp (100%)
 rename ucl/{inc => include}/ucl/util/delegation/Delegate.h (100%)
 rename ucl/{inc => include}/ucl/util/delegation/Delegate.hpp (100%)
 rename ucl/{inc => include}/ucl/util/delegation/Delegate2.h (100%)
 rename ucl/{inc => include}/ucl/util/delegation/Delegate2.hpp (100%)
 rename ucl/{inc => include}/ucl/util/delegation/helpers.h (100%)
 rename ucl/{inc => include}/ucl/util/delegation/macro.h (100%)
 rename ucl/{inc => include}/ucl/util/delegation/shortMacro.h (100%)
 rename ucl/{inc => include}/ucl/util/helpers.h (92%)
 rename ucl/{inc => include}/ucl/util/helpers.hpp (100%)
 rename ucl/{inc => include}/ucl/util/logging.h (100%)
 rename ucl/{inc => include}/ucl/util/memory.h (100%)
 rename ucl/{inc => include}/ucl/util/memory/BaseRef.h (100%)
 rename ucl/{inc => include}/ucl/util/memory/BaseRef.hpp (100%)
 rename ucl/{inc => include}/ucl/util/memory/IRefCountObj.h (100%)
 rename ucl/{inc => include}/ucl/util/memory/RefCountObj.h (100%)
 rename ucl/{inc => include}/ucl/util/memory/RefCountObj.hpp (100%)
 rename ucl/{inc => include}/ucl/util/memory/RefCounterMT.h (100%)
 rename ucl/{inc => include}/ucl/util/memory/RefCounterMT.hpp (100%)
 rename ucl/{inc => include}/ucl/util/memory/RefCounterST.h (100%)
 rename ucl/{inc => include}/ucl/util/memory/RefCounterST.hpp (100%)
 rename ucl/{inc => include}/ucl/util/memory/ReffedObj.h (100%)
 rename ucl/{inc => include}/ucl/util/memory/ReffedObj.hpp (100%)
 rename ucl/{inc => include}/ucl/util/memory/SharedRef.h (100%)
 rename ucl/{inc => include}/ucl/util/memory/SharedRef.hpp (100%)
 rename ucl/{inc => include}/ucl/util/memory/WeakRef.h (100%)
 rename ucl/{inc => include}/ucl/util/memory/WeakRef.hpp (100%)
 rename ucl/{inc => include}/ucl/util/memory/helpers.h (89%)
 rename ucl/{inc => include}/ucl/util/memory/macro.h (100%)
 rename ucl/{inc => include}/ucl/util/shortLogs.h (100%)
 rename ucl/{inc => include}/ucl/util/smartDelegation.h (100%)
 rename ucl/{inc => include}/ucl/util/smartDelegation/WeakDelegate.h (100%)
 rename ucl/{inc => include}/ucl/util/smartDelegation/WeakDelegate.hpp (100%)
 rename ucl/{inc => include}/ucl/util/smartDelegation/macro.h (100%)
 rename ucl/{inc => include}/ucl/util/smartDelegation/shortMacro.h (100%)
 rename ucl/{inc => include}/ucl/util/threading.h (100%)
 rename ucl/{inc => include}/ucl/util/threading/CondVar.h (100%)
 rename ucl/{inc => include}/ucl/util/threading/CondVar.hpp (100%)
 rename ucl/{inc => include}/ucl/util/threading/Mutex.h (100%)
 rename ucl/{inc => include}/ucl/util/threading/Mutex.hpp (100%)
 rename ucl/{inc => include}/ucl/util/threading/MutexLock.h (100%)
 rename ucl/{inc => include}/ucl/util/threading/MutexLock.hpp (100%)
 rename ucl/{inc => include}/ucl/util/threading/Thread.h (100%)
 rename ucl/{inc => include}/ucl/util/threading/Thread.hpp (100%)
 rename ucl/{inc => include}/ucl/util/types.h (100%)
 rename ucl/{inc => include}/ucl/util/types/Result.h (100%)
 rename ucl/{inc => include}/ucl/util/types/Result.hpp (100%)
 rename ucl/{inc => include}/ucl/util/types/baseTypes.h (100%)
 rename ucl/{inc => include}/ucl/util/types/classTypes.h (100%)
 rename ucl/{src => source}/appfw/InstanceManagerBase.cpp (100%)
 rename ucl/{src => source}/appfw/SysEventProvider.cpp (100%)
 rename ucl/{src => source}/appfw/UIApp.cpp (99%)
 rename ucl/{src/mvp => source/appfw}/common.h (80%)
 rename ucl/{src => source}/appfw/helpers.cpp (100%)
 rename ucl/{src => source}/common.h (90%)
 rename ucl/{src => source}/gui/EdjeWidget.cpp (100%)
 rename ucl/{src => source}/gui/ElmWidget.cpp (100%)
 rename ucl/{src => source}/gui/Genlist.cpp (100%)
 rename ucl/{src => source}/gui/Layout.cpp (100%)
 rename ucl/{src => source}/gui/NaviItem.cpp (100%)
 rename ucl/{src => source}/gui/Naviframe.cpp (98%)
 rename ucl/{src => source}/gui/Widget.cpp (100%)
 rename ucl/{src => source}/gui/WidgetItem.cpp (100%)
 rename ucl/{src => source}/gui/Window.cpp (100%)
 rename ucl/{src => source}/gui/common.h (81%)
 rename ucl/{src => source}/misc/Timeout.cpp (100%)
 rename ucl/{src => source}/misc/Variant.cpp (98%)
 rename ucl/{src/appfw => source/misc}/common.h (80%)
 rename ucl/{src => source}/mvp/GuiPresenter.cpp (100%)
 rename ucl/{src => source}/mvp/ListItemPresenter.cpp (88%)
 rename ucl/{src => source}/mvp/ListPresenter.cpp (98%)
 rename ucl/{src/misc => source/mvp}/common.h (81%)
 rename ucl/{src => source}/util/logging.cpp (100%)
 rename ucl/{src => source}/util/types/Result.cpp (100%)

diff --git a/.cproject b/.cproject
index 74dfbc8..ae875a3 100644
--- a/.cproject
+++ b/.cproject
@@ -226,7 +226,7 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/lib/dbus-1.0/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/lib/glib-2.0/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/ucl/inc}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/ucl/include}&quot;"/>
 								</option>
 								<option id="sbi.gnu.cpp.compiler.option.frameworks.core.1469916614" name="Tizen-Frameworks" superClass="sbi.gnu.cpp.compiler.option.frameworks.core" valueType="userObjs">
 									<listOptionValue builtIn="false" value="Native_API"/>
@@ -445,7 +445,7 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ug-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/vconf&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/ucl/inc}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/ucl/include}&quot;"/>
 								</option>
 								<option id="sbi.gnu.c.compiler.option.frameworks.core.1478193049" name="Tizen-Frameworks" superClass="sbi.gnu.c.compiler.option.frameworks.core" valueType="userObjs">
 									<listOptionValue builtIn="false" value="Native_API"/>
@@ -498,8 +498,7 @@
 					<sourceEntries>
 						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="call-ui"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="res"/>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="ucl/inc"/>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="ucl/src"/>
+						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="ucl/source"/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
@@ -718,7 +717,7 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/lib/dbus-1.0/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/lib/glib-2.0/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/ucl/inc}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/ucl/include}&quot;"/>
 								</option>
 								<option id="sbi.gnu.cpp.compiler.option.frameworks.core.863139267" name="Tizen-Frameworks" superClass="sbi.gnu.cpp.compiler.option.frameworks.core" valueType="userObjs">
 									<listOptionValue builtIn="false" value="Native_API"/>
@@ -922,7 +921,7 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ug-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/vconf&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/ucl/inc}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/ucl/include}&quot;"/>
 								</option>
 								<option id="sbi.gnu.c.compiler.option.frameworks.core.1251626395" name="Tizen-Frameworks" superClass="sbi.gnu.c.compiler.option.frameworks.core" valueType="userObjs">
 									<listOptionValue builtIn="false" value="Native_API"/>
@@ -965,8 +964,7 @@
 					<sourceEntries>
 						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="call-ui"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="res"/>
-						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="ucl/inc"/>
-						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="ucl/src"/>
+						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="ucl/source"/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
diff --git a/call-ui/common.h b/call-ui/common.h
index 43fd570..8b27447 100644
--- a/call-ui/common.h
+++ b/call-ui/common.h
@@ -41,6 +41,10 @@ namespace callui {
 
 	constexpr SmartEvent WIN_POWER_KEY_UP_EVENT {"callui,powerkey,up"};
 
+	namespace util {
+
+		using ucl::util::dispose;
+	}
 }
 
 #endif // __CALL_UI_COMMON_H__
diff --git a/call-ui/model/impl/IncomingCall.h b/call-ui/model/impl/IncomingCall.h
index 7b1e3e0..2a163a4 100644
--- a/call-ui/model/impl/IncomingCall.h
+++ b/call-ui/model/impl/IncomingCall.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __CALL_UI_MODEL_IMPL_ICOMING_CALL_H__
-#define __CALL_UI_MODEL_IMPL_ICOMING_CALL_H__
+#ifndef __CALL_UI_MODEL_IMPL_INCOMING_CALL_H__
+#define __CALL_UI_MODEL_IMPL_INCOMING_CALL_H__
 
 #include <call-manager-ext.h>
 
@@ -58,4 +58,4 @@ namespace callui {
 
 }
 
-#endif // __CALL_UI_MODEL_IMPL_ICOMING_CALL_H__
+#endif // __CALL_UI_MODEL_IMPL_INCOMING_CALL_H__
diff --git a/call-ui/presenters/Instance.cpp b/call-ui/presenters/Instance.cpp
index 58f62dd..7086452 100644
--- a/call-ui/presenters/Instance.cpp
+++ b/call-ui/presenters/Instance.cpp
@@ -59,9 +59,7 @@ namespace callui {
 			ecore_event_handler_del(m_keyUpEventHandler);
 		}
 
-		if (const auto page = m_page.lock()) {
-			page->exitNoTransition();
-		}
+		util::dispose(m_page);
 	}
 
 	Result Instance::onCreate(IInstanceContext *const context)
diff --git a/call-ui/presenters/base/Page.cpp b/call-ui/presenters/base/Page.cpp
index f2f1fa3..4286fda 100644
--- a/call-ui/presenters/base/Page.cpp
+++ b/call-ui/presenters/base/Page.cpp
@@ -100,20 +100,27 @@ namespace callui {
 			m_navi->pop();
 			m_item = nullptr;
 		} else {
-			exitNoTransition();
+			dispose();
 		}
 	}
 
-	void Page::exitNoTransition()
+	void Page::dispose()
 	{
-		if (isAtTop()) {
-			m_item.del();
-			dispatchTopPageChanged();
-		} else if (m_item) {
-			m_item.del();
+		if (m_item) {
+			if (isAtTop()) {
+				m_item.del();
+				dispatchTopPageChanged();
+			} else {
+				m_item.del();
+			}
 		}
 	}
 
+	bool Page::isDisposed() const
+	{
+		return m_item;
+	}
+
 	void Page::popTo()
 	{
 		if (m_item && !isAtTop()) {
diff --git a/call-ui/presenters/base/Page.h b/call-ui/presenters/base/Page.h
index ef039b3..59295ec 100644
--- a/call-ui/presenters/base/Page.h
+++ b/call-ui/presenters/base/Page.h
@@ -21,13 +21,12 @@
 
 #include "ucl/mvp/GuiPresenter.h"
 
-#include "call-ui/types.h"
-
 namespace callui {
 
 	UCL_DECLARE_REF_ALIASES(Page);
 
-	class Page : public ucl::GuiPresenter {
+	class Page : public ucl::GuiPresenter,
+			public ucl::IDisposable {
 	public:
 		using ExitRequestHandler = ucl::WeakDelegate<void(Page &page)>;
 
@@ -38,7 +37,6 @@ namespace callui {
 		bool isAtBottom() const;
 
 		void exit();
-		void exitNoTransition();
 
 		void popTo();
 		void deleteTo();
@@ -50,6 +48,11 @@ namespace callui {
 		template <class ...ARGS>
 		ucl::NaviItem insertBefore(ARGS &&...args);
 
+		// ucl::IDisposable
+
+		virtual void dispose() override;
+		virtual bool isDisposed() const final override;
+
 	protected:
 		Page(ucl::IRefCountObj &rc, const ucl::NaviframeSRef &navi,
 				const ExitRequestHandler &onExitRequest);
diff --git a/call-ui/presenters/dialogs/AcceptDialog.cpp b/call-ui/presenters/dialogs/AcceptDialog.cpp
index b6b31e9..2bbffa9 100644
--- a/call-ui/presenters/dialogs/AcceptDialog.cpp
+++ b/call-ui/presenters/dialogs/AcceptDialog.cpp
@@ -112,7 +112,7 @@ namespace callui {
 		if (!popupEo) {
 			LOG_RETURN(RES_FAIL, "elm_popup_add() failed!");
 		}
-		m_popup = makeShared<StyledWidget>(popupEo, true);
+		m_popup = makeShared<StyledWidget>(popupEo);
 		m_popup->setStyle(style);
 		m_popup->setWeight(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 		show(*m_popup);
@@ -144,7 +144,7 @@ namespace callui {
 		elm_genlist_mode_set(glEo, ELM_LIST_COMPRESS);
 		elm_genlist_homogeneous_set(glEo, EINA_TRUE);
 
-		m_genlist = makeShared<StyledWidget>(glEo);
+		m_genlist = makeShared<StyledWidget>(glEo, false);
 		m_genlist->setWeight(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 		m_genlist->setAlign(EVAS_HINT_FILL, EVAS_HINT_FILL);
 
diff --git a/call-ui/presenters/misc/AccessoryPresenter.cpp b/call-ui/presenters/misc/AccessoryPresenter.cpp
index 61c8eab..0b463c1 100644
--- a/call-ui/presenters/misc/AccessoryPresenter.cpp
+++ b/call-ui/presenters/misc/AccessoryPresenter.cpp
@@ -264,7 +264,6 @@ namespace callui {
 	{
 		m_widget = Layout::Builder().
 				setTheme(impl::LAYOUT_ACCESSORY_WIDGET).
-				setIsOwner(true).
 				build(parent);
 		if (!m_widget) {
 			LOG_RETURN(RES_FAIL, "Layout::build() failed!");
@@ -322,7 +321,7 @@ namespace callui {
 			LOG_RETURN(RES_FAIL, "eo is NULL");
 		}
 
-		m_volumeBtn = makeShared<StyledWidget>(eo, true);
+		m_volumeBtn = makeShared<StyledWidget>(eo);
 		m_volumeBtn->setStyle(impl::STYLE_BTN_VOLUME);
 		m_volumeBtn->addEventHandler(BTN_CLICKED,
 				WEAK_DELEGATE(AccessoryPresenter::onVolumeBtnClicked,
@@ -342,7 +341,7 @@ namespace callui {
 		if (!eo) {
 			LOG_RETURN(RES_FAIL, "eo is NULL");
 		}
-		m_muteBtn = makeShared<StyledWidget>(eo, true);
+		m_muteBtn = makeShared<StyledWidget>(eo);
 		m_muteBtn->setStyle(impl::STYLE_BTN_MUTE);
 		m_muteBtn->addEventHandler(BTN_CLICKED,
 				WEAK_DELEGATE(AccessoryPresenter::onMuteBtnClicked,
@@ -363,7 +362,7 @@ namespace callui {
 		if (!eo) {
 			LOG_RETURN(RES_FAIL, "eo is NULL");
 		}
-		m_bluetoothBtn = makeShared<StyledWidget>(eo, true);
+		m_bluetoothBtn = makeShared<StyledWidget>(eo);
 		m_bluetoothBtn->setStyle(impl::STYLE_BTN_BT);
 		m_bluetoothBtn->addEventHandler(BTN_CLICKED,
 				WEAK_DELEGATE(AccessoryPresenter::onBluetoothBtnClicked,
@@ -398,7 +397,7 @@ namespace callui {
 		if (!eo) {
 			LOG_RETURN(RES_FAIL, "eo is NULL");
 		}
-		m_addContactBtn = makeShared<StyledWidget>(eo, true);
+		m_addContactBtn = makeShared<StyledWidget>(eo);
 		m_addContactBtn->setStyle(impl::STYLE_BTN_ADD_CONTACT);
 		m_addContactBtn->addEventHandler(BTN_CLICKED,
 				WEAK_DELEGATE(AccessoryPresenter::onAddContactBtnClicked,
diff --git a/call-ui/presenters/misc/CallInfoPresenter.cpp b/call-ui/presenters/misc/CallInfoPresenter.cpp
index c36741d..1dba75f 100644
--- a/call-ui/presenters/misc/CallInfoPresenter.cpp
+++ b/call-ui/presenters/misc/CallInfoPresenter.cpp
@@ -174,7 +174,6 @@ namespace callui {
 	{
 		m_widget = Layout::Builder().
 				setTheme(impl::LAYOUT_CALLER_INFO_WIDGET).
-				setIsOwner(true).
 				build(parent);
 		if (!m_widget) {
 			LOG_RETURN(RES_FAIL, "Layout::build() failed!");
@@ -336,7 +335,7 @@ namespace callui {
 			txtStyle = impl::STR_LABEL_SUB_CID_ENABLE;
 		}
 
-		m_label = makeShared<StyledWidget>(eo, true);
+		m_label = makeShared<StyledWidget>(eo);
 		m_label->setStyle(impl::STYLE_SLIDING_LABEL);
 		m_label->setText(txtStyle.format(text.c_str()));
 
@@ -361,7 +360,7 @@ namespace callui {
 		if (!eo) {
 			LOG_RETURN(RES_FAIL, "elm_image_add() failed");
 		}
-		auto callerId = makeShared<StyledWidget>(eo, true);
+		auto callerId = makeShared<StyledWidget>(eo);
 		elm_image_file_set(*callerId, imagePath.c_str(), NULL);
 		elm_image_aspect_fixed_set(*callerId, EINA_TRUE);
 		elm_image_fill_outside_set(*callerId, EINA_TRUE);
diff --git a/call-ui/presenters/misc/IndicatorPresenter.cpp b/call-ui/presenters/misc/IndicatorPresenter.cpp
index 983d0fe..f8f2ee6 100644
--- a/call-ui/presenters/misc/IndicatorPresenter.cpp
+++ b/call-ui/presenters/misc/IndicatorPresenter.cpp
@@ -241,7 +241,6 @@ namespace callui {
 	{
 		m_widget = Layout::Builder().
 				setTheme(impl::LAYOUT_INDICATOR_WIDGET).
-				setIsOwner(true).
 				build(parent);
 		if (!m_widget) {
 			LOG_RETURN(RES_FAIL, "Layout::build() failed!");
@@ -254,6 +253,7 @@ namespace callui {
 	{
 		m_connLayout = Layout::Builder().
 				setTheme(impl::LAYOUT_CONNECTION).
+				setIsOwner(false).
 				build(*m_widget);
 		if (!m_connLayout) {
 			LOG_RETURN(RES_FAIL, "Layout::build() failed!");
@@ -269,6 +269,7 @@ namespace callui {
 	{
 		m_rssiLayout = Layout::Builder().
 				setTheme(impl::LAYOUT_RSSI).
+				setIsOwner(false).
 				build(*m_widget);
 		if (!m_rssiLayout) {
 			LOG_RETURN(RES_FAIL, "Layout::build() failed!");
@@ -284,6 +285,7 @@ namespace callui {
 	{
 		m_batteryLayout = Layout::Builder().
 				setTheme(impl::LAYOUT_BATTERY).
+				setIsOwner(false).
 				build(*m_widget);
 		if (!m_batteryLayout) {
 			LOG_RETURN(RES_FAIL, "Layout::build() failed!");
@@ -299,6 +301,7 @@ namespace callui {
 	{
 		m_voiceControlLayout = Layout::Builder().
 				setTheme(impl::LAYOUT_VOICE_CONTROL).
+				setIsOwner(false).
 				build(*m_widget);
 		if (!m_voiceControlLayout) {
 			LOG_RETURN(RES_FAIL, "Layout::build() failed!");
@@ -313,6 +316,7 @@ namespace callui {
 	{
 		m_simLayout = Layout::Builder().
 				setTheme(impl::LAYOUT_SIM).
+				setIsOwner(false).
 				build(*m_widget);
 		if (!m_simLayout) {
 			LOG_RETURN(RES_FAIL, "Layout::build() failed!");
@@ -328,6 +332,7 @@ namespace callui {
 	{
 		m_hdCallLayout = Layout::Builder().
 				setTheme(impl::LAYOUT_HD_CALL).
+				setIsOwner(false).
 				build(*m_widget);
 		if (!m_hdCallLayout) {
 			LOG_RETURN(RES_FAIL, "Layout::build() failed!");
diff --git a/call-ui/presenters/misc/MoreOptionsPresenter.cpp b/call-ui/presenters/misc/MoreOptionsPresenter.cpp
index a220ee1..6aa148c 100644
--- a/call-ui/presenters/misc/MoreOptionsPresenter.cpp
+++ b/call-ui/presenters/misc/MoreOptionsPresenter.cpp
@@ -136,9 +136,7 @@ namespace callui {
 			sendActivate(*m_widget);
 		}
 
-		if (const auto keypad = m_keypad.lock()) {
-			keypad->exitNoTransition();
-		}
+		util::dispose(m_keypad);
 	}
 
 	Result MoreOptionsPresenter::prepare(GuiPresenter &parent,
@@ -170,7 +168,6 @@ namespace callui {
 	{
 		m_widget = Layout::Builder().
 				setTheme(impl::LAYOUT_DRAWER_PANEL).
-				setIsOwner(true).
 				build(parent);
 
 		if (!m_widget) {
@@ -200,7 +197,7 @@ namespace callui {
 		if (!eo) {
 			LOG_RETURN(RES_FAIL, "elm_panel_add() failed!");
 		}
-		m_panel = makeShared<StyledWidget>(eo, true);
+		m_panel = makeShared<StyledWidget>(eo);
 		elm_panel_orient_set(*m_panel, ELM_PANEL_ORIENT_RIGHT);
 		show(*m_panel);
 
@@ -350,7 +347,7 @@ namespace callui {
 		if (!eo) {
 			LOG_RETURN_VALUE(RES_FAIL, {}, "elm_button_add() failed!");
 		}
-		auto btn = makeShared<StyledWidget>(eo, true);
+		auto btn = makeShared<StyledWidget>(eo);
 		btn->setStyle(style);
 		btn->setText(txt);
 		btn->addEventHandler(BTN_CLICKED, handler);
diff --git a/call-ui/presenters/misc/RejectMsgPresenter.cpp b/call-ui/presenters/misc/RejectMsgPresenter.cpp
index c3864d3..c6a14c8 100644
--- a/call-ui/presenters/misc/RejectMsgPresenter.cpp
+++ b/call-ui/presenters/misc/RejectMsgPresenter.cpp
@@ -185,7 +185,6 @@ namespace callui {
 	{
 		m_widget = Layout::Builder().
 				setTheme(impl::LAYOUT_DRAWER_PANEL).
-				setIsOwner(true).
 				build(parent);
 
 		if (!m_widget) {
@@ -251,7 +250,7 @@ namespace callui {
 
 	Result RejectMsgPresenter::createPanel()
 	{
-		m_panel = makeShared<StyledWidget>(elm_panel_add(*m_widget), true);
+		m_panel = makeShared<StyledWidget>(elm_panel_add(*m_widget));
 		if (!m_panel) {
 			LOG_RETURN(RES_FAIL, "elm_panel_add() failed!");
 		}
@@ -275,7 +274,7 @@ namespace callui {
 	Result RejectMsgPresenter::createPanelBg()
 	{
 		m_panelBg = makeShared<ElmWidget>(
-				evas_object_rectangle_add(evas_object_evas_get(*m_widget)));
+				evas_object_rectangle_add(evas_object_evas_get(*m_widget)), false);
 		if (!m_panelBg) {
 			LOG_RETURN(RES_FAIL, "evas_object_rectangle_add() failed!");
 		}
@@ -291,7 +290,6 @@ namespace callui {
 	{
 		m_panelLy = Layout::Builder().
 				setTheme(impl::LAYOUT_RM_PANEL_CONTENT).
-				setIsOwner(true).
 				build(*m_panel);
 		if (!m_panelLy) {
 			LOG_RETURN(RES_FAIL, "Layout::build failed!");
@@ -304,7 +302,9 @@ namespace callui {
 	Result RejectMsgPresenter::createGenlist()
 	{
 		// Genlist scroller Layout
-		auto circlLy = Layout::Builder().build(*m_panelLy);
+		auto circlLy = Layout::Builder().
+				setIsOwner(false).
+				build(*m_panelLy);
 		if (!circlLy) {
 			LOG_RETURN(RES_FAIL, "Layout::build failed!");
 		}
@@ -322,7 +322,7 @@ namespace callui {
 		elm_genlist_mode_set(glEo, ELM_LIST_COMPRESS);
 		elm_genlist_homogeneous_set(glEo, EINA_TRUE);
 
-		m_genlist = makeShared<StyledWidget>(glEo, true);
+		m_genlist = makeShared<StyledWidget>(glEo);
 		m_genlist->setWeight(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 		m_genlist->setAlign(EVAS_HINT_FILL, EVAS_HINT_FILL);
 
diff --git a/call-ui/presenters/misc/common.h b/call-ui/presenters/misc/common.h
index 638f819..9d901ec 100644
--- a/call-ui/presenters/misc/common.h
+++ b/call-ui/presenters/misc/common.h
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#ifndef __CALL_UI_PRESENTERS_MISC_MISC_COMMON_H__
-#define __CALL_UI_PRESENTERS_MISC_MISC_COMMON_H__
+#ifndef __CALL_UI_PRESENTERS_MISC_COMMON_H__
+#define __CALL_UI_PRESENTERS_MISC_COMMON_H__
 
 #include "call-ui/presenters/common.h"
 
-#endif // __CALL_UI_PRESENTERS_MISC_MISC_COMMON_H__
+#endif // __CALL_UI_PRESENTERS_MISC_COMMON_H__
diff --git a/call-ui/presenters/pages/KeypadPage.cpp b/call-ui/presenters/pages/KeypadPage.cpp
index ca920b1..2c06b75 100644
--- a/call-ui/presenters/pages/KeypadPage.cpp
+++ b/call-ui/presenters/pages/KeypadPage.cpp
@@ -219,7 +219,6 @@ namespace callui {
 	{
 		m_widget = Layout::Builder().
 				setTheme(impl::LAYOUT_KEYPAD_WIDGET).
-				setIsOwner(true).
 				build(getNaviframe());
 
 		if (!m_widget) {
@@ -237,7 +236,7 @@ namespace callui {
 		if (!entry) {
 			LOG_RETURN(RES_FAIL, "elm_entry_add() failed!");
 		}
-		m_entry = makeShared<ElmWidget>(entry, true);
+		m_entry = makeShared<ElmWidget>(entry);
 
 		static Elm_Entry_Filter_Accept_Set digitsFilterData;
 
@@ -268,7 +267,7 @@ namespace callui {
 				LOG_RETURN(RES_FAIL, "elm_button_add() failed!");
 			}
 
-			buttonSRef = makeShared<StyledWidget>(button);
+			buttonSRef = makeShared<StyledWidget>(button, false);
 			buttonSRef->bindToEo();
 			buttonSRef->setData(impl::BTN_DATA_KEY, &(impl::buttonsInfo[i]));
 			buttonSRef->setStyle(impl::buttonsInfo[i].style);
diff --git a/call-ui/presenters/pages/MainPage.cpp b/call-ui/presenters/pages/MainPage.cpp
index 9500909..3cf0ef3 100644
--- a/call-ui/presenters/pages/MainPage.cpp
+++ b/call-ui/presenters/pages/MainPage.cpp
@@ -227,7 +227,6 @@ namespace callui {
 	{
 		m_rmLy = Layout::Builder().
 				setTheme(impl::LAYOUT_REJECT_MSG_WIDGET).
-				setIsOwner(true).
 				build(*m_widget);
 		if (!m_rmLy) {
 			LOG_RETURN(RES_FAIL, "Layout::build() failed!");
@@ -369,7 +368,7 @@ namespace callui {
 	Result MainPage::createBottomBtn(const ElmStyle &style, bool setVisible)
 	{
 		m_bottomBtn = makeShared<StyledWidget>(
-				elm_button_add(*m_widget), true);
+				elm_button_add(*m_widget));
 		m_bottomBtn->setStyle(style);
 
 		m_bottomBtn->addEventHandler(BTN_CLICKED,
@@ -485,7 +484,6 @@ namespace callui {
 	{
 		m_widget = Layout::Builder().
 				setTheme(impl::LAYOUT_MAIN_WIDGET).
-				setIsOwner(true).
 				build(getNaviframe());
 
 		if (!m_widget) {
diff --git a/call-ui/presenters/pages/common.h b/call-ui/presenters/pages/common.h
index 28cd174..060daa9 100644
--- a/call-ui/presenters/pages/common.h
+++ b/call-ui/presenters/pages/common.h
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#ifndef __CALL_UI_PRESENTERS_PAGES_PAGES_COMMON_H__
-#define __CALL_UI_PRESENTERS_PAGES_PAGES_COMMON_H__
+#ifndef __CALL_UI_PRESENTERS_PAGES_COMMON_H__
+#define __CALL_UI_PRESENTERS_PAGES_COMMON_H__
 
 #include "call-ui/presenters/common.h"
 
-#endif // __CALL_UI_PRESENTERS_PAGES_PAGES_COMMON_H__
+#endif // __CALL_UI_PRESENTERS_PAGES_COMMON_H__
diff --git a/call-ui/view/AcceptRejectWidget.cpp b/call-ui/view/AcceptRejectWidget.cpp
index ed7c2aa..b16d4c9 100644
--- a/call-ui/view/AcceptRejectWidget.cpp
+++ b/call-ui/view/AcceptRejectWidget.cpp
@@ -142,7 +142,6 @@ namespace callui { namespace { namespace impl {
 	{
 		auto layout = Layout::Builder().
 				setTheme(theme).
-				setIsOwner(true).
 				build(parent);
 		if (!layout) {
 			LOG_RETURN_VALUE(RES_FAIL, {}, "Layout::build() failed!");
@@ -197,7 +196,6 @@ namespace callui {
 	{
 		auto layout = Layout::Builder().
 				setTheme(impl::LAYOUT_IMG_ACCEPT_REJECT).
-				setIsOwner(true).
 				build(parent);
 		if (!layout) {
 			LOG_RETURN_VALUE(RES_FAIL, {}, "Layout::build() failed!");
@@ -219,7 +217,7 @@ namespace callui {
 			const NotiHandler &acceptHandler,
 			const NotiHandler &rejectHandler,
 			AcceptButtonType acceptBtnType):
-		ElmWidget(&rc, *layout, true),
+		ElmWidget(&rc, *layout, false),
 		m_layout(layout.get()),
 		m_accHandler(acceptHandler),
 		m_rejHandler(rejectHandler),
@@ -339,13 +337,16 @@ namespace callui {
 		m_accEventLy = Layout::Builder().
 				setTheme(impl::LAYOUT_EVENT_ACCEPT_REJECT).
 				build(*m_layout);
-		m_accEventLy->setWeight(EXPAND, EXPAND);
+
 		m_accEventLy->addEventHandler(WidgetEvent::MOUSE_DOWN,
 				WEAK_DELEGATE(AcceptRejectWidget::onMouseDown, asWeak(*this)));
+
 		m_accEventLy->addEventHandler(WidgetEvent::MOUSE_UP,
 				WEAK_DELEGATE(AcceptRejectWidget::onMouseUp, asWeak(*this)));
+
 		m_accEventLy->addEventHandler(WidgetEvent::MOUSE_MOVE,
 				WEAK_DELEGATE(AcceptRejectWidget::onMouseMove, asWeak(*this)));
+
 		m_layout->setContent(*m_accEventLy,
 				impl::PART_SWL_ACCEPT_FINGER_EVENT);
 
diff --git a/call-ui/view/Slider.cpp b/call-ui/view/Slider.cpp
index 3c5b7f0..f127de4 100644
--- a/call-ui/view/Slider.cpp
+++ b/call-ui/view/Slider.cpp
@@ -54,7 +54,6 @@ namespace callui {
 	{
 		auto layout = Layout::Builder().
 				setTheme(impl::LAYOUT_SLIDER).
-				setIsOwner(true).
 				build(parent);
 		if (!layout) {
 			LOG_RETURN_VALUE(RES_FAIL, {}, "Layout::build() failed!");
@@ -71,7 +70,7 @@ namespace callui {
 			const LayoutSRef &layout,
 			int maxValue,
 			int curValue):
-				ElmWidget(&rc, *layout, true),
+				ElmWidget(&rc, *layout, false),
 				m_layout(layout.get()),
 				m_circleLy(elm_layout_add(*m_layout)),
 				m_circleSurf(eext_circle_surface_layout_add(m_circleLy)),
diff --git a/call-ui/view/VolumeControl.cpp b/call-ui/view/VolumeControl.cpp
index 2e5cfaf..13c06d9 100644
--- a/call-ui/view/VolumeControl.cpp
+++ b/call-ui/view/VolumeControl.cpp
@@ -77,7 +77,6 @@ namespace callui {
 	{
 		auto layout = Layout::Builder().
 				setTheme(impl::LAYOUT_VOLUME).
-				setIsOwner(true).
 				build(parent);
 		if (!layout) {
 			LOG_RETURN_VALUE(RES_FAIL, {}, "Layout::build() failed!");
diff --git a/call-ui/view/helpers.cpp b/call-ui/view/helpers.cpp
index 153e8ad..e4f931d 100644
--- a/call-ui/view/helpers.cpp
+++ b/call-ui/view/helpers.cpp
@@ -80,7 +80,6 @@ namespace callui { namespace utils {
 	{
 		const auto result = Layout::Builder().
 				setTheme(impl::LAYOUT_FAKE_ACCESS_OBJECT).
-				setIsOwner(true).
 				setNeedBindToEo(true).
 				build(parent);
 		if (!result) {
@@ -127,7 +126,7 @@ namespace callui { namespace utils {
 					"elm_access_object_register() failed!");
 		}
 
-		return makeShared<ElmWidget>(ao, true);
+		return makeShared<ElmWidget>(ao);
 	}
 
 	ElmWidgetSRef createAccessObjectFromLyPart(ElmWidget &parent,
@@ -147,7 +146,7 @@ namespace callui { namespace utils {
 					"elm_access_object_register() failed!");
 		}
 
-		return makeShared<ElmWidget>(ao, true);
+		return makeShared<ElmWidget>(ao);
 	}
 
 	void destroyAccessObject(ElmWidget &ao)
diff --git a/project_def.prop b/project_def.prop
index 0260b0b..7195d9e 100644
--- a/project_def.prop
+++ b/project_def.prop
@@ -9,7 +9,7 @@ type = app
 profile = wearable-4.0
 
 # C/CPP Sources
-USER_SRCS = ucl/src/gui/WidgetItem.cpp src/presenters/InstanceManager.cpp ucl/src/appfw/UIApp.cpp src/model/VoiceControlStateProvider.cpp src/presenters/AcceptDialog.cpp ucl/src/gui/NaviItem.cpp ucl/src/gui/Layout.cpp src/model/IncomingCall.cpp src/presenters/Page.cpp src/resources.cpp src/presenters/DeviceStatePresenter.cpp src/model/ContactInfoProvider.cpp ucl/src/gui/Genlist.cpp ucl/src/gui/Window.cpp src/types.cpp src/presenters/RejectMsgPresenter.cpp src/model/ConnectionStateSource.cpp src/presenters/AccessoryPresenter.cpp src/model/ContactInfo.cpp src/model/EndCall.cpp src/presenters/MainPage.cpp src/view/helpers.cpp ucl/src/mvp/ListItemPresenter.cpp ucl/src/util/types/Result.cpp ucl/src/mvp/ListPresenter.cpp ucl/src/misc/Variant.cpp src/model/CallUI.cpp ucl/src/mvp/GuiPresenter.cpp src/view/VolumeControl.cpp src/view/Slider.cpp src/model/CallInfo.cpp ucl/src/gui/ElmWidget.cpp src/model/SimSlotStateSource.cpp src/presenters/AcceptRejectPresenter.cpp ucl/src/gui/EdjeWidget.cpp ucl/src/gui/Naviframe.cpp src/model/CallManager.cpp ucl/src/misc/Timeout.cpp src/presenters/Instance.cpp ucl/src/gui/Widget.cpp src/model/ActiveCall.cpp src/model/RejectMsgProvider.cpp src/presenters/MoreOptionsPresenter.cpp ucl/src/appfw/SysEventProvider.cpp src/presenters/CallInfoPresenter.cpp src/model/BatteryStateSource.cpp src/model/CallClient.cpp src/model/VoiceControlStateSource.cpp src/model/RssiStateSource.cpp src/model/HdVoiceStateSource.cpp ucl/src/util/logging.cpp src/model/IndicatorStateProvider.cpp src/presenters/KeypadPage.cpp src/presenters/helpers.cpp src/presenters/MotionSensorPresenter.cpp src/main.cpp src/model/MsgClient.cpp src/presenters/IndicatorPresenter.cpp ucl/src/appfw/helpers.cpp src/model/CallUIBuilder.cpp src/presenters/AtspiHighlightHelper.cpp src/presenters/CallStatusPresenter.cpp src/model/ConferenceCallInfo.cpp src/model/HeldCall.cpp src/model/SoundManager.cpp src/model/BluetoothManager.cpp src/model/RejectMsg.cpp src/view/AcceptRejectWidget.cpp ucl/src/appfw/InstanceManagerBase.cpp 
+USER_SRCS = call-ui/view/VolumeControl.cpp call-ui/view/Slider.cpp call-ui/model/impl/CallInfo.cpp call-ui/model/impl/RejectMsgProvider.cpp ucl/source/mvp/GuiPresenter.cpp ucl/source/appfw/InstanceManagerBase.cpp call-ui/model/impl/BatteryStateSource.cpp ucl/source/gui/Widget.cpp call-ui/presenters/base/Page.cpp call-ui/model/impl/IncomingCall.cpp call-ui/presenters/dialogs/AcceptDialog.cpp call-ui/types.cpp ucl/source/appfw/helpers.cpp ucl/source/mvp/ListItemPresenter.cpp call-ui/presenters/misc/helpers.cpp call-ui/model/impl/IndicatorStateProvider.cpp call-ui/model/impl/RejectMsg.cpp call-ui/view/AcceptRejectWidget.cpp ucl/source/misc/Timeout.cpp call-ui/resources.cpp ucl/source/gui/Genlist.cpp call-ui/model/CallUIBuilder.cpp ucl/source/util/types/Result.cpp call-ui/presenters/misc/CallStatusPresenter.cpp call-ui/model/impl/ConferenceCallInfo.cpp call-ui/model/impl/HeldCall.cpp call-ui/model/impl/SoundManager.cpp call-ui/model/impl/BluetoothManager.cpp ucl/source/gui/Layout.cpp call-ui/presenters/misc/MotionSensorPresenter.cpp ucl/source/gui/EdjeWidget.cpp call-ui/model/impl/MsgClient.cpp call-ui/model/impl/RssiStateSource.cpp call-ui/presenters/Instance.cpp call-ui/model/impl/ActiveCall.cpp call-ui/presenters/InstanceManager.cpp call-ui/presenters/misc/MoreOptionsPresenter.cpp call-ui/presenters/misc/IndicatorPresenter.cpp call-ui/model/impl/SimSlotStateSource.cpp call-ui/presenters/misc/AtspiHighlightHelper.cpp ucl/source/gui/Naviframe.cpp call-ui/presenters/misc/AcceptRejectPresenter.cpp call-ui/model/impl/CallUI.cpp ucl/source/gui/WidgetItem.cpp call-ui/presenters/pages/MainPage.cpp ucl/source/gui/NaviItem.cpp ucl/source/gui/ElmWidget.cpp call-ui/presenters/misc/DeviceStatePresenter.cpp call-ui/model/impl/ContactInfoProvider.cpp ucl/source/misc/Variant.cpp call-ui/model/impl/HdVoiceStateSource.cpp call-ui/view/helpers.cpp call-ui/main.cpp call-ui/model/impl/VoiceControlStateProvider.cpp ucl/source/gui/Window.cpp call-ui/model/impl/CallManager.cpp call-ui/model/impl/ConnectionStateSource.cpp call-ui/presenters/misc/RejectMsgPresenter.cpp call-ui/presenters/pages/KeypadPage.cpp call-ui/presenters/misc/CallInfoPresenter.cpp ucl/source/appfw/SysEventProvider.cpp ucl/source/util/logging.cpp ucl/source/appfw/UIApp.cpp call-ui/model/impl/CallClient.cpp call-ui/presenters/misc/AccessoryPresenter.cpp call-ui/model/impl/ContactInfo.cpp call-ui/model/impl/EndCall.cpp call-ui/model/impl/VoiceControlStateSource.cpp ucl/source/mvp/ListPresenter.cpp 
 
 # EDC Sources
 USER_EDCS =  
@@ -36,7 +36,7 @@ USER_OBJS =
 USER_C_INC_DIRS = 
 USER_INC_FILES = 
 ## C++ Compiler
-USER_CPP_INC_DIRS = . ucl/inc 
+USER_CPP_INC_DIRS = . ucl/include 
 USER_CPP_INC_FILES = 
 
 USER_INC_DIRS = $(USER_C_INC_DIRS) $(USER_CPP_INC_DIRS)
diff --git a/ucl/inc/ucl/appfw/IInstance.h b/ucl/include/ucl/appfw/IInstance.h
similarity index 100%
rename from ucl/inc/ucl/appfw/IInstance.h
rename to ucl/include/ucl/appfw/IInstance.h
diff --git a/ucl/inc/ucl/appfw/IInstanceAppControlExt.h b/ucl/include/ucl/appfw/IInstanceAppControlExt.h
similarity index 100%
rename from ucl/inc/ucl/appfw/IInstanceAppControlExt.h
rename to ucl/include/ucl/appfw/IInstanceAppControlExt.h
diff --git a/ucl/inc/ucl/appfw/IInstanceContext.h b/ucl/include/ucl/appfw/IInstanceContext.h
similarity index 100%
rename from ucl/inc/ucl/appfw/IInstanceContext.h
rename to ucl/include/ucl/appfw/IInstanceContext.h
diff --git a/ucl/inc/ucl/appfw/InstanceManagerBase.h b/ucl/include/ucl/appfw/InstanceManagerBase.h
similarity index 100%
rename from ucl/inc/ucl/appfw/InstanceManagerBase.h
rename to ucl/include/ucl/appfw/InstanceManagerBase.h
diff --git a/ucl/inc/ucl/appfw/SysEventProvider.h b/ucl/include/ucl/appfw/SysEventProvider.h
similarity index 100%
rename from ucl/inc/ucl/appfw/SysEventProvider.h
rename to ucl/include/ucl/appfw/SysEventProvider.h
diff --git a/ucl/inc/ucl/appfw/SysEventProvider.hpp b/ucl/include/ucl/appfw/SysEventProvider.hpp
similarity index 100%
rename from ucl/inc/ucl/appfw/SysEventProvider.hpp
rename to ucl/include/ucl/appfw/SysEventProvider.hpp
diff --git a/ucl/inc/ucl/appfw/UIApp.h b/ucl/include/ucl/appfw/UIApp.h
similarity index 100%
rename from ucl/inc/ucl/appfw/UIApp.h
rename to ucl/include/ucl/appfw/UIApp.h
diff --git a/ucl/inc/ucl/appfw/helpers.h b/ucl/include/ucl/appfw/helpers.h
similarity index 100%
rename from ucl/inc/ucl/appfw/helpers.h
rename to ucl/include/ucl/appfw/helpers.h
diff --git a/ucl/inc/ucl/appfw/types.h b/ucl/include/ucl/appfw/types.h
similarity index 100%
rename from ucl/inc/ucl/appfw/types.h
rename to ucl/include/ucl/appfw/types.h
diff --git a/ucl/inc/ucl/config.h b/ucl/include/ucl/config.h
similarity index 100%
rename from ucl/inc/ucl/config.h
rename to ucl/include/ucl/config.h
diff --git a/ucl/inc/ucl/gui/EdjeWidget.h b/ucl/include/ucl/gui/EdjeWidget.h
similarity index 95%
rename from ucl/inc/ucl/gui/EdjeWidget.h
rename to ucl/include/ucl/gui/EdjeWidget.h
index 0ee57f0..8d045c4 100644
--- a/ucl/inc/ucl/gui/EdjeWidget.h
+++ b/ucl/include/ucl/gui/EdjeWidget.h
@@ -43,7 +43,7 @@ namespace ucl {
 				EdjeSignalSrc(""));
 
 	protected:
-		EdjeWidget(IRefCountObj *rc, Evas_Object *eo, bool isOwner = false);
+		EdjeWidget(IRefCountObj *rc, Evas_Object *eo, bool isOwner = true);
 	};
 }
 
diff --git a/ucl/inc/ucl/gui/EdjeWidget.hpp b/ucl/include/ucl/gui/EdjeWidget.hpp
similarity index 100%
rename from ucl/inc/ucl/gui/EdjeWidget.hpp
rename to ucl/include/ucl/gui/EdjeWidget.hpp
diff --git a/ucl/inc/ucl/gui/ElmWidget.h b/ucl/include/ucl/gui/ElmWidget.h
similarity index 92%
rename from ucl/inc/ucl/gui/ElmWidget.h
rename to ucl/include/ucl/gui/ElmWidget.h
index 3856b49..f967cc3 100644
--- a/ucl/inc/ucl/gui/ElmWidget.h
+++ b/ucl/include/ucl/gui/ElmWidget.h
@@ -31,7 +31,7 @@ namespace ucl {
 
 	class ElmWidget : public Widget {
 	public:
-		explicit ElmWidget(Evas_Object *eo, bool isOwner = false);
+		explicit ElmWidget(Evas_Object *eo, bool isOwner = true);
 		virtual ~ElmWidget();
 
 		void setEnabled(bool value);
@@ -48,7 +48,7 @@ namespace ucl {
 
 	protected:
 		friend class ReffedObj<ElmWidget>;
-		ElmWidget(IRefCountObj *rc, Evas_Object *eo, bool isOwner = false);
+		ElmWidget(IRefCountObj *rc, Evas_Object *eo, bool isOwner = true);
 
 		virtual void setFocusedImpl(bool value) final override;
 		virtual bool isFocusedImpl() const final override;
diff --git a/ucl/inc/ucl/gui/ElmWidget.hpp b/ucl/include/ucl/gui/ElmWidget.hpp
similarity index 100%
rename from ucl/inc/ucl/gui/ElmWidget.hpp
rename to ucl/include/ucl/gui/ElmWidget.hpp
diff --git a/ucl/inc/ucl/gui/Genlist.h b/ucl/include/ucl/gui/Genlist.h
similarity index 98%
rename from ucl/inc/ucl/gui/Genlist.h
rename to ucl/include/ucl/gui/Genlist.h
index ebbb43e..366eccf 100644
--- a/ucl/inc/ucl/gui/Genlist.h
+++ b/ucl/include/ucl/gui/Genlist.h
@@ -24,7 +24,7 @@ namespace ucl {
 
 	UCL_DECLARE_REF_ALIASES(Genlist);
 
-	class Genlist : public StyledWidget {
+	class Genlist final : public StyledWidget {
 	public:
 		enum class Mode {
 			COMPRESS = ELM_LIST_COMPRESS,
diff --git a/ucl/inc/ucl/gui/Genlist.hpp b/ucl/include/ucl/gui/Genlist.hpp
similarity index 99%
rename from ucl/inc/ucl/gui/Genlist.hpp
rename to ucl/include/ucl/gui/Genlist.hpp
index d3cfed0..3c93031 100644
--- a/ucl/inc/ucl/gui/Genlist.hpp
+++ b/ucl/include/ucl/gui/Genlist.hpp
@@ -21,7 +21,7 @@ namespace ucl {
 	inline Genlist::Builder::Builder() :
 		m_mode(Mode::COMPRESS),
 		m_isHomogeneous(true),
-		m_isOwner(false),
+		m_isOwner(true),
 		m_needBindToEo(false)
 	{
 	}
diff --git a/ucl/inc/ucl/gui/GenlistItem.h b/ucl/include/ucl/gui/GenlistItem.h
similarity index 100%
rename from ucl/inc/ucl/gui/GenlistItem.h
rename to ucl/include/ucl/gui/GenlistItem.h
diff --git a/ucl/inc/ucl/gui/GenlistItem.hpp b/ucl/include/ucl/gui/GenlistItem.hpp
similarity index 100%
rename from ucl/inc/ucl/gui/GenlistItem.hpp
rename to ucl/include/ucl/gui/GenlistItem.hpp
diff --git a/ucl/inc/ucl/gui/Layout.h b/ucl/include/ucl/gui/Layout.h
similarity index 96%
rename from ucl/inc/ucl/gui/Layout.h
rename to ucl/include/ucl/gui/Layout.h
index 9eb108e..d349f92 100644
--- a/ucl/inc/ucl/gui/Layout.h
+++ b/ucl/include/ucl/gui/Layout.h
@@ -44,7 +44,7 @@ namespace ucl {
 	public:
 		friend class ReffedObj<Layout>;
 		using EdjeWidget::EdjeWidget;
-		explicit Layout(Evas_Object *eo, bool isOwner = false);
+		explicit Layout(Evas_Object *eo, bool isOwner = true);
 
 		bool setTheme(const LayoutTheme &theme);
 		bool setEdjeFile(const std::string &filePath, EdjeGroup group);
diff --git a/ucl/inc/ucl/gui/Layout.hpp b/ucl/include/ucl/gui/Layout.hpp
similarity index 98%
rename from ucl/inc/ucl/gui/Layout.hpp
rename to ucl/include/ucl/gui/Layout.hpp
index e3df1db..d6d18a3 100644
--- a/ucl/inc/ucl/gui/Layout.hpp
+++ b/ucl/include/ucl/gui/Layout.hpp
@@ -19,7 +19,7 @@ namespace ucl {
 	// Layout::Builder //
 
 	inline Layout::Builder::Builder() :
-		m_isOwner(false),
+		m_isOwner(true),
 		m_needBindToEo(false)
 	{
 	}
diff --git a/ucl/inc/ucl/gui/NaviItem.h b/ucl/include/ucl/gui/NaviItem.h
similarity index 100%
rename from ucl/inc/ucl/gui/NaviItem.h
rename to ucl/include/ucl/gui/NaviItem.h
diff --git a/ucl/inc/ucl/gui/NaviItem.hpp b/ucl/include/ucl/gui/NaviItem.hpp
similarity index 100%
rename from ucl/inc/ucl/gui/NaviItem.hpp
rename to ucl/include/ucl/gui/NaviItem.hpp
diff --git a/ucl/inc/ucl/gui/Naviframe.h b/ucl/include/ucl/gui/Naviframe.h
similarity index 100%
rename from ucl/inc/ucl/gui/Naviframe.h
rename to ucl/include/ucl/gui/Naviframe.h
diff --git a/ucl/inc/ucl/gui/Naviframe.hpp b/ucl/include/ucl/gui/Naviframe.hpp
similarity index 100%
rename from ucl/inc/ucl/gui/Naviframe.hpp
rename to ucl/include/ucl/gui/Naviframe.hpp
diff --git a/ucl/inc/ucl/gui/StyledWidget.h b/ucl/include/ucl/gui/StyledWidget.h
similarity index 93%
rename from ucl/inc/ucl/gui/StyledWidget.h
rename to ucl/include/ucl/gui/StyledWidget.h
index 2a0280c..223a293 100644
--- a/ucl/inc/ucl/gui/StyledWidget.h
+++ b/ucl/include/ucl/gui/StyledWidget.h
@@ -27,7 +27,7 @@ namespace ucl {
 	public:
 		friend class ReffedObj<StyledWidget>;
 		using EdjeWidget::EdjeWidget;
-		explicit StyledWidget(Evas_Object *eo, bool isOwner = false);
+		explicit StyledWidget(Evas_Object *eo, bool isOwner = true);
 
 		void setStyle(ElmStyle style);
 	};
diff --git a/ucl/inc/ucl/gui/StyledWidget.hpp b/ucl/include/ucl/gui/StyledWidget.hpp
similarity index 100%
rename from ucl/inc/ucl/gui/StyledWidget.hpp
rename to ucl/include/ucl/gui/StyledWidget.hpp
diff --git a/ucl/inc/ucl/gui/Theme.h b/ucl/include/ucl/gui/Theme.h
similarity index 100%
rename from ucl/inc/ucl/gui/Theme.h
rename to ucl/include/ucl/gui/Theme.h
diff --git a/ucl/inc/ucl/gui/Theme.hpp b/ucl/include/ucl/gui/Theme.hpp
similarity index 100%
rename from ucl/inc/ucl/gui/Theme.hpp
rename to ucl/include/ucl/gui/Theme.hpp
diff --git a/ucl/inc/ucl/gui/Widget.h b/ucl/include/ucl/gui/Widget.h
similarity index 97%
rename from ucl/inc/ucl/gui/Widget.h
rename to ucl/include/ucl/gui/Widget.h
index e60c5ec..ac47866 100644
--- a/ucl/inc/ucl/gui/Widget.h
+++ b/ucl/include/ucl/gui/Widget.h
@@ -35,7 +35,7 @@ namespace ucl {
 		static constexpr auto FILL = EVAS_HINT_FILL;
 
 	public:
-		explicit Widget(Evas_Object *eo, bool isOwner = false);
+		explicit Widget(Evas_Object *eo, bool isOwner = true);
 		virtual ~Widget();
 
 		void bindToEo();
@@ -98,7 +98,7 @@ namespace ucl {
 
 	protected:
 		friend class ReffedObj<Widget>;
-		Widget(IRefCountObj *rc, Evas_Object *eo, bool isOwner = false);
+		Widget(IRefCountObj *rc, Evas_Object *eo, bool isOwner = true);
 
 		virtual void setFocusedImpl(bool value);
 		virtual bool isFocusedImpl() const;
diff --git a/ucl/inc/ucl/gui/Widget.hpp b/ucl/include/ucl/gui/Widget.hpp
similarity index 100%
rename from ucl/inc/ucl/gui/Widget.hpp
rename to ucl/include/ucl/gui/Widget.hpp
diff --git a/ucl/inc/ucl/gui/WidgetItem.h b/ucl/include/ucl/gui/WidgetItem.h
similarity index 100%
rename from ucl/inc/ucl/gui/WidgetItem.h
rename to ucl/include/ucl/gui/WidgetItem.h
diff --git a/ucl/inc/ucl/gui/WidgetItem.hpp b/ucl/include/ucl/gui/WidgetItem.hpp
similarity index 100%
rename from ucl/inc/ucl/gui/WidgetItem.hpp
rename to ucl/include/ucl/gui/WidgetItem.hpp
diff --git a/ucl/inc/ucl/gui/Window.h b/ucl/include/ucl/gui/Window.h
similarity index 100%
rename from ucl/inc/ucl/gui/Window.h
rename to ucl/include/ucl/gui/Window.h
diff --git a/ucl/inc/ucl/gui/Window.hpp b/ucl/include/ucl/gui/Window.hpp
similarity index 100%
rename from ucl/inc/ucl/gui/Window.hpp
rename to ucl/include/ucl/gui/Window.hpp
diff --git a/ucl/inc/ucl/gui/helpers.h b/ucl/include/ucl/gui/helpers.h
similarity index 100%
rename from ucl/inc/ucl/gui/helpers.h
rename to ucl/include/ucl/gui/helpers.h
diff --git a/ucl/inc/ucl/gui/helpers.hpp b/ucl/include/ucl/gui/helpers.hpp
similarity index 100%
rename from ucl/inc/ucl/gui/helpers.hpp
rename to ucl/include/ucl/gui/helpers.hpp
diff --git a/ucl/inc/ucl/gui/stdTheme.h b/ucl/include/ucl/gui/stdTheme.h
similarity index 100%
rename from ucl/inc/ucl/gui/stdTheme.h
rename to ucl/include/ucl/gui/stdTheme.h
diff --git a/ucl/inc/ucl/gui/stdTheme/common.h b/ucl/include/ucl/gui/stdTheme/common.h
similarity index 100%
rename from ucl/inc/ucl/gui/stdTheme/common.h
rename to ucl/include/ucl/gui/stdTheme/common.h
diff --git a/ucl/inc/ucl/gui/stdTheme/layout.h b/ucl/include/ucl/gui/stdTheme/layout.h
similarity index 100%
rename from ucl/inc/ucl/gui/stdTheme/layout.h
rename to ucl/include/ucl/gui/stdTheme/layout.h
diff --git a/ucl/inc/ucl/gui/stdTheme/naviframe.h b/ucl/include/ucl/gui/stdTheme/naviframe.h
similarity index 100%
rename from ucl/inc/ucl/gui/stdTheme/naviframe.h
rename to ucl/include/ucl/gui/stdTheme/naviframe.h
diff --git a/ucl/inc/ucl/gui/types.h b/ucl/include/ucl/gui/types.h
similarity index 100%
rename from ucl/inc/ucl/gui/types.h
rename to ucl/include/ucl/gui/types.h
diff --git a/ucl/inc/ucl/gui/types.hpp b/ucl/include/ucl/gui/types.hpp
similarity index 100%
rename from ucl/inc/ucl/gui/types.hpp
rename to ucl/include/ucl/gui/types.hpp
diff --git a/ucl/inc/ucl/misc/Aspect.h b/ucl/include/ucl/misc/Aspect.h
similarity index 100%
rename from ucl/inc/ucl/misc/Aspect.h
rename to ucl/include/ucl/misc/Aspect.h
diff --git a/ucl/inc/ucl/misc/Aspect.hpp b/ucl/include/ucl/misc/Aspect.hpp
similarity index 100%
rename from ucl/inc/ucl/misc/Aspect.hpp
rename to ucl/include/ucl/misc/Aspect.hpp
diff --git a/ucl/inc/ucl/misc/AutoHandle.h b/ucl/include/ucl/misc/AutoHandle.h
similarity index 100%
rename from ucl/inc/ucl/misc/AutoHandle.h
rename to ucl/include/ucl/misc/AutoHandle.h
diff --git a/ucl/inc/ucl/misc/CString.h b/ucl/include/ucl/misc/CString.h
similarity index 100%
rename from ucl/inc/ucl/misc/CString.h
rename to ucl/include/ucl/misc/CString.h
diff --git a/ucl/inc/ucl/misc/CString.hpp b/ucl/include/ucl/misc/CString.hpp
similarity index 100%
rename from ucl/inc/ucl/misc/CString.hpp
rename to ucl/include/ucl/misc/CString.hpp
diff --git a/ucl/inc/ucl/misc/ConstCString.h b/ucl/include/ucl/misc/ConstCString.h
similarity index 100%
rename from ucl/inc/ucl/misc/ConstCString.h
rename to ucl/include/ucl/misc/ConstCString.h
diff --git a/ucl/inc/ucl/misc/ConstCString.hpp b/ucl/include/ucl/misc/ConstCString.hpp
similarity index 100%
rename from ucl/inc/ucl/misc/ConstCString.hpp
rename to ucl/include/ucl/misc/ConstCString.hpp
diff --git a/ucl/inc/ucl/misc/Event.h b/ucl/include/ucl/misc/Event.h
similarity index 100%
rename from ucl/inc/ucl/misc/Event.h
rename to ucl/include/ucl/misc/Event.h
diff --git a/ucl/inc/ucl/misc/Event.hpp b/ucl/include/ucl/misc/Event.hpp
similarity index 100%
rename from ucl/inc/ucl/misc/Event.hpp
rename to ucl/include/ucl/misc/Event.hpp
diff --git a/ucl/inc/ucl/misc/HashMap.h b/ucl/include/ucl/misc/HashMap.h
similarity index 100%
rename from ucl/inc/ucl/misc/HashMap.h
rename to ucl/include/ucl/misc/HashMap.h
diff --git a/ucl/inc/ucl/misc/HashMap.hpp b/ucl/include/ucl/misc/HashMap.hpp
similarity index 100%
rename from ucl/inc/ucl/misc/HashMap.hpp
rename to ucl/include/ucl/misc/HashMap.hpp
diff --git a/ucl/inc/ucl/misc/RefCountAware.h b/ucl/include/ucl/misc/RefCountAware.h
similarity index 100%
rename from ucl/inc/ucl/misc/RefCountAware.h
rename to ucl/include/ucl/misc/RefCountAware.h
diff --git a/ucl/inc/ucl/misc/RefCountAware.hpp b/ucl/include/ucl/misc/RefCountAware.hpp
similarity index 100%
rename from ucl/inc/ucl/misc/RefCountAware.hpp
rename to ucl/include/ucl/misc/RefCountAware.hpp
diff --git a/ucl/inc/ucl/misc/TString.h b/ucl/include/ucl/misc/TString.h
similarity index 100%
rename from ucl/inc/ucl/misc/TString.h
rename to ucl/include/ucl/misc/TString.h
diff --git a/ucl/inc/ucl/misc/TString.hpp b/ucl/include/ucl/misc/TString.hpp
similarity index 100%
rename from ucl/inc/ucl/misc/TString.hpp
rename to ucl/include/ucl/misc/TString.hpp
diff --git a/ucl/inc/ucl/misc/Timeout.h b/ucl/include/ucl/misc/Timeout.h
similarity index 100%
rename from ucl/inc/ucl/misc/Timeout.h
rename to ucl/include/ucl/misc/Timeout.h
diff --git a/ucl/inc/ucl/misc/Variant.h b/ucl/include/ucl/misc/Variant.h
similarity index 100%
rename from ucl/inc/ucl/misc/Variant.h
rename to ucl/include/ucl/misc/Variant.h
diff --git a/ucl/inc/ucl/misc/Variant.hpp b/ucl/include/ucl/misc/Variant.hpp
similarity index 100%
rename from ucl/inc/ucl/misc/Variant.hpp
rename to ucl/include/ucl/misc/Variant.hpp
diff --git a/ucl/inc/ucl/mvp/GuiPresenter.h b/ucl/include/ucl/mvp/GuiPresenter.h
similarity index 100%
rename from ucl/inc/ucl/mvp/GuiPresenter.h
rename to ucl/include/ucl/mvp/GuiPresenter.h
diff --git a/ucl/inc/ucl/mvp/ListItemPresenter.h b/ucl/include/ucl/mvp/ListItemPresenter.h
similarity index 92%
rename from ucl/inc/ucl/mvp/ListItemPresenter.h
rename to ucl/include/ucl/mvp/ListItemPresenter.h
index 2c90f42..46d2fb4 100644
--- a/ucl/inc/ucl/mvp/ListItemPresenter.h
+++ b/ucl/include/ucl/mvp/ListItemPresenter.h
@@ -18,6 +18,7 @@
 #define __UCL_MVP_LIST_ITEM_PRESENTER_H__
 
 #include "ucl/gui/GenlistItem.h"
+#include "ucl/gui/ElmWidget.h"
 
 #include "ucl/misc/HashMap.h"
 
@@ -86,7 +87,7 @@ namespace ucl {
 		bool isActive() const;
 
 		GenlistItem getItem();
-		ItemClassCacheSRef getItemClassCache();
+		ItemClassCache *getItemClassCache();
 
 		Result updateItemStyle(ElmStyle newItemStyle);
 
@@ -96,7 +97,7 @@ namespace ucl {
 		virtual void onItemDetached();
 
 		virtual CString getItemPartText(EdjePart part);
-		virtual WidgetSRef getItemPartContent(EdjePart part);
+		virtual WidgetSRef getItemPartContent(EdjePart part, ElmWidget &parent);
 		virtual bool getItemPartState(EdjePart part);
 
 		virtual void onItemSelected();
@@ -107,6 +108,7 @@ namespace ucl {
 
 	private:
 		void attachItem(GenlistItem item,
+				ElmWidgetSRef &&parent,
 				const ItemClassCacheSRef &itcCache,
 				const SharedRef<bool> &isActiveRef);
 
@@ -119,8 +121,9 @@ namespace ucl {
 	private:
 		ListItemPresenterSRef m_selfRef;
 		GenlistItem m_item;
-		ItemClassCacheWRef m_itcCache;
+		ItemClassCacheSRef m_itcCache;
 		SharedRef<bool> m_isActiveRef;
+		ElmWidgetSRef m_parent;
 		int m_flags;
 	};
 }
diff --git a/ucl/inc/ucl/mvp/ListPresenter.h b/ucl/include/ucl/mvp/ListPresenter.h
similarity index 100%
rename from ucl/inc/ucl/mvp/ListPresenter.h
rename to ucl/include/ucl/mvp/ListPresenter.h
diff --git a/ucl/inc/ucl/mvp/types.h b/ucl/include/ucl/mvp/types.h
similarity index 100%
rename from ucl/inc/ucl/mvp/types.h
rename to ucl/include/ucl/mvp/types.h
diff --git a/ucl/inc/ucl/util/delegation.h b/ucl/include/ucl/util/delegation.h
similarity index 100%
rename from ucl/inc/ucl/util/delegation.h
rename to ucl/include/ucl/util/delegation.h
diff --git a/ucl/inc/ucl/util/delegation/BaseDelegate.h b/ucl/include/ucl/util/delegation/BaseDelegate.h
similarity index 100%
rename from ucl/inc/ucl/util/delegation/BaseDelegate.h
rename to ucl/include/ucl/util/delegation/BaseDelegate.h
diff --git a/ucl/inc/ucl/util/delegation/BaseDelegate.hpp b/ucl/include/ucl/util/delegation/BaseDelegate.hpp
similarity index 100%
rename from ucl/inc/ucl/util/delegation/BaseDelegate.hpp
rename to ucl/include/ucl/util/delegation/BaseDelegate.hpp
diff --git a/ucl/inc/ucl/util/delegation/BaseDelegate2.h b/ucl/include/ucl/util/delegation/BaseDelegate2.h
similarity index 100%
rename from ucl/inc/ucl/util/delegation/BaseDelegate2.h
rename to ucl/include/ucl/util/delegation/BaseDelegate2.h
diff --git a/ucl/inc/ucl/util/delegation/BaseDelegate2.hpp b/ucl/include/ucl/util/delegation/BaseDelegate2.hpp
similarity index 100%
rename from ucl/inc/ucl/util/delegation/BaseDelegate2.hpp
rename to ucl/include/ucl/util/delegation/BaseDelegate2.hpp
diff --git a/ucl/inc/ucl/util/delegation/Callback.h b/ucl/include/ucl/util/delegation/Callback.h
similarity index 100%
rename from ucl/inc/ucl/util/delegation/Callback.h
rename to ucl/include/ucl/util/delegation/Callback.h
diff --git a/ucl/inc/ucl/util/delegation/Callback.hpp b/ucl/include/ucl/util/delegation/Callback.hpp
similarity index 100%
rename from ucl/inc/ucl/util/delegation/Callback.hpp
rename to ucl/include/ucl/util/delegation/Callback.hpp
diff --git a/ucl/inc/ucl/util/delegation/Delegate.h b/ucl/include/ucl/util/delegation/Delegate.h
similarity index 100%
rename from ucl/inc/ucl/util/delegation/Delegate.h
rename to ucl/include/ucl/util/delegation/Delegate.h
diff --git a/ucl/inc/ucl/util/delegation/Delegate.hpp b/ucl/include/ucl/util/delegation/Delegate.hpp
similarity index 100%
rename from ucl/inc/ucl/util/delegation/Delegate.hpp
rename to ucl/include/ucl/util/delegation/Delegate.hpp
diff --git a/ucl/inc/ucl/util/delegation/Delegate2.h b/ucl/include/ucl/util/delegation/Delegate2.h
similarity index 100%
rename from ucl/inc/ucl/util/delegation/Delegate2.h
rename to ucl/include/ucl/util/delegation/Delegate2.h
diff --git a/ucl/inc/ucl/util/delegation/Delegate2.hpp b/ucl/include/ucl/util/delegation/Delegate2.hpp
similarity index 100%
rename from ucl/inc/ucl/util/delegation/Delegate2.hpp
rename to ucl/include/ucl/util/delegation/Delegate2.hpp
diff --git a/ucl/inc/ucl/util/delegation/helpers.h b/ucl/include/ucl/util/delegation/helpers.h
similarity index 100%
rename from ucl/inc/ucl/util/delegation/helpers.h
rename to ucl/include/ucl/util/delegation/helpers.h
diff --git a/ucl/inc/ucl/util/delegation/macro.h b/ucl/include/ucl/util/delegation/macro.h
similarity index 100%
rename from ucl/inc/ucl/util/delegation/macro.h
rename to ucl/include/ucl/util/delegation/macro.h
diff --git a/ucl/inc/ucl/util/delegation/shortMacro.h b/ucl/include/ucl/util/delegation/shortMacro.h
similarity index 100%
rename from ucl/inc/ucl/util/delegation/shortMacro.h
rename to ucl/include/ucl/util/delegation/shortMacro.h
diff --git a/ucl/inc/ucl/util/helpers.h b/ucl/include/ucl/util/helpers.h
similarity index 92%
rename from ucl/inc/ucl/util/helpers.h
rename to ucl/include/ucl/util/helpers.h
index 87485b0..117d3de 100644
--- a/ucl/inc/ucl/util/helpers.h
+++ b/ucl/include/ucl/util/helpers.h
@@ -18,6 +18,7 @@
 #define __UCL_UTIL_HELPERS_H__
 
 #include "types/baseTypes.h"
+#include "types/classTypes.h"
 
 namespace ucl {
 
@@ -108,6 +109,16 @@ namespace ucl { namespace util {
 
 	template <class T>
 	std::unique_ptr<T> makeUnique(T *p);
+
+	template <class T, class = typename std::enable_if<
+			std::is_convertible<T *, IDisposable *>::value>::type>
+	inline void dispose(T *&p) noexcept
+	{
+		if (p) {
+			p->dispose();
+			p = nullptr;
+		}
+	}
 }}
 
 #include "helpers.hpp"
diff --git a/ucl/inc/ucl/util/helpers.hpp b/ucl/include/ucl/util/helpers.hpp
similarity index 100%
rename from ucl/inc/ucl/util/helpers.hpp
rename to ucl/include/ucl/util/helpers.hpp
diff --git a/ucl/inc/ucl/util/logging.h b/ucl/include/ucl/util/logging.h
similarity index 100%
rename from ucl/inc/ucl/util/logging.h
rename to ucl/include/ucl/util/logging.h
diff --git a/ucl/inc/ucl/util/memory.h b/ucl/include/ucl/util/memory.h
similarity index 100%
rename from ucl/inc/ucl/util/memory.h
rename to ucl/include/ucl/util/memory.h
diff --git a/ucl/inc/ucl/util/memory/BaseRef.h b/ucl/include/ucl/util/memory/BaseRef.h
similarity index 100%
rename from ucl/inc/ucl/util/memory/BaseRef.h
rename to ucl/include/ucl/util/memory/BaseRef.h
diff --git a/ucl/inc/ucl/util/memory/BaseRef.hpp b/ucl/include/ucl/util/memory/BaseRef.hpp
similarity index 100%
rename from ucl/inc/ucl/util/memory/BaseRef.hpp
rename to ucl/include/ucl/util/memory/BaseRef.hpp
diff --git a/ucl/inc/ucl/util/memory/IRefCountObj.h b/ucl/include/ucl/util/memory/IRefCountObj.h
similarity index 100%
rename from ucl/inc/ucl/util/memory/IRefCountObj.h
rename to ucl/include/ucl/util/memory/IRefCountObj.h
diff --git a/ucl/inc/ucl/util/memory/RefCountObj.h b/ucl/include/ucl/util/memory/RefCountObj.h
similarity index 100%
rename from ucl/inc/ucl/util/memory/RefCountObj.h
rename to ucl/include/ucl/util/memory/RefCountObj.h
diff --git a/ucl/inc/ucl/util/memory/RefCountObj.hpp b/ucl/include/ucl/util/memory/RefCountObj.hpp
similarity index 100%
rename from ucl/inc/ucl/util/memory/RefCountObj.hpp
rename to ucl/include/ucl/util/memory/RefCountObj.hpp
diff --git a/ucl/inc/ucl/util/memory/RefCounterMT.h b/ucl/include/ucl/util/memory/RefCounterMT.h
similarity index 100%
rename from ucl/inc/ucl/util/memory/RefCounterMT.h
rename to ucl/include/ucl/util/memory/RefCounterMT.h
diff --git a/ucl/inc/ucl/util/memory/RefCounterMT.hpp b/ucl/include/ucl/util/memory/RefCounterMT.hpp
similarity index 100%
rename from ucl/inc/ucl/util/memory/RefCounterMT.hpp
rename to ucl/include/ucl/util/memory/RefCounterMT.hpp
diff --git a/ucl/inc/ucl/util/memory/RefCounterST.h b/ucl/include/ucl/util/memory/RefCounterST.h
similarity index 100%
rename from ucl/inc/ucl/util/memory/RefCounterST.h
rename to ucl/include/ucl/util/memory/RefCounterST.h
diff --git a/ucl/inc/ucl/util/memory/RefCounterST.hpp b/ucl/include/ucl/util/memory/RefCounterST.hpp
similarity index 100%
rename from ucl/inc/ucl/util/memory/RefCounterST.hpp
rename to ucl/include/ucl/util/memory/RefCounterST.hpp
diff --git a/ucl/inc/ucl/util/memory/ReffedObj.h b/ucl/include/ucl/util/memory/ReffedObj.h
similarity index 100%
rename from ucl/inc/ucl/util/memory/ReffedObj.h
rename to ucl/include/ucl/util/memory/ReffedObj.h
diff --git a/ucl/inc/ucl/util/memory/ReffedObj.hpp b/ucl/include/ucl/util/memory/ReffedObj.hpp
similarity index 100%
rename from ucl/inc/ucl/util/memory/ReffedObj.hpp
rename to ucl/include/ucl/util/memory/ReffedObj.hpp
diff --git a/ucl/inc/ucl/util/memory/SharedRef.h b/ucl/include/ucl/util/memory/SharedRef.h
similarity index 100%
rename from ucl/inc/ucl/util/memory/SharedRef.h
rename to ucl/include/ucl/util/memory/SharedRef.h
diff --git a/ucl/inc/ucl/util/memory/SharedRef.hpp b/ucl/include/ucl/util/memory/SharedRef.hpp
similarity index 100%
rename from ucl/inc/ucl/util/memory/SharedRef.hpp
rename to ucl/include/ucl/util/memory/SharedRef.hpp
diff --git a/ucl/inc/ucl/util/memory/WeakRef.h b/ucl/include/ucl/util/memory/WeakRef.h
similarity index 100%
rename from ucl/inc/ucl/util/memory/WeakRef.h
rename to ucl/include/ucl/util/memory/WeakRef.h
diff --git a/ucl/inc/ucl/util/memory/WeakRef.hpp b/ucl/include/ucl/util/memory/WeakRef.hpp
similarity index 100%
rename from ucl/inc/ucl/util/memory/WeakRef.hpp
rename to ucl/include/ucl/util/memory/WeakRef.hpp
diff --git a/ucl/inc/ucl/util/memory/helpers.h b/ucl/include/ucl/util/memory/helpers.h
similarity index 89%
rename from ucl/inc/ucl/util/memory/helpers.h
rename to ucl/include/ucl/util/memory/helpers.h
index bef907b..5ce25a3 100644
--- a/ucl/inc/ucl/util/memory/helpers.h
+++ b/ucl/include/ucl/util/memory/helpers.h
@@ -19,6 +19,31 @@
 
 namespace ucl {
 
+	// Misc //
+
+	namespace util {
+
+		template <class T, class = typename std::enable_if<
+				std::is_convertible<T *, IDisposable *>::value>::type>
+		inline void dispose(SharedRef<T> &r) noexcept
+		{
+			if (r) {
+				r->dispose();
+				r.reset();
+			}
+		}
+
+		template <class T, class = typename std::enable_if<
+				std::is_convertible<T *, IDisposable *>::value>::type>
+		inline void dispose(WeakRef<T> &r) noexcept
+		{
+			if (const auto shared = r.lock()) {
+				shared->dispose();
+				r.reset();
+			}
+		}
+	}
+
 	// Generic casting functions //
 
 	template <class T, class U>
diff --git a/ucl/inc/ucl/util/memory/macro.h b/ucl/include/ucl/util/memory/macro.h
similarity index 100%
rename from ucl/inc/ucl/util/memory/macro.h
rename to ucl/include/ucl/util/memory/macro.h
diff --git a/ucl/inc/ucl/util/shortLogs.h b/ucl/include/ucl/util/shortLogs.h
similarity index 100%
rename from ucl/inc/ucl/util/shortLogs.h
rename to ucl/include/ucl/util/shortLogs.h
diff --git a/ucl/inc/ucl/util/smartDelegation.h b/ucl/include/ucl/util/smartDelegation.h
similarity index 100%
rename from ucl/inc/ucl/util/smartDelegation.h
rename to ucl/include/ucl/util/smartDelegation.h
diff --git a/ucl/inc/ucl/util/smartDelegation/WeakDelegate.h b/ucl/include/ucl/util/smartDelegation/WeakDelegate.h
similarity index 100%
rename from ucl/inc/ucl/util/smartDelegation/WeakDelegate.h
rename to ucl/include/ucl/util/smartDelegation/WeakDelegate.h
diff --git a/ucl/inc/ucl/util/smartDelegation/WeakDelegate.hpp b/ucl/include/ucl/util/smartDelegation/WeakDelegate.hpp
similarity index 100%
rename from ucl/inc/ucl/util/smartDelegation/WeakDelegate.hpp
rename to ucl/include/ucl/util/smartDelegation/WeakDelegate.hpp
diff --git a/ucl/inc/ucl/util/smartDelegation/macro.h b/ucl/include/ucl/util/smartDelegation/macro.h
similarity index 100%
rename from ucl/inc/ucl/util/smartDelegation/macro.h
rename to ucl/include/ucl/util/smartDelegation/macro.h
diff --git a/ucl/inc/ucl/util/smartDelegation/shortMacro.h b/ucl/include/ucl/util/smartDelegation/shortMacro.h
similarity index 100%
rename from ucl/inc/ucl/util/smartDelegation/shortMacro.h
rename to ucl/include/ucl/util/smartDelegation/shortMacro.h
diff --git a/ucl/inc/ucl/util/threading.h b/ucl/include/ucl/util/threading.h
similarity index 100%
rename from ucl/inc/ucl/util/threading.h
rename to ucl/include/ucl/util/threading.h
diff --git a/ucl/inc/ucl/util/threading/CondVar.h b/ucl/include/ucl/util/threading/CondVar.h
similarity index 100%
rename from ucl/inc/ucl/util/threading/CondVar.h
rename to ucl/include/ucl/util/threading/CondVar.h
diff --git a/ucl/inc/ucl/util/threading/CondVar.hpp b/ucl/include/ucl/util/threading/CondVar.hpp
similarity index 100%
rename from ucl/inc/ucl/util/threading/CondVar.hpp
rename to ucl/include/ucl/util/threading/CondVar.hpp
diff --git a/ucl/inc/ucl/util/threading/Mutex.h b/ucl/include/ucl/util/threading/Mutex.h
similarity index 100%
rename from ucl/inc/ucl/util/threading/Mutex.h
rename to ucl/include/ucl/util/threading/Mutex.h
diff --git a/ucl/inc/ucl/util/threading/Mutex.hpp b/ucl/include/ucl/util/threading/Mutex.hpp
similarity index 100%
rename from ucl/inc/ucl/util/threading/Mutex.hpp
rename to ucl/include/ucl/util/threading/Mutex.hpp
diff --git a/ucl/inc/ucl/util/threading/MutexLock.h b/ucl/include/ucl/util/threading/MutexLock.h
similarity index 100%
rename from ucl/inc/ucl/util/threading/MutexLock.h
rename to ucl/include/ucl/util/threading/MutexLock.h
diff --git a/ucl/inc/ucl/util/threading/MutexLock.hpp b/ucl/include/ucl/util/threading/MutexLock.hpp
similarity index 100%
rename from ucl/inc/ucl/util/threading/MutexLock.hpp
rename to ucl/include/ucl/util/threading/MutexLock.hpp
diff --git a/ucl/inc/ucl/util/threading/Thread.h b/ucl/include/ucl/util/threading/Thread.h
similarity index 100%
rename from ucl/inc/ucl/util/threading/Thread.h
rename to ucl/include/ucl/util/threading/Thread.h
diff --git a/ucl/inc/ucl/util/threading/Thread.hpp b/ucl/include/ucl/util/threading/Thread.hpp
similarity index 100%
rename from ucl/inc/ucl/util/threading/Thread.hpp
rename to ucl/include/ucl/util/threading/Thread.hpp
diff --git a/ucl/inc/ucl/util/types.h b/ucl/include/ucl/util/types.h
similarity index 100%
rename from ucl/inc/ucl/util/types.h
rename to ucl/include/ucl/util/types.h
diff --git a/ucl/inc/ucl/util/types/Result.h b/ucl/include/ucl/util/types/Result.h
similarity index 100%
rename from ucl/inc/ucl/util/types/Result.h
rename to ucl/include/ucl/util/types/Result.h
diff --git a/ucl/inc/ucl/util/types/Result.hpp b/ucl/include/ucl/util/types/Result.hpp
similarity index 100%
rename from ucl/inc/ucl/util/types/Result.hpp
rename to ucl/include/ucl/util/types/Result.hpp
diff --git a/ucl/inc/ucl/util/types/baseTypes.h b/ucl/include/ucl/util/types/baseTypes.h
similarity index 100%
rename from ucl/inc/ucl/util/types/baseTypes.h
rename to ucl/include/ucl/util/types/baseTypes.h
diff --git a/ucl/inc/ucl/util/types/classTypes.h b/ucl/include/ucl/util/types/classTypes.h
similarity index 100%
rename from ucl/inc/ucl/util/types/classTypes.h
rename to ucl/include/ucl/util/types/classTypes.h
diff --git a/ucl/src/appfw/InstanceManagerBase.cpp b/ucl/source/appfw/InstanceManagerBase.cpp
similarity index 100%
rename from ucl/src/appfw/InstanceManagerBase.cpp
rename to ucl/source/appfw/InstanceManagerBase.cpp
diff --git a/ucl/src/appfw/SysEventProvider.cpp b/ucl/source/appfw/SysEventProvider.cpp
similarity index 100%
rename from ucl/src/appfw/SysEventProvider.cpp
rename to ucl/source/appfw/SysEventProvider.cpp
diff --git a/ucl/src/appfw/UIApp.cpp b/ucl/source/appfw/UIApp.cpp
similarity index 99%
rename from ucl/src/appfw/UIApp.cpp
rename to ucl/source/appfw/UIApp.cpp
index 4e1a4de..6f49c2b 100644
--- a/ucl/src/appfw/UIApp.cpp
+++ b/ucl/source/appfw/UIApp.cpp
@@ -158,7 +158,6 @@ namespace ucl {
 		m_window = Window::Builder().
 				setType(winType).
 				setName(paramValue.asString().get()).
-				setIsOwner(true).
 				build();
 		if (!m_window) {
 			LOG_RETURN(RES_FAIL, "Window::Builder().build() Failed!");
diff --git a/ucl/src/mvp/common.h b/ucl/source/appfw/common.h
similarity index 80%
rename from ucl/src/mvp/common.h
rename to ucl/source/appfw/common.h
index 2894a14..402bb6e 100644
--- a/ucl/src/mvp/common.h
+++ b/ucl/source/appfw/common.h
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#ifndef __UCL_MVP_COMMON_H__
-#define __UCL_MVP_COMMON_H__
+#ifndef __UCL_SOURCE_APPFW_COMMON_H__
+#define __UCL_SOURCE_APPFW_COMMON_H__
 
-#include "../common.h"
+#include "ucl/source/common.h"
 
-#endif // __UCL_MVP_COMMON_H__
+#endif // __UCL_SOURCE_APPFW_COMMON_H__
diff --git a/ucl/src/appfw/helpers.cpp b/ucl/source/appfw/helpers.cpp
similarity index 100%
rename from ucl/src/appfw/helpers.cpp
rename to ucl/source/appfw/helpers.cpp
diff --git a/ucl/src/common.h b/ucl/source/common.h
similarity index 90%
rename from ucl/src/common.h
rename to ucl/source/common.h
index f358669..3312380 100644
--- a/ucl/src/common.h
+++ b/ucl/source/common.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __UCL_COMMON_H__
-#define __UCL_COMMON_H__
+#ifndef __UCL_SOURCE_COMMON_H__
+#define __UCL_SOURCE_COMMON_H__
 
 #include <cmath>
 #include <cstring>
@@ -32,4 +32,4 @@
 #include "ucl/util/delegation/shortMacro.h"
 #include "ucl/util/smartDelegation/shortMacro.h"
 
-#endif // __UCL_COMMON_H__
+#endif // __UCL_SOURCE_COMMON_H__
diff --git a/ucl/src/gui/EdjeWidget.cpp b/ucl/source/gui/EdjeWidget.cpp
similarity index 100%
rename from ucl/src/gui/EdjeWidget.cpp
rename to ucl/source/gui/EdjeWidget.cpp
diff --git a/ucl/src/gui/ElmWidget.cpp b/ucl/source/gui/ElmWidget.cpp
similarity index 100%
rename from ucl/src/gui/ElmWidget.cpp
rename to ucl/source/gui/ElmWidget.cpp
diff --git a/ucl/src/gui/Genlist.cpp b/ucl/source/gui/Genlist.cpp
similarity index 100%
rename from ucl/src/gui/Genlist.cpp
rename to ucl/source/gui/Genlist.cpp
diff --git a/ucl/src/gui/Layout.cpp b/ucl/source/gui/Layout.cpp
similarity index 100%
rename from ucl/src/gui/Layout.cpp
rename to ucl/source/gui/Layout.cpp
diff --git a/ucl/src/gui/NaviItem.cpp b/ucl/source/gui/NaviItem.cpp
similarity index 100%
rename from ucl/src/gui/NaviItem.cpp
rename to ucl/source/gui/NaviItem.cpp
diff --git a/ucl/src/gui/Naviframe.cpp b/ucl/source/gui/Naviframe.cpp
similarity index 98%
rename from ucl/src/gui/Naviframe.cpp
rename to ucl/source/gui/Naviframe.cpp
index 69d80a5..717940b 100644
--- a/ucl/src/gui/Naviframe.cpp
+++ b/ucl/source/gui/Naviframe.cpp
@@ -48,7 +48,7 @@ namespace ucl {
 	// Naviframe //
 
 	Naviframe::Naviframe(IRefCountObj &rc, Evas_Object *eo) :
-		StyledWidget(&rc, eo, true),
+		StyledWidget(&rc, eo),
 		m_isInTransition(false)
 	{
 		addEventHandler(NAVI_TRANSITION_FINISHED, WEAK_DELEGATE(
diff --git a/ucl/src/gui/Widget.cpp b/ucl/source/gui/Widget.cpp
similarity index 100%
rename from ucl/src/gui/Widget.cpp
rename to ucl/source/gui/Widget.cpp
diff --git a/ucl/src/gui/WidgetItem.cpp b/ucl/source/gui/WidgetItem.cpp
similarity index 100%
rename from ucl/src/gui/WidgetItem.cpp
rename to ucl/source/gui/WidgetItem.cpp
diff --git a/ucl/src/gui/Window.cpp b/ucl/source/gui/Window.cpp
similarity index 100%
rename from ucl/src/gui/Window.cpp
rename to ucl/source/gui/Window.cpp
diff --git a/ucl/src/gui/common.h b/ucl/source/gui/common.h
similarity index 81%
rename from ucl/src/gui/common.h
rename to ucl/source/gui/common.h
index 6b543d3..b8a0028 100644
--- a/ucl/src/gui/common.h
+++ b/ucl/source/gui/common.h
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#ifndef __UCL_GUI_COMMON_H__
-#define __UCL_GUI_COMMON_H__
+#ifndef __UCL_SOURCE_GUI_COMMON_H__
+#define __UCL_SOURCE_GUI_COMMON_H__
 
-#include "../common.h"
+#include "ucl/source/common.h"
 
-#endif // __UCL_GUI_COMMON_H__
+#endif // __UCL_SOURCE_GUI_COMMON_H__
diff --git a/ucl/src/misc/Timeout.cpp b/ucl/source/misc/Timeout.cpp
similarity index 100%
rename from ucl/src/misc/Timeout.cpp
rename to ucl/source/misc/Timeout.cpp
diff --git a/ucl/src/misc/Variant.cpp b/ucl/source/misc/Variant.cpp
similarity index 98%
rename from ucl/src/misc/Variant.cpp
rename to ucl/source/misc/Variant.cpp
index f723f34..8be8708 100644
--- a/ucl/src/misc/Variant.cpp
+++ b/ucl/source/misc/Variant.cpp
@@ -26,7 +26,7 @@ namespace ucl {
 		m_type(aString ? TYPE_STRING : TYPE_NIL)
 	{
 		if (aString) {
-			const int realLength = ((length < 0) ? strlen(aString) : length);
+			const size_t realLength = ((length < 0) ? strlen(aString) : length);
 			if (realLength < sizeof(m_aSmallStr.buffer)) {
 				strncpy(m_aSmallStr.buffer, aString, realLength);
 				m_aSmallStr.buffer[realLength] = '\0';
diff --git a/ucl/src/appfw/common.h b/ucl/source/misc/common.h
similarity index 80%
rename from ucl/src/appfw/common.h
rename to ucl/source/misc/common.h
index b612dfb..fd9d17e 100644
--- a/ucl/src/appfw/common.h
+++ b/ucl/source/misc/common.h
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#ifndef __UCL_APPFW_COMMON_H__
-#define __UCL_APPFW_COMMON_H__
+#ifndef __UCL_SOURCE_MISC_COMMON_H__
+#define __UCL_SOURCE_MISC_COMMON_H__
 
-#include "../common.h"
+#include "ucl/source/common.h"
 
-#endif // __UCL_APPFW_COMMON_H__
+#endif // __UCL_SOURCE_MISC_COMMON_H__
diff --git a/ucl/src/mvp/GuiPresenter.cpp b/ucl/source/mvp/GuiPresenter.cpp
similarity index 100%
rename from ucl/src/mvp/GuiPresenter.cpp
rename to ucl/source/mvp/GuiPresenter.cpp
diff --git a/ucl/src/mvp/ListItemPresenter.cpp b/ucl/source/mvp/ListItemPresenter.cpp
similarity index 88%
rename from ucl/src/mvp/ListItemPresenter.cpp
rename to ucl/source/mvp/ListItemPresenter.cpp
index e2ad69a..d27568b 100644
--- a/ucl/src/mvp/ListItemPresenter.cpp
+++ b/ucl/source/mvp/ListItemPresenter.cpp
@@ -57,8 +57,9 @@ namespace ucl {
 				if (!data) {
 					LOG_RETURN_VALUE(RES_FATAL, nullptr, "data is NULL");
 				}
-				if (const auto widget = static_cast<ListItemPresenter *>(data)->
-						getItemPartContent(EdjePart(part))) {
+				auto &&item = *static_cast<ListItemPresenter *>(data);
+				if (const auto widget = item.getItemPartContent(
+						EdjePart(part), *item.m_parent)) {
 					widget->setIsOwner(false);
 					return widget->getEo();
 				}
@@ -128,14 +129,10 @@ namespace ucl {
 		}
 	}
 
-	void ListItemPresenter::attachItem(GenlistItem item,
+	void ListItemPresenter::attachItem(GenlistItem item, ElmWidgetSRef &&parent,
 			const ItemClassCacheSRef &itcCache,
 			const SharedRef<bool> &isActiveRef)
 	{
-		if (!item) {
-			LOG_RETURN_VOID(RES_FAIL, "item is NULL!");
-		}
-
 		if (m_item) {
 			deleteDetachedItem();
 		}
@@ -144,6 +141,8 @@ namespace ucl {
 		m_item.setData(this);
 		m_item.setDelCallback(CALLBACK_A(ListItemPresenter::onItemDel));
 
+		m_parent = std::move(parent);
+
 		m_itcCache = itcCache;
 		m_isActiveRef = isActiveRef;
 
@@ -166,6 +165,11 @@ namespace ucl {
 		m_item.setData(nullptr);
 		m_item.setDelCallback(nullptr);
 		m_item = nullptr;
+
+		m_parent.reset();
+		m_itcCache.reset();
+		m_isActiveRef.reset();
+
 		if (!silent) {
 			onItemDetached();
 		}
@@ -199,10 +203,9 @@ namespace ucl {
 		return m_item;
 	}
 
-	ListItemPresenter::ItemClassCacheSRef
-			ListItemPresenter::getItemClassCache()
+	ListItemPresenter::ItemClassCache *ListItemPresenter::getItemClassCache()
 	{
-		return m_itcCache.lock();
+		return m_itcCache.get();
 	}
 
 	Result ListItemPresenter::updateItemStyle(const ElmStyle newItemStyle)
@@ -210,15 +213,13 @@ namespace ucl {
 		if (!m_item) {
 			LOG_RETURN(RES_ILLEGAL_STATE, "m_item is NULL!");
 		}
-
-		const auto itcCache = getItemClassCache();
-		if (!itcCache) {
-			LOG_RETURN(RES_FATAL, "itcCache is NULL!");
+		if (!m_itcCache) {
+			LOG_RETURN(RES_FATAL, "m_itcCache is NULL!");
 		}
 
-		const auto itc = itcCache->getItemClass(newItemStyle);
+		const auto itc = m_itcCache->getItemClass(newItemStyle);
 		if (!itc) {
-			LOG_RETURN(RES_FAIL, "itcCache.getItemClass() failed!");
+			LOG_RETURN(RES_FAIL, "m_itcCache->getItemClass() failed!");
 		}
 
 		m_item.update(itc->get());
@@ -247,7 +248,8 @@ namespace ucl {
 	{
 	}
 
-	WidgetSRef ListItemPresenter::getItemPartContent(const EdjePart part)
+	WidgetSRef ListItemPresenter::getItemPartContent(const EdjePart part,
+			ElmWidget &parent)
 	{
 		return nullptr;
 	}
diff --git a/ucl/src/mvp/ListPresenter.cpp b/ucl/source/mvp/ListPresenter.cpp
similarity index 98%
rename from ucl/src/mvp/ListPresenter.cpp
rename to ucl/source/mvp/ListPresenter.cpp
index 220b10e..2835697 100644
--- a/ucl/src/mvp/ListPresenter.cpp
+++ b/ucl/source/mvp/ListPresenter.cpp
@@ -97,6 +97,9 @@ namespace ucl {
 
 	ListPresenter::~ListPresenter()
 	{
+		if (m_genlist) {
+			m_genlist->clear();
+		}
 	}
 
 	Result ListPresenter::prepare(
@@ -110,7 +113,6 @@ namespace ucl {
 				setStyle(style).
 				setMode(Genlist::Mode::COMPRESS).
 				setHomogeneous(flags & FLAG_HOMOGENEOUS).
-				setIsOwner(true).
 				setNeedBindToEo(true).
 				build(parentWidget);
 		if (!m_genlist) {
@@ -236,7 +238,7 @@ namespace ucl {
 			LOG_RETURN(RES_FAIL, "insertFunc() failed!");
 		}
 
-		itemPresenter.attachItem(item, m_itcCache, m_isActiveRef);
+		itemPresenter.attachItem(item, m_genlist, m_itcCache, m_isActiveRef);
 
 		return RES_OK;
 	}
diff --git a/ucl/src/misc/common.h b/ucl/source/mvp/common.h
similarity index 81%
rename from ucl/src/misc/common.h
rename to ucl/source/mvp/common.h
index 372ad4d..11a4d84 100644
--- a/ucl/src/misc/common.h
+++ b/ucl/source/mvp/common.h
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#ifndef __UCL_MISC_COMMON_H__
-#define __UCL_MISC_COMMON_H__
+#ifndef __UCL_SOURCE_MVP_COMMON_H__
+#define __UCL_SOURCE_MVP_COMMON_H__
 
-#include "../common.h"
+#include "ucl/source/common.h"
 
-#endif // __UCL_MISC_COMMON_H__
+#endif // __UCL_SOURCE_MVP_COMMON_H__
diff --git a/ucl/src/util/logging.cpp b/ucl/source/util/logging.cpp
similarity index 100%
rename from ucl/src/util/logging.cpp
rename to ucl/source/util/logging.cpp
diff --git a/ucl/src/util/types/Result.cpp b/ucl/source/util/types/Result.cpp
similarity index 100%
rename from ucl/src/util/types/Result.cpp
rename to ucl/source/util/types/Result.cpp
-- 
2.34.1