diff --git a/frontend/src/metabase/new_model/components/NewModelOption.jsx b/frontend/src/metabase/models/components/NewModelOption.jsx
similarity index 100%
rename from frontend/src/metabase/new_model/components/NewModelOption.jsx
rename to frontend/src/metabase/models/components/NewModelOption.jsx
diff --git a/frontend/src/metabase/new_model/containers/NewModelOptions.jsx b/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.jsx
similarity index 94%
rename from frontend/src/metabase/new_model/containers/NewModelOptions.jsx
rename to frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.jsx
index ee750cf955ac073d48a406eeb99931dcaf648cdd..8be81fc942be22594e01b68a8de18ed7a1cd6649 100644
--- a/frontend/src/metabase/new_model/containers/NewModelOptions.jsx
+++ b/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.jsx
@@ -3,13 +3,17 @@ import React, { Component } from "react";
 import { connect } from "react-redux";
 import { push } from "react-router-redux";
 import { t } from "ttag";
+
+import { Grid } from "metabase/components/Grid";
+import NewModelOption from "metabase/models/components/NewModelOption";
+
 import MetabaseSettings from "metabase/lib/settings";
 import * as Urls from "metabase/lib/urls";
-import { Grid } from "metabase/components/Grid";
-import NewModelOption from "metabase/new_model/components/NewModelOption";
-import NoDatabasesEmptyState from "metabase/reference/databases/NoDatabasesEmptyState";
-import { getHasDataAccess, getHasNativeWrite } from "metabase/selectors/data";
 import Database from "metabase/entities/databases";
+import { getHasDataAccess, getHasNativeWrite } from "metabase/selectors/data";
+
+import NoDatabasesEmptyState from "metabase/reference/databases/NoDatabasesEmptyState";
+
 import {
   OptionsGridItem,
   OptionsRoot,
@@ -59,9 +63,7 @@ class NewModelOptions extends Component {
       );
     }
 
-    {
-      /* Determine how many items will be shown based on permissions etc so we can make sure the layout adapts */
-    }
+    // Determine how many items will be shown based on permissions etc so we can make sure the layout adapts
     const itemsCount = (hasDataAccess ? 1 : 0) + (hasNativeWrite ? 1 : 0);
 
     return (
diff --git a/frontend/src/metabase/new_model/containers/NewModelOptions.styled.tsx b/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.styled.tsx
similarity index 100%
rename from frontend/src/metabase/new_model/containers/NewModelOptions.styled.tsx
rename to frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.styled.tsx
diff --git a/frontend/src/metabase/models/containers/NewModelOptions/index.ts b/frontend/src/metabase/models/containers/NewModelOptions/index.ts
new file mode 100644
index 0000000000000000000000000000000000000000..1c22815eb484450be6ca1664e1834bf29553e802
--- /dev/null
+++ b/frontend/src/metabase/models/containers/NewModelOptions/index.ts
@@ -0,0 +1 @@
+export { default } from "./NewModelOptions";
diff --git a/frontend/src/metabase/routes.jsx b/frontend/src/metabase/routes.jsx
index f04ab1b7c3c6cc3c0d5ddea7007415791a5e59ef..17ad1c4b7e2789360d54cd5003f5fd23e44b2ca1 100644
--- a/frontend/src/metabase/routes.jsx
+++ b/frontend/src/metabase/routes.jsx
@@ -40,7 +40,7 @@ import UserCollectionList from "metabase/containers/UserCollectionList";
 import PulseEditApp from "metabase/pulse/containers/PulseEditApp";
 import SetupApp from "metabase/setup/containers/SetupApp";
 
-import NewModelOptions from "metabase/new_model/containers/NewModelOptions";
+import NewModelOptions from "metabase/models/containers/NewModelOptions";
 
 import { Unauthorized } from "metabase/containers/ErrorPages";
 import NotFoundFallbackPage from "metabase/containers/NotFoundFallbackPage";