diff --git a/app/routes/blog._index/EmptyState.tsx b/app/components/EmptyState.tsx
similarity index 100%
rename from app/routes/blog._index/EmptyState.tsx
rename to app/components/EmptyState.tsx
diff --git a/app/routes/blog._index/PostPreview.tsx b/app/components/PostPreview.tsx
similarity index 100%
rename from app/routes/blog._index/PostPreview.tsx
rename to app/components/PostPreview.tsx
diff --git a/app/routes/blog/useMatch.ts b/app/hooks/useMatch.ts
similarity index 100%
rename from app/routes/blog/useMatch.ts
rename to app/hooks/useMatch.ts
diff --git a/app/routes/blog._index/route.tsx b/app/routes/blog._index.tsx
similarity index 86%
rename from app/routes/blog._index/route.tsx
rename to app/routes/blog._index.tsx
index 62d56a1..8edc1c3 100644
--- a/app/routes/blog._index/route.tsx
+++ b/app/routes/blog._index.tsx
@@ -1,8 +1,8 @@
 import { useLoaderData } from "@remix-run/react";
+import { EmptyState } from "~/components/EmptyState";
+import { PostPreview } from "~/components/PostPreview";
 import { Title } from "~/components/Title";
 import { findPosts } from "~/utils/posts.server";
-import { EmptyState } from "./EmptyState";
-import { PostPreview } from "./PostPreview";
 
 export const handle = {
   to: "/",
diff --git a/app/routes/blog/route.tsx b/app/routes/blog.tsx
similarity index 88%
rename from app/routes/blog/route.tsx
rename to app/routes/blog.tsx
index 616892a..e59d263 100644
--- a/app/routes/blog/route.tsx
+++ b/app/routes/blog.tsx
@@ -1,7 +1,7 @@
 import { Link } from "@remix-run/react";
 import { Outlet } from "react-router-dom";
 import { LinkWrapper } from "~/components/LinkWrapper";
-import { useMatch } from "./useMatch";
+import { useMatch } from "~/hooks/useMatch";
 
 export default function () {
   const { handle } = useMatch();