diff --git a/ghost/admin/app/components/editor-labs/modals/preview.hbs b/ghost/admin/app/components/editor/modals/preview.hbs
similarity index 94%
rename from ghost/admin/app/components/editor-labs/modals/preview.hbs
rename to ghost/admin/app/components/editor/modals/preview.hbs
index e035c97a43..1cafde3639 100644
--- a/ghost/admin/app/components/editor-labs/modals/preview.hbs
+++ b/ghost/admin/app/components/editor/modals/preview.hbs
@@ -51,14 +51,14 @@
         <GhLoadingSpinner />
     {{else}}
         {{#if (eq this.tab "browser")}}
-            <EditorLabs::Modals::Preview::Browser
+            <Editor::Modals::Preview::Browser
                 @post={{@data.publishOptions.post}}
                 @skipAnimation={{this.skipAnimation}}
             />
         {{/if}}
 
         {{#if (and (eq this.tab "mobile"))}}
-            <EditorLabs::Modals::Preview::Mobile
+            <Editor::Modals::Preview::Mobile
                 @post={{@data.publishOptions.post}}
                 @skipAnimation={{this.skipAnimation}}
             />
@@ -66,7 +66,7 @@
 
         {{#unless @data.publishOptions.user.isContributor}}
             {{#if (and (eq this.tab "email") @data.publishOptions.post.isPost)}}
-                <EditorLabs::Modals::Preview::Email
+                <Editor::Modals::Preview::Email
                     @post={{@data.publishOptions.post}}
                     @newsletter={{@data.publishOptions.newsletter}}
                     @skipAnimation={{this.skipAnimation}}
@@ -75,7 +75,7 @@
         {{/unless}}
 
         {{#if (eq this.tab "social")}}
-            <EditorLabs::Modals::Preview::Social
+            <Editor::Modals::Preview::Social
                 @post={{@data.publishOptions.post}}
                 @skipAnimation={{this.skipAnimation}}
             />
diff --git a/ghost/admin/app/components/editor-labs/modals/preview.js b/ghost/admin/app/components/editor/modals/preview.js
similarity index 100%
rename from ghost/admin/app/components/editor-labs/modals/preview.js
rename to ghost/admin/app/components/editor/modals/preview.js
diff --git a/ghost/admin/app/components/editor-labs/modals/preview/browser.hbs b/ghost/admin/app/components/editor/modals/preview/browser.hbs
similarity index 100%
rename from ghost/admin/app/components/editor-labs/modals/preview/browser.hbs
rename to ghost/admin/app/components/editor/modals/preview/browser.hbs
diff --git a/ghost/admin/app/components/editor-labs/modals/preview/browser.js b/ghost/admin/app/components/editor/modals/preview/browser.js
similarity index 100%
rename from ghost/admin/app/components/editor-labs/modals/preview/browser.js
rename to ghost/admin/app/components/editor/modals/preview/browser.js
diff --git a/ghost/admin/app/components/editor-labs/modals/preview/email.hbs b/ghost/admin/app/components/editor/modals/preview/email.hbs
similarity index 100%
rename from ghost/admin/app/components/editor-labs/modals/preview/email.hbs
rename to ghost/admin/app/components/editor/modals/preview/email.hbs
diff --git a/ghost/admin/app/components/editor-labs/modals/preview/email.js b/ghost/admin/app/components/editor/modals/preview/email.js
similarity index 100%
rename from ghost/admin/app/components/editor-labs/modals/preview/email.js
rename to ghost/admin/app/components/editor/modals/preview/email.js
diff --git a/ghost/admin/app/components/editor-labs/modals/preview/mobile.hbs b/ghost/admin/app/components/editor/modals/preview/mobile.hbs
similarity index 100%
rename from ghost/admin/app/components/editor-labs/modals/preview/mobile.hbs
rename to ghost/admin/app/components/editor/modals/preview/mobile.hbs
diff --git a/ghost/admin/app/components/editor-labs/modals/preview/mobile.js b/ghost/admin/app/components/editor/modals/preview/mobile.js
similarity index 100%
rename from ghost/admin/app/components/editor-labs/modals/preview/mobile.js
rename to ghost/admin/app/components/editor/modals/preview/mobile.js
diff --git a/ghost/admin/app/components/editor-labs/modals/preview/social.hbs b/ghost/admin/app/components/editor/modals/preview/social.hbs
similarity index 100%
rename from ghost/admin/app/components/editor-labs/modals/preview/social.hbs
rename to ghost/admin/app/components/editor/modals/preview/social.hbs
diff --git a/ghost/admin/app/components/editor-labs/modals/preview/social.js b/ghost/admin/app/components/editor/modals/preview/social.js
similarity index 100%
rename from ghost/admin/app/components/editor-labs/modals/preview/social.js
rename to ghost/admin/app/components/editor/modals/preview/social.js
diff --git a/ghost/admin/app/components/editor-labs/modals/publish-flow.hbs b/ghost/admin/app/components/editor/modals/publish-flow.hbs
similarity index 90%
rename from ghost/admin/app/components/editor-labs/modals/publish-flow.hbs
rename to ghost/admin/app/components/editor/modals/publish-flow.hbs
index 962cbb6b3c..b388b12c9f 100644
--- a/ghost/admin/app/components/editor-labs/modals/publish-flow.hbs
+++ b/ghost/admin/app/components/editor/modals/publish-flow.hbs
@@ -23,13 +23,13 @@
 
     <div class="gh-publish-settings-container {{unless @data.skipAnimation "fade-in"}}">
         {{#if this.emailErrorMessage}}
-            <EditorLabs::Modals::PublishFlow::CompleteWithEmailError
+            <Editor::Modals::PublishFlow::CompleteWithEmailError
                 @emailErrorMessage={{this.emailErrorMessage}}
                 @publishOptions={{@data.publishOptions}}
                 @close={{@close}}
             />
         {{else if this.isConfirming}}
-            <EditorLabs::Modals::PublishFlow::Confirm
+            <Editor::Modals::PublishFlow::Confirm
                 @publishOptions={{@data.publishOptions}}
                 @recipientType={{this.recipientType}}
                 @saveTask={{this.saveTask}}
@@ -37,14 +37,14 @@
                 @close={{@close}}
             />
         {{else if this.isComplete}}
-            <EditorLabs::Modals::PublishFlow::Complete
+            <Editor::Modals::PublishFlow::Complete
                 @publishOptions={{@data.publishOptions}}
                 @recipientType={{this.recipientType}}
                 @postCount={{this.postCount}}
                 @close={{@close}}
             />
         {{else}}
-            <EditorLabs::Modals::PublishFlow::Options
+            <Editor::Modals::PublishFlow::Options
                 @publishOptions={{@data.publishOptions}}
                 @recipientType={{this.recipientType}}
                 @confirm={{this.toggleConfirm}}
diff --git a/ghost/admin/app/components/editor-labs/modals/publish-flow.js b/ghost/admin/app/components/editor/modals/publish-flow.js
similarity index 100%
rename from ghost/admin/app/components/editor-labs/modals/publish-flow.js
rename to ghost/admin/app/components/editor/modals/publish-flow.js
diff --git a/ghost/admin/app/components/editor-labs/modals/publish-flow/complete-with-email-error.hbs b/ghost/admin/app/components/editor/modals/publish-flow/complete-with-email-error.hbs
similarity index 100%
rename from ghost/admin/app/components/editor-labs/modals/publish-flow/complete-with-email-error.hbs
rename to ghost/admin/app/components/editor/modals/publish-flow/complete-with-email-error.hbs
diff --git a/ghost/admin/app/components/editor-labs/modals/publish-flow/complete-with-email-error.js b/ghost/admin/app/components/editor/modals/publish-flow/complete-with-email-error.js
similarity index 100%
rename from ghost/admin/app/components/editor-labs/modals/publish-flow/complete-with-email-error.js
rename to ghost/admin/app/components/editor/modals/publish-flow/complete-with-email-error.js
diff --git a/ghost/admin/app/components/editor-labs/modals/publish-flow/complete.hbs b/ghost/admin/app/components/editor/modals/publish-flow/complete.hbs
similarity index 100%
rename from ghost/admin/app/components/editor-labs/modals/publish-flow/complete.hbs
rename to ghost/admin/app/components/editor/modals/publish-flow/complete.hbs
diff --git a/ghost/admin/app/components/editor-labs/modals/publish-flow/confirm.hbs b/ghost/admin/app/components/editor/modals/publish-flow/confirm.hbs
similarity index 100%
rename from ghost/admin/app/components/editor-labs/modals/publish-flow/confirm.hbs
rename to ghost/admin/app/components/editor/modals/publish-flow/confirm.hbs
diff --git a/ghost/admin/app/components/editor-labs/modals/publish-flow/confirm.js b/ghost/admin/app/components/editor/modals/publish-flow/confirm.js
similarity index 100%
rename from ghost/admin/app/components/editor-labs/modals/publish-flow/confirm.js
rename to ghost/admin/app/components/editor/modals/publish-flow/confirm.js
diff --git a/ghost/admin/app/components/editor-labs/modals/publish-flow/options.hbs b/ghost/admin/app/components/editor/modals/publish-flow/options.hbs
similarity index 97%
rename from ghost/admin/app/components/editor-labs/modals/publish-flow/options.hbs
rename to ghost/admin/app/components/editor/modals/publish-flow/options.hbs
index 1117b5af33..d08b321a27 100644
--- a/ghost/admin/app/components/editor-labs/modals/publish-flow/options.hbs
+++ b/ghost/admin/app/components/editor/modals/publish-flow/options.hbs
@@ -22,7 +22,7 @@
         {{/if}}
         {{#liquid-if (eq this.openSection "publishType")}}
             <div class="gh-publish-setting-form">
-                <EditorLabs::PublishOptions::PublishType
+                <Editor::PublishOptions::PublishType
                     @publishOptions={{@publishOptions}}
                 />
             </div>
@@ -82,7 +82,7 @@
             {{/if}}
             {{#liquid-if (eq this.openSection "emailRecipients")}}
                 <div class="gh-publish-setting-form">
-                    <EditorLabs::PublishOptions::EmailRecipients
+                    <Editor::PublishOptions::EmailRecipients
                         @publishOptions={{@publishOptions}}
                     />
                 </div>
@@ -125,7 +125,7 @@
         </button>
         {{#liquid-if (eq this.openSection "publishAt")}}
             <div class="gh-publish-setting-form last">
-                <EditorLabs::PublishOptions::PublishAt
+                <Editor::PublishOptions::PublishAt
                     @publishOptions={{@publishOptions}}
                 />
             </div>
diff --git a/ghost/admin/app/components/editor-labs/modals/publish-flow/options.js b/ghost/admin/app/components/editor/modals/publish-flow/options.js
similarity index 100%
rename from ghost/admin/app/components/editor-labs/modals/publish-flow/options.js
rename to ghost/admin/app/components/editor/modals/publish-flow/options.js
diff --git a/ghost/admin/app/components/editor-labs/modals/update-flow.hbs b/ghost/admin/app/components/editor/modals/update-flow.hbs
similarity index 100%
rename from ghost/admin/app/components/editor-labs/modals/update-flow.hbs
rename to ghost/admin/app/components/editor/modals/update-flow.hbs
diff --git a/ghost/admin/app/components/editor-labs/modals/update-flow.js b/ghost/admin/app/components/editor/modals/update-flow.js
similarity index 100%
rename from ghost/admin/app/components/editor-labs/modals/update-flow.js
rename to ghost/admin/app/components/editor/modals/update-flow.js
diff --git a/ghost/admin/app/components/editor-labs/publish-management.hbs b/ghost/admin/app/components/editor/publish-management.hbs
similarity index 100%
rename from ghost/admin/app/components/editor-labs/publish-management.hbs
rename to ghost/admin/app/components/editor/publish-management.hbs
diff --git a/ghost/admin/app/components/editor-labs/publish-management.js b/ghost/admin/app/components/editor/publish-management.js
similarity index 100%
rename from ghost/admin/app/components/editor-labs/publish-management.js
rename to ghost/admin/app/components/editor/publish-management.js
diff --git a/ghost/admin/app/components/editor-labs/publish-options/email-recipients.hbs b/ghost/admin/app/components/editor/publish-options/email-recipients.hbs
similarity index 100%
rename from ghost/admin/app/components/editor-labs/publish-options/email-recipients.hbs
rename to ghost/admin/app/components/editor/publish-options/email-recipients.hbs
diff --git a/ghost/admin/app/components/editor-labs/publish-options/publish-at.hbs b/ghost/admin/app/components/editor/publish-options/publish-at.hbs
similarity index 100%
rename from ghost/admin/app/components/editor-labs/publish-options/publish-at.hbs
rename to ghost/admin/app/components/editor/publish-options/publish-at.hbs
diff --git a/ghost/admin/app/components/editor-labs/publish-options/publish-at.js b/ghost/admin/app/components/editor/publish-options/publish-at.js
similarity index 100%
rename from ghost/admin/app/components/editor-labs/publish-options/publish-at.js
rename to ghost/admin/app/components/editor/publish-options/publish-at.js
diff --git a/ghost/admin/app/components/editor-labs/publish-options/publish-type.hbs b/ghost/admin/app/components/editor/publish-options/publish-type.hbs
similarity index 100%
rename from ghost/admin/app/components/editor-labs/publish-options/publish-type.hbs
rename to ghost/admin/app/components/editor/publish-options/publish-type.hbs
diff --git a/ghost/admin/app/components/editor-labs/publish-options/publish-type.js b/ghost/admin/app/components/editor/publish-options/publish-type.js
similarity index 100%
rename from ghost/admin/app/components/editor-labs/publish-options/publish-type.js
rename to ghost/admin/app/components/editor/publish-options/publish-type.js
diff --git a/ghost/admin/app/templates/editor.hbs b/ghost/admin/app/templates/editor.hbs
index 452dc44e13..1e3fb16489 100644
--- a/ghost/admin/app/templates/editor.hbs
+++ b/ghost/admin/app/templates/editor.hbs
@@ -28,7 +28,7 @@
 
                 <section class="flex items-center pe-auto h-100">
                     {{#unless this.post.isNew}}
-                        <EditorLabs::PublishManagement
+                        <Editor::PublishManagement
                             @post={{this.post}}
                             @hasUnsavedChanges={{this.hasDirtyAttributes}}
                             @beforePublish={{perform this.beforeSaveTask}}