diff --git a/src/app/HomePage.js b/src/app/HomePage.js
index 727fa88..cf499c4 100644
--- a/src/app/HomePage.js
+++ b/src/app/HomePage.js
@@ -9,7 +9,7 @@ import { Heading1, usePageTitle } from "./util";
 
 import HomepageSplashImg from "../images/homepage-splash.png";
 import HomepageSplashImg2x from "../images/homepage-splash@2x.png";
-import SpeciesColorPicker from "./SpeciesColorPicker";
+import SpeciesColorPicker from "./components/SpeciesColorPicker";
 
 function HomePage() {
   usePageTitle("Dress to Impress");
diff --git a/src/app/Item.js b/src/app/WardrobePage/Item.js
similarity index 99%
rename from src/app/Item.js
rename to src/app/WardrobePage/Item.js
index e8b94ac..52e46c3 100644
--- a/src/app/Item.js
+++ b/src/app/WardrobePage/Item.js
@@ -11,7 +11,7 @@ import {
 } from "@chakra-ui/core";
 import { DeleteIcon, InfoIcon } from "@chakra-ui/icons";
 
-import { safeImageUrl } from "./util";
+import { safeImageUrl } from "../util";
 
 /**
  * Item show a basic summary of an item, in the context of the current outfit!
diff --git a/src/app/ItemsAndSearchPanels.js b/src/app/WardrobePage/ItemsAndSearchPanels.js
similarity index 100%
rename from src/app/ItemsAndSearchPanels.js
rename to src/app/WardrobePage/ItemsAndSearchPanels.js
diff --git a/src/app/ItemsPanel.js b/src/app/WardrobePage/ItemsPanel.js
similarity index 99%
rename from src/app/ItemsPanel.js
rename to src/app/WardrobePage/ItemsPanel.js
index ee2143b..cda2dd5 100644
--- a/src/app/ItemsPanel.js
+++ b/src/app/WardrobePage/ItemsPanel.js
@@ -13,7 +13,7 @@ import {
 import { EditIcon } from "@chakra-ui/icons";
 import { CSSTransition, TransitionGroup } from "react-transition-group";
 
-import { Delay, Heading1, Heading2 } from "./util";
+import { Delay, Heading1, Heading2 } from "../util";
 import { Item, ItemListContainer, ItemListSkeleton } from "./Item";
 
 /**
diff --git a/src/app/OutfitControls.js b/src/app/WardrobePage/OutfitControls.js
similarity index 99%
rename from src/app/OutfitControls.js
rename to src/app/WardrobePage/OutfitControls.js
index 5272ea5..09363d7 100644
--- a/src/app/OutfitControls.js
+++ b/src/app/WardrobePage/OutfitControls.js
@@ -17,7 +17,7 @@ import {
 } from "@chakra-ui/icons";
 
 import PosePicker from "./PosePicker";
-import SpeciesColorPicker from "./SpeciesColorPicker";
+import SpeciesColorPicker from "../components/SpeciesColorPicker";
 import useOutfitAppearance from "./useOutfitAppearance";
 import { Link } from "react-router-dom";
 
diff --git a/src/app/OutfitPreview.js b/src/app/WardrobePage/OutfitPreview.js
similarity index 100%
rename from src/app/OutfitPreview.js
rename to src/app/WardrobePage/OutfitPreview.js
diff --git a/src/app/PosePicker.js b/src/app/WardrobePage/PosePicker.js
similarity index 97%
rename from src/app/PosePicker.js
rename to src/app/WardrobePage/PosePicker.js
index efe2550..ab40c72 100644
--- a/src/app/PosePicker.js
+++ b/src/app/WardrobePage/PosePicker.js
@@ -17,11 +17,11 @@ import {
 import { getVisibleLayers, petAppearanceFragment } from "./useOutfitAppearance";
 
 // From https://twemoji.twitter.com/, thank you!
-import twemojiSmile from "../images/twemoji/smile.svg";
-import twemojiCry from "../images/twemoji/cry.svg";
-import twemojiSick from "../images/twemoji/sick.svg";
-import twemojiMasc from "../images/twemoji/masc.svg";
-import twemojiFem from "../images/twemoji/fem.svg";
+import twemojiSmile from "../../images/twemoji/smile.svg";
+import twemojiCry from "../../images/twemoji/cry.svg";
+import twemojiSick from "../../images/twemoji/sick.svg";
+import twemojiMasc from "../../images/twemoji/masc.svg";
+import twemojiFem from "../../images/twemoji/fem.svg";
 import { OutfitLayers } from "./OutfitPreview";
 
 function PosePicker({
diff --git a/src/app/SearchPanel.js b/src/app/WardrobePage/SearchPanel.js
similarity index 99%
rename from src/app/SearchPanel.js
rename to src/app/WardrobePage/SearchPanel.js
index a21fe10..1a2ef9e 100644
--- a/src/app/SearchPanel.js
+++ b/src/app/WardrobePage/SearchPanel.js
@@ -3,7 +3,7 @@ import gql from "graphql-tag";
 import { Box, Text, VisuallyHidden } from "@chakra-ui/core";
 import { useQuery } from "@apollo/react-hooks";
 
-import { Delay, Heading1, useDebounce } from "./util";
+import { Delay, Heading1, useDebounce } from "../util";
 import { Item, ItemListContainer, ItemListSkeleton } from "./Item";
 import { itemAppearanceFragment } from "./useOutfitAppearance";
 
diff --git a/src/app/WardrobePage.js b/src/app/WardrobePage/index.js
similarity index 98%
rename from src/app/WardrobePage.js
rename to src/app/WardrobePage/index.js
index cf98f2d..c5151eb 100644
--- a/src/app/WardrobePage.js
+++ b/src/app/WardrobePage/index.js
@@ -5,7 +5,7 @@ import loadable from "@loadable/component";
 import ItemsAndSearchPanels from "./ItemsAndSearchPanels";
 import OutfitPreview from "./OutfitPreview";
 import useOutfitState from "./useOutfitState.js";
-import { usePageTitle } from "./util";
+import { usePageTitle } from "../util";
 
 const OutfitControls = loadable(() =>
   import(/* webpackPreload: true */ "./OutfitControls")
diff --git a/src/app/useOutfitAppearance.js b/src/app/WardrobePage/useOutfitAppearance.js
similarity index 100%
rename from src/app/useOutfitAppearance.js
rename to src/app/WardrobePage/useOutfitAppearance.js
diff --git a/src/app/useOutfitState.js b/src/app/WardrobePage/useOutfitState.js
similarity index 100%
rename from src/app/useOutfitState.js
rename to src/app/WardrobePage/useOutfitState.js
diff --git a/src/app/SpeciesColorPicker.js b/src/app/components/SpeciesColorPicker.js
similarity index 99%
rename from src/app/SpeciesColorPicker.js
rename to src/app/components/SpeciesColorPicker.js
index 92b0ff7..f74c056 100644
--- a/src/app/SpeciesColorPicker.js
+++ b/src/app/components/SpeciesColorPicker.js
@@ -3,7 +3,7 @@ import gql from "graphql-tag";
 import { useQuery } from "@apollo/react-hooks";
 import { Box, Flex, Select, Text } from "@chakra-ui/core";
 
-import { Delay, useFetch } from "./util";
+import { Delay, useFetch } from "../util";
 
 /**
  * SpeciesColorPicker lets the user pick the species/color of their pet.