diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/embed.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/embed.controller.js
index 9082dc5326..bcc67d21cf 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/embed.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/embed.controller.js
@@ -1,4 +1,4 @@
-angular.module("umbraco").controller("Umbraco.Dialogs.EmbedController", function ($scope, $http) {
+angular.module("umbraco").controller("Umbraco.Dialogs.RteEmbedController", function ($scope, $http) {
     $scope.url = "";
     $scope.width = 500;
     $scope.height = 300;
@@ -14,7 +14,7 @@
             
             $scope.success = false;
 
-            $http({ method: 'POST', url: '/umbraco/UmbracoApi/Embed/Embed', params: { url: $scope.url, width: $scope.width, height: $scope.height } })
+            $http({ method: 'POST', url: '/umbraco/UmbracoApi/RteEmbed/Embed', params: { url: $scope.url, width: $scope.width, height: $scope.height } })
                 .success(function(data) {
                     $scope.preview = data.Markup;
                     $scope.success = true;
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/embed.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/embed.html
index d76e5b52a7..56899697e6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/embed.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/embed.html
@@ -1,4 +1,4 @@
-<div class="umb-panel" ng-controller="Umbraco.Dialogs.EmbedController">
+<div class="umb-panel" ng-controller="Umbraco.Dialogs.RteEmbedController">
  
     
     <div class="umb-panel-header">
diff --git a/src/Umbraco.Web/Editors/EmbedController.cs b/src/Umbraco.Web/PropertyEditors/RteEmbedController.cs
similarity index 95%
rename from src/Umbraco.Web/Editors/EmbedController.cs
rename to src/Umbraco.Web/PropertyEditors/RteEmbedController.cs
index 15dfd51a97..e09d87218b 100644
--- a/src/Umbraco.Web/Editors/EmbedController.cs
+++ b/src/Umbraco.Web/PropertyEditors/RteEmbedController.cs
@@ -6,19 +6,20 @@ using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Xml;
 using Umbraco.Core.Configuration;
+using Umbraco.Web.Editors;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.WebApi.Filters;
 using Constants = Umbraco.Core.Constants;
 using Umbraco.Core.Media;
 using System.IO;
 
-namespace Umbraco.Web.Editors
+namespace Umbraco.Web.PropertyEditors
 {
     /// <summary>
     /// A controller used for the embed dialog
     /// </summary>
     [PluginController("UmbracoApi")]
-    public class EmbedController : UmbracoAuthorizedJsonController
+    public class RteEmbedController : UmbracoAuthorizedJsonController
     {
         public Result Embed(string url, int width, int height)
         {
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 3338fd23b5..9d60faccfb 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -304,7 +304,7 @@
     <Compile Include="Editors\DashboardController.cs" />
     <Compile Include="Editors\DataTypeController.cs" />
     <Compile Include="Editors\DataTypeValidateAttribute.cs" />
-    <Compile Include="Editors\EmbedController.cs" />
+    <Compile Include="PropertyEditors\RteEmbedController.cs" />
     <Compile Include="Editors\EntityController.cs" />
     <Compile Include="Editors\MediaPostValidateAttribute.cs" />
     <Compile Include="Editors\MemberController.cs" />