TizenRefApp-8332 [Gallery] Refactor application directory structure

- "presentation" folder split into "presenters" and "view".

Change-Id: Ife435970d2a7dc4c5164e92644ba01089c2d6b3c

34 files changed, 151 insertions, 104 deletions

diff --git a/inc/presentation/Instance.h b/inc/presenters/Instance.h
index 0440c14..be20bd5 100644
--- a/inc/presentation/Instance.h
+++ b/inc/presenters/Instance.h
@@ -14,10 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __GALLERY_PRESENTATION_INSTANCE_H__
-#define __GALLERY_PRESENTATION_INSTANCE_H__
-
-#include "types.h"
+#ifndef __GALLERY_PRESENTERS_INSTANCE_H__
+#define __GALLERY_PRESENTERS_INSTANCE_H__
 
 #include "ucl/appfw/IInstance.h"
 #include "ucl/appfw/IInstanceAppControlExt.h"
@@ -26,7 +24,6 @@
 #include "ucl/gui/Naviframe.h"
 
 #include "types.h"
-#include "model/types.h"
 
 namespace gallery {
 
@@ -78,4 +75,4 @@ namespace gallery {
 	};
 }
 
-#endif // __GALLERY_PRESENTATION_INSTANCE_H__
+#endif // __GALLERY_PRESENTERS_INSTANCE_H__
diff --git a/inc/presentation/InstanceManager.h b/inc/presenters/InstanceManager.h
index 9320544..b83b576 100644
--- a/inc/presentation/InstanceManager.h
+++ b/inc/presenters/InstanceManager.h
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#ifndef __GALLERY_PRESENTATION_INSTANCE_MANAGER_H__
-#define __GALLERY_PRESENTATION_INSTANCE_MANAGER_H__
-
-#include "types.h"
+#ifndef __GALLERY_PRESENTERS_INSTANCE_MANAGER_H__
+#define __GALLERY_PRESENTERS_INSTANCE_MANAGER_H__
 
 #include "ucl/appfw/InstanceManagerBase.h"
 
+#include "types.h"
+
 namespace gallery {
 
 	class InstanceManager : public ucl::InstanceManagerBase {
@@ -33,4 +33,4 @@ namespace gallery {
 	};
 }
 
-#endif // __GALLERY_PRESENTATION_INSTANCE_MANAGER_H__
+#endif // __GALLERY_PRESENTERS_INSTANCE_MANAGER_H__
diff --git a/inc/presentation/NoContentPage.h b/inc/presenters/NoContentPage.h
index e83674b..67008e5 100644
--- a/inc/presentation/NoContentPage.h
+++ b/inc/presenters/NoContentPage.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __GALLERY_PRESENTATION_NO_CONTENT_PAGE_H__
-#define __GALLERY_PRESENTATION_NO_CONTENT_PAGE_H__
+#ifndef __GALLERY_PRESENTERS_NO_CONTENT_PAGE_H__
+#define __GALLERY_PRESENTERS_NO_CONTENT_PAGE_H__
 
 #include "Page.h"
 
@@ -43,4 +43,4 @@ namespace gallery {
 	};
 }
 
-#endif // __GALLERY_PRESENTATION_NO_CONTENT_PAGE_H__
+#endif // __GALLERY_PRESENTERS_NO_CONTENT_PAGE_H__
diff --git a/inc/presentation/Page.h b/inc/presenters/Page.h
index 90febec..e1362cc 100644
--- a/inc/presentation/Page.h
+++ b/inc/presenters/Page.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __GALLERY_PRESENTATION_PAGE_H__
-#define __GALLERY_PRESENTATION_PAGE_H__
+#ifndef __GALLERY_PRESENTERS_PAGE_H__
+#define __GALLERY_PRESENTERS_PAGE_H__
 
 #include "ucl/gui/Naviframe.h"
 
@@ -94,4 +94,4 @@ namespace gallery {
 
 #include "Page.hpp"
 
-#endif // __GALLERY_PRESENTATION_PAGE_H__
+#endif // __GALLERY_PRESENTERS_PAGE_H__
diff --git a/inc/presentation/Page.hpp b/inc/presenters/Page.hpp
index 58be44b..58be44b 100644
--- a/inc/presentation/Page.hpp
+++ b/inc/presenters/Page.hpp
diff --git a/inc/presentation/PreviewPage.h b/inc/presenters/PreviewPage.h
index a2ea01e..86fcedc 100644
--- a/inc/presentation/PreviewPage.h
+++ b/inc/presenters/PreviewPage.h
@@ -14,14 +14,12 @@
  * limitations under the License.
  */
 
-#ifndef __GALLERY_PRESENTATION_PREVIEW_PAGE_H__
-#define __GALLERY_PRESENTATION_PREVIEW_PAGE_H__
+#ifndef __GALLERY_PRESENTERS_PREVIEW_PAGE_H__
+#define __GALLERY_PRESENTERS_PREVIEW_PAGE_H__
 
 #include "Page.h"
 
-#include "IImageGridListener.h"
-
-#include "model/types.h"
+#include "view/IImageGridListener.h"
 
 namespace gallery {
 
@@ -82,4 +80,4 @@ namespace gallery {
 	};
 }
 
-#endif // __GALLERY_PRESENTATION_PREVIEW_PAGE_H__
+#endif // __GALLERY_PRESENTERS_PREVIEW_PAGE_H__
diff --git a/inc/presentation/ThumbnailPage.h b/inc/presenters/ThumbnailPage.h
index 0b53f14..941ce90 100644
--- a/inc/presentation/ThumbnailPage.h
+++ b/inc/presenters/ThumbnailPage.h
@@ -14,14 +14,12 @@
  * limitations under the License.
  */
 
-#ifndef __GALLERY_PRESENTATION_THUMBNAIL_PAGE_H__
-#define __GALLERY_PRESENTATION_THUMBNAIL_PAGE_H__
+#ifndef __GALLERY_PRESENTERS_THUMBNAIL_PAGE_H__
+#define __GALLERY_PRESENTERS_THUMBNAIL_PAGE_H__
 
 #include "Page.h"
 
-#include "IImageGridListener.h"
-
-#include "model/types.h"
+#include "view/IImageGridListener.h"
 
 namespace gallery {
 
@@ -83,4 +81,4 @@ namespace gallery {
 	};
 }
 
-#endif // __GALLERY_PRESENTATION_THUMBNAIL_PAGE_H__
+#endif // __GALLERY_PRESENTERS_THUMBNAIL_PAGE_H__
diff --git a/inc/presentation/ViewerPage.h b/inc/presenters/ViewerPage.h
index 3d298fb..c944dc4 100644
--- a/inc/presentation/ViewerPage.h
+++ b/inc/presenters/ViewerPage.h
@@ -14,13 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef __GALLERY_PRESENTATION_VIEWER_PAGE_H__
-#define __GALLERY_PRESENTATION_VIEWER_PAGE_H__
+#ifndef __GALLERY_PRESENTERS_VIEWER_PAGE_H__
+#define __GALLERY_PRESENTERS_VIEWER_PAGE_H__
 
 #include "Page.h"
 
-#include "model/types.h"
-
 namespace gallery {
 
 	class ViewerPage final : public Page {
@@ -72,4 +70,4 @@ namespace gallery {
 	};
 }
 
-#endif // __GALLERY_PRESENTATION_VIEWER_PAGE_H__
+#endif // __GALLERY_PRESENTERS_VIEWER_PAGE_H__
diff --git a/inc/presentation/types.h b/inc/presenters/types.h
index 4e277c8..ad884c3 100644
--- a/inc/presentation/types.h
+++ b/inc/presenters/types.h
@@ -14,22 +14,15 @@
  * limitations under the License.
  */
 
-#ifndef __GALLERY_PRESENTATION_TYPES_H__
-#define __GALLERY_PRESENTATION_TYPES_H__
-
-#include <efl_extension.h>
+#ifndef __GALLERY_PRESENTERS_TYPES_H__
+#define __GALLERY_PRESENTERS_TYPES_H__
 
 #include "../types.h"
+#include "view/types.h"
+#include "model/types.h"
 
 namespace gallery {
 
-	class IImageGridListener;
-
-	UCL_DECLARE_REF_ALIASES(TouchParser);
-
-	UCL_DECLARE_REF_ALIASES(ImageGrid);
-	UCL_DECLARE_REF_ALIASES(ImageViewer);
-
 	UCL_DECLARE_REF_ALIASES(Page);
 
 	UCL_DECLARE_REF_ALIASES(NoContentPage);
@@ -38,4 +31,4 @@ namespace gallery {
 	UCL_DECLARE_REF_ALIASES(ViewerPage);
 }
 
-#endif // __GALLERY_PRESENTATION_TYPES_H__
+#endif // __GALLERY_PRESENTERS_TYPES_H__
diff --git a/inc/resources.h b/inc/resources.h
index fbdef93..9e087d1 100644
--- a/inc/resources.h
+++ b/inc/resources.h
@@ -17,10 +17,10 @@
 #ifndef __GALLERY_RESOURCES_H__
 #define __GALLERY_RESOURCES_H__
 
-#include "config.h"
-
 #include "ucl/misc/TString.h"
 
+#include "config.h"
+
 namespace gallery {
 
 	constexpr auto THEME_EDJE_PATH = "edje/theme.edj";
diff --git a/inc/presentation/IImageGridListener.h b/inc/view/IImageGridListener.h
index dd77813..1f2992f 100644
--- a/inc/presentation/IImageGridListener.h
+++ b/inc/view/IImageGridListener.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __GALLERY_PRESENTATION_I_IMAGE_GRID_LISTENER_H__
-#define __GALLERY_PRESENTATION_I_IMAGE_GRID_LISTENER_H__
+#ifndef __GALLERY_VIEW_I_IMAGE_GRID_LISTENER_H__
+#define __GALLERY_VIEW_I_IMAGE_GRID_LISTENER_H__
 
 #include "types.h"
 
@@ -29,4 +29,4 @@ namespace gallery {
 	};
 }
 
-#endif // __GALLERY_PRESENTATION_I_IMAGE_GRID_LISTENER_H__
+#endif // __GALLERY_VIEW_I_IMAGE_GRID_LISTENER_H__
diff --git a/inc/presentation/ImageGrid.h b/inc/view/ImageGrid.h
index dd0694d..3016f09 100644
--- a/inc/presentation/ImageGrid.h
+++ b/inc/view/ImageGrid.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __GALLERY_PRESENTATION_IMAGE_GRID_H__
-#define __GALLERY_PRESENTATION_IMAGE_GRID_H__
+#ifndef __GALLERY_VIEW_IMAGE_GRID_H__
+#define __GALLERY_VIEW_IMAGE_GRID_H__
 
 #include <deque>
 
@@ -204,4 +204,4 @@ namespace gallery {
 	};
 }
 
-#endif // __GALLERY_PRESENTATION_IMAGE_GRID_H__
+#endif // __GALLERY_VIEW_IMAGE_GRID_H__
diff --git a/inc/presentation/ImageViewer.h b/inc/view/ImageViewer.h
index 3818900..024dffb 100644
--- a/inc/presentation/ImageViewer.h
+++ b/inc/view/ImageViewer.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __GALLERY_PRESENTATION_IMAGE_VIEWER_H__
-#define __GALLERY_PRESENTATION_IMAGE_VIEWER_H__
+#ifndef __GALLERY_VIEW_IMAGE_VIEWER_H__
+#define __GALLERY_VIEW_IMAGE_VIEWER_H__
 
 #include "ucl/gui/StyledWidget.h"
 #include "ucl/gui/Layout.h"
@@ -109,4 +109,4 @@ namespace gallery {
 	};
 }
 
-#endif // __GALLERY_PRESENTATION_IMAGE_VIEWER_H__
+#endif // __GALLERY_VIEW_IMAGE_VIEWER_H__
diff --git a/inc/presentation/TouchParser.h b/inc/view/TouchParser.h
index 2c65fb3..98334e5 100644
--- a/inc/presentation/TouchParser.h
+++ b/inc/view/TouchParser.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __GALLERY_PRESENTATION_TOUCH_PARSER_H__
-#define __GALLERY_PRESENTATION_TOUCH_PARSER_H__
+#ifndef __GALLERY_VIEW_TOUCH_PARSER_H__
+#define __GALLERY_VIEW_TOUCH_PARSER_H__
 
 #include "ucl/gui/Widget.h"
 
@@ -58,4 +58,4 @@ namespace gallery {
 	};
 }
 
-#endif // __GALLERY_PRESENTATION_TOUCH_PARSER_H__
+#endif // __GALLERY_VIEW_TOUCH_PARSER_H__
diff --git a/src/presentation/helpers.h b/inc/view/helpers.h
index fa3d195..dab1486 100644
--- a/src/presentation/helpers.h
+++ b/inc/view/helpers.h
@@ -14,10 +14,12 @@
  * limitations under the License.
  */
 
-#ifndef __GALLERY_PRESENTATION_HELPERS_H__
-#define __GALLERY_PRESENTATION_HELPERS_H__
+#ifndef __GALLERY_VIEW_HELPERS_H__
+#define __GALLERY_VIEW_HELPERS_H__
 
-#include "presentation/types.h"
+#include <efl_extension.h>
+
+#include "types.h"
 
 namespace ucl {
 
@@ -32,4 +34,4 @@ namespace gallery {
 	Eext_Circle_Surface *getCircleSurface(const ucl::ElmWidget &widget);
 }
 
-#endif // __GALLERY_PRESENTATION_HELPERS_H__
+#endif // __GALLERY_VIEW_HELPERS_H__
diff --git a/inc/view/types.h b/inc/view/types.h
new file mode 100644
index 0000000..996f843
--- /dev/null
+++ b/inc/view/types.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2017 Samsung Electronics Co., Ltd
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __GALLERY_VIEW_TYPES_H__
+#define __GALLERY_VIEW_TYPES_H__
+
+#include "../types.h"
+
+namespace gallery {
+
+	class IImageGridListener;
+
+	UCL_DECLARE_REF_ALIASES(TouchParser);
+
+	UCL_DECLARE_REF_ALIASES(ImageGrid);
+	UCL_DECLARE_REF_ALIASES(ImageViewer);
+}
+
+#endif // __GALLERY_VIEW_TYPES_H__
diff --git a/src/common.h b/src/common.h
index e617be6..753d242 100644
--- a/src/common.h
+++ b/src/common.h
@@ -19,18 +19,11 @@
 
 #include <algorithm>
 
-#include <Ecore.h>
-
 #include "ucl/util/helpers.h"
 #include "ucl/util/logging.h"
 #include "ucl/util/shortLogs.h"
 
-#include "ucl/gui/stdTheme.h"
-#include "ucl/gui/helpers.h"
-
-#include "resources.h"
-
 #undef UCL_LOG_TAG
-#define UCL_LOG_TAG "GALLERY"
+#define UCL_LOG_TAG GALLERY_LOG_TAG
 
 #endif // __GALLERY_COMMON_H__
diff --git a/src/main.cpp b/src/main.cpp
index 526bf3d..e548152 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -16,7 +16,7 @@
 
 #include "ucl/appfw/UIApp.h"
 
-#include "presentation/InstanceManager.h"
+#include "presenters/InstanceManager.h"
 
 #include "common.h"
 
diff --git a/src/model/GalleryAlbum.cpp b/src/model/GalleryAlbum.cpp
index c79359f..7fe098c 100644
--- a/src/model/GalleryAlbum.cpp
+++ b/src/model/GalleryAlbum.cpp
@@ -16,6 +16,8 @@
 
 #include "GalleryAlbum.h"
 
+#include "ucl/misc/TString.h"
+
 #include "model/MediaItem.h"
 
 #include "common.h"
@@ -24,9 +26,8 @@ namespace gallery { namespace { namespace impl {
 
 	using namespace ucl;
 
-	const auto CONDITION = TString("%s=%d OR %s=%d").format(
-			MEDIA_TYPE, MEDIA_CONTENT_TYPE_IMAGE,
-			MEDIA_TYPE, MEDIA_CONTENT_TYPE_VIDEO);
+	const auto CONDITION = TString("%s=%d").format(
+			MEDIA_TYPE, MEDIA_CONTENT_TYPE_IMAGE);
 }}}
 
 namespace gallery {
diff --git a/src/model/MediaItem.cpp b/src/model/MediaItem.cpp
index c25d2c3..39c4b6f 100644
--- a/src/model/MediaItem.cpp
+++ b/src/model/MediaItem.cpp
@@ -16,6 +16,8 @@
 
 #include "model/MediaItem.h"
 
+#include <Ecore_File.h>
+
 #include "common.h"
 
 namespace gallery {
diff --git a/src/model/common.h b/src/model/common.h
index 594f735..7581a14 100644
--- a/src/model/common.h
+++ b/src/model/common.h
@@ -17,8 +17,8 @@
 #ifndef __GALLERY_MODEL_COMMON_H__
 #define __GALLERY_MODEL_COMMON_H__
 
-#include "../common.h"
-
 #include "helpers.h"
 
+#include "../common.h"
+
 #endif // __GALLERY_MODEL_COMMON_H__
diff --git a/src/presentation/Instance.cpp b/src/presenters/Instance.cpp
index 33a5f65..803af63 100644
--- a/src/presentation/Instance.cpp
+++ b/src/presenters/Instance.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "presentation/Instance.h"
+#include "presenters/Instance.h"
 
 #include <system_settings.h>
 
@@ -24,9 +24,10 @@
 #include "model/Gallery.h"
 #include "model/IMediaAlbum.h"
 
-#include "presentation/NoContentPage.h"
-#include "presentation/ThumbnailPage.h"
+#include "presenters/NoContentPage.h"
+#include "presenters/ThumbnailPage.h"
 
+#include "resources.h"
 #include "common.h"
 
 namespace gallery { namespace { namespace impl {
diff --git a/src/presentation/InstanceManager.cpp b/src/presenters/InstanceManager.cpp
index e0b3f2f..6aabaef 100644
--- a/src/presentation/InstanceManager.cpp
+++ b/src/presenters/InstanceManager.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "presentation/InstanceManager.h"
+#include "presenters/InstanceManager.h"
 
-#include "presentation/Instance.h"
+#include "presenters/Instance.h"
 
 namespace gallery {
 
diff --git a/src/presentation/NoContentPage.cpp b/src/presenters/NoContentPage.cpp
index ddbc272..7cb2793 100644
--- a/src/presentation/NoContentPage.cpp
+++ b/src/presenters/NoContentPage.cpp
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-#include "presentation/NoContentPage.h"
+#include "presenters/NoContentPage.h"
 
 #include "ucl/gui/Layout.h"
 
+#include "resources.h"
 #include "common.h"
 
 namespace gallery {namespace { namespace impl {
diff --git a/src/presentation/Page.cpp b/src/presenters/Page.cpp
index 0f4bf2d..7479a18 100644
--- a/src/presentation/Page.cpp
+++ b/src/presenters/Page.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "presentation/Page.h"
+#include "presenters/Page.h"
 
 #include "common.h"
 
diff --git a/src/presentation/PreviewPage.cpp b/src/presenters/PreviewPage.cpp
index 1020226..6b36bba 100644
--- a/src/presentation/PreviewPage.cpp
+++ b/src/presenters/PreviewPage.cpp
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-#include "presentation/PreviewPage.h"
+#include "presenters/PreviewPage.h"
 
 #include "model/IMediaAlbum.h"
 #include "model/MediaItem.h"
 
-#include "presentation/ImageGrid.h"
-#include "presentation/ViewerPage.h"
+#include "view/ImageGrid.h"
+
+#include "presenters/ViewerPage.h"
 
 #include "common.h"
 
diff --git a/src/presentation/ThumbnailPage.cpp b/src/presenters/ThumbnailPage.cpp
index 2628d98..f28f58f 100644
--- a/src/presentation/ThumbnailPage.cpp
+++ b/src/presenters/ThumbnailPage.cpp
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-#include "presentation/ThumbnailPage.h"
+#include "presenters/ThumbnailPage.h"
 
 #include "model/IMediaAlbum.h"
 #include "model/MediaItem.h"
 
-#include "presentation/ImageGrid.h"
-#include "presentation/PreviewPage.h"
+#include "view/ImageGrid.h"
+
+#include "presenters/PreviewPage.h"
 
 #include "common.h"
 
diff --git a/src/presentation/ViewerPage.cpp b/src/presenters/ViewerPage.cpp
index 60ad7c2..a6944b8 100644
--- a/src/presentation/ViewerPage.cpp
+++ b/src/presenters/ViewerPage.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include "presentation/ViewerPage.h"
+#include "presenters/ViewerPage.h"
 
 #include "model/MediaItem.h"
 
-#include "presentation/ImageViewer.h"
-#include "presentation/TouchParser.h"
+#include "view/ImageViewer.h"
+#include "view/TouchParser.h"
 
 #include "common.h"
 
diff --git a/src/presenters/common.h b/src/presenters/common.h
new file mode 100644
index 0000000..aec536f
--- /dev/null
+++ b/src/presenters/common.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2017 Samsung Electronics Co., Ltd
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __GALLERY_PRESENTERS_COMMON_H__
+#define __GALLERY_PRESENTERS_COMMON_H__
+
+#include "ucl/gui/stdTheme.h"
+
+#include "view/helpers.h"
+
+#include "../common.h"
+
+#endif // __GALLERY_PRESENTERS_COMMON_H__
diff --git a/src/presentation/ImageGrid.cpp b/src/view/ImageGrid.cpp
index 76aefa2..5d1a247 100644
--- a/src/presentation/ImageGrid.cpp
+++ b/src/view/ImageGrid.cpp
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-#include "presentation/ImageGrid.h"
+#include "view/ImageGrid.h"
 
 #include <array>
 #include <vector>
 
 #include "ucl/gui/Layout.h"
 
-#include "presentation/IImageGridListener.h"
-#include "presentation/TouchParser.h"
+#include "view/IImageGridListener.h"
+#include "view/TouchParser.h"
 
 #include "common.h"
 
diff --git a/src/presentation/ImageViewer.cpp b/src/view/ImageViewer.cpp
index 4fd2764..4cfccf4 100644
--- a/src/presentation/ImageViewer.cpp
+++ b/src/view/ImageViewer.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "presentation/ImageViewer.h"
+#include "view/ImageViewer.h"
 
 #include "common.h"
 
diff --git a/src/presentation/TouchParser.cpp b/src/view/TouchParser.cpp
index a556fd5..ed1d600 100644
--- a/src/presentation/TouchParser.cpp
+++ b/src/view/TouchParser.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "presentation/TouchParser.h"
+#include "view/TouchParser.h"
 
 #include "common.h"
 
diff --git a/src/presentation/common.h b/src/view/common.h
index 87f2d9c..92ae050 100644
--- a/src/presentation/common.h
+++ b/src/view/common.h
@@ -14,10 +14,13 @@
  * limitations under the License.
  */
 
-#ifndef __GALLERY_PRESENTATION_COMMON_H__
-#define __GALLERY_PRESENTATION_COMMON_H__
+#ifndef __GALLERY_VIEW_COMMON_H__
+#define __GALLERY_VIEW_COMMON_H__
 
-#include "helpers.h"
+#include "ucl/gui/stdTheme.h"
+#include "ucl/gui/helpers.h"
+
+#include "view/helpers.h"
 
 #include "../common.h"
 
@@ -26,4 +29,4 @@ namespace gallery {
 	constexpr ucl::ElmStyle SCROLLER_STYLE {"effect"};
 }
 
-#endif // __GALLERY_PRESENTATION_COMMON_H__
+#endif // __GALLERY_VIEW_COMMON_H__
diff --git a/src/presentation/helpers.cpp b/src/view/helpers.cpp
index 3bf55ce..77b6810 100644
--- a/src/presentation/helpers.cpp
+++ b/src/view/helpers.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "helpers.h"
+#include "view/helpers.h"
 
 #include "ucl/gui/Window.h"
 #include "ucl/gui/Naviframe.h"