diff --git a/src/Umbraco.Core/Embed/ProviderSetting.cs b/src/Umbraco.Core/Embed/ProviderSetting.cs
deleted file mode 100644
index 8256e66afa..0000000000
--- a/src/Umbraco.Core/Embed/ProviderSetting.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-namespace Umbraco.Core.Embed
-{
-
-    public class ProviderSetting: System.Attribute
-    {
-    }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Embed/IEmbedProvider.cs b/src/Umbraco.Core/Media/IEmbedProvider.cs
similarity index 54%
rename from src/Umbraco.Core/Embed/IEmbedProvider.cs
rename to src/Umbraco.Core/Media/IEmbedProvider.cs
index 5f41507520..73232d4637 100644
--- a/src/Umbraco.Core/Embed/IEmbedProvider.cs
+++ b/src/Umbraco.Core/Media/IEmbedProvider.cs
@@ -1,13 +1,9 @@
-using System;
-
-namespace Umbraco.Core.Embed
+namespace Umbraco.Core.Media
 {
     public interface IEmbedProvider
     {
         bool SupportsDimensions { get; }
 
         string GetMarkup(string url, int maxWidth = 0, int maxHeight = 0);
-
-        //string GetPreview(string url, int maxWidth = 0, int maxHeight = 0);
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/Embed/IEmbedSettingProvider.cs b/src/Umbraco.Core/Media/IEmbedSettingProvider.cs
similarity index 53%
rename from src/Umbraco.Core/Embed/IEmbedSettingProvider.cs
rename to src/Umbraco.Core/Media/IEmbedSettingProvider.cs
index 7e214c1380..ab1979184b 100644
--- a/src/Umbraco.Core/Embed/IEmbedSettingProvider.cs
+++ b/src/Umbraco.Core/Media/IEmbedSettingProvider.cs
@@ -1,11 +1,9 @@
-using System;
-using System.Xml;
+using System.Xml;
 
-namespace Umbraco.Core.Embed
+namespace Umbraco.Core.Media
 {
     public interface IEmbedSettingProvider
-    {
-       
+    {       
         object GetSetting(XmlNode settingNode);
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/Media/ProviderSetting.cs b/src/Umbraco.Core/Media/ProviderSetting.cs
new file mode 100644
index 0000000000..bfd06203d4
--- /dev/null
+++ b/src/Umbraco.Core/Media/ProviderSetting.cs
@@ -0,0 +1,8 @@
+using System;
+
+namespace Umbraco.Core.Media
+{
+    public class ProviderSetting : Attribute
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Embed/Result.cs b/src/Umbraco.Core/Media/Result.cs
similarity index 57%
rename from src/Umbraco.Core/Embed/Result.cs
rename to src/Umbraco.Core/Media/Result.cs
index 002d181fcf..fc1ea08f32 100644
--- a/src/Umbraco.Core/Embed/Result.cs
+++ b/src/Umbraco.Core/Media/Result.cs
@@ -1,15 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-namespace Umbraco.Core.Embed
+namespace Umbraco.Core.Media
 {
     public class Result
     {
         public Status Status { get; set; }
         public bool SupportsDimensions { get; set; }
         public string Markup { get; set; }
-
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/Embed/Status.cs b/src/Umbraco.Core/Media/Status.cs
similarity index 67%
rename from src/Umbraco.Core/Embed/Status.cs
rename to src/Umbraco.Core/Media/Status.cs
index e4223ecb75..a66ff34b9e 100644
--- a/src/Umbraco.Core/Embed/Status.cs
+++ b/src/Umbraco.Core/Media/Status.cs
@@ -1,6 +1,4 @@
-
-
-namespace Umbraco.Core.Embed
+namespace Umbraco.Core.Media
 {
     public enum Status
     {
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 19dcea9750..9ea09529c5 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -52,11 +52,11 @@
     <Compile Include="Configuration\UmbracoSettings.cs" />
     <Compile Include="DelegateEqualityComparer.cs" />
     <Compile Include="DynamicWrapper.cs" />
-    <Compile Include="Embed\IEmbedProvider.cs" />
-    <Compile Include="Embed\IEmbedSettingProvider.cs" />
-    <Compile Include="Embed\ProviderSetting.cs" />
-    <Compile Include="Embed\Result.cs" />
-    <Compile Include="Embed\Status.cs" />
+    <Compile Include="Media\IEmbedProvider.cs" />
+    <Compile Include="Media\IEmbedSettingProvider.cs" />
+    <Compile Include="Media\ProviderSetting.cs" />
+    <Compile Include="Media\Result.cs" />
+    <Compile Include="Media\Status.cs" />
     <Compile Include="EnumerableExtensions.cs" />
     <Compile Include="IfExtensions.cs" />
     <Compile Include="IO\FileSecurityException.cs" />
diff --git a/src/Umbraco.Web.UI/Web.config b/src/Umbraco.Web.UI/Web.config
index 4a07691103..7afb3f5683 100644
--- a/src/Umbraco.Web.UI/Web.config
+++ b/src/Umbraco.Web.UI/Web.config
@@ -3,13 +3,16 @@
   <configSections>
     <section name="urlrewritingnet" restartOnExternalChanges="true" requirePermission="false" type="UrlRewritingNet.Configuration.UrlRewriteSection, UrlRewritingNet.UrlRewriter" />
     <section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" />
+
     <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
       <section name="umbraco.presentation.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
     </sectionGroup>
-    <section name="clientDependency" type="ClientDependency.Core.Config.ClientDependencySection, ClientDependency.Core" requirePermission="false" />
-    <section name="Examine" type="Examine.Config.ExamineSettings, Examine" requirePermission="false" />
-    <section name="ExamineLuceneIndexSets" type="UmbracoExamine.Config.ExamineLuceneIndexes, UmbracoExamine" requirePermission="false" />
-    <section name="FileSystemProviders" type="Umbraco.Core.Configuration.FileSystemProvidersSection, Umbraco.Core" requirePermission="false" />
+
+    <section name="clientDependency" type="ClientDependency.Core.Config.ClientDependencySection, ClientDependency.Core" requirePermission="false"/>
+    <section name="Examine" type="Examine.Config.ExamineSettings, Examine" requirePermission="false"/>
+    <section name="ExamineLuceneIndexSets" type="UmbracoExamine.Config.ExamineLuceneIndexes, UmbracoExamine" requirePermission="false"/>
+    <section name="FileSystemProviders" type="Umbraco.Core.Configuration.FileSystemProvidersSection, Umbraco.Core" requirePermission="false"/>
+
     <!-- Added in Umbraco 4.6.2 -->
     <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
       <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
@@ -17,15 +20,17 @@
     </sectionGroup>
     <!-- End of added in Umbraco 4.6.2 -->
   </configSections>
+  
   <urlrewritingnet configSource="config\UrlRewriting.config" />
   <microsoft.scripting configSource="config\scripting.config" />
   <clientDependency configSource="config\ClientDependency.config" />
   <Examine configSource="config\ExamineSettings.config" />
   <ExamineLuceneIndexSets configSource="config\ExamineIndex.config" />
   <FileSystemProviders configSource="config\FileSystemProviders.config" />
+
   <appSettings>
-    <add key="umbracoDbDSN" value="datalayer=SQLCE4Umbraco.SqlCEHelper,SQLCE4Umbraco;data source=|DataDirectory|\Umbraco.sdf" />
-    <add key="umbracoConfigurationStatus" value="4.9.0" />
+    <add key="umbracoDbDSN" value="" />
+    <add key="umbracoConfigurationStatus" value="" />
     <add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd" />
     <add key="umbracoReservedPaths" value="~/umbraco,~/install/" />
     <add key="umbracoContentXML" value="~/App_Data/umbraco.config" />
@@ -43,15 +48,17 @@
     <add key="umbracoProfileUrl" value="profiler" />
     <add key="umbracoUseSSL" value="false" />
     <add key="umbracoUseMediumTrust" value="false" />
+
     <!-- 
       Set this to true to enable storing the xml cache locally to the IIS server even if the app files are stored centrally on a SAN/NAS 
       Alex Norcliffe 2010 02 for 4.1
     -->
-    <add key="umbracoContentXMLUseLocalTemp" value="false" />
+    <add key="umbracoContentXMLUseLocalTemp" value="false"/>
+
     <!-- Added in Umbraco 4.6.2 -->
-    <add key="webpages:Enabled" value="false" />
-    <add key="enableSimpleMembership" value="false" />
-    <add key="autoFormsAuthentication" value="false" />
+    <add key="webpages:Enabled" value="false"/>
+    <add key="enableSimpleMembership" value="false"/>
+    <add key="autoFormsAuthentication" value="false"/>
     <!-- End of added in Umbraco 4.6.2 -->
   </appSettings>
   <system.net>
@@ -61,6 +68,7 @@
       </smtp>
     </mailSettings>
   </system.net>
+
   <connectionStrings>
     <remove name="LocalSqlServer" />
     <!--<add name="LocalSqlServer" connectionString="server=.\sqlexpress;database=aspnetdb;user id=DBUSER;password=DBPASSWORD" providerName="System.Data.SqlClient"/>-->
@@ -71,7 +79,9 @@
     <sessionState mode="InProc" stateConnectionString="tcpip=127.0.0.1:42424" sqlConnectionString="data source=127.0.0.1;Trusted_Connection=yes" cookieless="false" timeout="20" />
     <globalization requestEncoding="UTF-8" responseEncoding="UTF-8" />
     <xhtmlConformance mode="Strict" />
+
     <httpRuntime requestValidationMode="2.0" />
+
     <pages enableEventValidation="false">
       <!-- ASPNETAJAX -->
       <controls>
@@ -90,7 +100,7 @@
       <!-- ASPNETAJAX -->
       <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
       <!-- CLIENT DEPENDENCY -->
-      <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
+      <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core"/>
     </httpModules>
     <httpHandlers>
       <remove verb="*" path="*.asmx" />
@@ -98,14 +108,16 @@
       <add verb="*" path="*.asmx" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false" />
       <add verb="*" path="*_AppService.axd" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false" />
       <add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false" />
+
       <!-- UMBRACO CHANNELS -->
       <add verb="*" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
       <add verb="*" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
       <!-- CLIENT DEPENDENCY -->
-      <add verb="*" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
+      <add verb="*" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core "/>
       <!-- SPELL CHECKER -->
       <add verb="GET,HEAD,POST" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco" />
     </httpHandlers>
+
     <compilation defaultLanguage="c#" debug="true" batch="false" targetFramework="4.0">
       <assemblies>
         <!-- ASP.NET 4.0 Assemblies -->
@@ -117,14 +129,16 @@
         <add assembly="System.Web.Extensions.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
         <add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
       </assemblies>
+
       <!-- Added in Umbraco 4.6.2 -->
       <buildProviders>
-        <add extension=".cshtml" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines" />
-        <add extension=".vbhtml" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines" />
-        <add extension=".razor" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines" />
+        <add extension=".cshtml" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines"/>
+        <add extension=".vbhtml" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines"/>
+        <add extension=".razor" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines"/>
       </buildProviders>
       <!-- End of added in Umbraco 4.6.2 -->
     </compilation>
+
     <authentication mode="Forms">
       <forms name="yourAuthCookie" loginUrl="login.aspx" protection="All" path="/" />
     </authentication>
@@ -134,7 +148,7 @@
     <!-- Membership Provider -->
     <membership defaultProvider="UmbracoMembershipProvider" userIsOnlineTimeWindow="15">
       <providers>
-        <clear />
+        <clear/>
         <add name="UmbracoMembershipProvider" type="umbraco.providers.members.UmbracoMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" defaultMemberTypeAlias="Another Type" passwordFormat="Hashed" />
         <add name="UsersMembershipProvider" type="umbraco.providers.UsersMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" passwordFormat="Hashed" />
       </providers>
@@ -142,44 +156,48 @@
     <!-- added by NH to support membership providers in access layer -->
     <roleManager enabled="true" defaultProvider="UmbracoRoleProvider">
       <providers>
-        <clear />
+        <clear/>
         <add name="UmbracoRoleProvider" type="umbraco.providers.members.UmbracoRoleProvider" />
       </providers>
     </roleManager>
     <!-- Sitemap provider-->
     <siteMap defaultProvider="UmbracoSiteMapProvider" enabled="true">
       <providers>
-        <clear />
+        <clear/>
         <add name="UmbracoSiteMapProvider" type="umbraco.presentation.nodeFactory.UmbracoSiteMapProvider" defaultDescriptionAlias="description" securityTrimmingEnabled="true" />
       </providers>
     </siteMap>
   </system.web>
+
   <!-- ASPNETAJAX -->
   <system.web.extensions>
     <scripting>
       <scriptResourceHandler enableCompression="true" enableCaching="true" />
     </scripting>
   </system.web.extensions>
+
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false" />
     <modules runAllManagedModulesForAllRequests="true">
-      <remove name="ScriptModule" />
-      <remove name="UrlRewriteModule" />
-      <remove name="umbracoRequestModule" />
-      <remove name="viewstateMoverModule" />
-      <remove name="umbracoBaseRequestModule" />
-      <remove name="ClientDependencyModule" />
-      <!-- Needed for login/membership to work on homepage (as per http://stackoverflow.com/questions/218057/httpcontext-current-session-is-null-when-routing-requests) -->
-      <remove name="FormsAuthentication" />
-      <add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
-      <add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
-      <add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule" />
-      <add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule" />
-      <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
-      <!-- Needed for login/membership to work on homepage (as per http://stackoverflow.com/questions/218057/httpcontext-current-session-is-null-when-routing-requests) -->
-      <add name="FormsAuthentication" type="System.Web.Security.FormsAuthenticationModule" />
+        <remove name="ScriptModule" />
+        <remove name="UrlRewriteModule" />
+        <remove name="umbracoRequestModule" />
+        <remove name="viewstateMoverModule" />
+        <remove name="umbracoBaseRequestModule" />
+        <remove name="ClientDependencyModule" />
+        <!-- Needed for login/membership to work on homepage (as per http://stackoverflow.com/questions/218057/httpcontext-current-session-is-null-when-routing-requests) -->
+        <remove name="FormsAuthentication" />
+
+        <add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
+        <add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
+        <add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule" />
+        <add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule" />
+        <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+        <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core"/>
+        <!-- Needed for login/membership to work on homepage (as per http://stackoverflow.com/questions/218057/httpcontext-current-session-is-null-when-routing-requests) -->
+        <add name="FormsAuthentication" type="System.Web.Security.FormsAuthenticationModule"/>
     </modules>
+
     <handlers accessPolicy="Read, Write, Script, Execute">
       <remove name="WebServiceHandlerFactory-Integrated" />
       <remove name="ScriptHandlerFactory" />
@@ -189,20 +207,25 @@
       <remove name="Channels_Word" />
       <remove name="ClientDependency" />
       <remove name="SpellChecker" />
+
       <add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
       <add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
       <add name="ScriptResource" verb="GET,HEAD" path="ScriptResource.axd" preCondition="integratedMode" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
       <add verb="*" name="Channels" preCondition="integratedMode" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
       <add verb="*" name="Channels_Word" preCondition="integratedMode" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
-      <add verb="*" name="ClientDependency" preCondition="integratedMode" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
-      <add verb="GET,HEAD,POST" preCondition="integratedMode" name="SpellChecker" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco" />
+      <add verb="*" name="ClientDependency" preCondition="integratedMode" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core "/>
+      <add verb="GET,HEAD,POST" preCondition="integratedMode" name="SpellChecker" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco"/>
     </handlers>
+
     <!-- Adobe AIR mime type -->
     <staticContent>
       <remove fileExtension=".air" />
       <mimeMap fileExtension=".air" mimeType="application/vnd.adobe.air-application-installer-package+zip" />
     </staticContent>
+
   </system.webServer>
+
+
   <system.codedom>
     <compilers>
       <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CSharp.CSharpCodeProvider,System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" warningLevel="4">
@@ -211,6 +234,8 @@
       </compiler>
     </compilers>
   </system.codedom>
+
+
   <runtime>
     <!-- Old asp.net ajax assembly bindings -->
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -224,9 +249,10 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
+
   <!-- Added in Umbraco 4.6.2 -->
   <system.web.webPages.razor>
-    <host factoryType="umbraco.MacroEngines.RazorUmbracoFactory, umbraco.MacroEngines" />
+    <host factoryType="umbraco.MacroEngines.RazorUmbracoFactory, umbraco.MacroEngines"/>
     <pages pageBaseType="umbraco.MacroEngines.DynamicNodeContext">
       <namespaces>
         <add namespace="Microsoft.Web.Helpers" />
@@ -236,4 +262,5 @@
     </pages>
   </system.web.webPages.razor>
   <!-- End of added in Umbraco 4.6.2 -->
+
 </configuration>
\ No newline at end of file
diff --git a/src/Umbraco.Web/Media/EmbedProviders/AbstractOEmbedProvider.cs b/src/Umbraco.Web/Media/EmbedProviders/AbstractOEmbedProvider.cs
index 32d5c61bef..22b912e8b1 100644
--- a/src/Umbraco.Web/Media/EmbedProviders/AbstractOEmbedProvider.cs
+++ b/src/Umbraco.Web/Media/EmbedProviders/AbstractOEmbedProvider.cs
@@ -1,8 +1,7 @@
-using System;
-using Umbraco.Core.Embed;
-using System.Text;
+using System.Text;
 using System.Xml;
 using System.Collections.Generic;
+using Umbraco.Core.Media;
 
 namespace Umbraco.Web.Media.EmbedProviders
 {
@@ -21,11 +20,6 @@ namespace Umbraco.Web.Media.EmbedProviders
 
         public abstract string GetMarkup(string url, int maxWidth, int maxHeight);
 
-        //public virtual string GetPreview(string url, int maxWidth, int maxHeight)
-        //{
-        //    return GetMarkup(url, maxWidth, maxHeight);
-        //}
-
         public virtual string BuildFullUrl(string url, int maxWidth, int maxHeight)
         {
             var fullUrl = new StringBuilder();
diff --git a/src/Umbraco.Web/Media/EmbedProviders/AbstractProvider.cs b/src/Umbraco.Web/Media/EmbedProviders/AbstractProvider.cs
index a5099f5a91..20c94c06d1 100644
--- a/src/Umbraco.Web/Media/EmbedProviders/AbstractProvider.cs
+++ b/src/Umbraco.Web/Media/EmbedProviders/AbstractProvider.cs
@@ -1,4 +1,4 @@
-using Umbraco.Core.Embed;
+using Umbraco.Core.Media;
 
 namespace Umbraco.Web.Media.EmbedProviders
 {
@@ -10,10 +10,5 @@ namespace Umbraco.Web.Media.EmbedProviders
         }
 
         public abstract string GetMarkup(string url, int maxWidth, int maxHeight);
-
-        //public virtual string GetPreview(string url, int maxWidth, int maxHeight)
-        //{
-        //    return GetMarkup(url, maxWidth, maxHeight);
-        //}
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web/Media/EmbedProviders/Flickr.cs b/src/Umbraco.Web/Media/EmbedProviders/Flickr.cs
index 76b28117ab..3e9cae2675 100644
--- a/src/Umbraco.Web/Media/EmbedProviders/Flickr.cs
+++ b/src/Umbraco.Web/Media/EmbedProviders/Flickr.cs
@@ -2,7 +2,6 @@
 
 namespace Umbraco.Web.Media.EmbedProviders
 {
-
     public class Flickr : AbstractOEmbedProvider
     {
         public override string GetMarkup(string url, int maxWidth, int maxHeight)
@@ -18,6 +17,5 @@ namespace Umbraco.Web.Media.EmbedProviders
             return string.Format("<img src=\"{0}\" width\"{1}\" height=\"{2}\" alt=\"{3}\" />",
                 imageUrl, imageWidth, imageHeight, HttpUtility.HtmlEncode(imageTitle));
         }
-
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web/Media/EmbedProviders/OEmbedRich.cs b/src/Umbraco.Web/Media/EmbedProviders/OEmbedRich.cs
index 101b4de1d7..f93a4d799b 100644
--- a/src/Umbraco.Web/Media/EmbedProviders/OEmbedRich.cs
+++ b/src/Umbraco.Web/Media/EmbedProviders/OEmbedRich.cs
@@ -1,7 +1,6 @@
-
-namespace Umbraco.Web.Media.EmbedProviders
+namespace Umbraco.Web.Media.EmbedProviders
 {
-    public class OEmbedRich: OEmbedVideo
+    public class OEmbedRich : OEmbedVideo
     {
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web/Media/EmbedProviders/OEmbedVideo.cs b/src/Umbraco.Web/Media/EmbedProviders/OEmbedVideo.cs
index 1286cddca9..c0e1e3f986 100644
--- a/src/Umbraco.Web/Media/EmbedProviders/OEmbedVideo.cs
+++ b/src/Umbraco.Web/Media/EmbedProviders/OEmbedVideo.cs
@@ -11,7 +11,6 @@ namespace Umbraco.Web.Media.EmbedProviders
             XmlDocument doc = GetXmlResponse(videoUrl);
            
             // add xslt transformation to return markup
-
             return doc.SelectSingleNode("/oembed/html").InnerText;
         }
     }
diff --git a/src/Umbraco.Web/Media/EmbedProviders/Settings/Dictionary.cs b/src/Umbraco.Web/Media/EmbedProviders/Settings/Dictionary.cs
index 12b342ec8a..7d40d9c866 100644
--- a/src/Umbraco.Web/Media/EmbedProviders/Settings/Dictionary.cs
+++ b/src/Umbraco.Web/Media/EmbedProviders/Settings/Dictionary.cs
@@ -1,6 +1,6 @@
 using System.Linq;
 using System.Xml;
-using Umbraco.Core.Embed;
+using Umbraco.Core.Media;
 
 namespace Umbraco.Web.Media.EmbedProviders.Settings
 {
diff --git a/src/Umbraco.Web/Media/EmbedProviders/Settings/String.cs b/src/Umbraco.Web/Media/EmbedProviders/Settings/String.cs
index f1d01c5ce1..9b6c162cc9 100644
--- a/src/Umbraco.Web/Media/EmbedProviders/Settings/String.cs
+++ b/src/Umbraco.Web/Media/EmbedProviders/Settings/String.cs
@@ -1,5 +1,5 @@
 using System.Xml;
-using Umbraco.Core.Embed;
+using Umbraco.Core.Media;
 
 namespace Umbraco.Web.Media.EmbedProviders.Settings
 {
diff --git a/src/Umbraco.Web/Media/EmbedProviders/Twitgoo.cs b/src/Umbraco.Web/Media/EmbedProviders/Twitgoo.cs
index f34df6c185..9efbb51d54 100644
--- a/src/Umbraco.Web/Media/EmbedProviders/Twitgoo.cs
+++ b/src/Umbraco.Web/Media/EmbedProviders/Twitgoo.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-using HtmlAgilityPack;
+using HtmlAgilityPack;
 
 namespace Umbraco.Web.Media.EmbedProviders
 {
@@ -16,6 +11,7 @@ namespace Umbraco.Web.Media.EmbedProviders
                 return false;
             }
         }
+
         public override string GetMarkup(string url, int maxWidth, int maxHeight)
         {
             var web = new HtmlWeb();
@@ -26,6 +22,5 @@ namespace Umbraco.Web.Media.EmbedProviders
             return string.Format("<img src=\"{0}\"/>",
                img.Value);
         }
-
     }
 }
\ No newline at end of file
diff --git a/src/umbraco.webservices/media/mediaService.cs b/src/umbraco.webservices/media/mediaService.cs
index f0b3201868..9a90d3aa59 100644
--- a/src/umbraco.webservices/media/mediaService.cs
+++ b/src/umbraco.webservices/media/mediaService.cs
@@ -4,11 +4,11 @@ using System.ComponentModel;
 using System.IO;
 using System.Reflection;
 using System.Web.Services;
+using Umbraco.Core.Media;
 using umbraco.IO;
 using umbraco.cms.businesslogic.media;
 using umbraco.cms.businesslogic.property;
 using Umbraco.Core.IO;
-using Umbraco.Core.Embed;
 using System.Xml;
 using System.Web;
 using System.Text.RegularExpressions;
@@ -193,7 +193,7 @@ namespace umbraco.webservices.media
 
         [WebMethod]
         [ScriptMethod(ResponseFormat = ResponseFormat.Json)]
-        public Umbraco.Core.Embed.Result Embed(string url, int width, int height)
+        public Result Embed(string url, int width, int height)
         {
             Result r = new Result();