diff --git a/src/lib/components/forms/Field.svelte b/src/lib/components/common/Field.svelte
similarity index 67%
rename from src/lib/components/forms/Field.svelte
rename to src/lib/components/common/Field.svelte
index e064f969e..e496837c8 100644
--- a/src/lib/components/forms/Field.svelte
+++ b/src/lib/components/common/Field.svelte
@@ -1,3 +1,9 @@
+<!-- @component
+  Field is a presentational component for displaying inputs.
+  It has a slot for displaying styled "help" text,
+  for providing more instruction on a field's purpose or meaning.
+-->
+
 <script lang="ts">
   import Flex from "$lib/components/common/Flex.svelte";
 
diff --git a/src/lib/components/forms/FieldLabel.svelte b/src/lib/components/common/FieldLabel.svelte
similarity index 77%
rename from src/lib/components/forms/FieldLabel.svelte
rename to src/lib/components/common/FieldLabel.svelte
index ce6df5144..d06ce7b9c 100644
--- a/src/lib/components/forms/FieldLabel.svelte
+++ b/src/lib/components/common/FieldLabel.svelte
@@ -1,6 +1,11 @@
+<!-- @component
+  FieldLabel is a presentational component for giving title and details about a field.
+  It has props for whether the field is required or exclusive to premium account holders.
+-->
+
 <script lang="ts">
   import PremiumBadge from "@/premium-credits/PremiumBadge.svelte";
-  import Flex from "$lib/components/common/Flex.svelte";
+  import Flex from "./Flex.svelte";
 
   export let required = false;
   export let premium = false;
diff --git a/src/lib/components/forms/stories/FieldLabel.stories.svelte b/src/lib/components/common/stories/FieldLabel.stories.svelte
similarity index 87%
rename from src/lib/components/forms/stories/FieldLabel.stories.svelte
rename to src/lib/components/common/stories/FieldLabel.stories.svelte
index b69192c6b..963c8ca1e 100644
--- a/src/lib/components/forms/stories/FieldLabel.stories.svelte
+++ b/src/lib/components/common/stories/FieldLabel.stories.svelte
@@ -1,10 +1,10 @@
 <script context="module" lang="ts">
   import { Template, Story } from "@storybook/addon-svelte-csf";
-  import FieldLabel from "../FieldLabel.svelte";
+  import FieldLabel from "..//FieldLabel.svelte";
   import { Infinity16 } from "svelte-octicons";
 
   export const meta = {
-    title: "Components / Forms / Inputs / Field Label",
+    title: "Components / Common / Field Label",
     component: FieldLabel,
     tags: ["autodocs"],
     parameters: { layout: "centered" },
diff --git a/src/lib/components/common/stories/PageToolbar.stories.svelte b/src/lib/components/common/stories/PageToolbar.stories.svelte
index f7460db13..853bcca90 100644
--- a/src/lib/components/common/stories/PageToolbar.stories.svelte
+++ b/src/lib/components/common/stories/PageToolbar.stories.svelte
@@ -1,7 +1,7 @@
 <script context="module" lang="ts">
   import { Story } from "@storybook/addon-svelte-csf";
   import PageToolbar from "../PageToolbar.svelte";
-  import Checkbox from "../Checkbox.svelte";
+  import Checkbox from "../../inputs/Checkbox.svelte";
   import Paginator from "@/common/Paginator.svelte";
 
   export const meta = {
diff --git a/src/lib/components/forms/DocumentUpload.svelte b/src/lib/components/forms/DocumentUpload.svelte
index 02f97e39d..ae45d92a0 100644
--- a/src/lib/components/forms/DocumentUpload.svelte
+++ b/src/lib/components/forms/DocumentUpload.svelte
@@ -3,18 +3,19 @@
   import { _ } from "svelte-i18n";
   import { File16, File24, Upload16, XCircleFill24 } from "svelte-octicons";
 
-  import AccessLevel from "./AccessLevel.svelte";
   import Button from "../common/Button.svelte";
-  import Dropzone from "./Dropzone.svelte";
   import Empty from "../common/Empty.svelte";
-  import Field from "./Field.svelte";
-  import FieldLabel from "./FieldLabel.svelte";
-  import Flex from "$lib/components/common/Flex.svelte";
-  import InputFile from "./InputFile.svelte";
-  import InputSelect from "./InputSelect.svelte";
-  import InputText from "./InputText.svelte";
+  import Field from "../common/Field.svelte";
+  import FieldLabel from "../common/FieldLabel.svelte";
+  import Flex from "../common/Flex.svelte";
   import Premium from "../common/Premium.svelte";
-  import Switch from "$lib/components/common/Switch.svelte";
+
+  import AccessLevel from "../inputs/AccessLevel.svelte";
+  import Dropzone from "../inputs/Dropzone.svelte";
+  import FileInput from "../inputs/File.svelte";
+  import Select from "../inputs/Select.svelte";
+  import Switch from "../inputs/Switch.svelte";
+  import Text from "../inputs/Text.svelte";
 
   import { DOCUMENT_TYPES } from "@/config/config.js";
   import { removeUnsupportedTypes } from "@/lib/utils/validateFiles";
@@ -107,7 +108,7 @@
               {formatFileType(file.type)} / {filesize(file.size)}
             </p>
             <div class="title">
-              <InputText name="title" bind:value={file.name} />
+              <Text name="title" bind:value={file.name} />
             </div>
             <button
               class="fileRemove"
@@ -135,8 +136,8 @@
             <p class="drop-instructions">Drag and drop files here</p>
             <Flex align="center" justify="center">
               <span class="drop-instructions-or">or</span>
-              <InputFile multiple onFileSelect={addFiles}
-                ><File16 /> Select Files</InputFile
+              <FileInput multiple onFileSelect={addFiles}
+                ><File16 /> Select Files</FileInput
               >
             </Flex>
           </div>
@@ -151,12 +152,12 @@
         </Field>
         <Field>
           <FieldLabel>Projects</FieldLabel>
-          <InputSelect name="projects" multiple items={projectOptions} />
+          <Select name="projects" multiple items={projectOptions} />
         </Field>
         <hr class="divider" />
         <Field>
           <FieldLabel>OCR Engine</FieldLabel>
-          <InputSelect
+          <Select
             name="ocr_engine"
             items={ocrEngineOptions}
             bind:value={ocrEngine}
diff --git a/src/lib/components/forms/AccessLevel.svelte b/src/lib/components/inputs/AccessLevel.svelte
similarity index 89%
rename from src/lib/components/forms/AccessLevel.svelte
rename to src/lib/components/inputs/AccessLevel.svelte
index 33532644a..51840ab5b 100644
--- a/src/lib/components/forms/AccessLevel.svelte
+++ b/src/lib/components/inputs/AccessLevel.svelte
@@ -10,7 +10,7 @@
 
   interface Level {
     value: access;
-    name: string;
+    title: string;
     description: string;
     icon: typeof SvgComponent;
   }
@@ -18,19 +18,19 @@
   const levels: Level[] = [
     {
       value: "private",
-      name: "Private",
+      title: "Private",
       description: "Documents will only be visible to you",
       icon: Lock24,
     },
     {
       value: "organization",
-      name: "Organization",
+      title: "Organization",
       description: "Documents will only be visible to your organization",
       icon: Organization24,
     },
     {
       value: "public",
-      name: "Public",
+      title: "Public",
       description: "Documents will be publicly visible to everyone",
       icon: Globe24,
     },
@@ -38,9 +38,10 @@
 
   export let name: string;
   export let selected: access = levels[0].value;
+  export let direction: "column" | "row" = "column";
 </script>
 
-<Flex direction="column" gap={0.5}>
+<Flex {direction} gap={0.5}>
   {#each levels as level}
     <div class="option" class:selected={level.value === selected}>
       <input
@@ -55,7 +56,7 @@
         <Flex gap={0.5}>
           <svelte:component this={level.icon} />
           <Flex direction="column" gap={0.125}>
-            <p class="name">{level.name}</p>
+            <p class="title">{level.title}</p>
             <p class="description">{level.description}</p>
           </Flex>
         </Flex>
@@ -66,6 +67,7 @@
 
 <style>
   .option {
+    flex: 1 1 0;
     padding: 0.5rem;
     border-radius: 0.25rem;
     border: 1px solid var(--gray-2, #d8dee2);
@@ -83,7 +85,7 @@
   .detail {
     cursor: pointer;
   }
-  .name {
+  .title {
     font-weight: var(--font-semibold);
   }
   .description {
diff --git a/src/lib/components/common/Checkbox.svelte b/src/lib/components/inputs/Checkbox.svelte
similarity index 100%
rename from src/lib/components/common/Checkbox.svelte
rename to src/lib/components/inputs/Checkbox.svelte
diff --git a/src/lib/components/forms/Dropzone.svelte b/src/lib/components/inputs/Dropzone.svelte
similarity index 100%
rename from src/lib/components/forms/Dropzone.svelte
rename to src/lib/components/inputs/Dropzone.svelte
diff --git a/src/lib/components/forms/InputFile.svelte b/src/lib/components/inputs/File.svelte
similarity index 86%
rename from src/lib/components/forms/InputFile.svelte
rename to src/lib/components/inputs/File.svelte
index 04e7d783a..754a5b620 100644
--- a/src/lib/components/forms/InputFile.svelte
+++ b/src/lib/components/inputs/File.svelte
@@ -1,3 +1,8 @@
+<!-- @component
+  The File input provides a styled wrapper around `<input type="file" />`.
+  It mimics the way our common `Button` component handles displaying children.
+-->
+
 <script lang="ts">
   import type { ComponentProps } from "svelte";
   import { DOCUMENT_TYPES } from "@/config/config.js";
diff --git a/src/lib/components/forms/InputSelect.svelte b/src/lib/components/inputs/Select.svelte
similarity index 98%
rename from src/lib/components/forms/InputSelect.svelte
rename to src/lib/components/inputs/Select.svelte
index 053da5d08..984be9258 100644
--- a/src/lib/components/forms/InputSelect.svelte
+++ b/src/lib/components/inputs/Select.svelte
@@ -1,5 +1,4 @@
-<!-- InputSelect.svelte
-  
+<!-- @component
   `svelte-select` provides a flexible, customizable basis for the InputSelect component.
 
   - https://github.com/rob-balfre/svelte-select
diff --git a/src/lib/components/common/Switch.svelte b/src/lib/components/inputs/Switch.svelte
similarity index 100%
rename from src/lib/components/common/Switch.svelte
rename to src/lib/components/inputs/Switch.svelte
diff --git a/src/lib/components/forms/InputText.svelte b/src/lib/components/inputs/Text.svelte
similarity index 89%
rename from src/lib/components/forms/InputText.svelte
rename to src/lib/components/inputs/Text.svelte
index 1616439cb..f29ba81be 100644
--- a/src/lib/components/forms/InputText.svelte
+++ b/src/lib/components/inputs/Text.svelte
@@ -1,3 +1,7 @@
+<!-- @component
+  The Text input provides styling to the default `<input type="text" … />`.
+-->
+
 <script lang="ts">
   export let name: string = null;
   export let placeholder = "";
diff --git a/src/lib/components/forms/stories/AccessLevel.stories.svelte b/src/lib/components/inputs/stories/AccessLevel.stories.svelte
similarity index 83%
rename from src/lib/components/forms/stories/AccessLevel.stories.svelte
rename to src/lib/components/inputs/stories/AccessLevel.stories.svelte
index b69be1b42..e3ff18ea5 100644
--- a/src/lib/components/forms/stories/AccessLevel.stories.svelte
+++ b/src/lib/components/inputs/stories/AccessLevel.stories.svelte
@@ -3,7 +3,7 @@
   import AccessLevel from "../AccessLevel.svelte";
 
   export const meta = {
-    title: "Components / Documents / Access Level",
+    title: "Components / Inputs / Access Level",
     component: AccessLevel,
     tags: ["autodocs"],
     parameters: { layout: "centered" },
@@ -21,3 +21,4 @@
 <Story name="Private" {args} />
 <Story name="Organization" args={{ ...args, level: "organization" }} />
 <Story name="Public" args={{ ...args, level: "public" }} />
+<Story name="Row" args={{ ...args, direction: "row" }} />
diff --git a/src/lib/components/common/stories/Checkbox.stories.svelte b/src/lib/components/inputs/stories/Checkbox.stories.svelte
similarity index 91%
rename from src/lib/components/common/stories/Checkbox.stories.svelte
rename to src/lib/components/inputs/stories/Checkbox.stories.svelte
index 200064ffd..8f7223e14 100644
--- a/src/lib/components/common/stories/Checkbox.stories.svelte
+++ b/src/lib/components/inputs/stories/Checkbox.stories.svelte
@@ -3,7 +3,7 @@
   import Checkbox from "../Checkbox.svelte";
 
   export const meta = {
-    title: "Components / Common / Checkbox",
+    title: "Components / Inputs / Checkbox",
     component: Checkbox,
     tags: ["autodocs"],
     parameters: { layout: "centered" },
diff --git a/src/lib/components/forms/stories/Dropzone.stories.svelte b/src/lib/components/inputs/stories/Dropzone.stories.svelte
similarity index 96%
rename from src/lib/components/forms/stories/Dropzone.stories.svelte
rename to src/lib/components/inputs/stories/Dropzone.stories.svelte
index 5e179678c..22973f319 100644
--- a/src/lib/components/forms/stories/Dropzone.stories.svelte
+++ b/src/lib/components/inputs/stories/Dropzone.stories.svelte
@@ -10,7 +10,7 @@
   };
 
   export const meta = {
-    title: "Components / Forms / Dropzone",
+    title: "Components / Inputs / Dropzone",
     component: Dropzone,
     tags: ["autodocs"],
     parameters: { layout: "centered" },
diff --git a/src/lib/components/forms/stories/InputFile.stories.svelte b/src/lib/components/inputs/stories/File.stories.svelte
similarity index 75%
rename from src/lib/components/forms/stories/InputFile.stories.svelte
rename to src/lib/components/inputs/stories/File.stories.svelte
index 25a1b257a..c843b9384 100644
--- a/src/lib/components/forms/stories/InputFile.stories.svelte
+++ b/src/lib/components/inputs/stories/File.stories.svelte
@@ -1,11 +1,11 @@
 <script context="module" lang="ts">
   import { Template, Story } from "@storybook/addon-svelte-csf";
   import { action } from "@storybook/addon-actions";
-  import InputFile from "../InputFile.svelte";
+  import File from "../File.svelte";
 
   export const meta = {
-    title: "Components / Forms / Inputs / File",
-    component: InputFile,
+    title: "Components / Inputs / File",
+    component: File,
     tags: ["autodocs"],
   };
 
@@ -17,7 +17,7 @@
 </script>
 
 <Template let:args>
-  <InputFile {...args}>Select Files</InputFile>
+  <File {...args}>Select Files</File>
 </Template>
 
 <Story name="Default" {args} />
diff --git a/src/lib/components/forms/stories/InputSelect.stories.svelte b/src/lib/components/inputs/stories/Select.stories.svelte
similarity index 84%
rename from src/lib/components/forms/stories/InputSelect.stories.svelte
rename to src/lib/components/inputs/stories/Select.stories.svelte
index b02c6f0ef..ce0d53101 100644
--- a/src/lib/components/forms/stories/InputSelect.stories.svelte
+++ b/src/lib/components/inputs/stories/Select.stories.svelte
@@ -1,10 +1,10 @@
 <script context="module" lang="ts">
   import { Template, Story } from "@storybook/addon-svelte-csf";
-  import InputSelect from "../InputSelect.svelte";
+  import Select from "../Select.svelte";
 
   export const meta = {
-    title: "Components / Forms / Inputs / Select",
-    component: InputSelect,
+    title: "Components / Inputs / Select",
+    component: Select,
     tags: ["autodocs"],
   };
 
@@ -22,7 +22,7 @@
 </script>
 
 <Template let:args>
-  <InputSelect {...args} />
+  <Select {...args} />
 </Template>
 
 <Story name="Empty" {args} />
diff --git a/src/lib/components/common/stories/Switch.stories.svelte b/src/lib/components/inputs/stories/Switch.stories.svelte
similarity index 91%
rename from src/lib/components/common/stories/Switch.stories.svelte
rename to src/lib/components/inputs/stories/Switch.stories.svelte
index 69df47d4d..03f0b05e2 100644
--- a/src/lib/components/common/stories/Switch.stories.svelte
+++ b/src/lib/components/inputs/stories/Switch.stories.svelte
@@ -3,7 +3,7 @@
   import Switch from "../Switch.svelte";
 
   export const meta = {
-    title: "Components / Common / Inputs / Switch",
+    title: "Components / Inputs / Switch",
     component: Switch,
     tags: ["autodocs"],
     parameters: { layout: "centered" },
diff --git a/src/lib/components/forms/stories/InputText.stories.svelte b/src/lib/components/inputs/stories/Text.stories.svelte
similarity index 73%
rename from src/lib/components/forms/stories/InputText.stories.svelte
rename to src/lib/components/inputs/stories/Text.stories.svelte
index ef4950c12..02a66cf31 100644
--- a/src/lib/components/forms/stories/InputText.stories.svelte
+++ b/src/lib/components/inputs/stories/Text.stories.svelte
@@ -1,10 +1,10 @@
 <script context="module" lang="ts">
   import { Template, Story } from "@storybook/addon-svelte-csf";
-  import InputText from "../InputText.svelte";
+  import Text from "../Text.svelte";
 
   export const meta = {
-    title: "Components / Forms / Inputs / Text",
-    component: InputText,
+    title: "Components / Inputs / Text",
+    component: Text,
     tags: ["autodocs"],
     parameters: { layout: "centered" },
   };
@@ -15,7 +15,7 @@
 </script>
 
 <Template let:args>
-  <InputText {...args} />
+  <Text {...args} />
 </Template>
 
 <Story name="Empty" {args} />