diff --git a/frontend/libs/components/model-selector/src/lib/model-lists.tsx b/frontend/libs/components/model-selector/src/lib/model-lists.tsx
index 42c912e7bd..8bf59fca4a 100644
--- a/frontend/libs/components/model-selector/src/lib/model-lists.tsx
+++ b/frontend/libs/components/model-selector/src/lib/model-lists.tsx
@@ -7,7 +7,7 @@ import {
   VIDEO_MODELS,
   IMAGE_MODELS,
 } from "@storyteller/model-list";
-import { ModelTag } from "libs/model-list/src/lib/ModelTag";
+import { ModelTag } from "@storyteller/model-list";
 
 export type ModelList = Omit<PopoverItem, "selected">[];
 
diff --git a/frontend/libs/model-list/src/index.ts b/frontend/libs/model-list/src/index.ts
index 93b6c75d15..940a69b699 100644
--- a/frontend/libs/model-list/src/index.ts
+++ b/frontend/libs/model-list/src/index.ts
@@ -1,13 +1,14 @@
-export * from "./lib/ModelConfig.js";
-export * from "./lib/creator/ModelCreator.js";
-export * from "./lib/creator/ModelCreatorIcons.js";
-export * from "./lib/ModelInfo.js";
-export * from "./lib/ModelMapping.js";
-export * from "./lib/Models.js";
-export * from "./lib/ModelsByPage.js";
 export * from "./lib/classes/ImageModel.js";
 export * from "./lib/classes/Model.js";
 export * from "./lib/classes/VideoModel.js";
+export * from "./lib/legacy/ModelConfig.js";
+export * from "./lib/legacy/ModelInfo.js";
+export * from "./lib/legacy/Models.js";
+export * from "./lib/legacy/ModelsByPage.js";
 export * from "./lib/lists/AllModels.js";
 export * from "./lib/lists/ImageModels.js";
-export * from "./lib/lists/VideoModels.js";
\ No newline at end of file
+export * from "./lib/lists/VideoModels.js";
+export * from "./lib/metadata/ModelCreator.js";
+export * from "./lib/metadata/ModelCreatorIcons.js";
+export * from "./lib/metadata/ModelMapping.js";
+export * from "./lib/metadata/ModelTag.js";
diff --git a/frontend/libs/model-list/src/lib/classes/ImageModel.ts b/frontend/libs/model-list/src/lib/classes/ImageModel.ts
index beeb42897e..8454061352 100644
--- a/frontend/libs/model-list/src/lib/classes/ImageModel.ts
+++ b/frontend/libs/model-list/src/lib/classes/ImageModel.ts
@@ -1,7 +1,7 @@
 import { ModelCreator } from "src/index.js";
 import { Model } from "./Model.js";
-import { ModelCategory } from "../ModelConfig.js";
-import { ModelTag } from "../ModelTag.js";
+import { ModelCategory } from "../legacy/ModelConfig.js";
+import { ModelTag } from "../metadata/ModelTag.js";
 
 export class ImageModel extends Model {
   readonly maxGenerationCount: number;
diff --git a/frontend/libs/model-list/src/lib/classes/Model.ts b/frontend/libs/model-list/src/lib/classes/Model.ts
index 664fc2551a..c1ddcdd341 100644
--- a/frontend/libs/model-list/src/lib/classes/Model.ts
+++ b/frontend/libs/model-list/src/lib/classes/Model.ts
@@ -1,6 +1,6 @@
-import { ModelCreator } from "../creator/ModelCreator.js";
-import { ModelCategory, ModelConfig } from "../ModelConfig.js";
-import { ModelTag } from "../ModelTag.js";
+import { ModelCreator } from "../metadata/ModelCreator.js";
+import { ModelCategory, ModelConfig } from "../legacy/ModelConfig.js";
+import { ModelTag } from "../metadata/ModelTag.js";
 
 // NB: Do not create instances of this class directly, use subclasses.
 export class Model {
diff --git a/frontend/libs/model-list/src/lib/classes/VideoModel.ts b/frontend/libs/model-list/src/lib/classes/VideoModel.ts
index 9814f11b92..495c2d4dde 100644
--- a/frontend/libs/model-list/src/lib/classes/VideoModel.ts
+++ b/frontend/libs/model-list/src/lib/classes/VideoModel.ts
@@ -1,7 +1,7 @@
 import { ModelCreator } from "src/index.js";
 import { Model } from "./Model.js";
-import { ModelCategory } from "../ModelConfig.js";
-import { ModelTag } from "../ModelTag.js";
+import { ModelCategory } from "../legacy/ModelConfig.js";
+import { ModelTag } from "../metadata/ModelTag.js";
 
 export class VideoModel extends Model {
   // Whether the model supports image starting frames
diff --git a/frontend/libs/model-list/src/lib/ModelConfig.ts b/frontend/libs/model-list/src/lib/legacy/ModelConfig.ts
similarity index 92%
rename from frontend/libs/model-list/src/lib/ModelConfig.ts
rename to frontend/libs/model-list/src/lib/legacy/ModelConfig.ts
index ca8d65d730..e6230587af 100644
--- a/frontend/libs/model-list/src/lib/ModelConfig.ts
+++ b/frontend/libs/model-list/src/lib/legacy/ModelConfig.ts
@@ -1,5 +1,5 @@
 import { ModelInfo } from "./ModelInfo.js";
-import { ModelTag } from "./ModelTag.js";
+import { ModelTag } from "../metadata/ModelTag.js";
 
 export type ModelCategory = "image" | "video";
 
diff --git a/frontend/libs/model-list/src/lib/ModelInfo.ts b/frontend/libs/model-list/src/lib/legacy/ModelInfo.ts
similarity index 84%
rename from frontend/libs/model-list/src/lib/ModelInfo.ts
rename to frontend/libs/model-list/src/lib/legacy/ModelInfo.ts
index 76e5d905a0..2b355d65cd 100644
--- a/frontend/libs/model-list/src/lib/ModelInfo.ts
+++ b/frontend/libs/model-list/src/lib/legacy/ModelInfo.ts
@@ -1,4 +1,4 @@
-import { ModelCreator } from "./creator/ModelCreator.js";
+import { ModelCreator } from "../metadata/ModelCreator.js";
 
 export interface ModelInfo {
   // Human-readible name
diff --git a/frontend/libs/model-list/src/lib/Models.ts b/frontend/libs/model-list/src/lib/legacy/Models.ts
similarity index 97%
rename from frontend/libs/model-list/src/lib/Models.ts
rename to frontend/libs/model-list/src/lib/legacy/Models.ts
index b0d50ab9ca..8deb0e8254 100644
--- a/frontend/libs/model-list/src/lib/Models.ts
+++ b/frontend/libs/model-list/src/lib/legacy/Models.ts
@@ -1,12 +1,12 @@
-import { ModelCreator } from "./creator/ModelCreator.js";
+import { ModelCreator } from "../metadata/ModelCreator.js";
 import { ModelInfo } from "./ModelInfo.js";
-import { ModelTag } from "./ModelTag.js";
+import { ModelTag } from "../metadata/ModelTag.js";
 import {
   ModelConfig,
   ModelCapabilities,
   ModelCategory,
 } from "./ModelConfig.js";
-import { Model } from "./classes/Model.js";
+import { Model } from "../classes/Model.js";
 
 const mc = ModelCreator;
 
diff --git a/frontend/libs/model-list/src/lib/ModelsByPage.ts b/frontend/libs/model-list/src/lib/legacy/ModelsByPage.ts
similarity index 100%
rename from frontend/libs/model-list/src/lib/ModelsByPage.ts
rename to frontend/libs/model-list/src/lib/legacy/ModelsByPage.ts
diff --git a/frontend/libs/model-list/src/lib/lists/ImageModels.ts b/frontend/libs/model-list/src/lib/lists/ImageModels.ts
index 4a6cb582a8..298e1dfad4 100644
--- a/frontend/libs/model-list/src/lib/lists/ImageModels.ts
+++ b/frontend/libs/model-list/src/lib/lists/ImageModels.ts
@@ -1,6 +1,6 @@
 import { ImageModel } from "../classes/ImageModel.js";
-import { ModelCreator } from "../creator/ModelCreator.js";
-import { ModelTag } from "../ModelTag.js";
+import { ModelCreator } from "../metadata/ModelCreator.js";
+import { ModelTag } from "../metadata/ModelTag.js";
 
 export const IMAGE_MODELS: ImageModel[] = [
   new ImageModel({
diff --git a/frontend/libs/model-list/src/lib/lists/VideoModels.ts b/frontend/libs/model-list/src/lib/lists/VideoModels.ts
index 7e6bb6e494..6351b19cf9 100644
--- a/frontend/libs/model-list/src/lib/lists/VideoModels.ts
+++ b/frontend/libs/model-list/src/lib/lists/VideoModels.ts
@@ -1,5 +1,5 @@
 import { VideoModel } from "../classes/VideoModel.js";
-import { ModelCreator } from "../creator/ModelCreator.js";
+import { ModelCreator } from "../metadata/ModelCreator.js";
 
 export const VIDEO_MODELS: VideoModel[] = [
   new VideoModel({
diff --git a/frontend/libs/model-list/src/lib/creator/ModelCreator.ts b/frontend/libs/model-list/src/lib/metadata/ModelCreator.ts
similarity index 100%
rename from frontend/libs/model-list/src/lib/creator/ModelCreator.ts
rename to frontend/libs/model-list/src/lib/metadata/ModelCreator.ts
diff --git a/frontend/libs/model-list/src/lib/creator/ModelCreatorIcons.ts b/frontend/libs/model-list/src/lib/metadata/ModelCreatorIcons.ts
similarity index 100%
rename from frontend/libs/model-list/src/lib/creator/ModelCreatorIcons.ts
rename to frontend/libs/model-list/src/lib/metadata/ModelCreatorIcons.ts
diff --git a/frontend/libs/model-list/src/lib/ModelMapping.ts b/frontend/libs/model-list/src/lib/metadata/ModelMapping.ts
similarity index 97%
rename from frontend/libs/model-list/src/lib/ModelMapping.ts
rename to frontend/libs/model-list/src/lib/metadata/ModelMapping.ts
index 4c197a7099..b6c1c3aa80 100644
--- a/frontend/libs/model-list/src/lib/ModelMapping.ts
+++ b/frontend/libs/model-list/src/lib/metadata/ModelMapping.ts
@@ -1,6 +1,6 @@
 import React from "react";
-import { ModelCreator } from "./creator/ModelCreator.js";
-import { getCreatorIcon } from "./creator/ModelCreatorIcons.js";
+import { ModelCreator } from "./ModelCreator.js";
+import { getCreatorIcon } from "./ModelCreatorIcons.js";
 
 // Map from model type strings to ModelCreator enum values
 export const MODEL_TYPE_TO_CREATOR: Record<string, ModelCreator> = {
diff --git a/frontend/libs/model-list/src/lib/ModelTag.ts b/frontend/libs/model-list/src/lib/metadata/ModelTag.ts
similarity index 100%
rename from frontend/libs/model-list/src/lib/ModelTag.ts
rename to frontend/libs/model-list/src/lib/metadata/ModelTag.ts