diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 3021a74..24ea86b 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -1,18 +1,17 @@
 import React, { useEffect, useState } from 'react'
 import { BrowserRouter as Router, Route, Routes, Navigate } from 'react-router-dom'
-import TagPage from '@/pages/TagPage'
 import TopNav from '@/components/TopNav'
 import TagSidebar from '@/components/TagSidebar'
 import TagDetailSidebar from '@/components/TagDetailSidebar'
-import PostPage from '@/pages/posts/PostPage'
+import PostListPage from '@/pages/posts/PostListPage'
 import PostNewPage from '@/pages/posts/PostNewPage'
 import PostDetailPage from '@/pages/posts/PostDetailPage'
-import WikiPage from '@/pages/WikiPage'
-import WikiNewPage from '@/pages/WikiNewPage'
-import WikiEditPage from '@/pages/WikiEditPage'
-import WikiDiffPage from '@/pages/WikiDiffPage'
-import WikiDetailPage from '@/pages/WikiDetailPage'
-import WikiHistoryPage from '@/pages/WikiHistoryPage'
+import WikiSearchPage from '@/pages/wiki/WikiSearchPage'
+import WikiNewPage from '@/pages/wiki/WikiNewPage'
+import WikiEditPage from '@/pages/wiki/WikiEditPage'
+import WikiDiffPage from '@/pages/wiki/WikiDiffPage'
+import WikiDetailPage from '@/pages/wiki/WikiDetailPage'
+import WikiHistoryPage from '@/pages/wiki/WikiHistoryPage'
 import { API_BASE_URL } from '@/config'
 import axios from 'axios'
 import { Toaster } from '@/components/ui/toaster'
@@ -60,11 +59,10 @@ export default () => {
             <div className="flex flex-1">
               <Routes>
                 <Route path="/" element={<Navigate to="/posts" replace />} />
-                <Route path="/posts" element={<PostPage />} />
+                <Route path="/posts" element={<PostListPage />} />
                 <Route path="/posts/new" element={<PostNewPage />} />
                 <Route path="/posts/:id" element={<PostDetailPage user={user} />} />
-                <Route path="/tags/:tag" element={<TagPage />} />
-                <Route path="/wiki" element={<WikiPage />} />
+                <Route path="/wiki" element={<WikiSearchPage />} />
                 <Route path="/wiki/:title" element={<WikiDetailPage />} />
                 <Route path="/wiki/new" element={<WikiNewPage />} />
                 <Route path="/wiki/:id/edit" element={<WikiEditPage />} />
diff --git a/frontend/src/pages/TagPage.tsx b/frontend/src/pages/TagPage.tsx
deleted file mode 100644
index f4a1ebe..0000000
--- a/frontend/src/pages/TagPage.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import React, { useEffect, useState } from 'react'
-import axios from 'axios'
-import { useParams } from 'react-router-dom'
-import { API_BASE_URL } from '../config'
-import MainArea from '@/components/layout/MainArea'
-
-
-export default () => {
-  const { id } = useParams()
-  const [posts, setPosts] = useState([])
-  const [tagName, setTagName] = useState('')
-
-  useEffect (() => {
-    const fetchTag = async () => {
-      try {
-        const response = await axios.get (`${API_BASE_URL}/tags/${id}`)
-        setTagName (response.data.name)
-      } catch (error) {
-        console.error ('Error fetching tag:', error)
-      }
-    }
-
-    const fetchPosts = async () => {
-      try {
-        const response = await axios.get (`${API_BASE_URL}/tags/${id}/posts`)
-        setPosts (response.data)
-      } catch (error) {
-        console.error ('Error fetching posts:', error)
-      }
-    }
-
-    fetchTag ()
-    fetchPosts ()
-  }, [id])
-
-  return (
-      <MainArea>
-        <div className="container mx-auto p-4">
-          <h1 className="text-2xl font-bold mb-4">タグ: {tagName}</h1>
-          <div className="grid grid-cols-4 gap-4">
-            {posts.map ((post, index) => (
-              <div key={index} className="border rounded p-2">
-                <img src={post.image_url} alt={post.title} className="w-full h-48 object-cover mb-2" />
-                <h2 className="text-lg font-semibold">{post.title}</h2>
-              </div>
-            ))}
-          </div>
-        </div>
-      </MainArea>)
-}
diff --git a/frontend/src/pages/posts/PostPage.tsx b/frontend/src/pages/posts/PostListPage.tsx
similarity index 100%
rename from frontend/src/pages/posts/PostPage.tsx
rename to frontend/src/pages/posts/PostListPage.tsx
diff --git a/frontend/src/pages/WikiDetailPage.tsx b/frontend/src/pages/wiki/WikiDetailPage.tsx
similarity index 100%
rename from frontend/src/pages/WikiDetailPage.tsx
rename to frontend/src/pages/wiki/WikiDetailPage.tsx
diff --git a/frontend/src/pages/WikiDiffPage.tsx b/frontend/src/pages/wiki/WikiDiffPage.tsx
similarity index 100%
rename from frontend/src/pages/WikiDiffPage.tsx
rename to frontend/src/pages/wiki/WikiDiffPage.tsx
diff --git a/frontend/src/pages/WikiEditPage.tsx b/frontend/src/pages/wiki/WikiEditPage.tsx
similarity index 100%
rename from frontend/src/pages/WikiEditPage.tsx
rename to frontend/src/pages/wiki/WikiEditPage.tsx
diff --git a/frontend/src/pages/WikiHistoryPage.tsx b/frontend/src/pages/wiki/WikiHistoryPage.tsx
similarity index 100%
rename from frontend/src/pages/WikiHistoryPage.tsx
rename to frontend/src/pages/wiki/WikiHistoryPage.tsx
diff --git a/frontend/src/pages/WikiNewPage.tsx b/frontend/src/pages/wiki/WikiNewPage.tsx
similarity index 100%
rename from frontend/src/pages/WikiNewPage.tsx
rename to frontend/src/pages/wiki/WikiNewPage.tsx
diff --git a/frontend/src/pages/WikiPage.tsx b/frontend/src/pages/wiki/WikiSearchPage.tsx
similarity index 100%
rename from frontend/src/pages/WikiPage.tsx
rename to frontend/src/pages/wiki/WikiSearchPage.tsx