TizenRefApp-8669 [Gallery] Refactor directory structure

Change-Id: I82d1a4e2c01c05ad823f74c1ce4c161f3a97374b

69 files changed, 88 insertions, 80 deletions

diff --git a/inc/config.h b/inc/gallery/config.h
index debdc9a..debdc9a 100644
--- a/inc/config.h
+++ b/inc/gallery/config.h
diff --git a/inc/model/Gallery.h b/inc/gallery/model/Gallery.h
index 1a711f9..1a711f9 100644
--- a/inc/model/Gallery.h
+++ b/inc/gallery/model/Gallery.h
diff --git a/inc/model/IJob.h b/inc/gallery/model/IJob.h
index 8c7d56e..8c7d56e 100644
--- a/inc/model/IJob.h
+++ b/inc/gallery/model/IJob.h
diff --git a/inc/model/IMediaAlbum.h b/inc/gallery/model/IMediaAlbum.h
index 80eb222..80eb222 100644
--- a/inc/model/IMediaAlbum.h
+++ b/inc/gallery/model/IMediaAlbum.h
diff --git a/inc/model/IMediaAlbum.hpp b/inc/gallery/model/IMediaAlbum.hpp
index 5793dfc..5793dfc 100644
--- a/inc/model/IMediaAlbum.hpp
+++ b/inc/gallery/model/IMediaAlbum.hpp
diff --git a/inc/model/MediaItem.h b/inc/gallery/model/MediaItem.h
index df35b8d..df35b8d 100644
--- a/inc/model/MediaItem.h
+++ b/inc/gallery/model/MediaItem.h
diff --git a/inc/model/SoundManager.h b/inc/gallery/model/SoundManager.h
index df5e36a..df5e36a 100644
--- a/inc/model/SoundManager.h
+++ b/inc/gallery/model/SoundManager.h
diff --git a/inc/model/types.h b/inc/gallery/model/types.h
index 87beb8f..38feee5 100644
--- a/inc/model/types.h
+++ b/inc/gallery/model/types.h
@@ -17,7 +17,7 @@
 #ifndef __GALLERY_MODEL_TYPES_H__
 #define __GALLERY_MODEL_TYPES_H__
 
-#include "../types.h"
+#include "gallery/types.h"
 
 namespace gallery {
 
diff --git a/inc/presenters/AlertDialog.h b/inc/gallery/presenters/AlertDialog.h
index 59274a2..59274a2 100644
--- a/inc/presenters/AlertDialog.h
+++ b/inc/gallery/presenters/AlertDialog.h
diff --git a/inc/presenters/AtspiHighlightHelper.h b/inc/gallery/presenters/AtspiHighlightHelper.h
index b84471e..b84471e 100644
--- a/inc/presenters/AtspiHighlightHelper.h
+++ b/inc/gallery/presenters/AtspiHighlightHelper.h
diff --git a/inc/presenters/Instance.h b/inc/gallery/presenters/Instance.h
index bdd20f6..2fee458 100644
--- a/inc/presenters/Instance.h
+++ b/inc/gallery/presenters/Instance.h
@@ -24,7 +24,7 @@
 #include "ucl/gui/Theme.h"
 #include "ucl/gui/Naviframe.h"
 
-#include "model/Gallery.h"
+#include "gallery/model/Gallery.h"
 #include "Page.h"
 
 namespace gallery {
diff --git a/inc/presenters/InstanceManager.h b/inc/gallery/presenters/InstanceManager.h
index b83b576..b83b576 100644
--- a/inc/presenters/InstanceManager.h
+++ b/inc/gallery/presenters/InstanceManager.h
diff --git a/inc/presenters/MoreOptionsPresenter.h b/inc/gallery/presenters/MoreOptionsPresenter.h
index c959b3c..c959b3c 100644
--- a/inc/presenters/MoreOptionsPresenter.h
+++ b/inc/gallery/presenters/MoreOptionsPresenter.h
diff --git a/inc/presenters/NoContentPage.h b/inc/gallery/presenters/NoContentPage.h
index b02900d..b02900d 100644
--- a/inc/presenters/NoContentPage.h
+++ b/inc/gallery/presenters/NoContentPage.h
diff --git a/inc/presenters/Page.h b/inc/gallery/presenters/Page.h
index 4be629e..4be629e 100644
--- a/inc/presenters/Page.h
+++ b/inc/gallery/presenters/Page.h
diff --git a/inc/presenters/Page.hpp b/inc/gallery/presenters/Page.hpp
index b0e1ae7..b0e1ae7 100644
--- a/inc/presenters/Page.hpp
+++ b/inc/gallery/presenters/Page.hpp
diff --git a/inc/presenters/Presenter.h b/inc/gallery/presenters/Presenter.h
index 4ed3530..4ed3530 100644
--- a/inc/presenters/Presenter.h
+++ b/inc/gallery/presenters/Presenter.h
diff --git a/inc/presenters/PreviewPage.h b/inc/gallery/presenters/PreviewPage.h
index aa0c70d..a93691b 100644
--- a/inc/presenters/PreviewPage.h
+++ b/inc/gallery/presenters/PreviewPage.h
@@ -19,10 +19,10 @@
 
 #include "Page.h"
 
-#include "model/IMediaAlbum.h"
+#include "gallery/model/IMediaAlbum.h"
 
-#include "view/PageContent.h"
-#include "view/ImageGrid.h"
+#include "gallery/view/PageContent.h"
+#include "gallery/view/ImageGrid.h"
 
 #include "MoreOptionsPresenter.h"
 #include "SelectModePresenter.h"
diff --git a/inc/presenters/ProcessingPresenter.h b/inc/gallery/presenters/ProcessingPresenter.h
index 59ff50f..59ff50f 100644
--- a/inc/presenters/ProcessingPresenter.h
+++ b/inc/gallery/presenters/ProcessingPresenter.h
diff --git a/inc/presenters/SelectModePresenter.h b/inc/gallery/presenters/SelectModePresenter.h
index b7de8bf..72c014f 100644
--- a/inc/presenters/SelectModePresenter.h
+++ b/inc/gallery/presenters/SelectModePresenter.h
@@ -21,7 +21,7 @@
 
 #include "Presenter.h"
 
-#include "view/PageContent.h"
+#include "gallery/view/PageContent.h"
 
 namespace gallery {
 
diff --git a/inc/presenters/ThumbnailPage.h b/inc/gallery/presenters/ThumbnailPage.h
index 066a017..ccfe14e 100644
--- a/inc/presenters/ThumbnailPage.h
+++ b/inc/gallery/presenters/ThumbnailPage.h
@@ -19,10 +19,10 @@
 
 #include "Page.h"
 
-#include "model/IMediaAlbum.h"
+#include "gallery/model/IMediaAlbum.h"
 
-#include "view/PageContent.h"
-#include "view/ImageGrid.h"
+#include "gallery/view/PageContent.h"
+#include "gallery/view/ImageGrid.h"
 
 #include "MoreOptionsPresenter.h"
 #include "AtspiHighlightHelper.h"
diff --git a/inc/presenters/VideoPlayerPage.h b/inc/gallery/presenters/VideoPlayerPage.h
index 440a336..64732fa 100644
--- a/inc/presenters/VideoPlayerPage.h
+++ b/inc/gallery/presenters/VideoPlayerPage.h
@@ -23,10 +23,10 @@
 
 #include "Page.h"
 
-#include "model/SoundManager.h"
-#include "model/MediaItem.h"
+#include "gallery/model/SoundManager.h"
+#include "gallery/model/MediaItem.h"
 
-#include "view/TouchParser.h"
+#include "gallery/view/TouchParser.h"
 
 namespace gallery {
 
diff --git a/inc/presenters/ViewerPage.h b/inc/gallery/presenters/ViewerPage.h
index 3e44887..6cb80ad 100644
--- a/inc/presenters/ViewerPage.h
+++ b/inc/gallery/presenters/ViewerPage.h
@@ -19,11 +19,11 @@
 
 #include "Page.h"
 
-#include "model/MediaItem.h"
+#include "gallery/model/MediaItem.h"
 
-#include "view/PageContent.h"
-#include "view/ImageViewer.h"
-#include "view/TouchParser.h"
+#include "gallery/view/PageContent.h"
+#include "gallery/view/ImageViewer.h"
+#include "gallery/view/TouchParser.h"
 
 #include "MoreOptionsPresenter.h"
 #include "ProcessingPresenter.h"
diff --git a/inc/presenters/types.h b/inc/gallery/presenters/types.h
index 86e3572..2d862ff 100644
--- a/inc/presenters/types.h
+++ b/inc/gallery/presenters/types.h
@@ -17,7 +17,7 @@
 #ifndef __GALLERY_PRESENTERS_TYPES_H__
 #define __GALLERY_PRESENTERS_TYPES_H__
 
-#include "view/types.h"
-#include "model/types.h"
+#include "gallery/view/types.h"
+#include "gallery/model/types.h"
 
 #endif // __GALLERY_PRESENTERS_TYPES_H__
diff --git a/inc/resources.h b/inc/gallery/resources.h
index 9403a67..9403a67 100644
--- a/inc/resources.h
+++ b/inc/gallery/resources.h
diff --git a/inc/types.h b/inc/gallery/types.h
index 9a1476e..9a1476e 100644
--- a/inc/types.h
+++ b/inc/gallery/types.h
diff --git a/inc/view/ImageGrid.h b/inc/gallery/view/ImageGrid.h
index 31aa0a5..31aa0a5 100644
--- a/inc/view/ImageGrid.h
+++ b/inc/gallery/view/ImageGrid.h
diff --git a/inc/view/ImageViewer.h b/inc/gallery/view/ImageViewer.h
index 5b6f215..5b6f215 100644
--- a/inc/view/ImageViewer.h
+++ b/inc/gallery/view/ImageViewer.h
diff --git a/inc/view/PageContent.h b/inc/gallery/view/PageContent.h
index 9e581b4..9e581b4 100644
--- a/inc/view/PageContent.h
+++ b/inc/gallery/view/PageContent.h
diff --git a/inc/view/TouchParser.h b/inc/gallery/view/TouchParser.h
index 484fb84..484fb84 100644
--- a/inc/view/TouchParser.h
+++ b/inc/gallery/view/TouchParser.h
diff --git a/inc/view/helpers.h b/inc/gallery/view/helpers.h
index 5a13ab4..5a13ab4 100644
--- a/inc/view/helpers.h
+++ b/inc/gallery/view/helpers.h
diff --git a/inc/view/types.h b/inc/gallery/view/types.h
index d458dc3..35b0594 100644
--- a/inc/view/types.h
+++ b/inc/gallery/view/types.h
@@ -21,6 +21,6 @@
 
 #include "ucl/gui/types.h"
 
-#include "../types.h"
+#include "gallery/types.h"
 
 #endif // __GALLERY_VIEW_TYPES_H__
diff --git a/src/common.h b/src/common.h
index 57d60ad..d6d7bae 100644
--- a/src/common.h
+++ b/src/common.h
@@ -26,7 +26,7 @@
 #undef UCL_LOG_TAG
 #define UCL_LOG_TAG GALLERY_LOG_TAG
 
-#include "internal.h"
+#include "helpers.h"
 
 namespace gallery {
 
diff --git a/src/internal.h b/src/helpers.h
index 504f985..666ebc6 100644
--- a/src/internal.h
+++ b/src/helpers.h
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#ifndef __GALLERY_INTERNAL_H__
-#define __GALLERY_INTERNAL_H__
+#ifndef __GALLERY_HELPERS_H__
+#define __GALLERY_HELPERS_H__
 
-#include "types.h"
+#include "gallery/types.h"
 
 namespace gallery { namespace util {
 
@@ -31,6 +31,6 @@ namespace gallery { namespace util {
 	ucl::Result call(FUNC &&func, ARGS &&...args);
 }}
 
-#include "internal.hpp"
+#include "helpers.hpp"
 
-#endif // __GALLERY_INTERNAL_H__
+#endif // __GALLERY_HELPERS_H__
diff --git a/src/internal.hpp b/src/helpers.hpp
index 1ed8f2b..1ed8f2b 100644
--- a/src/internal.hpp
+++ b/src/helpers.hpp
diff --git a/src/main.cpp b/src/main.cpp
index 0165f6f..826f6c3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -16,7 +16,7 @@
 
 #include "ucl/appfw/UIApp.h"
 
-#include "presenters/InstanceManager.h"
+#include "gallery/presenters/InstanceManager.h"
 
 #include "common.h"
 
diff --git a/src/model/BaseJob.h b/src/model/BaseJob.h
index 33c28cd..5b12d54 100644
--- a/src/model/BaseJob.h
+++ b/src/model/BaseJob.h
@@ -21,7 +21,7 @@
 
 #include "ucl/util/threading/Thread.h"
 
-#include "model/IJob.h"
+#include "gallery/model/IJob.h"
 
 namespace gallery {
 
diff --git a/src/model/Gallery.cpp b/src/model/Gallery.cpp
index 9e4fae8..a2c9acc 100644
--- a/src/model/Gallery.cpp
+++ b/src/model/Gallery.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "model/Gallery.h"
+#include "gallery/model/Gallery.h"
 
 #include "GalleryAlbum.h"
 
diff --git a/src/model/GalleryAlbum.h b/src/model/GalleryAlbum.h
index 9a03043..57f7e48 100644
--- a/src/model/GalleryAlbum.h
+++ b/src/model/GalleryAlbum.h
@@ -23,7 +23,7 @@
 
 #include "ucl/misc/Event.h"
 
-#include "model/IMediaAlbum.h"
+#include "gallery/model/IMediaAlbum.h"
 
 namespace gallery {
 
diff --git a/src/model/MediaItem.cpp b/src/model/MediaItem.cpp
index 67f8212..ac8c3ef 100644
--- a/src/model/MediaItem.cpp
+++ b/src/model/MediaItem.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "model/MediaItem.h"
+#include "gallery/model/MediaItem.h"
 
 #include <Ecore_File.h>
 #include <storage.h>
diff --git a/src/model/SoundManager.cpp b/src/model/SoundManager.cpp
index efdf651..0d83a73 100644
--- a/src/model/SoundManager.cpp
+++ b/src/model/SoundManager.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "model/SoundManager.h"
+#include "gallery/model/SoundManager.h"
 
 #include "common.h"
 
diff --git a/src/model/common.h b/src/model/common.h
index c1e6306..7581a14 100644
--- a/src/model/common.h
+++ b/src/model/common.h
@@ -17,7 +17,7 @@
 #ifndef __GALLERY_MODEL_COMMON_H__
 #define __GALLERY_MODEL_COMMON_H__
 
-#include "internal.h"
+#include "helpers.h"
 
 #include "../common.h"
 
diff --git a/src/model/internal.cpp b/src/model/helpers.cpp
index 9f0e5cf..452abb7 100644
--- a/src/model/internal.cpp
+++ b/src/model/helpers.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "internal.h"
+#include "helpers.h"
 
 #include <Ecore_File.h>
 #include <storage.h>
diff --git a/src/model/internal.h b/src/model/helpers.h
index 61a9176..4fa988f 100644
--- a/src/model/internal.h
+++ b/src/model/helpers.h
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-#ifndef __GALLERY_MODEL_INTERNAL_H__
-#define __GALLERY_MODEL_INTERNAL_H__
+#ifndef __GALLERY_MODEL_HELPERS_H__
+#define __GALLERY_MODEL_HELPERS_H__
 
 #include <media_content.h>
 
 #include "ucl/util/threading.h"
 
-#include "model/types.h"
+#include "gallery/model/types.h"
 
 namespace gallery {
 
@@ -53,6 +53,6 @@ namespace gallery { namespace util {
 			bool caseSensitive = true);
 }}
 
-#include "internal.hpp"
+#include "helpers.hpp"
 
-#endif // __GALLERY_MODEL_INTERNAL_H__
+#endif // __GALLERY_MODEL_HELPERS_H__
diff --git a/src/model/internal.hpp b/src/model/helpers.hpp
index 56efe64..56efe64 100644
--- a/src/model/internal.hpp
+++ b/src/model/helpers.hpp
diff --git a/src/presenters/AlertDialog.cpp b/src/presenters/AlertDialog.cpp
index 85ec84b..57b06d6 100644
--- a/src/presenters/AlertDialog.cpp
+++ b/src/presenters/AlertDialog.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-#include "presenters/AlertDialog.h"
+#include "gallery/presenters/AlertDialog.h"
+
+#include "gallery/resources.h"
 
-#include "resources.h"
 #include "common.h"
 
 namespace gallery { namespace { namespace impl {
diff --git a/src/presenters/AtspiHighlightHelper.cpp b/src/presenters/AtspiHighlightHelper.cpp
index 8e6ae07..08cd14e 100644
--- a/src/presenters/AtspiHighlightHelper.cpp
+++ b/src/presenters/AtspiHighlightHelper.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "presenters/AtspiHighlightHelper.h"
+#include "gallery/presenters/AtspiHighlightHelper.h"
 
 #include "common.h"
 
diff --git a/src/presenters/Instance.cpp b/src/presenters/Instance.cpp
index cceb718..fbefd8e 100644
--- a/src/presenters/Instance.cpp
+++ b/src/presenters/Instance.cpp
@@ -14,18 +14,19 @@
  * limitations under the License.
  */
 
-#include "presenters/Instance.h"
+#include "gallery/presenters/Instance.h"
 
 #include <system_settings.h>
 
 #include "ucl/appfw/helpers.h"
 
-#include "presenters/NoContentPage.h"
-#include "presenters/ThumbnailPage.h"
-#include "presenters/ViewerPage.h"
-#include "presenters/VideoPlayerPage.h"
+#include "gallery/presenters/NoContentPage.h"
+#include "gallery/presenters/ThumbnailPage.h"
+#include "gallery/presenters/ViewerPage.h"
+#include "gallery/presenters/VideoPlayerPage.h"
+
+#include "gallery/resources.h"
 
-#include "resources.h"
 #include "common.h"
 
 namespace gallery { namespace { namespace impl {
diff --git a/src/presenters/InstanceManager.cpp b/src/presenters/InstanceManager.cpp
index 826362e..dd187d7 100644
--- a/src/presenters/InstanceManager.cpp
+++ b/src/presenters/InstanceManager.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "presenters/InstanceManager.h"
+#include "gallery/presenters/InstanceManager.h"
 
-#include "presenters/Instance.h"
+#include "gallery/presenters/Instance.h"
 
 #include "common.h"
 
diff --git a/src/presenters/MoreOptionsPresenter.cpp b/src/presenters/MoreOptionsPresenter.cpp
index c718ff9..f0d902f 100644
--- a/src/presenters/MoreOptionsPresenter.cpp
+++ b/src/presenters/MoreOptionsPresenter.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "presenters/MoreOptionsPresenter.h"
+#include "gallery/presenters/MoreOptionsPresenter.h"
 
 #include "ucl/gui/Layout.h"
 
diff --git a/src/presenters/NoContentPage.cpp b/src/presenters/NoContentPage.cpp
index f2537fe..db5c2d6 100644
--- a/src/presenters/NoContentPage.cpp
+++ b/src/presenters/NoContentPage.cpp
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-#include "presenters/NoContentPage.h"
+#include "gallery/presenters/NoContentPage.h"
 
 #include "ucl/gui/Layout.h"
 
-#include "resources.h"
+#include "gallery/resources.h"
+
 #include "common.h"
 
 namespace gallery {
diff --git a/src/presenters/Page.cpp b/src/presenters/Page.cpp
index 2bc1870..39a6930 100644
--- a/src/presenters/Page.cpp
+++ b/src/presenters/Page.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "presenters/Page.h"
+#include "gallery/presenters/Page.h"
 
 #include "common.h"
 
diff --git a/src/presenters/Presenter.cpp b/src/presenters/Presenter.cpp
index 7d86b06..13f2856 100644
--- a/src/presenters/Presenter.cpp
+++ b/src/presenters/Presenter.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "presenters/Presenter.h"
+#include "gallery/presenters/Presenter.h"
 
 #include "common.h"
 
diff --git a/src/presenters/PreviewPage.cpp b/src/presenters/PreviewPage.cpp
index b741e74..05f3f12 100644
--- a/src/presenters/PreviewPage.cpp
+++ b/src/presenters/PreviewPage.cpp
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-#include "presenters/PreviewPage.h"
+#include "gallery/presenters/PreviewPage.h"
 
-#include "presenters/ViewerPage.h"
+#include "gallery/presenters/ViewerPage.h"
+
+#include "gallery/resources.h"
 
-#include "resources.h"
 #include "common.h"
 
 namespace gallery { namespace { namespace impl {
diff --git a/src/presenters/ProcessingPresenter.cpp b/src/presenters/ProcessingPresenter.cpp
index 4eea1d4..90e679e 100644
--- a/src/presenters/ProcessingPresenter.cpp
+++ b/src/presenters/ProcessingPresenter.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "presenters/ProcessingPresenter.h"
+#include "gallery/presenters/ProcessingPresenter.h"
 
 #include "common.h"
 
diff --git a/src/presenters/SelectModePresenter.cpp b/src/presenters/SelectModePresenter.cpp
index 7b2e02f..d0fec2c 100644
--- a/src/presenters/SelectModePresenter.cpp
+++ b/src/presenters/SelectModePresenter.cpp
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-#include "presenters/SelectModePresenter.h"
+#include "gallery/presenters/SelectModePresenter.h"
 
 #include "ucl/gui/WidgetItem.h"
 
-#include "resources.h"
+#include "gallery/resources.h"
+
 #include "common.h"
 
 namespace gallery { namespace { namespace impl {
diff --git a/src/presenters/ThumbnailPage.cpp b/src/presenters/ThumbnailPage.cpp
index d341a5b..4d96ab6 100644
--- a/src/presenters/ThumbnailPage.cpp
+++ b/src/presenters/ThumbnailPage.cpp
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-#include "presenters/ThumbnailPage.h"
+#include "gallery/presenters/ThumbnailPage.h"
 
-#include "presenters/PreviewPage.h"
+#include "gallery/presenters/PreviewPage.h"
+
+#include "gallery/resources.h"
 
-#include "resources.h"
 #include "common.h"
 
 namespace gallery { namespace { namespace impl {
diff --git a/src/presenters/VideoPlayerPage.cpp b/src/presenters/VideoPlayerPage.cpp
index e9e1cdb..96c384d 100644
--- a/src/presenters/VideoPlayerPage.cpp
+++ b/src/presenters/VideoPlayerPage.cpp
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-#include "presenters/VideoPlayerPage.h"
+#include "gallery/presenters/VideoPlayerPage.h"
 
 #include <efl_util.h>
 
 #include "ucl/appfw/types.h"
 
-#include "resources.h"
+#include "gallery/resources.h"
+
 #include "common.h"
 
 namespace gallery { namespace { namespace impl {
diff --git a/src/presenters/ViewerPage.cpp b/src/presenters/ViewerPage.cpp
index 2e2805c..e8a7d85 100644
--- a/src/presenters/ViewerPage.cpp
+++ b/src/presenters/ViewerPage.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-#include "presenters/ViewerPage.h"
+#include "gallery/presenters/ViewerPage.h"
+
+#include "gallery/resources.h"
 
-#include "resources.h"
 #include "common.h"
 
 namespace gallery { namespace { namespace impl {
diff --git a/src/presenters/common.h b/src/presenters/common.h
index 8a5ab5c..a769b95 100644
--- a/src/presenters/common.h
+++ b/src/presenters/common.h
@@ -17,7 +17,7 @@
 #ifndef __GALLERY_PRESENTERS_COMMON_H__
 #define __GALLERY_PRESENTERS_COMMON_H__
 
-#include "internal.h"
+#include "helpers.h"
 
 #include "../view/common.h"
 
diff --git a/src/presenters/internal.cpp b/src/presenters/helpers.cpp
index 207fdb1..c325932 100644
--- a/src/presenters/internal.cpp
+++ b/src/presenters/helpers.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "internal.h"
+#include "helpers.h"
 
 #include "common.h"
 
diff --git a/src/presenters/internal.h b/src/presenters/helpers.h
index a0f7ecb..0540406 100644
--- a/src/presenters/internal.h
+++ b/src/presenters/helpers.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __GALLERY_PRESENTERS_INTERNAL_H__
-#define __GALLERY_PRESENTERS_INTERNAL_H__
+#ifndef __GALLERY_PRESENTERS_HELPERS_H__
+#define __GALLERY_PRESENTERS_HELPERS_H__
 
 #include "ucl/gui/Window.h"
 
@@ -28,4 +28,4 @@ namespace gallery {
 	bool isInstancePaused(const ucl::Window &win);
 }
 
-#endif // __GALLERY_PRESENTERS_INTERNAL_H__
+#endif // __GALLERY_PRESENTERS_HELPERS_H__
diff --git a/src/resources.cpp b/src/resources.cpp
index 83291cd..f685c91 100644
--- a/src/resources.cpp
+++ b/src/resources.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "resources.h"
+#include "gallery/resources.h"
 
 namespace gallery {
 
diff --git a/src/view/ImageGrid.cpp b/src/view/ImageGrid.cpp
index c3a2b7c..ece8828 100644
--- a/src/view/ImageGrid.cpp
+++ b/src/view/ImageGrid.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "view/ImageGrid.h"
+#include "gallery/view/ImageGrid.h"
 
 #include <array>
 #include <vector>
@@ -22,7 +22,7 @@
 #include "ucl/gui/Layout.h"
 #include "ucl/gui/Window.h"
 
-#include "view/TouchParser.h"
+#include "gallery/view/TouchParser.h"
 
 #include "common.h"
 
diff --git a/src/view/ImageViewer.cpp b/src/view/ImageViewer.cpp
index 5e90e41..606e376 100644
--- a/src/view/ImageViewer.cpp
+++ b/src/view/ImageViewer.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "view/ImageViewer.h"
+#include "gallery/view/ImageViewer.h"
 
 #include "common.h"
 
diff --git a/src/view/PageContent.cpp b/src/view/PageContent.cpp
index 39c2505..21d601d 100644
--- a/src/view/PageContent.cpp
+++ b/src/view/PageContent.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "view/PageContent.h"
+#include "gallery/view/PageContent.h"
 
 #include "common.h"
 
diff --git a/src/view/TouchParser.cpp b/src/view/TouchParser.cpp
index bed06bf..d06d2f1 100644
--- a/src/view/TouchParser.cpp
+++ b/src/view/TouchParser.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "view/TouchParser.h"
+#include "gallery/view/TouchParser.h"
 
 #include "common.h"
 
diff --git a/src/view/common.h b/src/view/common.h
index d56f144..e72c13b 100644
--- a/src/view/common.h
+++ b/src/view/common.h
@@ -21,7 +21,7 @@
 #include "ucl/gui/stdTheme.h"
 #include "ucl/gui/helpers.h"
 
-#include "view/helpers.h"
+#include "gallery/view/helpers.h"
 
 #include "../common.h"
 
diff --git a/src/view/helpers.cpp b/src/view/helpers.cpp
index 2a9fe7f..f9361da 100644
--- a/src/view/helpers.cpp
+++ b/src/view/helpers.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "view/helpers.h"
+#include "gallery/view/helpers.h"
 
 #include <vector>