diff --git a/.gitignore b/.gitignore
index 8ff5a8ef25..5390da67dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -166,3 +166,4 @@ build/temp/
 /src/ApiDocs/api/*
 /src/Umbraco.Web.UI.NetCore/wwwroot/Media/*
 /src/Umbraco.Web.UI.NetCore/wwwroot/is-cache/*
+/src/Umbraco.Tests.Integration/App_Data/*
diff --git a/src/Umbraco.Core/Manifest/ManifestWatcher.cs b/src/Umbraco.Core/Manifest/ManifestWatcher.cs
index 23caac3a1b..adf2be466b 100644
--- a/src/Umbraco.Core/Manifest/ManifestWatcher.cs
+++ b/src/Umbraco.Core/Manifest/ManifestWatcher.cs
@@ -4,7 +4,7 @@ using System.IO;
 using System.Linq;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.Logging;
-using Umbraco.Net;
+using Umbraco.Core.Net;
 
 namespace Umbraco.Core.Manifest
 {
diff --git a/src/Umbraco.Core/Net/IIpResolver.cs b/src/Umbraco.Core/Net/IIpResolver.cs
index 7fb6b8a793..8a7d670723 100644
--- a/src/Umbraco.Core/Net/IIpResolver.cs
+++ b/src/Umbraco.Core/Net/IIpResolver.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Net
+namespace Umbraco.Core.Net
 {
     public interface IIpResolver
     {
diff --git a/src/Umbraco.Core/Net/ISessionIdResolver.cs b/src/Umbraco.Core/Net/ISessionIdResolver.cs
index 745be5a435..94cdfb454a 100644
--- a/src/Umbraco.Core/Net/ISessionIdResolver.cs
+++ b/src/Umbraco.Core/Net/ISessionIdResolver.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Net
+namespace Umbraco.Core.Net
 {
     public interface ISessionIdResolver
     {
diff --git a/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs b/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs
index 10d5b10955..eb38c67e2e 100644
--- a/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs
+++ b/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Net
+namespace Umbraco.Core.Net
 {
     public interface IUmbracoApplicationLifetime
     {
diff --git a/src/Umbraco.Core/Net/IUserAgentProvider.cs b/src/Umbraco.Core/Net/IUserAgentProvider.cs
index 14246ea99e..d3f997c607 100644
--- a/src/Umbraco.Core/Net/IUserAgentProvider.cs
+++ b/src/Umbraco.Core/Net/IUserAgentProvider.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Net
+namespace Umbraco.Core.Net
 {
     public interface IUserAgentProvider
     {
diff --git a/src/Umbraco.Infrastructure/Intall/InstallHelper.cs b/src/Umbraco.Infrastructure/Intall/InstallHelper.cs
index a5b4f71d8e..7aca4af09f 100644
--- a/src/Umbraco.Infrastructure/Intall/InstallHelper.cs
+++ b/src/Umbraco.Infrastructure/Intall/InstallHelper.cs
@@ -9,10 +9,10 @@ using Umbraco.Core.Cookie;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Migrations.Install;
 using Umbraco.Core.Models;
+using Umbraco.Core.Net;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Serialization;
 using Umbraco.Core.Services;
-using Umbraco.Net;
 using Umbraco.Web.Install.Models;
 
 namespace Umbraco.Web.Install
diff --git a/src/Umbraco.Infrastructure/Intall/InstallSteps/StarterKitDownloadStep.cs b/src/Umbraco.Infrastructure/Intall/InstallSteps/StarterKitDownloadStep.cs
index d8986cacb7..a20637584f 100644
--- a/src/Umbraco.Infrastructure/Intall/InstallSteps/StarterKitDownloadStep.cs
+++ b/src/Umbraco.Infrastructure/Intall/InstallSteps/StarterKitDownloadStep.cs
@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 using Umbraco.Core.Services;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Models.Packaging;
-using Umbraco.Net;
+using Umbraco.Core.Net;
 using Umbraco.Web.Install.Models;
 
 namespace Umbraco.Web.Install.InstallSteps
diff --git a/src/Umbraco.Infrastructure/Intall/InstallSteps/StarterKitInstallStep.cs b/src/Umbraco.Infrastructure/Intall/InstallSteps/StarterKitInstallStep.cs
index cc269408f4..0a6e67c829 100644
--- a/src/Umbraco.Infrastructure/Intall/InstallSteps/StarterKitInstallStep.cs
+++ b/src/Umbraco.Infrastructure/Intall/InstallSteps/StarterKitInstallStep.cs
@@ -2,8 +2,8 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
+using Umbraco.Core.Net;
 using Umbraco.Core.Services;
-using Umbraco.Net;
 using Umbraco.Web.Install.Models;
 
 namespace Umbraco.Web.Install.InstallSteps
diff --git a/src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/HttpSessionIdEnricher.cs b/src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/HttpSessionIdEnricher.cs
index 1558cdcf21..052775d918 100644
--- a/src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/HttpSessionIdEnricher.cs
+++ b/src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/HttpSessionIdEnricher.cs
@@ -1,7 +1,7 @@
 using Serilog.Core;
 using Serilog.Events;
 using System;
-using Umbraco.Net;
+using Umbraco.Core.Net;
 
 namespace Umbraco.Core.Logging.Serilog.Enrichers
 {
diff --git a/src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs b/src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs
index f4e8f85281..59e0b8854f 100644
--- a/src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs
+++ b/src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs
@@ -10,7 +10,7 @@ using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.Logging.Serilog.Enrichers;
-using Umbraco.Net;
+using Umbraco.Core.Net;
 
 namespace Umbraco.Core.Logging.Serilog
 {
diff --git a/src/Umbraco.Infrastructure/Logging/Serilog/SerilogLogger.cs b/src/Umbraco.Infrastructure/Logging/Serilog/SerilogLogger.cs
index bb77869e28..55b89d7996 100644
--- a/src/Umbraco.Infrastructure/Logging/Serilog/SerilogLogger.cs
+++ b/src/Umbraco.Infrastructure/Logging/Serilog/SerilogLogger.cs
@@ -9,7 +9,7 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.Diagnostics;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
-using Umbraco.Net;
+using Umbraco.Core.Net;
 
 namespace Umbraco.Core.Logging.Serilog
 {
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreIpResolver.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreIpResolver.cs
index cee43757d8..520fe6b8aa 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreIpResolver.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreIpResolver.cs
@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Http;
-using Umbraco.Net;
+using Umbraco.Core.Net;
 
 namespace Umbraco.Web.BackOffice.AspNetCore
 {
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreMarchal.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreMarchal.cs
index 98e040d338..247666090e 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreMarchal.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreMarchal.cs
@@ -2,7 +2,7 @@ using System;
 using System.Runtime.InteropServices;
 using Umbraco.Core.Diagnostics;
 
-namespace Umbraco.Web.BackOffice
+namespace Umbraco.Web.BackOffice.AspNetCore
 {
 
     public class AspNetCoreMarchal : IMarchal
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreSessionIdResolver.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreSessionIdResolver.cs
index cafb02d367..a27e378909 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreSessionIdResolver.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreSessionIdResolver.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
-using Umbraco.Net;
+using Umbraco.Core.Net;
 
 namespace Umbraco.Web.BackOffice.AspNetCore
 {
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
index 20cfef352d..e7aba5e2de 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
@@ -1,9 +1,9 @@
 using System.Threading;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Hosting;
-using Umbraco.Net;
+using Umbraco.Core.Net;
 
-namespace Umbraco.Web.AspNet
+namespace Umbraco.Web.BackOffice.AspNetCore
 {
     public class AspNetCoreUmbracoApplicationLifetime : IUmbracoApplicationLifetime
     {
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUserAgentProvider.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUserAgentProvider.cs
index f9c9884704..a85970afaf 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUserAgentProvider.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUserAgentProvider.cs
@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Http;
-using Umbraco.Net;
+using Umbraco.Core.Net;
 
 namespace Umbraco.Web.BackOffice.AspNetCore
 {
diff --git a/src/Umbraco.Web/AspNet/AspNetIpResolver.cs b/src/Umbraco.Web/AspNet/AspNetIpResolver.cs
index 7eaca54663..026fb7ff12 100644
--- a/src/Umbraco.Web/AspNet/AspNetIpResolver.cs
+++ b/src/Umbraco.Web/AspNet/AspNetIpResolver.cs
@@ -1,6 +1,6 @@
 using System.Web;
 using Umbraco.Core;
-using Umbraco.Net;
+using Umbraco.Core.Net;
 
 namespace Umbraco.Web
 {
diff --git a/src/Umbraco.Web/AspNet/AspNetSessionManager.cs b/src/Umbraco.Web/AspNet/AspNetSessionManager.cs
index bf7b1c05c3..9196cb137f 100644
--- a/src/Umbraco.Web/AspNet/AspNetSessionManager.cs
+++ b/src/Umbraco.Web/AspNet/AspNetSessionManager.cs
@@ -1,6 +1,6 @@
 using System.Web;
+using Umbraco.Core.Net;
 using Umbraco.Core.Session;
-using Umbraco.Net;
 
 namespace Umbraco.Web.AspNet
 {
diff --git a/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs b/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs
index 245e8ea374..64988a20d9 100644
--- a/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs
+++ b/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs
@@ -1,6 +1,6 @@
 using System.Threading;
 using System.Web;
-using Umbraco.Net;
+using Umbraco.Core.Net;
 
 namespace Umbraco.Web.AspNet
 {
diff --git a/src/Umbraco.Web/AspNet/AspNetUserAgentProvider.cs b/src/Umbraco.Web/AspNet/AspNetUserAgentProvider.cs
index bd37b62531..4ba73292bb 100644
--- a/src/Umbraco.Web/AspNet/AspNetUserAgentProvider.cs
+++ b/src/Umbraco.Web/AspNet/AspNetUserAgentProvider.cs
@@ -1,4 +1,4 @@
-using Umbraco.Net;
+using Umbraco.Core.Net;
 
 namespace Umbraco.Web.AspNet
 {
diff --git a/src/Umbraco.Web/Compose/AuditEventsComponent.cs b/src/Umbraco.Web/Compose/AuditEventsComponent.cs
index fba6e754c8..d03f33d7ac 100644
--- a/src/Umbraco.Web/Compose/AuditEventsComponent.cs
+++ b/src/Umbraco.Web/Compose/AuditEventsComponent.cs
@@ -7,10 +7,10 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.Events;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Net;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
-using Umbraco.Net;
 using Umbraco.Web.Security;
 
 namespace Umbraco.Core.Compose
diff --git a/src/Umbraco.Web/Composing/Current.cs b/src/Umbraco.Web/Composing/Current.cs
index eec3dcd1e3..4424de6771 100644
--- a/src/Umbraco.Web/Composing/Current.cs
+++ b/src/Umbraco.Web/Composing/Current.cs
@@ -11,6 +11,7 @@ using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.Mapping;
+using Umbraco.Core.Net;
 using Umbraco.Core.PackageActions;
 using Umbraco.Core.Packaging;
 using Umbraco.Core.PropertyEditors;
@@ -18,7 +19,6 @@ using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
 using Umbraco.Core.Sync;
-using Umbraco.Net;
 using Umbraco.Web.Actions;
 using Umbraco.Web.Cache;
 using Umbraco.Web.Editors;
diff --git a/src/Umbraco.Web/Editors/PackageInstallController.cs b/src/Umbraco.Web/Editors/PackageInstallController.cs
index 672b47f1eb..178a5c96d9 100644
--- a/src/Umbraco.Web/Editors/PackageInstallController.cs
+++ b/src/Umbraco.Web/Editors/PackageInstallController.cs
@@ -14,11 +14,11 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Mapping;
 using Umbraco.Core.Models.Editors;
 using Umbraco.Core.Models.Packaging;
+using Umbraco.Core.Net;
 using Umbraco.Core.Packaging;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
-using Umbraco.Net;
 using Umbraco.Web.JavaScript;
 using Umbraco.Web.Models;
 using Umbraco.Web.Models.ContentEditing;
diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
index 81aac30d2c..1d7fc8fd6e 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
@@ -18,7 +18,6 @@ using Umbraco.Core.Runtime;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
 using Umbraco.Core.Sync;
-using Umbraco.Net;
 using Umbraco.Web.Actions;
 using Umbraco.Web.Cache;
 using Umbraco.Web.Composing.CompositionExtensions;
@@ -46,6 +45,7 @@ using Umbraco.Web.WebApi;
 using Umbraco.Web.PropertyEditors;
 using Umbraco.Examine;
 using Umbraco.Core.Models;
+using Umbraco.Core.Net;
 using Umbraco.Core.Request;
 using Umbraco.Core.Session;
 using Umbraco.Web.AspNet;
diff --git a/src/Umbraco.Web/Security/AppBuilderExtensions.cs b/src/Umbraco.Web/Security/AppBuilderExtensions.cs
index 8fab9f4ea8..5416683eab 100644
--- a/src/Umbraco.Web/Security/AppBuilderExtensions.cs
+++ b/src/Umbraco.Web/Security/AppBuilderExtensions.cs
@@ -17,9 +17,9 @@ using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.IO;
 using Umbraco.Core.Mapping;
 using Umbraco.Core.Models.Identity;
+using Umbraco.Core.Net;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
-using Umbraco.Net;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Models.Identity;
 using Constants = Umbraco.Core.Constants;
diff --git a/src/Umbraco.Web/Security/BackOfficeUserManager.cs b/src/Umbraco.Web/Security/BackOfficeUserManager.cs
index 354b9c2dde..64b7054723 100644
--- a/src/Umbraco.Web/Security/BackOfficeUserManager.cs
+++ b/src/Umbraco.Web/Security/BackOfficeUserManager.cs
@@ -9,9 +9,9 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Mapping;
 using Umbraco.Core.Models.Identity;
+using Umbraco.Core.Net;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
-using Umbraco.Net;
 using Umbraco.Web.Models.Identity;
 using IPasswordHasher = Microsoft.AspNet.Identity.IPasswordHasher;
 
diff --git a/src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs b/src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
index d393078cc6..ffa9a1c967 100644
--- a/src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
+++ b/src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
@@ -10,7 +10,7 @@ using Umbraco.Core.Services;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Web.Composing;
 using System;
-using Umbraco.Net;
+using Umbraco.Core.Net;
 
 namespace Umbraco.Web.Security.Providers
 {
diff --git a/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs b/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
index d2eeebaeaf..9466dd6732 100644
--- a/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
+++ b/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
@@ -10,10 +10,10 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Net;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
-using Umbraco.Net;
 using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Security.Providers
diff --git a/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs b/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
index a69e6c6f8d..8fcdc2c542 100644
--- a/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
+++ b/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
@@ -7,8 +7,8 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.IO;
 using Umbraco.Core.Mapping;
+using Umbraco.Core.Net;
 using Umbraco.Core.Services;
-using Umbraco.Net;
 using Umbraco.Web;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Security;