diff --git a/frontend/src/metabase/query_builder/components/QueryModals.jsx b/frontend/src/metabase/query_builder/components/QueryModals.jsx
index 1932a7a4e09b978e4f071baed0825eb1ea80fe53..bf79fef66c5b7441e0ef7edc99f11e2fd7c5e481 100644
--- a/frontend/src/metabase/query_builder/components/QueryModals.jsx
+++ b/frontend/src/metabase/query_builder/components/QueryModals.jsx
@@ -17,7 +17,7 @@ import QuestionSavedModal from "metabase/components/QuestionSavedModal";
 import AddToDashSelectDashModal from "metabase/containers/AddToDashSelectDashModal";
 
 import CollectionMoveModal from "metabase/containers/CollectionMoveModal";
-import ArchiveQuestionModal from "metabase/query_builder/containers/ArchiveQuestionModal";
+import ArchiveQuestionModal from "metabase/questions/containers/ArchiveQuestionModal";
 import QuestionEmbedWidget from "metabase/query_builder/containers/QuestionEmbedWidget";
 
 import QuestionHistoryModal from "metabase/query_builder/containers/QuestionHistoryModal";
@@ -31,7 +31,7 @@ import EditEventModal from "metabase/timelines/questions/containers/EditEventMod
 import MoveEventModal from "metabase/timelines/questions/containers/MoveEventModal";
 import PreviewQueryModal from "metabase/query_builder/components/view/PreviewQueryModal";
 import ConvertQueryModal from "metabase/query_builder/components/view/ConvertQueryModal";
-import QuestionMoveToast from "./QuestionMoveToast";
+import QuestionMoveToast from "metabase/questions/components/QuestionMoveToast";
 
 const mapDispatchToProps = {
   setQuestionCollection: Questions.actions.setCollection,
diff --git a/frontend/src/metabase/query_builder/components/QuestionMoveToast/QuestionMoveToast.styled.tsx b/frontend/src/metabase/questions/components/QuestionMoveToast/QuestionMoveToast.styled.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/QuestionMoveToast/QuestionMoveToast.styled.tsx
rename to frontend/src/metabase/questions/components/QuestionMoveToast/QuestionMoveToast.styled.tsx
diff --git a/frontend/src/metabase/query_builder/components/QuestionMoveToast/QuestionMoveToast.tsx b/frontend/src/metabase/questions/components/QuestionMoveToast/QuestionMoveToast.tsx
similarity index 88%
rename from frontend/src/metabase/query_builder/components/QuestionMoveToast/QuestionMoveToast.tsx
rename to frontend/src/metabase/questions/components/QuestionMoveToast/QuestionMoveToast.tsx
index 8faf35fe53e1de3ceb31227d5fe84e5a607b323c..d5dcc02226295d42d13486723b99fc178f5e69e9 100644
--- a/frontend/src/metabase/query_builder/components/QuestionMoveToast/QuestionMoveToast.tsx
+++ b/frontend/src/metabase/questions/components/QuestionMoveToast/QuestionMoveToast.tsx
@@ -11,10 +11,7 @@ interface QuestionMoveToastProps {
   collectionId: number;
 }
 
-export default function QuestionMoveToast({
-  isModel,
-  collectionId,
-}: QuestionMoveToastProps) {
+function QuestionMoveToast({ isModel, collectionId }: QuestionMoveToastProps) {
   return (
     <ToastRoot>
       <StyledIcon name="all" color="white" />
@@ -38,3 +35,5 @@ export default function QuestionMoveToast({
     </ToastRoot>
   );
 }
+
+export default QuestionMoveToast;
diff --git a/frontend/src/metabase/query_builder/components/QuestionMoveToast/index.ts b/frontend/src/metabase/questions/components/QuestionMoveToast/index.ts
similarity index 100%
rename from frontend/src/metabase/query_builder/components/QuestionMoveToast/index.ts
rename to frontend/src/metabase/questions/components/QuestionMoveToast/index.ts
diff --git a/frontend/src/metabase/query_builder/containers/ArchiveQuestionModal.jsx b/frontend/src/metabase/questions/containers/ArchiveQuestionModal.jsx
similarity index 100%
rename from frontend/src/metabase/query_builder/containers/ArchiveQuestionModal.jsx
rename to frontend/src/metabase/questions/containers/ArchiveQuestionModal.jsx