diff --git a/.gitignore b/.gitignore
index 360fe85ee7..936bf7a5ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -127,25 +127,26 @@ cypress.env.json
 /src/Umbraco.Web.UI.Client/TESTS-*.xml
 /src/ApiDocs/api/*
 /src/Umbraco.Web.UI.Client/package-lock.json
-/src/Umbraco.Web.UI.NetCore/wwwroot/Media/*
-/src/Umbraco.Web.UI.NetCore/wwwroot/is-cache/*
+/src/Umbraco.Web.UI/wwwroot/Media/*
+/src/Umbraco.Web.UI/wwwroot/is-cache/*
 /src/Umbraco.Tests.Integration/App_Data/*
 /src/Umbraco.Tests.Integration/TEMP/*
-/src/Umbraco.Web.UI.NetCore/wwwroot/[Uu]mbraco/assets/*
-/src/Umbraco.Web.UI.NetCore/wwwroot/[Uu]mbraco/js/*
-/src/Umbraco.Web.UI.NetCore/wwwroot/[Uu]mbraco/lib/*
-/src/Umbraco.Web.UI.NetCore/wwwroot/[Uu]mbraco/views/*
-/src/Umbraco.Web.UI.NetCore/wwwroot/App_Data/TEMP/*
-/src/Umbraco.Web.UI.NetCore/App_Data/Logs/*
-/src/Umbraco.Web.UI.NetCore/App_Data/TEMP/TypesCache/*
-/src/Umbraco.Web.UI.NetCore/App_Data/TEMP/*
-/src/Umbraco.Web.UI.NetCore/App_Data/Smidge/Cache/*
-/src/Umbraco.Web.UI.NetCore/[Uu]mbraco/[Ll]ogs
-/src/Umbraco.Web.UI.NetCore/[Uu]mbraco/[Dd]ata/*
-/src/Umbraco.Web.UI.NetCore/[Uu]mbraco/[Mm]odels/*
+/src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/assets/*
+/src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/js/*
+/src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/lib/*
+/src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/views/*
+/src/Umbraco.Web.UI/wwwroot/App_Data/TEMP/*
+/src/Umbraco.Web.UI/App_Data/Logs/*
+/src/Umbraco.Web.UI/App_Data/TEMP/TypesCache/*
+/src/Umbraco.Web.UI/App_Data/TEMP/*
+/src/Umbraco.Web.UI/App_Data/Smidge/Cache/*
+/src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ogs
+/src/Umbraco.Web.UI/[Uu]mbraco/[Dd]ata/*
+/src/Umbraco.Web.UI/[Uu]mbraco/[Mm]odels/*
 /src/Umbraco.Web.UI/[Vv]iews/*.vbhtml
-/src/Umbraco.Web.UI.NetCore/appsettings.json
-/src/Umbraco.Web.UI.NetCore/appsettings.Development.json
+/src/Umbraco.Web.UI/appsettings.json
+/src/Umbraco.Web.UI/appsettings.Development.json
+/src/Umbraco.Web.UI/appsettings.Local.json
 
 
 src/Umbraco.Tests.Integration/umbraco/Data/
@@ -157,8 +158,7 @@ src/Umbraco.Tests/TEMP/
 
 
 src/Umbraco.Tests.UnitTests/umbraco/Data/TEMP/
-/src/Umbraco.Web.UI.NetCore/appsettings.Local.json
 src/Umbraco.Tests.Integration.SqlCe/umbraco/Data/TEMP/
 src/Umbraco.Tests.Integration.SqlCe/DatabaseContextTests.sdf
 
-src/Umbraco.Web.UI.NetCore/umbraco/config/appsettings-schema.json
+src/Umbraco.Web.UI/umbraco/config/appsettings-schema.json
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 85b28c51c1..1c7f8b11d7 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -10,9 +10,9 @@
             "request": "launch",
             "preLaunchTask": "Dotnet build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/src/Umbraco.Web.UI.NetCore/bin/Debug/net5.0/Umbraco.Web.UI.NetCore.dll",
+            "program": "${workspaceFolder}/src/Umbraco.Web.UI/bin/Debug/net5.0/Umbraco.Web.UI.dll",
             "args": [],
-            "cwd": "${workspaceFolder}/src/Umbraco.Web.UI.NetCore",
+            "cwd": "${workspaceFolder}/src/Umbraco.Web.UI",
             "stopAtEntry": false,
             // Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser
             "serverReadyAction": {
@@ -33,4 +33,4 @@
             "processId": "${command:pickProcess}"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index e2b6c01894..a086d1fb3a 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -57,11 +57,11 @@
             "args": [
                 "watch",
                 "run",
-                "${workspaceFolder}/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj",
+                "${workspaceFolder}/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj",
                 "/property:GenerateFullPaths=true",
                 "/consoleloggerparameters:NoSummary"
             ],
             "problemMatcher": "$msCompile"
         }
     ]
-}
\ No newline at end of file
+}