diff --git a/component/viewer/src/main/java/one/nem/lacerta/component/viewer/BookMarkFragment.java b/component/viewer/src/main/java/one/nem/lacerta/component/viewer/BookMark/BookMarkFragment.java
similarity index 95%
rename from component/viewer/src/main/java/one/nem/lacerta/component/viewer/BookMarkFragment.java
rename to component/viewer/src/main/java/one/nem/lacerta/component/viewer/BookMark/BookMarkFragment.java
index 75573893..fc953738 100644
--- a/component/viewer/src/main/java/one/nem/lacerta/component/viewer/BookMarkFragment.java
+++ b/component/viewer/src/main/java/one/nem/lacerta/component/viewer/BookMark/BookMarkFragment.java
@@ -1,4 +1,4 @@
-package one.nem.lacerta.component.viewer;
+package one.nem.lacerta.component.viewer.BookMark;
 
 import android.os.Bundle;
 import android.view.GestureDetector;
@@ -14,6 +14,8 @@ import java.util.UUID;
 
 import javax.inject.Inject;
 
+import one.nem.lacerta.component.viewer.R;
+
 // BookMarkFragment.java
 public class BookMarkFragment extends Fragment {
 
diff --git a/component/viewer/src/main/java/one/nem/lacerta/component/viewer/BookMarkListFragment.java b/component/viewer/src/main/java/one/nem/lacerta/component/viewer/BookMark/BookMarkListFragment.java
similarity index 94%
rename from component/viewer/src/main/java/one/nem/lacerta/component/viewer/BookMarkListFragment.java
rename to component/viewer/src/main/java/one/nem/lacerta/component/viewer/BookMark/BookMarkListFragment.java
index 62d9e82c..2f30026b 100644
--- a/component/viewer/src/main/java/one/nem/lacerta/component/viewer/BookMarkListFragment.java
+++ b/component/viewer/src/main/java/one/nem/lacerta/component/viewer/BookMark/BookMarkListFragment.java
@@ -1,4 +1,4 @@
-package one.nem.lacerta.component.viewer;
+package one.nem.lacerta.component.viewer.BookMark;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -13,6 +13,8 @@ import java.util.List;
 
 import javax.inject.Inject;
 
+import one.nem.lacerta.component.viewer.R;
+
 // BookMarkListFragment.java
 public class BookMarkListFragment extends Fragment {
     @Inject
diff --git a/component/viewer/src/main/java/one/nem/lacerta/component/viewer/Bookmark.java b/component/viewer/src/main/java/one/nem/lacerta/component/viewer/BookMark/Bookmark.java
similarity index 95%
rename from component/viewer/src/main/java/one/nem/lacerta/component/viewer/Bookmark.java
rename to component/viewer/src/main/java/one/nem/lacerta/component/viewer/BookMark/Bookmark.java
index f3ff87b1..23711620 100644
--- a/component/viewer/src/main/java/one/nem/lacerta/component/viewer/Bookmark.java
+++ b/component/viewer/src/main/java/one/nem/lacerta/component/viewer/BookMark/Bookmark.java
@@ -1,4 +1,4 @@
-package one.nem.lacerta.component.viewer;
+package one.nem.lacerta.component.viewer.BookMark;
 
 // Bookmark.java
 public class Bookmark {
diff --git a/component/viewer/src/main/java/one/nem/lacerta/component/viewer/BookmarkRepository.java b/component/viewer/src/main/java/one/nem/lacerta/component/viewer/BookMark/BookmarkRepository.java
similarity index 89%
rename from component/viewer/src/main/java/one/nem/lacerta/component/viewer/BookmarkRepository.java
rename to component/viewer/src/main/java/one/nem/lacerta/component/viewer/BookMark/BookmarkRepository.java
index c5abc95d..063b1b9d 100644
--- a/component/viewer/src/main/java/one/nem/lacerta/component/viewer/BookmarkRepository.java
+++ b/component/viewer/src/main/java/one/nem/lacerta/component/viewer/BookMark/BookmarkRepository.java
@@ -1,4 +1,4 @@
-package one.nem.lacerta.component.viewer;
+package one.nem.lacerta.component.viewer.BookMark;
 
 // BookmarkRepository.java
 import java.util.ArrayList;