diff --git a/app/db/index.ts b/app/db/index.ts
index f4cc1a7e3..4ca7d13c2 100644
--- a/app/db/index.ts
+++ b/app/db/index.ts
@@ -1,8 +1,8 @@
-import * as users from "./models/users.server";
-import * as plusSuggestions from "./models/plusSuggestions.server";
-import * as plusVotes from "./models/plusVotes.server";
-import * as badges from "./models/badges.server";
-import * as calendarEvents from "./models/calendar.server";
+import * as users from "./models/users/users.server";
+import * as plusSuggestions from "./models/plusSuggestions/plusSuggestions.server";
+import * as plusVotes from "./models/plusVotes/plusVotes.server";
+import * as badges from "./models/badges/queries.server";
+import * as calendarEvents from "./models/calendar/queries.server";
 
 export const db = {
   users,
diff --git a/app/db/models/badges.server.ts b/app/db/models/badges/queries.server.ts
similarity index 97%
rename from app/db/models/badges.server.ts
rename to app/db/models/badges/queries.server.ts
index 71cc1e64d..a440ff294 100644
--- a/app/db/models/badges.server.ts
+++ b/app/db/models/badges/queries.server.ts
@@ -1,5 +1,5 @@
-import { sql } from "../sql";
-import type { Badge, User } from "../types";
+import { sql } from "../../sql";
+import type { Badge, User } from "../../types";
 
 const deleteManyManagersStm = sql.prepare(`
   DELETE FROM
diff --git a/app/db/models/calendar.server.ts b/app/db/models/calendar/queries.server.ts
similarity index 99%
rename from app/db/models/calendar.server.ts
rename to app/db/models/calendar/queries.server.ts
index 9ef7d6fb4..2f76a2ffc 100644
--- a/app/db/models/calendar.server.ts
+++ b/app/db/models/calendar/queries.server.ts
@@ -1,5 +1,5 @@
 import { dateToDatabaseTimestamp } from "~/utils/dates";
-import { sql } from "../sql";
+import { sql } from "../../sql";
 import type {
   CalendarEvent,
   CalendarEventDate,
@@ -9,7 +9,7 @@ import type {
   CalendarEventBadge,
   CalendarEventResultTeam,
   CalendarEventResultPlayer,
-} from "../types";
+} from "../../types";
 
 const createStm = sql.prepare(`
   insert into "CalendarEvent" (
diff --git a/app/db/models/plusSuggestions.server.ts b/app/db/models/plusSuggestions/plusSuggestions.server.ts
similarity index 99%
rename from app/db/models/plusSuggestions.server.ts
rename to app/db/models/plusSuggestions/plusSuggestions.server.ts
index 1f4ee4a99..444303784 100644
--- a/app/db/models/plusSuggestions.server.ts
+++ b/app/db/models/plusSuggestions/plusSuggestions.server.ts
@@ -3,8 +3,8 @@ import type { MonthYear } from "~/modules/plus-server";
 import { nextNonCompletedVoting } from "~/modules/plus-server";
 import { atOrError } from "~/utils/arrays";
 import { databaseTimestampToDate } from "~/utils/dates";
-import { sql } from "../sql";
-import type { PlusSuggestion, User, UserWithPlusTier } from "../types";
+import { sql } from "../../sql";
+import type { PlusSuggestion, User, UserWithPlusTier } from "../../types";
 
 const createStm = sql.prepare(`
   INSERT INTO 
diff --git a/app/db/models/plusVotes.server.ts b/app/db/models/plusVotes/plusVotes.server.ts
similarity index 97%
rename from app/db/models/plusVotes.server.ts
rename to app/db/models/plusVotes/plusVotes.server.ts
index 5af0991fb..098b597c5 100644
--- a/app/db/models/plusVotes.server.ts
+++ b/app/db/models/plusVotes/plusVotes.server.ts
@@ -5,15 +5,15 @@ import { nextNonCompletedVoting } from "~/modules/plus-server";
 import { atOrError } from "~/utils/arrays";
 import { dateToDatabaseTimestamp } from "~/utils/dates";
 import type { Unpacked } from "~/utils/types";
-import { db } from "..";
-import { sql } from "../sql";
+import { db } from "../..";
+import { sql } from "../../sql";
 import type {
   PlusVote,
   PlusVotingResult,
   User,
   UserWithPlusTier,
-} from "../types";
-import type { FindVisibleForUserSuggestedUserInfo } from "./plusSuggestions.server";
+} from "../../types";
+import type { FindVisibleForUserSuggestedUserInfo } from "../plusSuggestions/plusSuggestions.server";
 
 const createStm = sql.prepare(`
   INSERT INTO 
diff --git a/app/db/models/users.server.ts b/app/db/models/users/users.server.ts
similarity index 97%
rename from app/db/models/users.server.ts
rename to app/db/models/users/users.server.ts
index e7df9dc96..d830bb247 100644
--- a/app/db/models/users.server.ts
+++ b/app/db/models/users/users.server.ts
@@ -1,5 +1,5 @@
-import { sql } from "../sql";
-import type { User, UserWithPlusTier } from "../types";
+import { sql } from "../../sql";
+import type { User, UserWithPlusTier } from "../../types";
 
 const upsertStm = sql.prepare(`
   INSERT INTO
diff --git a/app/db/seed.ts b/app/db/seed.ts
index f47afb68c..948c81539 100644
--- a/app/db/seed.ts
+++ b/app/db/seed.ts
@@ -6,7 +6,7 @@ import {
 } from "~/modules/plus-server";
 import { db } from "~/db";
 import { sql } from "~/db/sql";
-import type { UpsertManyPlusVotesArgs } from "./models/plusVotes.server";
+import type { UpsertManyPlusVotesArgs } from "./models/plusVotes/plusVotes.server";
 import { ADMIN_DISCORD_ID } from "~/constants";
 import shuffle from "just-shuffle";
 import { dateToDatabaseTimestamp } from "~/utils/dates";
diff --git a/app/modules/patreon/updater.ts b/app/modules/patreon/updater.ts
index 7e3c919db..1563e4a4a 100644
--- a/app/modules/patreon/updater.ts
+++ b/app/modules/patreon/updater.ts
@@ -1,6 +1,6 @@
 import type { z } from "zod";
 import { db } from "~/db";
-import type { UpdatePatronDataArgs } from "~/db/models/users.server";
+import type { UpdatePatronDataArgs } from "~/db/models/users/users.server";
 import { dateToDatabaseTimestamp } from "~/utils/dates";
 import { fetchWithTimeout } from "~/utils/fetch";
 import type { Unpacked } from "~/utils/types";
diff --git a/app/modules/plus-server/usePlusVoting.ts b/app/modules/plus-server/usePlusVoting.ts
index 69cbf128a..b340edd43 100644
--- a/app/modules/plus-server/usePlusVoting.ts
+++ b/app/modules/plus-server/usePlusVoting.ts
@@ -1,7 +1,7 @@
 import * as React from "react";
 import invariant from "tiny-invariant";
 import { PLUS_DOWNVOTE, PLUS_UPVOTE } from "~/constants";
-import type { UsersForVoting } from "~/db/models/plusVotes.server";
+import type { UsersForVoting } from "~/db/models/plusVotes/plusVotes.server";
 import type { User } from "~/db/types";
 import type { PlusVoteFromFE } from "./types";
 import { nextNonCompletedVoting } from "./voting-time";
diff --git a/app/permissions.ts b/app/permissions.ts
index e433759b8..7863aa7f7 100644
--- a/app/permissions.ts
+++ b/app/permissions.ts
@@ -1,4 +1,4 @@
-import type * as plusSuggestions from "~/db/models/plusSuggestions.server";
+import type * as plusSuggestions from "~/db/models/plusSuggestions/plusSuggestions.server";
 import { monthsVotingRange } from "./modules/plus-server";
 import type {
   CalendarEvent,
@@ -9,7 +9,7 @@ import type {
 import { allTruthy } from "./utils/arrays";
 import { ADMIN_DISCORD_ID, LOHI_TOKEN_HEADER_NAME } from "./constants";
 import invariant from "tiny-invariant";
-import type { ManagersByBadgeId } from "./db/models/badges.server";
+import type { ManagersByBadgeId } from "./db/models/badges/queries.server";
 import { databaseTimestampToDate } from "./utils/dates";
 
 // TODO: 1) move "root checkers" to one file and utils to one file 2) make utils const for more terseness
diff --git a/app/root.tsx b/app/root.tsx
index bcc7c129f..e3c13ea41 100644
--- a/app/root.tsx
+++ b/app/root.tsx
@@ -23,7 +23,7 @@ import resetStyles from "~/styles/reset.css";
 import { Catcher } from "./components/Catcher";
 import { Layout } from "./components/layout";
 import { db } from "./db";
-import type { FindAllPatrons } from "./db/models/users.server";
+import type { FindAllPatrons } from "./db/models/users/users.server";
 import type { UserWithPlusTier } from "./db/types";
 import { getUser } from "./modules/auth";
 import { DEFAULT_LANGUAGE, i18next } from "./modules/i18n";
diff --git a/app/routes/badges.tsx b/app/routes/badges.tsx
index 2f40e6752..080aec1f6 100644
--- a/app/routes/badges.tsx
+++ b/app/routes/badges.tsx
@@ -4,7 +4,7 @@ import { Link, NavLink, Outlet, useLoaderData } from "@remix-run/react";
 import { Badge } from "~/components/Badge";
 import { Main } from "~/components/Main";
 import { db } from "~/db";
-import type { All } from "~/db/models/badges.server";
+import type { All } from "~/db/models/badges/queries.server";
 import styles from "~/styles/badges.css";
 import { BORZOIC_TWITTER, FAQ_PAGE } from "~/utils/urls";
 import { Trans, useTranslation } from "react-i18next";
diff --git a/app/routes/badges/$id.tsx b/app/routes/badges/$id.tsx
index 4996f60fa..5c12fbb9e 100644
--- a/app/routes/badges/$id.tsx
+++ b/app/routes/badges/$id.tsx
@@ -9,7 +9,7 @@ import { db } from "~/db";
 import {
   type ManagersByBadgeId,
   type OwnersByBadgeId,
-} from "~/db/models/badges.server";
+} from "~/db/models/badges/queries.server";
 import { type Badge as BadgeDBType } from "~/db/types";
 import { useUser } from "~/modules/auth";
 import { canEditBadgeOwners } from "~/permissions";
diff --git a/app/routes/plus/suggestions.tsx b/app/routes/plus/suggestions.tsx
index 437309be4..d9c270821 100644
--- a/app/routes/plus/suggestions.tsx
+++ b/app/routes/plus/suggestions.tsx
@@ -16,7 +16,7 @@ import { FormWithConfirm } from "~/components/FormWithConfirm";
 import { TrashIcon } from "~/components/icons/Trash";
 import { nextNonCompletedVoting } from "~/modules/plus-server";
 import { db } from "~/db";
-import type * as plusSuggestions from "~/db/models/plusSuggestions.server";
+import type * as plusSuggestions from "~/db/models/plusSuggestions/plusSuggestions.server";
 import type { PlusSuggestion, User } from "~/db/types";
 import { getUser, requireUser, useUser } from "~/modules/auth";
 import {
diff --git a/app/routes/plus/voting/index.tsx b/app/routes/plus/voting/index.tsx
index 1571079e1..47784a9c7 100644
--- a/app/routes/plus/voting/index.tsx
+++ b/app/routes/plus/voting/index.tsx
@@ -14,7 +14,7 @@ import { CheckmarkIcon } from "~/components/icons/Checkmark";
 import { RelativeTime } from "~/components/RelativeTime";
 import { PLUS_DOWNVOTE, PLUS_UPVOTE } from "~/constants";
 import { db } from "~/db";
-import type { UsersForVoting } from "~/db/models/plusVotes.server";
+import type { UsersForVoting } from "~/db/models/plusVotes/plusVotes.server";
 import { getUser, requireUser } from "~/modules/auth";
 import type { PlusVoteFromFE } from "~/modules/plus-server";
 import {
diff --git a/app/routes/plus/voting/results.tsx b/app/routes/plus/voting/results.tsx
index b7e395ae6..9742ba18f 100644
--- a/app/routes/plus/voting/results.tsx
+++ b/app/routes/plus/voting/results.tsx
@@ -7,7 +7,7 @@ import { json } from "@remix-run/node";
 import { Link, useLoaderData } from "@remix-run/react";
 import { lastCompletedVoting } from "~/modules/plus-server";
 import { db } from "~/db";
-import type { PlusVotingResultByMonthYear } from "~/db/models/plusVotes.server";
+import type { PlusVotingResultByMonthYear } from "~/db/models/plusVotes/plusVotes.server";
 import type { PlusVotingResult } from "~/db/types";
 import { roundToTwoDecimalPlaces } from "~/utils/number";
 import { makeTitle } from "~/utils/strings";