diff --git a/src/components/AppLayout.tsx b/src/components/AppLayout.tsx
index 5901af3..6afd3a7 100644
--- a/src/components/AppLayout.tsx
+++ b/src/components/AppLayout.tsx
@@ -1,4 +1,4 @@
-import Button from "components/Button";
+import Button from "components/Inputs/Button";
 import { useAppLayout } from "contexts/AppLayoutContext";
 import { UploadImageFragment } from "graphql/generated";
 import { useMediaMobile } from "hooks/useMediaQuery";
@@ -14,10 +14,10 @@ import {
 import { useEffect, useState } from "react";
 import { useSwipeable } from "react-swipeable";
 import { ImageQuality } from "./Img";
-import OrderableList from "./OrderableList";
+import OrderableList from "./Inputs/OrderableList";
 import MainPanel from "./Panels/MainPanel";
 import Popup from "./Popup";
-import Select from "./Select";
+import Select from "./Inputs/Select";
 
 interface Props extends AppStaticProps {
   subPanel?: React.ReactNode;
diff --git a/src/components/Button.tsx b/src/components/Inputs/Button.tsx
similarity index 100%
rename from src/components/Button.tsx
rename to src/components/Inputs/Button.tsx
diff --git a/src/components/LanguageSwitcher.tsx b/src/components/Inputs/LanguageSwitcher.tsx
similarity index 94%
rename from src/components/LanguageSwitcher.tsx
rename to src/components/Inputs/LanguageSwitcher.tsx
index 6f853c7..030afb4 100644
--- a/src/components/LanguageSwitcher.tsx
+++ b/src/components/Inputs/LanguageSwitcher.tsx
@@ -2,7 +2,7 @@ import { AppStaticProps } from "queries/getAppStaticProps";
 import { prettyLanguage } from "queries/helpers";
 import { Dispatch, SetStateAction } from "react";
 import Button from "./Button";
-import ToolTip from "./ToolTip";
+import ToolTip from "../ToolTip";
 
 interface Props {
   className?: string;
diff --git a/src/components/OrderableList.tsx b/src/components/Inputs/OrderableList.tsx
similarity index 100%
rename from src/components/OrderableList.tsx
rename to src/components/Inputs/OrderableList.tsx
diff --git a/src/components/PageSelector.tsx b/src/components/Inputs/PageSelector.tsx
similarity index 100%
rename from src/components/PageSelector.tsx
rename to src/components/Inputs/PageSelector.tsx
diff --git a/src/components/Select.tsx b/src/components/Inputs/Select.tsx
similarity index 100%
rename from src/components/Select.tsx
rename to src/components/Inputs/Select.tsx
diff --git a/src/components/Switch.tsx b/src/components/Inputs/Switch.tsx
similarity index 100%
rename from src/components/Switch.tsx
rename to src/components/Inputs/Switch.tsx
diff --git a/src/components/Library/ContentLine.tsx b/src/components/Library/ContentLine.tsx
index 0419d53..167eeff 100644
--- a/src/components/Library/ContentLine.tsx
+++ b/src/components/Library/ContentLine.tsx
@@ -1,4 +1,4 @@
-import Button from "components/Button";
+import Button from "components/Inputs/Button";
 import Chip from "components/Chip";
 import { GetLibraryItemQuery } from "graphql/generated";
 import { AppStaticProps } from "queries/getAppStaticProps";
diff --git a/src/components/Library/ScanSet.tsx b/src/components/Library/ScanSet.tsx
index 22411d4..5931edc 100644
--- a/src/components/Library/ScanSet.tsx
+++ b/src/components/Library/ScanSet.tsx
@@ -1,7 +1,7 @@
-import Button from "components/Button";
+import Button from "components/Inputs/Button";
 import Chip from "components/Chip";
 import Img, { getAssetURL, ImageQuality } from "components/Img";
-import LanguageSwitcher from "components/LanguageSwitcher";
+import LanguageSwitcher from "components/Inputs/LanguageSwitcher";
 import RecorderChip from "components/RecorderChip";
 import ToolTip from "components/ToolTip";
 import { useAppLayout } from "contexts/AppLayoutContext";
diff --git a/src/components/Library/ScanSetCover.tsx b/src/components/Library/ScanSetCover.tsx
index 3fab3ad..4cbc812 100644
--- a/src/components/Library/ScanSetCover.tsx
+++ b/src/components/Library/ScanSetCover.tsx
@@ -1,6 +1,6 @@
 import Chip from "components/Chip";
 import Img, { getAssetURL, ImageQuality } from "components/Img";
-import LanguageSwitcher from "components/LanguageSwitcher";
+import LanguageSwitcher from "components/Inputs/LanguageSwitcher";
 import RecorderChip from "components/RecorderChip";
 import ToolTip from "components/ToolTip";
 import { useAppLayout } from "contexts/AppLayoutContext";
diff --git a/src/components/PanelComponents/ReturnButton.tsx b/src/components/PanelComponents/ReturnButton.tsx
index c127701..ffd7aa5 100644
--- a/src/components/PanelComponents/ReturnButton.tsx
+++ b/src/components/PanelComponents/ReturnButton.tsx
@@ -1,4 +1,4 @@
-import Button from "components/Button";
+import Button from "components/Inputs/Button";
 import HorizontalLine from "components/HorizontalLine";
 import { useAppLayout } from "contexts/AppLayoutContext";
 import { AppStaticProps } from "queries/getAppStaticProps";
diff --git a/src/components/Panels/MainPanel.tsx b/src/components/Panels/MainPanel.tsx
index 00de67e..ef742e2 100644
--- a/src/components/Panels/MainPanel.tsx
+++ b/src/components/Panels/MainPanel.tsx
@@ -1,4 +1,4 @@
-import Button from "components/Button";
+import Button from "components/Inputs/Button";
 import HorizontalLine from "components/HorizontalLine";
 import NavOption from "components/PanelComponents/NavOption";
 import ToolTip from "components/ToolTip";
diff --git a/src/components/Post.tsx b/src/components/Post.tsx
index 9de74b9..570302f 100644
--- a/src/components/Post.tsx
+++ b/src/components/Post.tsx
@@ -11,7 +11,7 @@ import { useEffect, useMemo, useState } from "react";
 import AppLayout from "./AppLayout";
 import Chip from "./Chip";
 import HorizontalLine from "./HorizontalLine";
-import LanguageSwitcher from "./LanguageSwitcher";
+import LanguageSwitcher from "./Inputs/LanguageSwitcher";
 import Markdawn from "./Markdown/Markdawn";
 import TOC from "./Markdown/TOC";
 import ReturnButton, { ReturnButtonType } from "./PanelComponents/ReturnButton";
diff --git a/src/components/RecorderChip.tsx b/src/components/RecorderChip.tsx
index cf82c0e..3866bc0 100644
--- a/src/components/RecorderChip.tsx
+++ b/src/components/RecorderChip.tsx
@@ -1,7 +1,7 @@
 import Chip from "components/Chip";
 import { RecorderChipFragment } from "graphql/generated";
 import { AppStaticProps } from "queries/getAppStaticProps";
-import Button from "./Button";
+import Button from "./Inputs/Button";
 import Img, { ImageQuality } from "./Img";
 import ToolTip from "./ToolTip";
 
diff --git a/src/pages/archives/videos/c/[uid].tsx b/src/pages/archives/videos/c/[uid].tsx
index 9cdb88c..337c561 100644
--- a/src/pages/archives/videos/c/[uid].tsx
+++ b/src/pages/archives/videos/c/[uid].tsx
@@ -7,7 +7,7 @@ import ContentPanel, {
   ContentPanelWidthSizes,
 } from "components/Panels/ContentPanel";
 import SubPanel from "components/Panels/SubPanel";
-import Switch from "components/Switch";
+import Switch from "components/Inputs/Switch";
 import ThumbnailPreview from "components/PreviewCard";
 import { GetVideoChannelQuery } from "graphql/generated";
 import { getReadySdk } from "graphql/sdk";
diff --git a/src/pages/archives/videos/index.tsx b/src/pages/archives/videos/index.tsx
index d661e0b..4479cf8 100644
--- a/src/pages/archives/videos/index.tsx
+++ b/src/pages/archives/videos/index.tsx
@@ -1,5 +1,5 @@
 import AppLayout from "components/AppLayout";
-import PageSelector from "components/PageSelector";
+import PageSelector from "components/Inputs/PageSelector";
 import PanelHeader from "components/PanelComponents/PanelHeader";
 import ReturnButton, {
   ReturnButtonType,
@@ -8,7 +8,7 @@ import ContentPanel, {
   ContentPanelWidthSizes,
 } from "components/Panels/ContentPanel";
 import SubPanel from "components/Panels/SubPanel";
-import Switch from "components/Switch";
+import Switch from "components/Inputs/Switch";
 import ThumbnailPreview from "components/PreviewCard";
 import { GetVideosPreviewQuery } from "graphql/generated";
 import { getReadySdk } from "graphql/sdk";
diff --git a/src/pages/archives/videos/v/[uid].tsx b/src/pages/archives/videos/v/[uid].tsx
index 84f6860..72c89e5 100644
--- a/src/pages/archives/videos/v/[uid].tsx
+++ b/src/pages/archives/videos/v/[uid].tsx
@@ -1,5 +1,5 @@
 import AppLayout from "components/AppLayout";
-import Button from "components/Button";
+import Button from "components/Inputs/Button";
 import HorizontalLine from "components/HorizontalLine";
 import InsetBox from "components/InsetBox";
 import NavOption from "components/PanelComponents/NavOption";
diff --git a/src/pages/contents/[slug]/index.tsx b/src/pages/contents/[slug]/index.tsx
index 2d741bc..d159032 100644
--- a/src/pages/contents/[slug]/index.tsx
+++ b/src/pages/contents/[slug]/index.tsx
@@ -1,7 +1,7 @@
 import AppLayout from "components/AppLayout";
 import Chip from "components/Chip";
 import HorizontalLine from "components/HorizontalLine";
-import LanguageSwitcher from "components/LanguageSwitcher";
+import LanguageSwitcher from "components/Inputs/LanguageSwitcher";
 import Markdawn from "components/Markdown/Markdawn";
 import TOC from "components/Markdown/TOC";
 import ReturnButton, {
diff --git a/src/pages/contents/index.tsx b/src/pages/contents/index.tsx
index 1967461..d84c82f 100644
--- a/src/pages/contents/index.tsx
+++ b/src/pages/contents/index.tsx
@@ -5,8 +5,8 @@ import ContentPanel, {
   ContentPanelWidthSizes,
 } from "components/Panels/ContentPanel";
 import SubPanel from "components/Panels/SubPanel";
-import Select from "components/Select";
-import Switch from "components/Switch";
+import Select from "components/Inputs/Select";
+import Switch from "components/Inputs/Switch";
 import ThumbnailPreview from "components/PreviewCard";
 import { GetContentsQuery } from "graphql/generated";
 import { getReadySdk } from "graphql/sdk";
diff --git a/src/pages/dev/editor.tsx b/src/pages/dev/editor.tsx
index ec0cceb..4311a6e 100644
--- a/src/pages/dev/editor.tsx
+++ b/src/pages/dev/editor.tsx
@@ -1,5 +1,5 @@
 import AppLayout from "components/AppLayout";
-import Button from "components/Button";
+import Button from "components/Inputs/Button";
 import Markdawn from "components/Markdown/Markdawn";
 import ContentPanel, {
   ContentPanelWidthSizes,
diff --git a/src/pages/library/[slug]/index.tsx b/src/pages/library/[slug]/index.tsx
index f09d553..318c78b 100644
--- a/src/pages/library/[slug]/index.tsx
+++ b/src/pages/library/[slug]/index.tsx
@@ -1,5 +1,5 @@
 import AppLayout from "components/AppLayout";
-import Button from "components/Button";
+import Button from "components/Inputs/Button";
 import Chip from "components/Chip";
 import Img, { getAssetURL, ImageQuality } from "components/Img";
 import InsetBox from "components/InsetBox";
@@ -13,7 +13,7 @@ import ContentPanel, {
   ContentPanelWidthSizes,
 } from "components/Panels/ContentPanel";
 import SubPanel from "components/Panels/SubPanel";
-import Switch from "components/Switch";
+import Switch from "components/Inputs/Switch";
 import ThumbnailPreview from "components/PreviewCard";
 import { useAppLayout } from "contexts/AppLayoutContext";
 import {
diff --git a/src/pages/library/index.tsx b/src/pages/library/index.tsx
index 1fb77a1..160e39a 100644
--- a/src/pages/library/index.tsx
+++ b/src/pages/library/index.tsx
@@ -5,8 +5,8 @@ import ContentPanel, {
   ContentPanelWidthSizes,
 } from "components/Panels/ContentPanel";
 import SubPanel from "components/Panels/SubPanel";
-import Select from "components/Select";
-import Switch from "components/Switch";
+import Select from "components/Inputs/Select";
+import Switch from "components/Inputs/Switch";
 import ThumbnailPreview from "components/PreviewCard";
 import { GetLibraryItemsPreviewQuery } from "graphql/generated";
 import { getReadySdk } from "graphql/sdk";
diff --git a/src/pages/news/index.tsx b/src/pages/news/index.tsx
index 020fe1f..5ed6f5d 100644
--- a/src/pages/news/index.tsx
+++ b/src/pages/news/index.tsx
@@ -4,7 +4,7 @@ import ContentPanel, {
   ContentPanelWidthSizes,
 } from "components/Panels/ContentPanel";
 import SubPanel from "components/Panels/SubPanel";
-import Switch from "components/Switch";
+import Switch from "components/Inputs/Switch";
 import ThumbnailPreview from "components/PreviewCard";
 import { GetPostsPreviewQuery } from "graphql/generated";
 import { getReadySdk } from "graphql/sdk";