Reorg code, move stuff

src/Umbraco.Core/Collections/OrderedHashSet.cs

@@ -1,6 +1,6 @@
 using System.Collections.ObjectModel;
 
-namespace Umbraco.Core
+namespace Umbraco.Core.Collections
 {
     /// <summary>
     /// A custom collection similar to HashSet{T} which only contains unique items, however this collection keeps items in order

src/Umbraco.Core/Events/QueuingEventDispatcherBase.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Umbraco.Core.Collections;
 using Umbraco.Core.Models.EntityBase;
 using Umbraco.Core.Composing;
 

src/Umbraco.Core/Runtime/CoreRuntime.cs

@@ -4,11 +4,10 @@ using System.Configuration;
 using System.Threading;
 using System.Web;
 using LightInject;
-using Semver;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Components;
-using Umbraco.Core.Configuration;
 using Umbraco.Core.Composing;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
@@ -18,9 +17,8 @@ using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Mappers;
 using Umbraco.Core.Persistence.SqlSyntax;
 using Umbraco.Core.Scoping;
-using Umbraco.Core.Services.Implement;
 
-namespace Umbraco.Core
+namespace Umbraco.Core.Runtime
 {
     /// <summary>
     /// Represents the Core Umbraco runtime.

src/Umbraco.Core/Runtime/CoreRuntimeComponent.cs

@@ -6,10 +6,10 @@ using AutoMapper;
 using LightInject;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Components;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Composing.CompositionRoots;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Manifest;
@@ -25,7 +25,7 @@ using Umbraco.Core.Sync;
 using Umbraco.Core._Legacy.PackageActions;
 using IntegerValidator = Umbraco.Core.PropertyEditors.IntegerValidator;
 
-namespace Umbraco.Core
+namespace Umbraco.Core.Runtime
 {
     public class CoreRuntimeComponent : UmbracoComponentBase, IRuntimeComponent
     {

src/Umbraco.Core/Umbraco.Core.csproj

@@ -312,8 +312,8 @@
     <Compile Include="Constants-System.cs" />
     <Compile Include="Constants-Web.cs" />
     <Compile Include="Constants.cs" />
-    <Compile Include="CoreRuntime.cs" />
-    <Compile Include="CoreRuntimeComponent.cs" />
+    <Compile Include="Runtime\CoreRuntime.cs" />
+    <Compile Include="Runtime\CoreRuntimeComponent.cs" />
     <Compile Include="CustomBooleanTypeConverter.cs" />
     <Compile Include="Migrations\Expressions\Common\ExecutableBuilder.cs" />
     <Compile Include="Migrations\Expressions\Common\IExecutableBuilder.cs" />
@@ -775,7 +775,7 @@
     <Compile Include="NameValueCollectionExtensions.cs" />
     <Compile Include="NetworkHelper.cs" />
     <Compile Include="ObjectExtensions.cs" />
-    <Compile Include="OrderedHashSet.cs" />
+    <Compile Include="Collections\OrderedHashSet.cs" />
     <Compile Include="Packaging\ConflictingPackageData.cs" />
     <Compile Include="Packaging\DefaultPackageContext.cs" />
     <Compile Include="Packaging\IConflictingPackageData.cs" />

src/Umbraco.Tests/Collections/OrderedHashSetTests.cs

@@ -1,6 +1,7 @@
 using System;
 using NUnit.Framework;
 using Umbraco.Core;
+using Umbraco.Core.Collections;
 
 namespace Umbraco.Tests.Collections
 {

src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs

@@ -18,6 +18,7 @@ using Umbraco.Web.WebApi;
 using Umbraco.Core.Strings;
 using Umbraco.Core.Composing;
 using Umbraco.Tests.Testing;
+using Umbraco.Web.Runtime;
 using Current = Umbraco.Web.Composing.Current;
 
 namespace Umbraco.Tests.Routing

src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs

@@ -9,6 +9,7 @@ using Umbraco.Core.Components;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence;
+using Umbraco.Core.Runtime;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Stubs;
 using Umbraco.Examine;

src/Umbraco.Tests/Runtimes/WebRuntimeTests.cs

@@ -4,6 +4,7 @@ using NUnit.Framework;
 using Umbraco.Core.Profiling;
 using Umbraco.Web;
 using Umbraco.Web.Mvc;
+using Umbraco.Web.Runtime;
 
 namespace Umbraco.Tests.Runtimes
 {

src/Umbraco.Web/Runtime/WebRuntime.cs

@@ -2,12 +2,13 @@
 using System.Web;
 using LightInject;
 using Umbraco.Core;
-using Umbraco.Core.Logging;
 using Umbraco.Core.Cache;
-using Umbraco.Core.Configuration;
 using Umbraco.Core.Composing;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Runtime;
 
-namespace Umbraco.Web
+namespace Umbraco.Web.Runtime
 {
     /// <summary>
     /// Represents the Web Umbraco runtime.

src/Umbraco.Web/Runtime/WebRuntimeComponent.cs

@@ -14,8 +14,8 @@ using LightInject;
 using Microsoft.AspNet.SignalR;
 using Umbraco.Core;
 using Umbraco.Core.Components;
-using Umbraco.Core.Configuration;
 using Umbraco.Core.Composing;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Dictionary;
 using Umbraco.Core.Events;
 using Umbraco.Core.Logging;
@@ -23,8 +23,11 @@ using Umbraco.Core.Macros;
 using Umbraco.Core.Profiling;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.PropertyEditors.ValueConverters;
+using Umbraco.Core.Runtime;
 using Umbraco.Core.Services;
+using Umbraco.Examine;
 using Umbraco.Web.Cache;
+using Umbraco.Web.Composing.CompositionRoots;
 using Umbraco.Web.Dictionary;
 using Umbraco.Web.Editors;
 using Umbraco.Web.HealthCheck;
@@ -34,19 +37,17 @@ using Umbraco.Web.Media.ThumbnailProviders;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.PublishedCache;
 using Umbraco.Web.Routing;
+using Umbraco.Web.Search;
 using Umbraco.Web.Security;
 using Umbraco.Web.Services;
 using Umbraco.Web.SignalR;
+using Umbraco.Web.Trees;
 using Umbraco.Web.UI.JavaScript;
 using Umbraco.Web.WebApi;
 using Umbraco.Web._Legacy.Actions;
-using Umbraco.Examine;
-using Umbraco.Web.Composing.CompositionRoots;
-using Umbraco.Web.Search;
-using Umbraco.Web.Trees;
 using Current = Umbraco.Web.Composing.Current;
 
-namespace Umbraco.Web
+namespace Umbraco.Web.Runtime
 {
     [RequireComponent(typeof(CoreRuntimeComponent))]
     public class WebRuntimeComponent : UmbracoComponentBase, IRuntimeComponent

src/Umbraco.Web/Strategies/LegacyServerRegistrarAndMessengerComponent.cs

@@ -5,6 +5,7 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Services;
 using LightInject;
+using Umbraco.Web.Runtime;
 
 namespace Umbraco.Web.Strategies
 {

src/Umbraco.Web/Umbraco.Web.csproj

@@ -347,7 +347,7 @@
     <Compile Include="WebApi\UmbracoApiControllerTypeCollection.cs" />
     <Compile Include="WebApi\UnhandedExceptionLoggerConfigurationAttribute.cs" />
     <Compile Include="WebApi\UnhandledExceptionLogger.cs" />
-    <Compile Include="WebRuntimeComponent.cs" />
+    <Compile Include="Runtime\WebRuntimeComponent.cs" />
     <Compile Include="WebServices\PublishedStatusController.cs" />
     <Compile Include="WebServices\NuCacheStatusController.cs" />
     <Compile Include="_Legacy\Actions\Action.cs" />
@@ -1153,7 +1153,7 @@
     <Compile Include="WebApi\UmbracoAuthorizedApiController.cs" />
     <Compile Include="WebApi\Filters\ValidationFilterAttribute.cs" />
     <Compile Include="WebApi\Filters\UmbracoUserTimeoutFilterAttribute.cs" />
-    <Compile Include="WebRuntime.cs" />
+    <Compile Include="Runtime\WebRuntime.cs" />
     <Compile Include="Routing\LegacyRequestInitializer.cs" />
     <Compile Include="Mvc\ControllerExtensions.cs" />
     <Compile Include="Routing\ContentFinderByUrlAlias.cs" />

src/Umbraco.Web/UmbracoApplication.cs

@@ -1,4 +1,5 @@
 using Umbraco.Core;
+using Umbraco.Web.Runtime;
 
 namespace Umbraco.Web
 {

src/Umbraco.Web/UmbracoContext.cs

@@ -6,6 +6,7 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Web.PublishedCache;
 using Umbraco.Web.Routing;
+using Umbraco.Web.Runtime;
 using Umbraco.Web.Security;
 
 namespace Umbraco.Web