diff --git a/frontend/src/metabase-lib/lib/metadata/Field.ts b/frontend/src/metabase-lib/lib/metadata/Field.ts
index c2a100a9f26ad1622bfabab437a2beeb63b0a486..4b6ced77392887c7447278f46f34d43ac5bef954 100644
--- a/frontend/src/metabase-lib/lib/metadata/Field.ts
+++ b/frontend/src/metabase-lib/lib/metadata/Field.ts
@@ -41,7 +41,7 @@ import { FieldDimension } from "../Dimension";
 import Base from "./Base";
 import type Table from "./Table";
 import type Metadata from "./Metadata";
-import { getUniqueFieldId } from "./utils";
+import { getUniqueFieldId } from "./utils/fields";
 
 export const LONG_TEXT_MIN = 80;
 
diff --git a/frontend/src/metabase-lib/lib/metadata/Metadata.ts b/frontend/src/metabase-lib/lib/metadata/Metadata.ts
index 26c030dccf180d2a513021ee22cdc2de418a4d2b..55b6a51278df3b53d4840eb38a3c75a961e6ffcd 100644
--- a/frontend/src/metabase-lib/lib/metadata/Metadata.ts
+++ b/frontend/src/metabase-lib/lib/metadata/Metadata.ts
@@ -8,7 +8,7 @@ import type Database from "./Database";
 import type Table from "./Table";
 import type Schema from "./Schema";
 import type Field from "./Field";
-import { getUniqueFieldId } from "./utils";
+import { getUniqueFieldId } from "./utils/fields";
 
 /**
  * @typedef { import("./metadata").DatabaseId } DatabaseId
diff --git a/frontend/src/metabase-lib/lib/metadata/utils.ts b/frontend/src/metabase-lib/lib/metadata/utils/fields.ts
similarity index 93%
rename from frontend/src/metabase-lib/lib/metadata/utils.ts
rename to frontend/src/metabase-lib/lib/metadata/utils/fields.ts
index c41c00a9001e7259f234fd97ab38cb1045749b6c..79af47b4324eb8864c4a38347f8ddc3831c085db 100644
--- a/frontend/src/metabase-lib/lib/metadata/utils.ts
+++ b/frontend/src/metabase-lib/lib/metadata/utils/fields.ts
@@ -1,5 +1,5 @@
 import { isVirtualCardId } from "metabase/lib/saved-questions/saved-questions";
-import type Field from "./Field";
+import type Field from "../Field";
 
 export function getUniqueFieldId(field: Field): number | string {
   const { table_id } = field;
diff --git a/frontend/src/metabase-lib/lib/metadata/utils.unit.spec.ts b/frontend/src/metabase-lib/lib/metadata/utils/fields.unit.spec.ts
similarity index 96%
rename from frontend/src/metabase-lib/lib/metadata/utils.unit.spec.ts
rename to frontend/src/metabase-lib/lib/metadata/utils/fields.unit.spec.ts
index a6cf15754c6ae9bdf2543e844e7248aad0de5491..d941771f120c1eae9fc37a7849f1551c70d6eb98 100644
--- a/frontend/src/metabase-lib/lib/metadata/utils.unit.spec.ts
+++ b/frontend/src/metabase-lib/lib/metadata/utils/fields.unit.spec.ts
@@ -1,5 +1,5 @@
-import { getUniqueFieldId } from "./utils";
-import { createMockConcreteField, createMockVirtualField } from "./mocks";
+import { createMockConcreteField, createMockVirtualField } from "../mocks";
+import { getUniqueFieldId } from "./fields";
 
 const structuredVirtualCardField = createMockConcreteField({
   apiOpts: {
diff --git a/frontend/src/metabase-lib/lib/queries/utils/description.js b/frontend/src/metabase-lib/lib/queries/utils/description.js
index f0f0a0b007e77fe53f907a7484d608f984fd6b88..b7bd7faafd0be8ab373883d64b9b74cf67061f20 100644
--- a/frontend/src/metabase-lib/lib/queries/utils/description.js
+++ b/frontend/src/metabase-lib/lib/queries/utils/description.js
@@ -11,7 +11,7 @@ import { format as formatExpression } from "metabase/lib/expressions/format";
 import * as AGGREGATION from "./aggregation";
 import * as QUERY from "./query";
 import * as FIELD_REF from "./field-ref";
-import { FilterClause, MetricClause } from "./description.styled";
+import { FilterClause, MetricClause } from "./description.styled.tsx";
 
 // NOTE: This doesn't support every MBQL clause, e.x. joins. It should also be moved to StructuredQuery.
 
diff --git a/frontend/src/metabase/schema.js b/frontend/src/metabase/schema.js
index 807331f0d2ce09766073ef1f6e5390a784ff7450..4e937792b8b2ebc467fbfb0990e034243cc26789 100644
--- a/frontend/src/metabase/schema.js
+++ b/frontend/src/metabase/schema.js
@@ -3,7 +3,7 @@
 import { schema } from "normalizr";
 import { generateSchemaId, entityTypeForObject } from "metabase/lib/schema";
 import { SAVED_QUESTIONS_VIRTUAL_DB_ID } from "metabase/lib/saved-questions";
-import { getUniqueFieldId } from "metabase-lib/lib/metadata/utils";
+import { getUniqueFieldId } from "metabase-lib/lib/metadata/utils/fields";
 
 export const QuestionSchema = new schema.Entity("questions");
 export const BookmarkSchema = new schema.Entity("bookmarks");