diff --git a/app/admin/baseline/page.tsx b/app/admin/baseline/page.tsx
index 167a67d7..631c15b1 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/form/FieldsetWithStatus';
+import FieldsetWithStatus from '@/components/FieldsetWithStatus';
 import AppGrid from '@/components/AppGrid';
 import EntityLink from '@/components/entity/EntityLink';
 import LabeledIcon from '@/components/primitives/LabeledIcon';
diff --git a/app/admin/components/page.tsx b/app/admin/components/page.tsx
index 8c48522f..397353a6 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/form/FieldsetWithStatus';
+import FieldsetWithStatus from '@/components/FieldsetWithStatus';
 import IconHidden from '@/components/icons/IconHidden';
 import IconLock from '@/components/icons/IconLock';
 import SelectMenu from '@/components/SelectMenu';
diff --git a/src/admin/AdminBatchUploadActions.tsx b/src/admin/AdminBatchUploadActions.tsx
index 3df8f40e..a2b6e8bd 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/form/FieldsetWithStatus';
+import FieldsetWithStatus from '@/components/FieldsetWithStatus';
 import Container from '@/components/Container';
 import { addUploadsAction } from '@/photo/actions';
 import { PATH_ADMIN_PHOTOS } from '@/app/paths';
diff --git a/src/admin/AdminRecipeForm.tsx b/src/admin/AdminRecipeForm.tsx
index d8c19ac7..36a894fc 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/form/FieldsetWithStatus';
+import FieldsetWithStatus from '@/components/FieldsetWithStatus';
 import { ReactNode, useMemo, useState } from 'react';
 import { renamePhotoRecipeGloballyAction } from '@/photo/actions';
 import { parameterize } from '@/utility/string';
diff --git a/src/admin/AdminTagForm.tsx b/src/admin/AdminTagForm.tsx
index 5c139d3f..3f067e8a 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/form/FieldsetWithStatus';
+import FieldsetWithStatus from '@/components/FieldsetWithStatus';
 import { ReactNode, useMemo, useState } from 'react';
 import { renamePhotoTagGloballyAction } from '@/photo/actions';
 import { parameterize } from '@/utility/string';
diff --git a/src/admin/AdminUploadsTableRow.tsx b/src/admin/AdminUploadsTableRow.tsx
index 5f86ccdf..bf2dda94 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/form/FieldsetWithStatus';
+import FieldsetWithStatus from '@/components/FieldsetWithStatus';
 import EditButton from './EditButton';
 import AddUploadButton from './AddUploadButton';
 
diff --git a/src/admin/PhotoTagFieldset.tsx b/src/admin/PhotoTagFieldset.tsx
index 39af09fe..5c72a409 100644
--- a/src/admin/PhotoTagFieldset.tsx
+++ b/src/admin/PhotoTagFieldset.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import FieldsetWithStatus from '@/components/form/FieldsetWithStatus';
+import FieldsetWithStatus from '@/components/FieldsetWithStatus';
 import { useAppText } from '@/i18n/state/client';
 import { convertTagsForForm, getValidationMessageForTags, Tags } from '@/tag';
 import { ComponentProps, useEffect, useRef, useState } from 'react';
diff --git a/src/auth/SignInForm.tsx b/src/auth/SignInForm.tsx
index 33b0ecde..7f137f6f 100644
--- a/src/auth/SignInForm.tsx
+++ b/src/auth/SignInForm.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import FieldsetWithStatus from '@/components/form/FieldsetWithStatus';
+import FieldsetWithStatus from '@/components/FieldsetWithStatus';
 import Container from '@/components/Container';
 import SubmitButtonWithStatus from '@/components/SubmitButtonWithStatus';
 import {
diff --git a/src/components/form/FieldsetWithStatus.tsx b/src/components/FieldsetWithStatus.tsx
similarity index 95%
rename from src/components/form/FieldsetWithStatus.tsx
rename to src/components/FieldsetWithStatus.tsx
index b9050196..c9c1e811 100644
--- a/src/components/form/FieldsetWithStatus.tsx
+++ b/src/components/FieldsetWithStatus.tsx
@@ -2,16 +2,16 @@
 
 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({
   id: _id,
diff --git a/src/photo/form/ApplyRecipesGloballyCheckbox.tsx b/src/photo/form/ApplyRecipesGloballyCheckbox.tsx
index 3a02570d..93f44e22 100644
--- a/src/photo/form/ApplyRecipesGloballyCheckbox.tsx
+++ b/src/photo/form/ApplyRecipesGloballyCheckbox.tsx
@@ -1,4 +1,4 @@
-import FieldsetWithStatus from '@/components/form/FieldsetWithStatus';
+import FieldsetWithStatus from '@/components/FieldsetWithStatus';
 import { ComponentProps, useEffect, useState } from 'react';
 import { getPhotosNeedingRecipeTitleCountAction } from '../actions';
 
diff --git a/src/photo/form/FieldsetFavs.tsx b/src/photo/form/FieldsetFavs.tsx
index cf5b67d8..71e939cc 100644
--- a/src/photo/form/FieldsetFavs.tsx
+++ b/src/photo/form/FieldsetFavs.tsx
@@ -1,5 +1,5 @@
 import { ComponentProps } from 'react';
-import FieldsetWithStatus from '@/components/form/FieldsetWithStatus';
+import FieldsetWithStatus from '@/components/FieldsetWithStatus';
 import IconFavs from '@/components/icons/IconFavs';
 
 export default function FieldsetFavs(props: Omit<
diff --git a/src/photo/form/PhotoForm.tsx b/src/photo/form/PhotoForm.tsx
index d9158faf..24dc25e1 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/form/FieldsetWithStatus';
+import FieldsetWithStatus from '@/components/FieldsetWithStatus';
 import { createPhotoAction, updatePhotoAction } from '../actions';
 import SubmitButtonWithStatus from '@/components/SubmitButtonWithStatus';
 import Link from 'next/link';
diff --git a/src/photo/visibility/FieldsetVisibility.tsx b/src/photo/visibility/FieldsetVisibility.tsx
index d00ada6e..91836743 100644
--- a/src/photo/visibility/FieldsetVisibility.tsx
+++ b/src/photo/visibility/FieldsetVisibility.tsx
@@ -1,4 +1,4 @@
-import FieldsetWithStatus from '@/components/form/FieldsetWithStatus';
+import FieldsetWithStatus from '@/components/FieldsetWithStatus';
 import { ComponentProps, Dispatch, SetStateAction } from 'react';
 import {
   getVisibilityValue,