diff --git a/src/controllers/api/accounts.ts b/src/controllers/api/accounts.ts
index f717be3..2d61adc 100644
--- a/src/controllers/api/accounts.ts
+++ b/src/controllers/api/accounts.ts
@@ -7,7 +7,6 @@ import { Conf } from '@/config.ts';
 import { getAuthor, getFollowedPubkeys } from '@/queries.ts';
 import { booleanParamSchema, fileSchema } from '@/schema.ts';
 import { Storages } from '@/storages.ts';
-import { addTag, deleteTag, findReplyTag, getTagSet } from '@/tags.ts';
 import { uploadFile } from '@/utils/upload.ts';
 import { nostrNow } from '@/utils.ts';
 import { createEvent, paginated, paginationSchema, parseBody, updateListEvent } from '@/utils/api.ts';
@@ -18,6 +17,7 @@ import { renderRelationship } from '@/views/mastodon/relationships.ts';
 import { renderStatus } from '@/views/mastodon/statuses.ts';
 import { hydrateEvents } from '@/storages/hydrate.ts';
 import { bech32ToPubkey } from '@/utils.ts';
+import { addTag, deleteTag, findReplyTag, getTagSet } from '@/utils/tags.ts';
 
 const usernameSchema = z
   .string().min(1).max(30)
diff --git a/src/controllers/api/admin.ts b/src/controllers/api/admin.ts
index 77571aa..d7cd365 100644
--- a/src/controllers/api/admin.ts
+++ b/src/controllers/api/admin.ts
@@ -5,8 +5,8 @@ import { Conf } from '@/config.ts';
 import { DittoEvent } from '@/interfaces/DittoEvent.ts';
 import { booleanParamSchema } from '@/schema.ts';
 import { Storages } from '@/storages.ts';
-import { addTag } from '@/tags.ts';
 import { paginated, paginationSchema, parseBody, updateListAdminEvent } from '@/utils/api.ts';
+import { addTag } from '@/utils/tags.ts';
 import { renderAdminAccount } from '@/views/mastodon/admin-accounts.ts';
 
 const adminAccountQuerySchema = z.object({
diff --git a/src/controllers/api/bookmarks.ts b/src/controllers/api/bookmarks.ts
index 7655182..6d80b50 100644
--- a/src/controllers/api/bookmarks.ts
+++ b/src/controllers/api/bookmarks.ts
@@ -1,6 +1,6 @@
 import { type AppController } from '@/app.ts';
 import { Storages } from '@/storages.ts';
-import { getTagSet } from '@/tags.ts';
+import { getTagSet } from '@/utils/tags.ts';
 import { renderStatuses } from '@/views.ts';
 
 /** https://docs.joinmastodon.org/methods/bookmarks/#get */
diff --git a/src/controllers/api/mutes.ts b/src/controllers/api/mutes.ts
index 4afb6c4..31f54ee 100644
--- a/src/controllers/api/mutes.ts
+++ b/src/controllers/api/mutes.ts
@@ -1,6 +1,6 @@
 import { type AppController } from '@/app.ts';
 import { Storages } from '@/storages.ts';
-import { getTagSet } from '@/tags.ts';
+import { getTagSet } from '@/utils/tags.ts';
 import { renderAccounts } from '@/views.ts';
 
 /** https://docs.joinmastodon.org/methods/mutes/#get */
diff --git a/src/controllers/api/statuses.ts b/src/controllers/api/statuses.ts
index 291d970..e9c872f 100644
--- a/src/controllers/api/statuses.ts
+++ b/src/controllers/api/statuses.ts
@@ -8,15 +8,15 @@ import { Conf } from '@/config.ts';
 import { DittoDB } from '@/db/DittoDB.ts';
 import { getUnattachedMediaByIds } from '@/db/unattached-media.ts';
 import { getAncestors, getAuthor, getDescendants, getEvent } from '@/queries.ts';
-import { addTag, deleteTag } from '@/tags.ts';
-import { createEvent, paginationSchema, parseBody, updateListEvent } from '@/utils/api.ts';
 import { renderEventAccounts } from '@/views.ts';
 import { renderReblog, renderStatus } from '@/views/mastodon/statuses.ts';
-import { getLnurl } from '@/utils/lnurl.ts';
-import { asyncReplaceAll } from '@/utils/text.ts';
 import { Storages } from '@/storages.ts';
 import { hydrateEvents } from '@/storages/hydrate.ts';
+import { createEvent, paginationSchema, parseBody, updateListEvent } from '@/utils/api.ts';
+import { getLnurl } from '@/utils/lnurl.ts';
 import { lookupPubkey } from '@/utils/lookup.ts';
+import { addTag, deleteTag } from '@/utils/tags.ts';
+import { asyncReplaceAll } from '@/utils/text.ts';
 
 const createStatusSchema = z.object({
   in_reply_to_id: z.string().regex(/[0-9a-f]{64}/).nullish(),
diff --git a/src/controllers/api/suggestions.ts b/src/controllers/api/suggestions.ts
index 6377bd4..012244a 100644
--- a/src/controllers/api/suggestions.ts
+++ b/src/controllers/api/suggestions.ts
@@ -2,8 +2,8 @@ import { NStore } from '@nostrify/nostrify';
 
 import { AppController } from '@/app.ts';
 import { Conf } from '@/config.ts';
-import { getTagSet } from '@/tags.ts';
 import { hydrateEvents } from '@/storages/hydrate.ts';
+import { getTagSet } from '@/utils/tags.ts';
 import { accountFromPubkey, renderAccount } from '@/views/mastodon/accounts.ts';
 
 export const suggestionsV1Controller: AppController = async (c) => {
diff --git a/src/pipeline.ts b/src/pipeline.ts
index 15d495e..bfb0577 100644
--- a/src/pipeline.ts
+++ b/src/pipeline.ts
@@ -13,7 +13,6 @@ import { RelayError } from '@/RelayError.ts';
 import { updateStats } from '@/stats.ts';
 import { hydrateEvents, purifyEvent } from '@/storages/hydrate.ts';
 import { Storages } from '@/storages.ts';
-import { getTagSet } from '@/tags.ts';
 import { eventAge, nostrDate, nostrNow, parseNip05, Time } from '@/utils.ts';
 import { fetchWorker } from '@/workers/fetch.ts';
 import { policyWorker } from '@/workers/policy.ts';
@@ -22,6 +21,7 @@ import { verifyEventWorker } from '@/workers/verify.ts';
 import { AdminSigner } from '@/signers/AdminSigner.ts';
 import { lnurlCache } from '@/utils/lnurl.ts';
 import { nip05Cache } from '@/utils/nip05.ts';
+import { getTagSet } from '@/utils/tags.ts';
 
 import { MuteListPolicy } from '@/policies/MuteListPolicy.ts';
 
diff --git a/src/policies/MuteListPolicy.ts b/src/policies/MuteListPolicy.ts
index cae08eb..130d10d 100644
--- a/src/policies/MuteListPolicy.ts
+++ b/src/policies/MuteListPolicy.ts
@@ -1,6 +1,6 @@
 import { NostrEvent, NostrRelayOK, NPolicy, NStore } from '@nostrify/nostrify';
 
-import { getTagSet } from '@/tags.ts';
+import { getTagSet } from '@/utils/tags.ts';
 
 export class MuteListPolicy implements NPolicy {
   constructor(private pubkey: string, private store: NStore) {}
diff --git a/src/queries.ts b/src/queries.ts
index 76fabfd..6a197ea 100644
--- a/src/queries.ts
+++ b/src/queries.ts
@@ -5,8 +5,8 @@ import { Conf } from '@/config.ts';
 import { Storages } from '@/storages.ts';
 import { type DittoEvent } from '@/interfaces/DittoEvent.ts';
 import { type DittoRelation } from '@/interfaces/DittoFilter.ts';
-import { findReplyTag, getTagSet } from '@/tags.ts';
 import { hydrateEvents } from '@/storages/hydrate.ts';
+import { findReplyTag, getTagSet } from '@/utils/tags.ts';
 
 const debug = Debug('ditto:queries');
 
diff --git a/src/stats.ts b/src/stats.ts
index 256c570..6ffe5f7 100644
--- a/src/stats.ts
+++ b/src/stats.ts
@@ -8,7 +8,7 @@ import { SetRequired } from 'type-fest';
 import { DittoDB } from '@/db/DittoDB.ts';
 import { DittoTables } from '@/db/DittoTables.ts';
 import { Storages } from '@/storages.ts';
-import { findReplyTag, getTagSet } from '@/tags.ts';
+import { findReplyTag, getTagSet } from '@/utils/tags.ts';
 
 type AuthorStat = keyof Omit<DittoTables['author_stats'], 'pubkey'>;
 type EventStat = keyof Omit<DittoTables['event_stats'], 'event_id'>;
diff --git a/src/storages/EventsDB.ts b/src/storages/EventsDB.ts
index 5a3839a..a550f39 100644
--- a/src/storages/EventsDB.ts
+++ b/src/storages/EventsDB.ts
@@ -7,11 +7,11 @@ import { Kysely } from 'kysely';
 import { Conf } from '@/config.ts';
 import { DittoTables } from '@/db/DittoTables.ts';
 import { normalizeFilters } from '@/filter.ts';
+import { RelayError } from '@/RelayError.ts';
 import { purifyEvent } from '@/storages/hydrate.ts';
-import { getTagSet } from '@/tags.ts';
 import { isNostrId, isURL } from '@/utils.ts';
 import { abortError } from '@/utils/abort.ts';
-import { RelayError } from '@/RelayError.ts';
+import { getTagSet } from '@/utils/tags.ts';
 
 /** Function to decide whether or not to index a tag. */
 type TagCondition = ({ event, count, value }: {
diff --git a/src/storages/UserStore.ts b/src/storages/UserStore.ts
index c5657b6..43c1771 100644
--- a/src/storages/UserStore.ts
+++ b/src/storages/UserStore.ts
@@ -1,7 +1,7 @@
 import { NostrEvent, NostrFilter, NStore } from '@nostrify/nostrify';
 
 import { DittoEvent } from '@/interfaces/DittoEvent.ts';
-import { getTagSet } from '@/tags.ts';
+import { getTagSet } from '@/utils/tags.ts';
 
 export class UserStore implements NStore {
   constructor(private pubkey: string, private store: NStore) {}
diff --git a/src/storages/hydrate.ts b/src/storages/hydrate.ts
index f55d741..68dc0bd 100644
--- a/src/storages/hydrate.ts
+++ b/src/storages/hydrate.ts
@@ -6,7 +6,7 @@ import { type DittoEvent } from '@/interfaces/DittoEvent.ts';
 import { DittoTables } from '@/db/DittoTables.ts';
 import { Conf } from '@/config.ts';
 import { refreshAuthorStatsDebounced } from '@/stats.ts';
-import { findQuoteTag } from '@/tags.ts';
+import { findQuoteTag } from '@/utils/tags.ts';
 
 interface HydrateOpts {
   events: DittoEvent[];
diff --git a/src/tags.ts b/src/utils/tags.ts
similarity index 100%
rename from src/tags.ts
rename to src/utils/tags.ts
diff --git a/src/views/mastodon/relationships.ts b/src/views/mastodon/relationships.ts
index 2f8ffdd..425ea56 100644
--- a/src/views/mastodon/relationships.ts
+++ b/src/views/mastodon/relationships.ts
@@ -1,5 +1,5 @@
 import { Storages } from '@/storages.ts';
-import { hasTag } from '@/tags.ts';
+import { hasTag } from '@/utils/tags.ts';
 
 async function renderRelationship(sourcePubkey: string, targetPubkey: string) {
   const db = await Storages.db();
diff --git a/src/views/mastodon/statuses.ts b/src/views/mastodon/statuses.ts
index 1571977..cc7cc36 100644
--- a/src/views/mastodon/statuses.ts
+++ b/src/views/mastodon/statuses.ts
@@ -4,9 +4,9 @@ import { nip19 } from 'nostr-tools';
 import { Conf } from '@/config.ts';
 import { type DittoEvent } from '@/interfaces/DittoEvent.ts';
 import { Storages } from '@/storages.ts';
-import { findQuoteTag, findReplyTag } from '@/tags.ts';
 import { nostrDate } from '@/utils.ts';
 import { getMediaLinks, parseNoteContent, stripimeta } from '@/utils/note.ts';
+import { findQuoteTag, findReplyTag } from '@/utils/tags.ts';
 import { unfurlCardCached } from '@/utils/unfurl.ts';
 import { accountFromPubkey, renderAccount } from '@/views/mastodon/accounts.ts';
 import { renderAttachment } from '@/views/mastodon/attachments.ts';