diff --git a/components/AbilityIcon.tsx b/lib/components/AbilityIcon.tsx
similarity index 100%
rename from components/AbilityIcon.tsx
rename to lib/components/AbilityIcon.tsx
diff --git a/components/ColorPicker.tsx b/lib/components/ColorPicker.tsx
similarity index 100%
rename from components/ColorPicker.tsx
rename to lib/components/ColorPicker.tsx
diff --git a/components/Emoji.tsx b/lib/components/Emoji.tsx
similarity index 90%
rename from components/Emoji.tsx
rename to lib/components/Emoji.tsx
index b6fdca2cb..ea4fb7c65 100644
--- a/components/Emoji.tsx
+++ b/lib/components/Emoji.tsx
@@ -1,6 +1,6 @@
-import AbilityIcon from "components/AbilityIcon";
-import GearImage from "components/GearImage";
-import WeaponImage from "components/WeaponImage";
+import AbilityIcon from "lib/components/AbilityIcon";
+import GearImage from "lib/components/GearImage";
+import WeaponImage from "lib/components/WeaponImage";
 import { abilityMarkdownCodes } from "lib/lists/abilityMarkdownCodes";
 import { gearMarkdownCodes } from "lib/lists/gearMarkdownCodes";
 import { weaponMarkdownCodes } from "lib/lists/weaponMarkdownCodes";
diff --git a/components/GearImage.tsx b/lib/components/GearImage.tsx
similarity index 100%
rename from components/GearImage.tsx
rename to lib/components/GearImage.tsx
diff --git a/components/LimitProgress.tsx b/lib/components/LimitProgress.tsx
similarity index 100%
rename from components/LimitProgress.tsx
rename to lib/components/LimitProgress.tsx
diff --git a/components/LoadingBoundary.tsx b/lib/components/LoadingBoundary.tsx
similarity index 100%
rename from components/LoadingBoundary.tsx
rename to lib/components/LoadingBoundary.tsx
diff --git a/components/Markdown.tsx b/lib/components/Markdown.tsx
similarity index 98%
rename from components/Markdown.tsx
rename to lib/components/Markdown.tsx
index c4bfd5f1f..d7c67d2fe 100644
--- a/components/Markdown.tsx
+++ b/lib/components/Markdown.tsx
@@ -9,7 +9,7 @@ import {
   ListItem,
   Text,
 } from "@chakra-ui/core";
-import Emoji from "components/Emoji";
+import Emoji from "lib/components/Emoji";
 import {
   Table,
   TableBody,
@@ -17,7 +17,7 @@ import {
   TableHead,
   TableHeader,
   TableRow,
-} from "components/Table";
+} from "lib/components/Table";
 import { useMyTheme } from "lib/useMyTheme";
 import ReactMarkdown from "react-markdown";
 import reactStringReplace from "react-string-replace";
diff --git a/components/MarkdownTextarea.tsx b/lib/components/MarkdownTextarea.tsx
similarity index 100%
rename from components/MarkdownTextarea.tsx
rename to lib/components/MarkdownTextarea.tsx
diff --git a/components/ModeImage.tsx b/lib/components/ModeImage.tsx
similarity index 100%
rename from components/ModeImage.tsx
rename to lib/components/ModeImage.tsx
diff --git a/components/MyHead.tsx b/lib/components/MyHead.tsx
similarity index 100%
rename from components/MyHead.tsx
rename to lib/components/MyHead.tsx
diff --git a/components/PageHeader.tsx b/lib/components/PageHeader.tsx
similarity index 100%
rename from components/PageHeader.tsx
rename to lib/components/PageHeader.tsx
diff --git a/components/Section.tsx b/lib/components/Section.tsx
similarity index 100%
rename from components/Section.tsx
rename to lib/components/Section.tsx
diff --git a/components/Table.tsx b/lib/components/Table.tsx
similarity index 100%
rename from components/Table.tsx
rename to lib/components/Table.tsx
diff --git a/components/WeaponImage.tsx b/lib/components/WeaponImage.tsx
similarity index 100%
rename from components/WeaponImage.tsx
rename to lib/components/WeaponImage.tsx
diff --git a/components/WeaponSelector.tsx b/lib/components/WeaponSelector.tsx
similarity index 100%
rename from components/WeaponSelector.tsx
rename to lib/components/WeaponSelector.tsx
diff --git a/pages/player/[id].tsx b/pages/player/[id].tsx
index 5339d3f50..e3a9306a6 100644
--- a/pages/player/[id].tsx
+++ b/pages/player/[id].tsx
@@ -1,10 +1,10 @@
 import { PrismaClient } from "@prisma/client";
-import LoadingBoundary from "components/LoadingBoundary";
 import {
   GetPlayersXRankPlacementsDocument,
   useGetPlayersXRankPlacementsQuery,
 } from "generated/graphql";
 import { initializeApollo } from "lib/apollo";
+import LoadingBoundary from "lib/components/LoadingBoundary";
 import { GetStaticPaths, GetStaticProps } from "next";
 import { useRouter } from "next/router";
 import Player from "scenes/Player";
diff --git a/pages/top500.tsx b/pages/top500.tsx
index 3b7bf4807..a7dc33553 100644
--- a/pages/top500.tsx
+++ b/pages/top500.tsx
@@ -1,7 +1,5 @@
 import { Radio, RadioGroup, Select, Stack } from "@chakra-ui/core";
 import { PrismaClient } from "@prisma/client";
-import LoadingBoundary from "components/LoadingBoundary";
-import PageHeader from "components/PageHeader";
 import {
   GetXRankPlacementsDocument,
   GetXRankPlacementsQueryVariables,
@@ -9,6 +7,8 @@ import {
   useGetXRankPlacementsQuery,
 } from "generated/graphql";
 import { initializeApollo } from "lib/apollo";
+import LoadingBoundary from "lib/components/LoadingBoundary";
+import PageHeader from "lib/components/PageHeader";
 import { getLocalizedMonthYearString } from "lib/getLocalizedMontYearString";
 import { useTranslation } from "lib/useMockT";
 import { GetStaticProps } from "next";
diff --git a/scenes/MapPlanner/components/DraggableImageAdder.tsx b/scenes/MapPlanner/components/DraggableImageAdder.tsx
index c3082ba4a..692898c2c 100644
--- a/scenes/MapPlanner/components/DraggableImageAdder.tsx
+++ b/scenes/MapPlanner/components/DraggableImageAdder.tsx
@@ -1,5 +1,5 @@
 import { Box, Flex, Image } from "@chakra-ui/core";
-import WeaponImage from "components/WeaponImage";
+import WeaponImage from "lib/components/WeaponImage";
 import { weapons } from "lib/lists/weapons";
 import { useMyTheme } from "lib/useMyTheme";
 import { useState } from "react";
diff --git a/scenes/MapPlanner/components/DraggableToolsSelector.tsx b/scenes/MapPlanner/components/DraggableToolsSelector.tsx
index d9cda8ee8..e02581009 100644
--- a/scenes/MapPlanner/components/DraggableToolsSelector.tsx
+++ b/scenes/MapPlanner/components/DraggableToolsSelector.tsx
@@ -1,5 +1,5 @@
 import { Box, Flex, IconButton } from "@chakra-ui/core";
-import ColorPicker from "components/ColorPicker";
+import ColorPicker from "lib/components/ColorPicker";
 import { useMyTheme } from "lib/useMyTheme";
 import { useState } from "react";
 import Draggable from "react-draggable";
diff --git a/scenes/MapPlanner/components/StageSelector.tsx b/scenes/MapPlanner/components/StageSelector.tsx
index 7194b74f8..3d1d8159d 100644
--- a/scenes/MapPlanner/components/StageSelector.tsx
+++ b/scenes/MapPlanner/components/StageSelector.tsx
@@ -2,7 +2,7 @@ import { Box, HStack, Image, Radio, RadioGroup, Select } from "@chakra-ui/core";
 import salmonRunHighTide from "assets/SalmonRunHighTide.svg";
 import salmonRunLowTide from "assets/SalmonRunLowTide.svg";
 import salmonRunMidTide from "assets/SalmonRunMidTide.svg";
-import ModeImage from "components/ModeImage";
+import ModeImage from "lib/components/ModeImage";
 import { stages } from "lib/lists/stages";
 import { PlannerMapBg } from "..";
 
diff --git a/scenes/Player/index.tsx b/scenes/Player/index.tsx
index b7472a281..c788e2074 100644
--- a/scenes/Player/index.tsx
+++ b/scenes/Player/index.tsx
@@ -1,5 +1,6 @@
 import { Text } from "@chakra-ui/core";
-import ModeImage from "components/ModeImage";
+import { GetPlayersXRankPlacementsQuery } from "generated/graphql";
+import ModeImage from "lib/components/ModeImage";
 import {
   Table,
   TableBody,
@@ -7,9 +8,8 @@ import {
   TableHead,
   TableHeader,
   TableRow,
-} from "components/Table";
-import WeaponImage from "components/WeaponImage";
-import { GetPlayersXRankPlacementsQuery } from "generated/graphql";
+} from "lib/components/Table";
+import WeaponImage from "lib/components/WeaponImage";
 import { getRankingString } from "lib/getRankingString";
 import { useTranslation } from "lib/useMockT";
 import { useMyTheme } from "lib/useMyTheme";
diff --git a/scenes/Profile/components/AvatarWithInfo.tsx b/scenes/Profile/components/AvatarWithInfo.tsx
index bbd40ba15..f3e726dbc 100644
--- a/scenes/Profile/components/AvatarWithInfo.tsx
+++ b/scenes/Profile/components/AvatarWithInfo.tsx
@@ -1,8 +1,8 @@
 import { Avatar, Box, Flex, Heading, IconButton } from "@chakra-ui/core";
-import Section from "components/Section";
-import WeaponImage from "components/WeaponImage";
 import { getEmojiFlag } from "countries-list";
 import { GetUserByIdentifierQuery } from "generated/graphql";
+import Section from "lib/components/Section";
+import WeaponImage from "lib/components/WeaponImage";
 import { useTranslation } from "lib/useMockT";
 import { useMyTheme } from "lib/useMyTheme";
 import { FaGamepad, FaTwitch, FaTwitter, FaYoutube } from "react-icons/fa";
diff --git a/scenes/Profile/components/ProfileModal.tsx b/scenes/Profile/components/ProfileModal.tsx
index 64e12da01..23055f88c 100644
--- a/scenes/Profile/components/ProfileModal.tsx
+++ b/scenes/Profile/components/ProfileModal.tsx
@@ -18,8 +18,6 @@ import {
   useToast,
 } from "@chakra-ui/core";
 import { zodResolver } from "@hookform/resolvers/zod";
-import MarkdownTextarea from "components/MarkdownTextarea";
-import WeaponSelector from "components/WeaponSelector";
 import { countries } from "countries-list";
 import {
   GetUserByIdentifierDocument,
@@ -27,6 +25,8 @@ import {
   UpdateUserProfileInput,
   useUpdateUserProfileMutation,
 } from "generated/graphql";
+import MarkdownTextarea from "lib/components/MarkdownTextarea";
+import WeaponSelector from "lib/components/WeaponSelector";
 import { getToastOptions } from "lib/getToastOptions";
 import { useTranslation } from "lib/useMockT";
 import { Controller, useForm } from "react-hook-form";
diff --git a/scenes/Profile/index.tsx b/scenes/Profile/index.tsx
index 40352ca31..08b38e543 100644
--- a/scenes/Profile/index.tsx
+++ b/scenes/Profile/index.tsx
@@ -1,7 +1,7 @@
 import { Box, Button } from "@chakra-ui/core";
-import Markdown from "components/Markdown";
-import MyHead from "components/MyHead";
 import { GetUserByIdentifierQuery } from "generated/graphql";
+import Markdown from "lib/components/Markdown";
+import MyHead from "lib/components/MyHead";
 import { useTranslation } from "lib/useMockT";
 import useUser from "lib/useUser";
 import { useState } from "react";
diff --git a/scenes/Top500/index.tsx b/scenes/Top500/index.tsx
index d7511e9da..3cf4c86a9 100644
--- a/scenes/Top500/index.tsx
+++ b/scenes/Top500/index.tsx
@@ -1,5 +1,6 @@
 import { Avatar, Text } from "@chakra-ui/core";
-import MyHead from "components/MyHead";
+import { GetXRankPlacementsQuery } from "generated/graphql";
+import MyHead from "lib/components/MyHead";
 import {
   Table,
   TableBody,
@@ -7,9 +8,8 @@ import {
   TableHead,
   TableHeader,
   TableRow,
-} from "components/Table";
-import WeaponImage from "components/WeaponImage";
-import { GetXRankPlacementsQuery } from "generated/graphql";
+} from "lib/components/Table";
+import WeaponImage from "lib/components/WeaponImage";
 import { getRankingString } from "lib/getRankingString";
 import { useTranslation } from "lib/useMockT";
 import { useMyTheme } from "lib/useMyTheme";