diff --git a/src/components/layouts/BacklogPage.tsx b/src/components/layouts/BacklogPage.tsx
index 7841cc4..65128e3 100644
--- a/src/components/layouts/BacklogPage.tsx
+++ b/src/components/layouts/BacklogPage.tsx
@@ -2,7 +2,7 @@ import Link from "next/link";
 import { CheckIcon } from "@heroicons/react/16/solid";
 
 import { PageContainer } from "./PageContainer";
-import { BacklogCountLabel } from "../BacklogPreview";
+import { BacklogCountLabel } from "../pages/home/BacklogPreview";
 
 import { EMAIL } from "~/utils/constants";
 import { BACKLOG, BacklogItem } from "~/utils/data";
diff --git a/src/components/layouts/HomePage.tsx b/src/components/layouts/HomePage.tsx
index e586766..a35f8ad 100644
--- a/src/components/layouts/HomePage.tsx
+++ b/src/components/layouts/HomePage.tsx
@@ -1,9 +1,7 @@
-import { MainCards } from "../MainCards";
 import { ShareForm } from "../ShareForm";
 import { SubscribeForm } from "../SubscribeForm";
 import { PageContainer } from "./PageContainer";
-import { About } from "../About";
-import { BacklogPreview } from "../BacklogPreview";
+import { About, MainCards, BacklogPreview } from "../pages/home";
 
 import { getPeople } from "~/api-client/people";
 
diff --git a/src/components/layouts/PersonQAPage.tsx b/src/components/layouts/PersonQAPage.tsx
index 53738f9..519fbd8 100644
--- a/src/components/layouts/PersonQAPage.tsx
+++ b/src/components/layouts/PersonQAPage.tsx
@@ -1,10 +1,8 @@
 import { notFound } from "next/navigation";
 
 import { ShareForm } from "../ShareForm";
-import { PersonPreview } from "../PersonPreview";
 import { PageContainer } from "./PageContainer";
-import { Content } from "../Content";
-import { SidePeoplePanel } from "../SidePeoplePanel";
+import { PersonPreview, Content, SidePeoplePanel } from "../pages/person";
 
 import { getPerson } from "~/api-client/people";
 import { getAnswersByPersonSlug } from "~/api-client/answers";
diff --git a/src/components/layouts/QuestionPage.tsx b/src/components/layouts/QuestionPage.tsx
index f90de3c..c214625 100644
--- a/src/components/layouts/QuestionPage.tsx
+++ b/src/components/layouts/QuestionPage.tsx
@@ -4,7 +4,7 @@ import { notFound } from "next/navigation";
 import { PageContainer } from "./PageContainer";
 import { PersonImage } from "../PersonImage";
 import { Answer } from "../Content";
-import { QuestionsNavigation } from "../QuestionsNavigation";
+import { QuestionsNavigation } from "../pages/question/QuestionsNavigation";
 
 import { getAnswersByQuestionSlug } from "~/api-client/answers";
 import { getQuestions } from "~/api-client/questions";
diff --git a/src/components/About.tsx b/src/components/pages/home/About.tsx
similarity index 96%
rename from src/components/About.tsx
rename to src/components/pages/home/About.tsx
index a2b532c..c53651c 100644
--- a/src/components/About.tsx
+++ b/src/components/pages/home/About.tsx
@@ -1,4 +1,4 @@
-import { SmileIconSolid } from "./icons/SmileIconSolid";
+import { SmileIconSolid } from "../../icons/SmileIconSolid";
 
 import { cn } from "~/utils/handlers";
 
diff --git a/src/components/BacklogPreview.tsx b/src/components/pages/home/BacklogPreview.tsx
similarity index 100%
rename from src/components/BacklogPreview.tsx
rename to src/components/pages/home/BacklogPreview.tsx
diff --git a/src/components/MainCards.tsx b/src/components/pages/home/MainCards.tsx
similarity index 88%
rename from src/components/MainCards.tsx
rename to src/components/pages/home/MainCards.tsx
index efc54f7..afe4278 100644
--- a/src/components/MainCards.tsx
+++ b/src/components/pages/home/MainCards.tsx
@@ -1,4 +1,5 @@
-import { PersonCard } from "./PersonCard";
+import { PersonCard } from "~/components/PersonCard";
+
 import { IPerson } from "~/models/Person";
 
 interface MainCardsProps {
diff --git a/src/components/pages/home/index.ts b/src/components/pages/home/index.ts
new file mode 100644
index 0000000..5dc7443
--- /dev/null
+++ b/src/components/pages/home/index.ts
@@ -0,0 +1,3 @@
+export * from "./About";
+export * from "./BacklogPreview";
+export * from "./MainCards";
diff --git a/src/components/Content.tsx b/src/components/pages/person/Content.tsx
similarity index 99%
rename from src/components/Content.tsx
rename to src/components/pages/person/Content.tsx
index fd25415..d5eebbf 100644
--- a/src/components/Content.tsx
+++ b/src/components/pages/person/Content.tsx
@@ -3,7 +3,6 @@ import Link from "next/link";
 import Image from "next/image";
 
 import { ParsedParagraph } from "./ParsedParagraph";
-
 import { IAnswer, IAnswerLink } from "~/models/Answer";
 import { AnswerViewType, IQuestion } from "~/models/Question";
 import { isOuterURL } from "~/utils/handlers";
diff --git a/src/components/ParsedParagraph.tsx b/src/components/pages/person/ParsedParagraph.tsx
similarity index 100%
rename from src/components/ParsedParagraph.tsx
rename to src/components/pages/person/ParsedParagraph.tsx
diff --git a/src/components/PersonPreview.tsx b/src/components/pages/person/PersonPreview.tsx
similarity index 93%
rename from src/components/PersonPreview.tsx
rename to src/components/pages/person/PersonPreview.tsx
index 949c848..e6345b7 100644
--- a/src/components/PersonPreview.tsx
+++ b/src/components/pages/person/PersonPreview.tsx
@@ -1,7 +1,7 @@
 import { ReactNode } from "react";
 
-import { PersonImage } from "./PersonImage";
-import { Job, Name } from "./PersonCard";
+import { Name, Job } from "~/components/PersonCard";
+import { PersonImage } from "~/components/PersonImage";
 
 import { IPerson } from "~/models/Person";
 
diff --git a/src/components/SidePeoplePanel.tsx b/src/components/pages/person/SidePeoplePanel.tsx
similarity index 95%
rename from src/components/SidePeoplePanel.tsx
rename to src/components/pages/person/SidePeoplePanel.tsx
index 458d6ba..3fbd2a3 100644
--- a/src/components/SidePeoplePanel.tsx
+++ b/src/components/pages/person/SidePeoplePanel.tsx
@@ -1,8 +1,8 @@
 import Link from "next/link";
 import { ReactNode } from "react";
 
-import { PersonImage } from "./PersonImage";
-import { PlusIcon } from "./icons/Plus";
+import { PlusIcon } from "~/components/icons/Plus";
+import { PersonImage } from "~/components/PersonImage";
 
 import { getPeople } from "~/api-client/people";
 
diff --git a/src/components/pages/person/index.ts b/src/components/pages/person/index.ts
new file mode 100644
index 0000000..2bef3e1
--- /dev/null
+++ b/src/components/pages/person/index.ts
@@ -0,0 +1,4 @@
+export * from "./Content";
+export * from "./ParsedParagraph";
+export * from "./PersonPreview";
+export * from "./SidePeoplePanel";
diff --git a/src/components/QuestionsNavigation.tsx b/src/components/pages/question/QuestionsNavigation.tsx
similarity index 100%
rename from src/components/QuestionsNavigation.tsx
rename to src/components/pages/question/QuestionsNavigation.tsx
diff --git a/src/components/pages/question/index.ts b/src/components/pages/question/index.ts
new file mode 100644
index 0000000..f41a4af
--- /dev/null
+++ b/src/components/pages/question/index.ts
@@ -0,0 +1 @@
+export * from "./QuestionsNavigation";