diff --git a/src/components/boards/BoardBottomBar.tsx b/src/components/boards/BoardBottomBar.tsx
index d2369339..141f2972 100644
--- a/src/components/boards/BoardBottomBar.tsx
+++ b/src/components/boards/BoardBottomBar.tsx
@@ -1,6 +1,6 @@
 import { BoardMetadata, RealmPermissions } from "types/Types";
 import { BoardOptions, useBoardOptions } from "../hooks/useBoardOptions";
-import { BoardPageDetails, usePageDetails } from "utils/router-utils";
+import { BoardPageDetails, usePageDetails } from "lib/router";
 import {
   EditorActions,
   useEditorsDispatch,
diff --git a/src/components/core/editors/withEditors.tsx b/src/components/core/editors/withEditors.tsx
index c1524d9b..2eadb6b4 100644
--- a/src/components/core/editors/withEditors.tsx
+++ b/src/components/core/editors/withEditors.tsx
@@ -22,7 +22,7 @@ import { addCommentInCache } from "lib/api/cache/comment";
 import debug from "debug";
 import { useAuth } from "components/Auth";
 import { useCachedLinks } from "components/hooks/useCachedLinks";
-import { usePageDetails } from "utils/router-utils";
+import { usePageDetails } from "lib/router";
 import { usePreventPageChange } from "components/hooks/usePreventPageChange";
 import { useQueryClient } from "react-query";
 import { useRefetchBoardActivity } from "lib/api/hooks/board-feed";
diff --git a/src/components/core/feeds/FilterableContext.tsx b/src/components/core/feeds/FilterableContext.tsx
index 7e6f36c6..0cf4001d 100644
--- a/src/components/core/feeds/FilterableContext.tsx
+++ b/src/components/core/feeds/FilterableContext.tsx
@@ -1,7 +1,7 @@
 import { ArrayParam } from "use-query-params";
 import React from "react";
 // import debug from "debug";
-import { isNotNull } from "utils/typescript-utils";
+import { isNotNull } from "lib/typescript";
 import { useQueryParams } from "use-query-params";
 
 //const log = debug("bobafrontend:contexts:RealmContext-log");
diff --git a/src/components/core/feeds/ThreadPreview.tsx b/src/components/core/feeds/ThreadPreview.tsx
index c10e5d39..be894986 100644
--- a/src/components/core/feeds/ThreadPreview.tsx
+++ b/src/components/core/feeds/ThreadPreview.tsx
@@ -1,10 +1,13 @@
-import { Post, PostHandler, TagType, TagsType, HiddenThread } from "@bobaboard/ui-components";
+import {
+  HiddenThread,
+  Post,
+  PostHandler,
+  TagType,
+  TagsType,
+} from "@bobaboard/ui-components";
 import { PostData, ThreadSummaryType } from "types/Types";
 import { PostOptions, usePostOptions } from "components/options/usePostOptions";
-import {
-  addThreadHandlerRef,
-  removeThreadHandlerRef,
-} from "utils/scroll-utils";
+import { addThreadHandlerRef, removeThreadHandlerRef } from "lib/scroll";
 
 import React from "react";
 import { THREAD_VIEW_OPTIONS } from "components/core/editors/utils";
@@ -105,11 +108,14 @@ const ThreadPreview: React.FC<{
 
   // If the thread is hidden, use a special placeholder to represent it.
   if (thread.hidden) {
-    return <HiddenThread 
-             hidden={thread.hidden} 
-             onThreadHidden={(hide: boolean) => 
-               setThreadHidden({threadId, boardId, hide})} 
-            />;
+    return (
+      <HiddenThread
+        hidden={thread.hidden}
+        onThreadHidden={(hide: boolean) =>
+          setThreadHidden({ threadId, boardId, hide })
+        }
+      />
+    );
   }
 
   return (
diff --git a/src/components/core/layouts/Layout.tsx b/src/components/core/layouts/Layout.tsx
index ae487c54..c5967c46 100644
--- a/src/components/core/layouts/Layout.tsx
+++ b/src/components/core/layouts/Layout.tsx
@@ -3,7 +3,7 @@ import {
   DefaultTheme,
   Layout as LibraryLayout,
 } from "@bobaboard/ui-components";
-import { PageTypes, usePageDetails } from "utils/router-utils";
+import { PageTypes, usePageDetails } from "lib/router";
 import {
   useInvalidateNotifications,
   useNotifications,
diff --git a/src/components/core/layouts/PinnedMenu.tsx b/src/components/core/layouts/PinnedMenu.tsx
index 4c228a27..55f50c1a 100644
--- a/src/components/core/layouts/PinnedMenu.tsx
+++ b/src/components/core/layouts/PinnedMenu.tsx
@@ -1,4 +1,4 @@
-import { PageTypes, usePageDetails } from "utils/router-utils";
+import { PageTypes, usePageDetails } from "lib/router";
 import { faInbox, faRss, faThumbtack } from "@fortawesome/free-solid-svg-icons";
 import {
   useInvalidateNotifications,
diff --git a/src/components/core/layouts/SideMenu.tsx b/src/components/core/layouts/SideMenu.tsx
index a82aa7b1..1721c390 100644
--- a/src/components/core/layouts/SideMenu.tsx
+++ b/src/components/core/layouts/SideMenu.tsx
@@ -16,11 +16,11 @@ import React from "react";
 import { THREAD_QUERY_KEY } from "lib/api/hooks/thread";
 import debug from "debug";
 import { dismissRealmNotifications } from "lib/api/queries/user";
-import { processBoardsUpdates } from "utils/boards-utils";
+import { processBoardsUpdates } from "lib/boards";
 import { useAuth } from "components/Auth";
 import { useBoardSummaryBySlug } from "lib/api/hooks/board";
 import { useCachedLinks } from "components/hooks/useCachedLinks";
-import { usePageDetails } from "utils/router-utils";
+import { usePageDetails } from "lib/router";
 import { useRefetchBoardActivity } from "lib/api/hooks/board-feed";
 
 const log = debug("bobafrontend:SideMenu-log");
diff --git a/src/components/core/useIsChangingRoute.ts b/src/components/core/useIsChangingRoute.ts
index 9852b165..90a661d9 100644
--- a/src/components/core/useIsChangingRoute.ts
+++ b/src/components/core/useIsChangingRoute.ts
@@ -1,7 +1,6 @@
 import React from "react";
-
+import { usePageDetails } from "lib/router";
 import { useRouter } from "next/router";
-import { usePageDetails } from "utils/router-utils";
 
 export const useIsChangingRoute = (props?: { onRouteChange?: () => void }) => {
   const router = useRouter();
diff --git a/src/components/hooks/useBeamToFeedElement.ts b/src/components/hooks/useBeamToFeedElement.ts
index 18fbb697..0cf2db5b 100644
--- a/src/components/hooks/useBeamToFeedElement.ts
+++ b/src/components/hooks/useBeamToFeedElement.ts
@@ -3,7 +3,7 @@ import React from "react";
 import type { UseInfiniteQueryResult } from "react-query";
 import debug from "debug";
 import { getNextElementInViewIndex } from "./useBeamToThreadElement";
-import { tryScrollToElement } from "utils/scroll-utils";
+import { tryScrollToElement } from "lib/scroll";
 
 const log = debug("bobafrontend:useBeamToThreadElement-log");
 const info = debug("bobafrontend:useBeamToThreadElement-info");
diff --git a/src/components/hooks/useBeamToThreadElement.ts b/src/components/hooks/useBeamToThreadElement.ts
index b43e3b22..18e25dc2 100644
--- a/src/components/hooks/useBeamToThreadElement.ts
+++ b/src/components/hooks/useBeamToThreadElement.ts
@@ -11,12 +11,12 @@ import {
   TIMELINE_VIEW_SUB_MODE,
   useThreadViewContext,
 } from "contexts/ThreadViewContext";
-import { isScrolledPast, tryScrollToElement } from "utils/scroll-utils";
+import { isScrolledPast, tryScrollToElement } from "lib/scroll";
 
 import { DisplayManager } from "./useDisplayMananger";
 import React from "react";
 import debug from "debug";
-import { extractRepliesSequence } from "utils/thread-utils";
+import { extractRepliesSequence } from "lib/thread";
 import { useStateWithCallback } from "components/core/useStateWithCallback";
 import { useThreadContext } from "../thread/ThreadContext";
 
diff --git a/src/components/hooks/useCachedLinks.ts b/src/components/hooks/useCachedLinks.ts
index f8a59c22..5036eb76 100644
--- a/src/components/hooks/useCachedLinks.ts
+++ b/src/components/hooks/useCachedLinks.ts
@@ -6,7 +6,7 @@ import {
   REALM_ADMIN_PATH,
   THREAD_PATH,
   createLinkTo,
-} from "utils/router-utils";
+} from "lib/router";
 
 import { PostData } from "types/Types";
 import { ThreadViewQueryParams } from "types/ThreadQueryParams";
diff --git a/src/components/hooks/useDisplayMananger.ts b/src/components/hooks/useDisplayMananger.ts
index bdee45bc..9459b434 100644
--- a/src/components/hooks/useDisplayMananger.ts
+++ b/src/components/hooks/useDisplayMananger.ts
@@ -12,13 +12,13 @@ import {
   ThreadViewMode,
   useThreadViewContext,
 } from "contexts/ThreadViewContext";
-import { ThreadPageDetails, usePageDetails } from "utils/router-utils";
+import { ThreadPageDetails, usePageDetails } from "lib/router";
 import {
   UNCATEGORIZED_LABEL,
   findFirstLevelParent,
   findNextSibling,
   findPreviousSibling,
-} from "utils/thread-utils";
+} from "lib/thread";
 import {
   useActiveCategories,
   useFilterableContext,
@@ -27,7 +27,7 @@ import {
 import { CollapseManager } from "components/thread/useCollapseManager";
 import React from "react";
 import debug from "debug";
-import { getElementId } from "utils/thread-utils";
+import { getElementId } from "lib/thread";
 import { useStateWithCallback } from "components/core/useStateWithCallback";
 import { useThreadContext } from "components/thread/ThreadContext";
 
diff --git a/src/components/hooks/useServerCssVariables.ts b/src/components/hooks/useServerCssVariables.ts
index 2c12f87e..2871b156 100644
--- a/src/components/hooks/useServerCssVariables.ts
+++ b/src/components/hooks/useServerCssVariables.ts
@@ -1,7 +1,8 @@
-import { useRealmSettings } from "contexts/RealmContext";
-import React from "react";
+import { PageTypes, usePageDetails } from "lib/router";
+
 import { CssVariableSetting } from "types/Types";
-import { PageTypes, usePageDetails } from "utils/router-utils";
+import React from "react";
+import { useRealmSettings } from "contexts/RealmContext";
 
 export const useServerCssVariables = (ref: React.RefObject<HTMLDivElement>) => {
   const {
diff --git a/src/components/options/comment/useDebugOptions.ts b/src/components/options/comment/useDebugOptions.ts
index 78f146f1..be633f95 100644
--- a/src/components/options/comment/useDebugOptions.ts
+++ b/src/components/options/comment/useDebugOptions.ts
@@ -1,6 +1,6 @@
 import { CommentType } from "types/Types";
 import React from "react";
-import { copyText } from "utils/text-utils";
+import { copyText } from "lib/text";
 import { faBug } from "@fortawesome/free-solid-svg-icons";
 import { faCopy } from "@fortawesome/free-regular-svg-icons";
 import { toast } from "@bobaboard/ui-components";
diff --git a/src/components/options/post/useDebugOptions.ts b/src/components/options/post/useDebugOptions.ts
index 615cd58c..007bf220 100644
--- a/src/components/options/post/useDebugOptions.ts
+++ b/src/components/options/post/useDebugOptions.ts
@@ -1,6 +1,6 @@
 import { PostType } from "types/Types";
 import React from "react";
-import { copyText } from "utils/text-utils";
+import { copyText } from "lib/text";
 import { faBug } from "@fortawesome/free-solid-svg-icons";
 import { faCopy } from "@fortawesome/free-regular-svg-icons";
 import { toast } from "@bobaboard/ui-components";
diff --git a/src/components/options/post/useEditTagsOption.ts b/src/components/options/post/useEditTagsOption.ts
index 51a8e67d..9c8e5269 100644
--- a/src/components/options/post/useEditTagsOption.ts
+++ b/src/components/options/post/useEditTagsOption.ts
@@ -2,7 +2,7 @@ import { EditorActions } from "components/core/editors/types";
 import { PostType } from "types/Types";
 import React from "react";
 import { faEdit } from "@fortawesome/free-solid-svg-icons";
-import { isPostEditPermission } from "utils/permissions-utils";
+import { isPostEditPermission } from "lib/permissions";
 import { useAuth } from "components/Auth";
 import { useBoardMetadata } from "lib/api/hooks/board";
 import { useEditorsDispatch } from "components/core/editors/EditorsContext";
diff --git a/src/components/options/useCommentOptions.ts b/src/components/options/useCommentOptions.ts
index 11972eb3..d4d88e67 100644
--- a/src/components/options/useCommentOptions.ts
+++ b/src/components/options/useCommentOptions.ts
@@ -1,5 +1,5 @@
 import { CommentType, RealmPermissions } from "types/Types";
-import { ThreadPageDetails, usePageDetails } from "utils/router-utils";
+import { ThreadPageDetails, usePageDetails } from "lib/router";
 import { faArrowRight, faLink } from "@fortawesome/free-solid-svg-icons";
 import {
   useCurrentRealmBoardId,
@@ -8,10 +8,10 @@ import {
 
 import { DropdownProps } from "@bobaboard/ui-components/dist/common/DropdownListMenu";
 import React from "react";
-import { copyText } from "utils/text-utils";
+import { copyText } from "lib/text";
 import { faComment } from "@fortawesome/free-regular-svg-icons";
 import { getCommentsChain } from "components/thread/CommentsThread";
-import { isNotNull } from "utils/typescript-utils";
+import { isNotNull } from "lib/typescript";
 import { toast } from "@bobaboard/ui-components";
 import { useBoardMetadata } from "lib/api/hooks/board";
 import { useCachedLinks } from "components/hooks/useCachedLinks";
diff --git a/src/components/options/useLoggedInOptions.ts b/src/components/options/useLoggedInOptions.ts
index 64c504ab..edd4ca2b 100644
--- a/src/components/options/useLoggedInOptions.ts
+++ b/src/components/options/useLoggedInOptions.ts
@@ -11,7 +11,7 @@ import {
 import { useRealmContext, useRealmPermissions } from "contexts/RealmContext";
 
 import React from "react";
-import { hasAdminPanelAccess } from "utils/permissions-utils";
+import { hasAdminPanelAccess } from "lib/permissions";
 import { useCachedLinks } from "../hooks/useCachedLinks";
 import { useForceHideIdentity } from "../hooks/useForceHideIdentity";
 
@@ -19,11 +19,8 @@ import { useForceHideIdentity } from "../hooks/useForceHideIdentity";
 // here instead of passing it as an argument
 export const useLoggedInOptions = (openLogin: () => void) => {
   const { forceHideIdentity, toggleForceHideIdentity } = useForceHideIdentity();
-  const {
-    linkToPersonalSettings,
-    linkToLogs,
-    linkToRealmAdmin,
-  } = useCachedLinks();
+  const { linkToPersonalSettings, linkToLogs, linkToRealmAdmin } =
+    useCachedLinks();
   const userRealmPermissions = useRealmPermissions();
   const realmData = useRealmContext();
 
diff --git a/src/components/options/usePostOptions.ts b/src/components/options/usePostOptions.ts
index 9f19e369..5ba8ea26 100644
--- a/src/components/options/usePostOptions.ts
+++ b/src/components/options/usePostOptions.ts
@@ -10,7 +10,7 @@ import {
 import { DropdownProps } from "@bobaboard/ui-components/dist/common/DropdownListMenu";
 import { LinkWithAction } from "@bobaboard/ui-components/dist/types";
 import React from "react";
-import { copyText } from "utils/text-utils";
+import { copyText } from "lib/text";
 import { toast } from "@bobaboard/ui-components";
 import { useBoardMetadata } from "lib/api/hooks/board";
 import { useCachedLinks } from "../hooks/useCachedLinks";
diff --git a/src/components/options/useTagsOptions.ts b/src/components/options/useTagsOptions.ts
index b46233c6..f9dd8b7b 100644
--- a/src/components/options/useTagsOptions.ts
+++ b/src/components/options/useTagsOptions.ts
@@ -1,4 +1,4 @@
-import { GetPropsFromForwardedRef, isNotNull } from "utils/typescript-utils";
+import { GetPropsFromForwardedRef, isNotNull } from "lib/typescript";
 import type { Post, TagsType } from "@bobaboard/ui-components";
 
 import React from "react";
diff --git a/src/components/realm/InvitesPanel.tsx b/src/components/realm/InvitesPanel.tsx
index 9e25f650..9058856f 100644
--- a/src/components/realm/InvitesPanel.tsx
+++ b/src/components/realm/InvitesPanel.tsx
@@ -5,7 +5,7 @@ import { AdminPanelIds } from "pages/realms/admin/[[...panelId]]";
 import CreateInvitePanel from "./CreateInvitePanel";
 import InvitesTable from "./InvitesTable";
 import React from "react";
-import { copyText } from "utils/text-utils";
+import { copyText } from "lib/text";
 import debug from "debug";
 import { toast } from "@bobaboard/ui-components";
 import { useHotkeys } from "react-hotkeys-hook";
diff --git a/src/components/settings/UserSettings.tsx b/src/components/settings/UserSettings.tsx
index 584f36f9..33af200d 100644
--- a/src/components/settings/UserSettings.tsx
+++ b/src/components/settings/UserSettings.tsx
@@ -1,6 +1,6 @@
 import { BobaDex, UserDetails } from "@bobaboard/ui-components";
 import React, { useEffect } from "react";
-import { extractImageExtension, uploadImage } from "utils/image-upload";
+import { extractImageExtension, uploadImage } from "lib/image-upload";
 import { getBobadex, updateUserData } from "lib/api/queries/user";
 import { useMutation, useQuery } from "react-query";
 
diff --git a/src/components/thread/CommentsThread.tsx b/src/components/thread/CommentsThread.tsx
index 03f444b5..aa53a92c 100644
--- a/src/components/thread/CommentsThread.tsx
+++ b/src/components/thread/CommentsThread.tsx
@@ -12,12 +12,12 @@ import {
   RealmPermissions,
   ThreadCommentInfoType,
 } from "types/Types";
-import { ThreadPageDetails, usePageDetails } from "utils/router-utils";
+import { ThreadPageDetails, usePageDetails } from "lib/router";
 import {
   addCommentHandlerRef,
   removeCommentHandlerRef,
   scrollToComment,
-} from "utils/scroll-utils";
+} from "lib/scroll";
 import {
   useBoardSummary,
   useCurrentRealmBoardId,
diff --git a/src/components/thread/GalleryThreadView.tsx b/src/components/thread/GalleryThreadView.tsx
index 780555b5..b7f18e6f 100644
--- a/src/components/thread/GalleryThreadView.tsx
+++ b/src/components/thread/GalleryThreadView.tsx
@@ -7,7 +7,7 @@ import {
   NewThread,
   SegmentedButton,
 } from "@bobaboard/ui-components";
-import { ThreadPageDetails, usePageDetails } from "utils/router-utils";
+import { ThreadPageDetails, usePageDetails } from "lib/router";
 import {
   extractPostId,
   getCommentThreadId,
@@ -20,7 +20,7 @@ import EmptyView from "./EmptyView";
 import { PostType } from "types/Types";
 import React from "react";
 import ThreadPost from "./ThreadPost";
-import { scrollToPost } from "utils/scroll-utils";
+import { scrollToPost } from "lib/scroll";
 import { useBoardSummaryBySlug } from "lib/api/hooks/board";
 import { useStemOptions } from "components/hooks/useStemOptions";
 import { useThreadContext } from "components/thread/ThreadContext";
diff --git a/src/components/thread/ThreadBottomBar.tsx b/src/components/thread/ThreadBottomBar.tsx
index bf4b1ac9..9299c728 100644
--- a/src/components/thread/ThreadBottomBar.tsx
+++ b/src/components/thread/ThreadBottomBar.tsx
@@ -1,5 +1,5 @@
 import { PostOptions, usePostOptions } from "components/options/usePostOptions";
-import { ThreadPageDetails, usePageDetails } from "utils/router-utils";
+import { ThreadPageDetails, usePageDetails } from "lib/router";
 import {
   faAnglesDown,
   faAnglesUp,
diff --git a/src/components/thread/ThreadContext.tsx b/src/components/thread/ThreadContext.tsx
index a8388940..d9241cc8 100644
--- a/src/components/thread/ThreadContext.tsx
+++ b/src/components/thread/ThreadContext.tsx
@@ -14,7 +14,7 @@ import {
   getCommentFromId,
   makeCommentsTree,
   makePostsTree,
-} from "utils/thread-utils";
+} from "lib/thread";
 
 import React from "react";
 import { compareAsc as compareDatesAsc } from "date-fns";
diff --git a/src/components/thread/ThreadPost.tsx b/src/components/thread/ThreadPost.tsx
index bba6633b..fe6e1959 100644
--- a/src/components/thread/ThreadPost.tsx
+++ b/src/components/thread/ThreadPost.tsx
@@ -5,11 +5,8 @@ import {
   TagsOptions,
   useGetTagOptions,
 } from "components/options/useTagsOptions";
-import { ThreadPageDetails, usePageDetails } from "utils/router-utils";
-import {
-  getTotalContributions,
-  getTotalNewContributions,
-} from "utils/thread-utils";
+import { ThreadPageDetails, usePageDetails } from "lib/router";
+import { getTotalContributions, getTotalNewContributions } from "lib/thread";
 import {
   isCommentEditorState,
   isReplyContribution,
@@ -20,12 +17,12 @@ import {
   useRealmPermissions,
 } from "contexts/RealmContext";
 
-import { GetPropsFromForwardedRef } from "utils/typescript-utils";
+import { GetPropsFromForwardedRef } from "lib/typescript";
 import React from "react";
-import { addPostHandlerRef } from "utils/scroll-utils";
+import { addPostHandlerRef } from "lib/scroll";
 import classNames from "classnames";
 import { formatDistanceToNow } from "date-fns";
-import { getCurrentSearchParams } from "utils/location-utils";
+import { getCurrentSearchParams } from "lib/location";
 import { useAuth } from "components/Auth";
 import { useCachedLinks } from "components/hooks/useCachedLinks";
 import { useEditorsState } from "components/core/editors/EditorsContext";
diff --git a/src/components/thread/ThreadSidebar.tsx b/src/components/thread/ThreadSidebar.tsx
index 56ea322a..889931d3 100644
--- a/src/components/thread/ThreadSidebar.tsx
+++ b/src/components/thread/ThreadSidebar.tsx
@@ -5,15 +5,15 @@ import {
   TagType,
   TagsFilterSection,
 } from "@bobaboard/ui-components";
-import { ThreadPageDetails, usePageDetails } from 'utils/router-utils';
+import { ThreadPageDetails, usePageDetails } from "lib/router";
 
 import { DisplayManager } from "components/hooks/useDisplayMananger";
 import React from "react";
 import { THREAD_VIEW_MODE } from "contexts/ThreadViewContext";
-import { UNCATEGORIZED_LABEL } from "utils/thread-utils";
+import { UNCATEGORIZED_LABEL } from "lib/thread";
 import classnames from "classnames";
 import { formatDistanceToNow } from "date-fns";
-import { useCachedLinks } from 'components/hooks/useCachedLinks';
+import { useCachedLinks } from "components/hooks/useCachedLinks";
 import { useFilterableContext } from "components/core/feeds/FilterableContext";
 import { useForceHideIdentity } from "components/hooks/useForceHideIdentity";
 import { useThreadContext } from "components/thread/ThreadContext";
@@ -30,24 +30,24 @@ const ThreadSidebar: React.FC<ThreadSidebarProps> = (props) => {
   const { threadRoot, categories, contentNotices } = useThreadContext();
   const { getLinkToThread } = useCachedLinks();
 
-  const {threadId, slug} = usePageDetails<ThreadPageDetails>();
+  const { threadId, slug } = usePageDetails<ThreadPageDetails>();
 
   const linkToThread = getLinkToThread({
     slug,
     threadId,
-    view: "thread"
+    view: "thread",
   }).href;
   const linkToGallery = getLinkToThread({
     slug,
     threadId,
-    view: "gallery"
+    view: "gallery",
   }).href;
-const linkToTimeline = getLinkToThread({
+  const linkToTimeline = getLinkToThread({
     slug,
     threadId,
-    view: "timeline"
+    view: "timeline",
   }).href;
- 
+
   const {
     activeCategories,
     setActiveCategories,
@@ -80,7 +80,7 @@ const linkToTimeline = getLinkToThread({
                 label: "Thread",
                 link: {
                   onClick: () => props.onViewChange(THREAD_VIEW_MODE.THREAD),
-                  href: `${linkToThread}`
+                  href: `${linkToThread}`,
                 },
               },
               {
@@ -88,7 +88,7 @@ const linkToTimeline = getLinkToThread({
                 label: "Gallery",
                 link: {
                   onClick: () => props.onViewChange(THREAD_VIEW_MODE.MASONRY),
-                  href: `${linkToGallery}`
+                  href: `${linkToGallery}`,
                 },
               },
               {
@@ -96,7 +96,7 @@ const linkToTimeline = getLinkToThread({
                 label: "Timeline",
                 link: {
                   onClick: () => props.onViewChange(THREAD_VIEW_MODE.TIMELINE),
-                  href: `${linkToTimeline}`
+                  href: `${linkToTimeline}`,
                 },
               },
             ]}
diff --git a/src/components/thread/ThreadView.tsx b/src/components/thread/ThreadView.tsx
index 053011ee..1454a683 100644
--- a/src/components/thread/ThreadView.tsx
+++ b/src/components/thread/ThreadView.tsx
@@ -10,7 +10,7 @@ import {
   DisplayManager,
   READ_MORE_STEP,
 } from "components/hooks/useDisplayMananger";
-import { ThreadPageDetails, usePageDetails } from "utils/router-utils";
+import { ThreadPageDetails, usePageDetails } from "lib/router";
 
 import CommentsThread from "./CommentsThread";
 import Link from "next/link";
@@ -19,8 +19,8 @@ import ThreadPost from "./ThreadPost";
 import classnames from "classnames";
 import css from "styled-jsx/css";
 import debug from "debug";
-import { getCurrentSearchParams } from "utils/location-utils";
-import { scrollToPost } from "utils/scroll-utils";
+import { getCurrentSearchParams } from "lib/location";
+import { scrollToPost } from "lib/scroll";
 import { useBoardSummaryBySlug } from "lib/api/hooks/board";
 import { useStemOptions } from "components/hooks/useStemOptions";
 import { useThreadContext } from "components/thread/ThreadContext";
diff --git a/src/components/thread/TimelineThreadView.tsx b/src/components/thread/TimelineThreadView.tsx
index f3974d99..ad9459f1 100644
--- a/src/components/thread/TimelineThreadView.tsx
+++ b/src/components/thread/TimelineThreadView.tsx
@@ -3,7 +3,7 @@ import {
   TIMELINE_VIEW_SUB_MODE,
   useThreadViewContext,
 } from "contexts/ThreadViewContext";
-import { ThreadPageDetails, usePageDetails } from "utils/router-utils";
+import { ThreadPageDetails, usePageDetails } from "lib/router";
 import {
   extractPostId,
   getCommentThreadId,
@@ -16,7 +16,7 @@ import EmptyView from "./EmptyView";
 import React from "react";
 import ThreadPost from "./ThreadPost";
 import classnames from "classnames";
-import { scrollToPost } from "utils/scroll-utils";
+import { scrollToPost } from "lib/scroll";
 import { useAuth } from "components/Auth";
 import { useBoardSummaryBySlug } from "lib/api/hooks/board";
 import { useStemOptions } from "components/hooks/useStemOptions";
diff --git a/src/contexts/RealmContext.tsx b/src/contexts/RealmContext.tsx
index 43d62d4e..319dae63 100644
--- a/src/contexts/RealmContext.tsx
+++ b/src/contexts/RealmContext.tsx
@@ -3,7 +3,7 @@ import { useQuery, useQueryClient } from "react-query";
 import React from "react";
 import { RealmType } from "types/Types";
 import debug from "debug";
-import { getCurrentRealmSlug } from "utils/location-utils";
+import { getCurrentRealmSlug } from "lib/location";
 import { getRealmData } from "lib/api/queries/realm";
 import { useAuth } from "components/Auth";
 
diff --git a/src/utils/boards-utils.ts b/src/lib/boards.ts
similarity index 100%
rename from src/utils/boards-utils.ts
rename to src/lib/boards.ts
diff --git a/src/utils/embeds-cache.ts b/src/lib/embeds-cache.ts
similarity index 100%
rename from src/utils/embeds-cache.ts
rename to src/lib/embeds-cache.ts
diff --git a/src/utils/image-upload.tsx b/src/lib/image-upload.tsx
similarity index 98%
rename from src/utils/image-upload.tsx
rename to src/lib/image-upload.tsx
index 78af884d..c793b754 100644
--- a/src/utils/image-upload.tsx
+++ b/src/lib/image-upload.tsx
@@ -8,7 +8,7 @@ import {
 import { NextRouter } from "next/router";
 import React from "react";
 import debug from "debug";
-import { getPageDetails } from "./router-utils";
+import { getPageDetails } from "./router";
 import loadImage from "blueimp-load-image";
 import { v4 as uuidv4 } from "uuid";
 
diff --git a/src/utils/location-utils.ts b/src/lib/location.ts
similarity index 100%
rename from src/utils/location-utils.ts
rename to src/lib/location.ts
diff --git a/src/utils/permissions-utils.ts b/src/lib/permissions.ts
similarity index 100%
rename from src/utils/permissions-utils.ts
rename to src/lib/permissions.ts
diff --git a/src/utils/router-utils.ts b/src/lib/router.ts
similarity index 99%
rename from src/utils/router-utils.ts
rename to src/lib/router.ts
index ef192dfe..80825c6f 100644
--- a/src/utils/router-utils.ts
+++ b/src/lib/router.ts
@@ -2,7 +2,7 @@ import Router, { NextRouter } from "next/router";
 
 import React from "react";
 import debug from "debug";
-import { getCurrentRealmSlug } from "./location-utils";
+import { getCurrentRealmSlug } from "./location";
 
 const log = debug("bobafrontend:router-utils-log");
 
diff --git a/src/utils/scroll-utils.ts b/src/lib/scroll.ts
similarity index 98%
rename from src/utils/scroll-utils.ts
rename to src/lib/scroll.ts
index b30a916c..8b6f3e87 100644
--- a/src/utils/scroll-utils.ts
+++ b/src/lib/scroll.ts
@@ -5,7 +5,7 @@ import {
 } from "@bobaboard/ui-components";
 import { CommentType, PostType, ThreadSummaryType } from "types/Types";
 
-import { getThreadElementIdWithType } from "./thread-utils";
+import { getThreadElementIdWithType } from "./thread";
 import { log } from "debug";
 
 const POST_HANDLERS = new Map<string, PostHandler>();
diff --git a/src/utils/text-utils.ts b/src/lib/text.ts
similarity index 100%
rename from src/utils/text-utils.ts
rename to src/lib/text.ts
diff --git a/src/utils/thread-utils.ts b/src/lib/thread.ts
similarity index 100%
rename from src/utils/thread-utils.ts
rename to src/lib/thread.ts
diff --git a/src/utils/typescript-utils.ts b/src/lib/typescript.ts
similarity index 100%
rename from src/utils/typescript-utils.ts
rename to src/lib/typescript.ts
diff --git a/src/pages/[boardId]/index.tsx b/src/pages/[boardId]/index.tsx
index 9f53a44a..c9106ec0 100644
--- a/src/pages/[boardId]/index.tsx
+++ b/src/pages/[boardId]/index.tsx
@@ -1,4 +1,4 @@
-import { BoardPageDetails, usePageDetails } from "utils/router-utils";
+import { BoardPageDetails, usePageDetails } from "lib/router";
 import {
   FilterableContextProvider,
   useFilterableContext,
@@ -14,7 +14,7 @@ import {
   getCurrentHost,
   getCurrentRealmSlug,
   isClientContext,
-} from "utils/location-utils";
+} from "lib/location";
 import { prefetchBoardMetadata, useBoardMetadata } from "lib/api/hooks/board";
 
 import BoardBottomBar from "components/boards/BoardBottomBar";
diff --git a/src/pages/[boardId]/thread/[...threadId].tsx b/src/pages/[boardId]/thread/[...threadId].tsx
index 70f3df65..f8079f61 100644
--- a/src/pages/[boardId]/thread/[...threadId].tsx
+++ b/src/pages/[boardId]/thread/[...threadId].tsx
@@ -9,7 +9,7 @@ import ThreadContextProvider, {
   useInvalidateThreadData,
   useThreadContext,
 } from "components/thread/ThreadContext";
-import { ThreadPageDetails, usePageDetails } from "utils/router-utils";
+import { ThreadPageDetails, usePageDetails } from "lib/router";
 import {
   useBoardSummary,
   useCurrentRealmBoardId,
@@ -32,7 +32,7 @@ import TimelineThreadView from "components/thread/TimelineThreadView";
 import classnames from "classnames";
 import debug from "debug";
 import { getThreadData } from "lib/api/queries/thread";
-import { isClientContext } from "utils/location-utils";
+import { isClientContext } from "lib/location";
 import { useAuth } from "components/Auth";
 import { useCachedLinks } from "components/hooks/useCachedLinks";
 import { useDisplayManager } from "components/hooks/useDisplayMananger";
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
index 3757e754..7ae76be7 100644
--- a/src/pages/_app.tsx
+++ b/src/pages/_app.tsx
@@ -25,7 +25,7 @@ import {
   getCurrentRealmSlug,
   getServerBaseUrl,
   isClientContext,
-} from "utils/location-utils";
+} from "lib/location";
 
 import App from "next/app";
 import { CustomErrorPage } from "./_error";
@@ -38,13 +38,13 @@ import { ReactQueryDevtools } from "react-query/devtools";
 import { UpdateNotice } from "components/UpdateNotice";
 import axios from "axios";
 import debug from "debug";
-import embedsCache from "utils/embeds-cache";
+import embedsCache from "lib/embeds-cache";
 import { getRealmData } from "lib/api/queries/realm";
 import smoothscroll from "smoothscroll-polyfill";
 import { useConsoleHelloMessage } from "components/hooks/useConsoleHelloMessage";
 import useFromBackButton from "components/core/useFromBackButton";
-import { useImageUploader } from "utils/image-upload";
-import { usePageDataListener } from "utils/router-utils";
+import { useImageUploader } from "lib/image-upload";
+import { usePageDataListener } from "lib/router";
 import { useScrollRestoration } from "components/hooks/useScrollRestoration";
 
 const log = debug("bobafrontend:app-log");
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index 021e7b0c..480785fa 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -22,7 +22,7 @@ import {
   isClientContext,
   isLocalhost,
   isStaging,
-} from "utils/location-utils";
+} from "lib/location";
 import {
   prefetchSubscriptionData,
   useSubscription,
diff --git a/src/pages/invites/[inviteId].tsx b/src/pages/invites/[inviteId].tsx
index 863544fe..185cd27d 100644
--- a/src/pages/invites/[inviteId].tsx
+++ b/src/pages/invites/[inviteId].tsx
@@ -8,7 +8,7 @@ import {
 } from "@bobaboard/ui-components";
 import { NextPage, NextPageContext } from "next";
 import React, { useEffect } from "react";
-import { getCurrentRealmSlug, isLocal } from "utils/location-utils";
+import { getCurrentRealmSlug, isLocal } from "lib/location";
 import { getInviteStatusByNonce, getRealmData } from "lib/api/queries/realm";
 import {
   useRealmHomepage,
@@ -24,7 +24,7 @@ import { acceptInvite } from "lib/api/queries/user";
 import axios from "axios";
 import classnames from "classnames";
 import debug from "debug";
-import { getRealmNameFromSlug } from "utils/text-utils";
+import { getRealmNameFromSlug } from "lib/text";
 import { useAuth } from "components/Auth";
 import { useMutation } from "react-query";
 import { useRouter } from "next/router";
diff --git a/src/pages/realms/admin/[[...panelId]].tsx b/src/pages/realms/admin/[[...panelId]].tsx
index 8c9ec2fd..db215fb0 100644
--- a/src/pages/realms/admin/[[...panelId]].tsx
+++ b/src/pages/realms/admin/[[...panelId]].tsx
@@ -6,7 +6,7 @@ import InvitesPanel from "components/realm/InvitesPanel";
 import Layout from "components/core/layouts/Layout";
 import React from "react";
 import { RealmPermissions } from "types/Types";
-import { hasAdminPanelAccess } from "utils/permissions-utils";
+import { hasAdminPanelAccess } from "lib/permissions";
 import { useAuth } from "components/Auth";
 import { useCachedLinks } from "components/hooks/useCachedLinks";
 import { useRealmPermissions } from "contexts/RealmContext";
diff --git a/tests/UI/InvitesPage.test.tsx b/tests/UI/InvitesPage.test.tsx
index 95b7f765..fb07e65f 100644
--- a/tests/UI/InvitesPage.test.tsx
+++ b/tests/UI/InvitesPage.test.tsx
@@ -13,7 +13,7 @@ import InvitesPage from "pages/invites/[inviteId]";
 import React from "react";
 import { RealmType } from "types/Types";
 import debug from "debug";
-import { getRealmNameFromSlug } from "utils/text-utils";
+import { getRealmNameFromSlug } from "lib/text";
 import { makeRealmData } from "lib/api/client-data";
 import userEvent from "@testing-library/user-event";
 
diff --git a/tests/UI/InvitesPanel.test.tsx b/tests/UI/InvitesPanel.test.tsx
index 5eab8811..444cd3e2 100644
--- a/tests/UI/InvitesPanel.test.tsx
+++ b/tests/UI/InvitesPanel.test.tsx
@@ -26,8 +26,8 @@ const ADMIN_ROUTER = getAdminPanelRoute({
 
 jest.mock("components/hooks/usePreventPageChange");
 jest.mock("components/core/useIsChangingRoute");
-jest.mock("utils/image-upload", () => ({
-  ...jest.requireActual("utils/image-upload"),
+jest.mock("lib/image-upload", () => ({
+  ...jest.requireActual("lib/image-upload"),
   uploadImage: jest.fn(({ baseUrl, extension }) =>
     Promise.resolve(`${baseUrl}image${extension}`)
   ),
diff --git a/tests/UI/PostOptions.test.tsx b/tests/UI/PostOptions.test.tsx
index ac31224d..33fb3a34 100644
--- a/tests/UI/PostOptions.test.tsx
+++ b/tests/UI/PostOptions.test.tsx
@@ -11,12 +11,12 @@ import { FAVORITE_CHARACTER_TO_MAIM_THREAD } from "../server-mocks/data/thread";
 import React from "react";
 import { TagMatcher } from "./utils/matchers";
 import ThreadPage from "pages/[boardId]/thread/[...threadId]";
-import { copyText } from "utils/text-utils";
+import { copyText } from "lib/text";
 
 jest.mock("components/hooks/usePreventPageChange");
 jest.mock("components/core/useIsChangingRoute");
 jest.mock("components/hooks/useOnPageExit");
-jest.mock("utils/text-utils.ts");
+jest.mock("lib/text.ts");
 
 const displaysOptionInPanel = async ({
   optionText,
diff --git a/tests/UI/UserSettings.test.tsx b/tests/UI/UserSettings.test.tsx
index 113a2393..044a4118 100644
--- a/tests/UI/UserSettings.test.tsx
+++ b/tests/UI/UserSettings.test.tsx
@@ -18,8 +18,8 @@ const SETTINGS_ROUTER = getUserSettingsRoute({
 
 jest.mock("components/hooks/usePreventPageChange");
 jest.mock("components/core/useIsChangingRoute");
-jest.mock("utils/image-upload", () => ({
-  ...jest.requireActual("utils/image-upload"),
+jest.mock("lib/image-upload", () => ({
+  ...jest.requireActual("lib/image-upload"),
   uploadImage: jest.fn(({ baseUrl, extension }) =>
     Promise.resolve(`${baseUrl}image${extension}`)
   ),
diff --git a/tests/UI/jest.setup.ts b/tests/UI/jest.setup.ts
index e13dbde5..2ce66a7d 100644
--- a/tests/UI/jest.setup.ts
+++ b/tests/UI/jest.setup.ts
@@ -1,8 +1,12 @@
 import "@testing-library/jest-dom/extend-expect";
 import "jest-canvas-mock";
 
+import {
+  ensureMocksReset,
+  intersectionObserver,
+} from "@shopify/jest-dom-mocks";
+
 import crypto from "crypto";
-import { ensureMocksReset } from "@shopify/jest-dom-mocks";
 import { server } from "../server-mocks/index";
 
 jest.mock("next/router", () => {
@@ -137,5 +141,9 @@ afterAll(() => server.close());
 
 beforeEach(() => {
   server.resetHandlers();
+  if (intersectionObserver.isMocked()) {
+    intersectionObserver.restore();
+  }
   ensureMocksReset();
+  intersectionObserver.mock();
 });
diff --git a/tests/UI/utils/index.tsx b/tests/UI/utils/index.tsx
index 2395ecf1..2f65f376 100644
--- a/tests/UI/utils/index.tsx
+++ b/tests/UI/utils/index.tsx
@@ -12,7 +12,7 @@ import { debug } from "debug";
 import { makeRealmData } from "lib/api/client-data";
 import { matchRequestUrl } from "msw";
 import { server } from "../../server-mocks";
-import { usePageDataListener } from "utils/router-utils";
+import { usePageDataListener } from "lib/router";
 
 const useRouter = jest.spyOn(require("next/router"), "useRouter");
 
diff --git a/tests/board-utils/sideMenuOrdering.test.ts b/tests/board-utils/sideMenuOrdering.test.ts
index d4ed3916..c46a4aa7 100644
--- a/tests/board-utils/sideMenuOrdering.test.ts
+++ b/tests/board-utils/sideMenuOrdering.test.ts
@@ -1,7 +1,7 @@
 import { expect, test } from "@jest/globals";
 
 import { BoardSummary } from "types/Types";
-import { processBoardsUpdates } from "utils/boards-utils";
+import { processBoardsUpdates } from "lib/boards";
 
 export const BOARDS_INITIAL_DATA: BoardSummary[] = [
   {
diff --git a/tests/location-utils/realms-location.test.ts b/tests/location-utils/realms-location.test.ts
index c028b965..3759142d 100644
--- a/tests/location-utils/realms-location.test.ts
+++ b/tests/location-utils/realms-location.test.ts
@@ -1,6 +1,6 @@
 import { expect, test } from "@jest/globals";
 
-import { getCurrentRealmSlug } from "utils/location-utils";
+import { getCurrentRealmSlug } from "lib/location";
 
 const updateWindowHostname = (hostname: string) => {
   Object.defineProperty(global.window, "location", {
diff --git a/tests/thread-utils/commentsTree.test.ts b/tests/thread-utils/commentsTree.test.ts
index a8861619..fd607b8f 100644
--- a/tests/thread-utils/commentsTree.test.ts
+++ b/tests/thread-utils/commentsTree.test.ts
@@ -1,7 +1,7 @@
 import { expect, test } from "@jest/globals";
 
 import { makeComment } from "../utils";
-import { makeCommentsTree } from "utils/thread-utils";
+import { makeCommentsTree } from "lib/thread";
 
 // NOTE: Chained comments also share the parent with the comment they're chained to.
 
diff --git a/tests/thread-utils/postsHierarchy.test.ts b/tests/thread-utils/postsHierarchy.test.ts
index ba2e1ad4..0e9c14f4 100644
--- a/tests/thread-utils/postsHierarchy.test.ts
+++ b/tests/thread-utils/postsHierarchy.test.ts
@@ -3,7 +3,7 @@ import {
   findFirstLevelParent,
   findNextSibling,
   findPreviousSibling,
-} from "utils/thread-utils";
+} from "lib/thread";
 
 import { makePost } from "../utils";
 
diff --git a/tests/thread-utils/postsTree.test.ts b/tests/thread-utils/postsTree.test.ts
index 77018fbb..96a5f90a 100644
--- a/tests/thread-utils/postsTree.test.ts
+++ b/tests/thread-utils/postsTree.test.ts
@@ -2,7 +2,7 @@ import { expect, test } from "@jest/globals";
 
 import { makePost } from "../utils";
 // TODO: figure out absolute import paths
-import { makePostsTree } from "utils/thread-utils";
+import { makePostsTree } from "lib/thread";
 
 test("makes posts tree (empty array)", () => {
   const postsTree = makePostsTree([], "test");
diff --git a/tests/thread-utils/repliesSequence.test.ts b/tests/thread-utils/repliesSequence.test.ts
index 05636519..9764096a 100644
--- a/tests/thread-utils/repliesSequence.test.ts
+++ b/tests/thread-utils/repliesSequence.test.ts
@@ -1,9 +1,6 @@
 import { expect, test } from "@jest/globals";
 // TODO: figure out absolute import paths
-import {
-  extractNewRepliesSequence,
-  extractRepliesSequence,
-} from "utils/thread-utils";
+import { extractNewRepliesSequence, extractRepliesSequence } from "lib/thread";
 import { makeComment, makePost } from "../utils";
 
 // #######################################################
diff --git a/types/ThreadQueryParams.ts b/types/ThreadQueryParams.ts
index 05b75bc9..3369103d 100644
--- a/types/ThreadQueryParams.ts
+++ b/types/ThreadQueryParams.ts
@@ -1,4 +1,4 @@
-import { AllFalse, MakeRecursiveTypeReadable } from "utils/typescript-utils";
+import { AllFalse, MakeRecursiveTypeReadable } from "lib/typescript";
 
 import { DecodedValueMap } from "use-query-params";
 import { ExistanceParam } from "components/QueryParamNextProvider";