diff --git a/.vscode/settings.json b/.vscode/settings.json
index dddfcf15..42996c0b 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -20,6 +20,7 @@
     "Eterna",
     "exif",
     "exiftool",
+    "fieldset",
     "favicons",
     "Favoriting",
     "favs",
diff --git a/app/admin/baseline/page.tsx b/app/admin/baseline/page.tsx
index 9b975fc0..167a67d7 100644
--- a/app/admin/baseline/page.tsx
+++ b/app/admin/baseline/page.tsx
@@ -3,7 +3,7 @@
 import PhotoCamera from '@/camera/PhotoCamera';
 import Badge from '@/components/Badge';
 import DivDebugBaselineGrid from '@/components/DivDebugBaselineGrid';
-import FieldSetWithStatus from '@/components/FieldSetWithStatus';
+import FieldsetWithStatus from '@/components/form/FieldsetWithStatus';
 import AppGrid from '@/components/AppGrid';
 import EntityLink from '@/components/entity/EntityLink';
 import LabeledIcon from '@/components/primitives/LabeledIcon';
@@ -45,13 +45,13 @@ export default function ComponentsPage() {
             'flex gap-1',
             '*:inline-flex *:gap-1 [&_input]:-translate-y-0.5',
           )}>
-            <FieldSetWithStatus
+            <FieldsetWithStatus
               label="Grid"
               type="checkbox"
               value={shouldShowBaselineGrid ? 'true' : 'false'}
               onChange={e => setShouldShowBaselineGrid?.(e === 'true')}
             />
-            <FieldSetWithStatus
+            <FieldsetWithStatus
               label="Components"
               type="checkbox"
               value={debugComponents ? 'true' : 'false'}
diff --git a/app/admin/components/page.tsx b/app/admin/components/page.tsx
index 6c99327d..8c48522f 100644
--- a/app/admin/components/page.tsx
+++ b/app/admin/components/page.tsx
@@ -2,7 +2,7 @@
 
 import PhotoTagFieldset from '@/admin/PhotoTagFieldset';
 import AppGrid from '@/components/AppGrid';
-import FieldSetWithStatus from '@/components/FieldSetWithStatus';
+import FieldsetWithStatus from '@/components/form/FieldsetWithStatus';
 import IconHidden from '@/components/icons/IconHidden';
 import IconLock from '@/components/icons/IconLock';
 import SelectMenu from '@/components/SelectMenu';
@@ -42,7 +42,7 @@ export default function ComponentsPage() {
           />
         </div>
         <div className="z-11">
-          <FieldSetWithStatus
+          <FieldsetWithStatus
             label="Select"
             value="tag-1"
             selectOptions={[{
diff --git a/src/admin/AdminBatchUploadActions.tsx b/src/admin/AdminBatchUploadActions.tsx
index 0486f95e..3df8f40e 100644
--- a/src/admin/AdminBatchUploadActions.tsx
+++ b/src/admin/AdminBatchUploadActions.tsx
@@ -1,7 +1,7 @@
 'use client';
 
 import ErrorNote from '@/components/ErrorNote';
-import FieldSetWithStatus from '@/components/FieldSetWithStatus';
+import FieldsetWithStatus from '@/components/form/FieldsetWithStatus';
 import Container from '@/components/Container';
 import { addUploadsAction } from '@/photo/actions';
 import { PATH_ADMIN_PHOTOS } from '@/app/paths';
@@ -136,7 +136,7 @@ export default function AdminBatchUploadActions({
                 ? `Apply to ${pluralize(uploadUrls.length, 'upload')}`
                 : `Found ${pluralize(uploadUrls.length, 'upload')}`}
             </div>
-            <FieldSetWithStatus
+            <FieldsetWithStatus
               label="Apply to All"
               type="checkbox"
               value={showBulkSettings ? 'true' : 'false'}
diff --git a/src/admin/AdminRecipeForm.tsx b/src/admin/AdminRecipeForm.tsx
index cd7163a2..d8c19ac7 100644
--- a/src/admin/AdminRecipeForm.tsx
+++ b/src/admin/AdminRecipeForm.tsx
@@ -3,7 +3,7 @@
 import SubmitButtonWithStatus from '@/components/SubmitButtonWithStatus';
 import Link from 'next/link';
 import { PATH_ADMIN_RECIPES } from '@/app/paths';
-import FieldSetWithStatus from '@/components/FieldSetWithStatus';
+import FieldsetWithStatus from '@/components/form/FieldsetWithStatus';
 import { ReactNode, useMemo, useState } from 'react';
 import { renamePhotoRecipeGloballyAction } from '@/photo/actions';
 import { parameterize } from '@/utility/string';
@@ -34,7 +34,7 @@ export default function AdminRecipeForm({
       action={renamePhotoRecipeGloballyAction}
       className="space-y-8"
     >
-      <FieldSetWithStatus
+      <FieldsetWithStatus
         label="New Recipe Name"
         value={updatedRecipeRaw}
         onChange={setUpdatedRecipeRaw}
diff --git a/src/admin/AdminTagForm.tsx b/src/admin/AdminTagForm.tsx
index a2ab86e7..5c139d3f 100644
--- a/src/admin/AdminTagForm.tsx
+++ b/src/admin/AdminTagForm.tsx
@@ -3,7 +3,7 @@
 import SubmitButtonWithStatus from '@/components/SubmitButtonWithStatus';
 import Link from 'next/link';
 import { PATH_ADMIN_TAGS } from '@/app/paths';
-import FieldSetWithStatus from '@/components/FieldSetWithStatus';
+import FieldsetWithStatus from '@/components/form/FieldsetWithStatus';
 import { ReactNode, useMemo, useState } from 'react';
 import { renamePhotoTagGloballyAction } from '@/photo/actions';
 import { parameterize } from '@/utility/string';
@@ -34,7 +34,7 @@ export default function AdminTagForm({
       action={renamePhotoTagGloballyAction}
       className="space-y-8"
     >
-      <FieldSetWithStatus
+      <FieldsetWithStatus
         label="New Tag Name"
         value={updatedTagRaw}
         onChange={setUpdatedTagRaw}
diff --git a/src/admin/AdminUploadsTableRow.tsx b/src/admin/AdminUploadsTableRow.tsx
index d98fa9b7..5f86ccdf 100644
--- a/src/admin/AdminUploadsTableRow.tsx
+++ b/src/admin/AdminUploadsTableRow.tsx
@@ -12,7 +12,7 @@ import { pathForAdminUploadUrl } from '@/app/paths';
 import DeleteUploadButton from './DeleteUploadButton';
 import { Dispatch, SetStateAction, useEffect, useRef } from 'react';
 import { isElementEntirelyInViewport } from '@/utility/dom';
-import FieldSetWithStatus from '@/components/FieldSetWithStatus';
+import FieldsetWithStatus from '@/components/form/FieldsetWithStatus';
 import EditButton from './EditButton';
 import AddUploadButton from './AddUploadButton';
 
@@ -105,7 +105,7 @@ export default function AdminUploadsTableRow({
       )}>
         <div className="flex flex-col gap-6 w-full">
           <div className="flex flex-col grow gap-2">
-            <FieldSetWithStatus
+            <FieldsetWithStatus
               label="Title"
               value={draftTitle}
               onChange={titleUpdated =>
diff --git a/src/admin/PhotoTagFieldset.tsx b/src/admin/PhotoTagFieldset.tsx
index 17ff1464..39af09fe 100644
--- a/src/admin/PhotoTagFieldset.tsx
+++ b/src/admin/PhotoTagFieldset.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import FieldSetWithStatus from '@/components/FieldSetWithStatus';
+import FieldsetWithStatus from '@/components/form/FieldsetWithStatus';
 import { useAppText } from '@/i18n/state/client';
 import { convertTagsForForm, getValidationMessageForTags, Tags } from '@/tag';
 import { ComponentProps, useEffect, useRef, useState } from 'react';
@@ -12,7 +12,7 @@ export default function PhotoTagFieldset(props: {
   onError?: (error: string) => void
   openOnLoad?: boolean
 } & Partial<Omit<
-  ComponentProps<typeof FieldSetWithStatus>,
+  ComponentProps<typeof FieldsetWithStatus>,
   'tagOptions'
 >>) {
   const {
@@ -41,7 +41,7 @@ export default function PhotoTagFieldset(props: {
   
   return (
     <div ref={ref}>
-      <FieldSetWithStatus
+      <FieldsetWithStatus
         {...rest}
         inputRef={ref}
         label="Tags"
diff --git a/src/auth/SignInForm.tsx b/src/auth/SignInForm.tsx
index 5526a9f3..33b0ecde 100644
--- a/src/auth/SignInForm.tsx
+++ b/src/auth/SignInForm.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import FieldSetWithStatus from '@/components/FieldSetWithStatus';
+import FieldsetWithStatus from '@/components/form/FieldsetWithStatus';
 import Container from '@/components/Container';
 import SubmitButtonWithStatus from '@/components/SubmitButtonWithStatus';
 import {
@@ -92,7 +92,7 @@ export default function SignInForm({
               {appText.auth.invalidEmailPassword}
             </ErrorNote>}
           <div className="space-y-4 w-full">
-            <FieldSetWithStatus
+            <FieldsetWithStatus
               id="email"
               inputRef={emailRef}
               label={appText.auth.email}
@@ -100,7 +100,7 @@ export default function SignInForm({
               value={email}
               onChange={setEmail}
             />
-            <FieldSetWithStatus
+            <FieldsetWithStatus
               id="password"
               label={appText.auth.password}
               type="password"
diff --git a/src/components/FieldSetWithStatus.tsx b/src/components/form/FieldsetWithStatus.tsx
similarity index 95%
rename from src/components/FieldSetWithStatus.tsx
rename to src/components/form/FieldsetWithStatus.tsx
index b25ccc84..b9050196 100644
--- a/src/components/FieldSetWithStatus.tsx
+++ b/src/components/form/FieldsetWithStatus.tsx
@@ -2,18 +2,18 @@
 
 import { InputHTMLAttributes, useRef, RefObject, ReactNode } from 'react';
 import { useFormStatus } from 'react-dom';
-import Spinner from './Spinner';
+import Spinner from '../Spinner';
 import { clsx } from 'clsx/lite';
 import { FieldSetType, AnnotatedTag } from '@/photo/form';
-import TagInput from './TagInput';
+import TagInput from '../TagInput';
 import { parameterize } from '@/utility/string';
-import Checkbox from './Checkbox';
-import ResponsiveText from './primitives/ResponsiveText';
-import Tooltip from './Tooltip';
-import { SelectMenuOptionType } from './SelectMenuOption';
-import SelectMenu from './SelectMenu';
+import Checkbox from '../Checkbox';
+import ResponsiveText from '../primitives/ResponsiveText';
+import Tooltip from '../Tooltip';
+import { SelectMenuOptionType } from '../SelectMenuOption';
+import SelectMenu from '../SelectMenu';
 
-export default function FieldSetWithStatus({
+export default function FieldsetWithStatus({
   id: _id,
   label,
   icon,
diff --git a/src/photo/form/ApplyRecipesGloballyCheckbox.tsx b/src/photo/form/ApplyRecipesGloballyCheckbox.tsx
index 38754a77..3a02570d 100644
--- a/src/photo/form/ApplyRecipesGloballyCheckbox.tsx
+++ b/src/photo/form/ApplyRecipesGloballyCheckbox.tsx
@@ -1,4 +1,4 @@
-import FieldSetWithStatus from '@/components/FieldSetWithStatus';
+import FieldsetWithStatus from '@/components/form/FieldsetWithStatus';
 import { ComponentProps, useEffect, useState } from 'react';
 import { getPhotosNeedingRecipeTitleCountAction } from '../actions';
 
@@ -10,7 +10,7 @@ export default function ApplyRecipeTitleGloballyCheckbox({
   film,
   onMatchResults,
   ...props
-}: ComponentProps<typeof FieldSetWithStatus> & {
+}: ComponentProps<typeof FieldsetWithStatus> & {
   photoId?: string
   recipeTitle?: string
   hasRecipeTitleChanged?: boolean
@@ -40,7 +40,7 @@ export default function ApplyRecipeTitleGloballyCheckbox({
 
   return (
     shouldShowFieldSet
-      ? <FieldSetWithStatus {...{
+      ? <FieldsetWithStatus {...{
         ...props,
         label: loading
           ? 'Scanning photos for matching recipes ...'
diff --git a/src/photo/form/FieldsetFavs.tsx b/src/photo/form/FieldsetFavs.tsx
index 122e273d..cf5b67d8 100644
--- a/src/photo/form/FieldsetFavs.tsx
+++ b/src/photo/form/FieldsetFavs.tsx
@@ -1,13 +1,13 @@
 import { ComponentProps } from 'react';
-import FieldSetWithStatus from '@/components/FieldSetWithStatus';
+import FieldsetWithStatus from '@/components/form/FieldsetWithStatus';
 import IconFavs from '@/components/icons/IconFavs';
 
 export default function FieldsetFavs(props: Omit<
-  ComponentProps<typeof FieldSetWithStatus>,
+  ComponentProps<typeof FieldsetWithStatus>,
   'label' | 'icon' | 'type'
 >) {
   return (
-    <FieldSetWithStatus
+    <FieldsetWithStatus
       {...props}
       label="Favorite"
       type="checkbox"
diff --git a/src/photo/form/PhotoForm.tsx b/src/photo/form/PhotoForm.tsx
index 5218c8e2..d9158faf 100644
--- a/src/photo/form/PhotoForm.tsx
+++ b/src/photo/form/PhotoForm.tsx
@@ -19,7 +19,7 @@ import {
   getFormErrors,
   isFormValid,
 } from '.';
-import FieldSetWithStatus from '@/components/FieldSetWithStatus';
+import FieldsetWithStatus from '@/components/form/FieldsetWithStatus';
 import { createPhotoAction, updatePhotoAction } from '../actions';
 import SubmitButtonWithStatus from '@/components/SubmitButtonWithStatus';
 import Link from 'next/link';
@@ -367,7 +367,7 @@ export default function PhotoForm({
               staticValue,
             }]) => {
               if (!isFieldHidden(key, hideIfEmpty, shouldHide)) {
-                const fieldProps: ComponentProps<typeof FieldSetWithStatus> = {
+                const fieldProps: ComponentProps<typeof FieldsetWithStatus> = {
                   id: key,
                   label: label + (
                     key === 'blurData' && shouldDebugImageFallbacks
@@ -424,7 +424,7 @@ export default function PhotoForm({
 
                 switch (key) {
                 case 'film':
-                  return <FieldSetWithStatus
+                  return <FieldsetWithStatus
                     key={key}
                     {...fieldProps}
                     tagOptionsDefaultIcon={<span
@@ -462,7 +462,7 @@ export default function PhotoForm({
                     {...fieldProps}
                   />;
                 default:
-                  return <FieldSetWithStatus
+                  return <FieldsetWithStatus
                     key={key}
                     {...fieldProps}
                   />;
diff --git a/src/photo/visibility/FieldsetVisibility.tsx b/src/photo/visibility/FieldsetVisibility.tsx
index 6755ac7b..d00ada6e 100644
--- a/src/photo/visibility/FieldsetVisibility.tsx
+++ b/src/photo/visibility/FieldsetVisibility.tsx
@@ -1,4 +1,4 @@
-import FieldSetWithStatus from '@/components/FieldSetWithStatus';
+import FieldsetWithStatus from '@/components/form/FieldsetWithStatus';
 import { ComponentProps, Dispatch, SetStateAction } from 'react';
 import {
   getVisibilityValue,
@@ -16,9 +16,9 @@ export default function FieldsetVisibility({
   label?: string
   formData: Partial<PhotoFormData>
   setFormData: Dispatch<SetStateAction<Partial<PhotoFormData>>>
-} & Omit<ComponentProps<typeof FieldSetWithStatus>, 'label' | 'value'>) {
+} & Omit<ComponentProps<typeof FieldsetWithStatus>, 'label' | 'value'>) {
   return (
-    <FieldSetWithStatus
+    <FieldsetWithStatus
       label="Visibility"
       {...props}
       selectOptions={VISIBILITY_OPTIONS}