diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index f0d31ad2..6c6bd28d 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -31,6 +31,7 @@
             <option value="$PROJECT_DIR$/source" />
             <option value="$PROJECT_DIR$/utils" />
             <option value="$PROJECT_DIR$/vcs" />
+            <option value="$PROJECT_DIR$/viewer2" />
           </set>
         </option>
         <option name="resolveExternalAnnotations" value="false" />
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 93%
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..83c775a6 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
@@ -31,7 +33,7 @@ public class BookMarkListFragment extends Fragment {
         List<Bookmark> bookmarks = bookmarkRepository.getAllBookmarks();
 
         // ブックマーク一覧を表示するRecyclerViewのセットアップ
-        RecyclerView recyclerView = view.findViewById(R.id.recyclerView);
+        RecyclerView recyclerView = view.findViewById(R.id.recycler_view);
         BookmarkAdapter adapter = new BookmarkAdapter(bookmarks, new OnBookmarkClickListener() {
             @Override
             public void onBookmarkClick(Bookmark selectedBookmark) {
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;
diff --git a/component/viewer/src/main/java/one/nem/lacerta/component/viewer/BookMark/OnBookmarkClickListener.java b/component/viewer/src/main/java/one/nem/lacerta/component/viewer/BookMark/OnBookmarkClickListener.java
new file mode 100644
index 00000000..d3e67802
--- /dev/null
+++ b/component/viewer/src/main/java/one/nem/lacerta/component/viewer/BookMark/OnBookmarkClickListener.java
@@ -0,0 +1,10 @@
+package one.nem.lacerta.component.viewer.BookMark;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.os.Bundle;
+
+// OnBookmarkClickListener.java
+public interface OnBookmarkClickListener {
+    void onBookmarkClick(Bookmark selectedBookmark);
+}
diff --git a/component/viewer/src/main/res/layout/fragment_bookmark_list.xml b/component/viewer/src/main/res/layout/fragment_bookmark_list.xml
index 695e5164..ad077d4f 100644
--- a/component/viewer/src/main/res/layout/fragment_bookmark_list.xml
+++ b/component/viewer/src/main/res/layout/fragment_bookmark_list.xml
@@ -11,5 +11,12 @@
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
+    <!-- item_bookmark.xml -->
+    <TextView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/titleTextView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="16dp"/>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index c1389035..df3041a3 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -32,3 +32,4 @@ include ':processor'
 include ':shared:ui'
 include ':vcs'
 include ':feature:setting'
+include ':viewer2'