diff --git a/clients/chrome/manifest.json b/clients/chrome/manifest.json
index a94c62a6..18daf0f6 100644
--- a/clients/chrome/manifest.json
+++ b/clients/chrome/manifest.json
@@ -11,8 +11,8 @@
   "author": "Microsoft Corporation",
   "short_name": "code the micro:bit",
 
-  "description": "Extension for https://codethemicrobit.com.",
-  "homepage_url": "https://codethemicrobit.com",
+  "description": "Extension for https://pxt.microbit.org.",
+  "homepage_url": "https://pxt.microbit.org",
   "offline_enabled": "true",
   "icons": {
     "48": "logo48.png",
@@ -25,6 +25,6 @@
   ],
 
   "externally_connectable": {
-    "matches": [ "*://localhost/*", "https://codethemicrobit.com/*", "https://*.codethemicrobit.com/*" ]
+    "matches": [ "*://localhost/*", "https://pxt.microbit.org/*", "https://*.microbit.org/*" ]
   }
 }
diff --git a/clients/macuploader/Microbit Uploader/AppDelegate.m b/clients/macuploader/Microbit Uploader/AppDelegate.m
index 3d62dc45..3f07a9ed 100644
--- a/clients/macuploader/Microbit Uploader/AppDelegate.m	
+++ b/clients/macuploader/Microbit Uploader/AppDelegate.m	
@@ -124,7 +124,7 @@
 }
 
 - (void)launchEditor:(id)sender {
-    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://codethemicrobit.com/"]];
+    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://pxt.microbit.org/"]];
 }
 
 @end
diff --git a/clients/win10/app.sln b/clients/win10/app.sln
deleted file mode 100644
index 7d514686..00000000
--- a/clients/win10/app.sln
+++ /dev/null
@@ -1,48 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{262852C6-CD72-467D-83FE-5EEB1973A190}") = "m.pxt.io", "app\m.pxt.io.jsproj", "{39122940-AB16-4CD4-A0CE-79A3EB863ECF}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|ARM = Debug|ARM
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|ARM = Release|ARM
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|ARM.ActiveCfg = Debug|ARM
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|ARM.Build.0 = Debug|ARM
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|ARM.Deploy.0 = Debug|ARM
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x64.ActiveCfg = Debug|x64
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x64.Build.0 = Debug|x64
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x64.Deploy.0 = Debug|x64
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x86.ActiveCfg = Debug|x86
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x86.Build.0 = Debug|x86
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x86.Deploy.0 = Debug|x86
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|ARM.ActiveCfg = Release|ARM
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|ARM.Build.0 = Release|ARM
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|ARM.Deploy.0 = Release|ARM
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x64.ActiveCfg = Release|x64
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x64.Build.0 = Release|x64
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x64.Deploy.0 = Release|x64
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x86.ActiveCfg = Release|x86
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x86.Build.0 = Release|x86
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x86.Deploy.0 = Release|x86
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.ps1 b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.ps1
deleted file mode 100644
index 9b620977..00000000
Binary files a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.ps1 and /dev/null differ
diff --git a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/Add-AppDevPackage.psd1 b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/Add-AppDevPackage.psd1
deleted file mode 100644
index e2fe6f3f..00000000
Binary files a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/Add-AppDevPackage.psd1 and /dev/null differ
diff --git a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/cs-CZ/Add-AppDevPackage.psd1 b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/cs-CZ/Add-AppDevPackage.psd1
deleted file mode 100644
index d973be27..00000000
Binary files a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/cs-CZ/Add-AppDevPackage.psd1 and /dev/null differ
diff --git a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/de-DE/Add-AppDevPackage.psd1 b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/de-DE/Add-AppDevPackage.psd1
deleted file mode 100644
index 19238225..00000000
Binary files a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/de-DE/Add-AppDevPackage.psd1 and /dev/null differ
diff --git a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/en-US/Add-AppDevPackage.psd1 b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/en-US/Add-AppDevPackage.psd1
deleted file mode 100644
index e2fe6f3f..00000000
Binary files a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/en-US/Add-AppDevPackage.psd1 and /dev/null differ
diff --git a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/es-ES/Add-AppDevPackage.psd1 b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/es-ES/Add-AppDevPackage.psd1
deleted file mode 100644
index aca49f4e..00000000
Binary files a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/es-ES/Add-AppDevPackage.psd1 and /dev/null differ
diff --git a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/fr-FR/Add-AppDevPackage.psd1 b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/fr-FR/Add-AppDevPackage.psd1
deleted file mode 100644
index 41c39b86..00000000
Binary files a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/fr-FR/Add-AppDevPackage.psd1 and /dev/null differ
diff --git a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/it-IT/Add-AppDevPackage.psd1 b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/it-IT/Add-AppDevPackage.psd1
deleted file mode 100644
index 6098731f..00000000
Binary files a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/it-IT/Add-AppDevPackage.psd1 and /dev/null differ
diff --git a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/ja-JP/Add-AppDevPackage.psd1 b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/ja-JP/Add-AppDevPackage.psd1
deleted file mode 100644
index 0fd1ae55..00000000
Binary files a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/ja-JP/Add-AppDevPackage.psd1 and /dev/null differ
diff --git a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/ko-KR/Add-AppDevPackage.psd1 b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/ko-KR/Add-AppDevPackage.psd1
deleted file mode 100644
index ddf71404..00000000
Binary files a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/ko-KR/Add-AppDevPackage.psd1 and /dev/null differ
diff --git a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/pl-PL/Add-AppDevPackage.psd1 b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/pl-PL/Add-AppDevPackage.psd1
deleted file mode 100644
index 191b915a..00000000
Binary files a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/pl-PL/Add-AppDevPackage.psd1 and /dev/null differ
diff --git a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/pt-BR/Add-AppDevPackage.psd1 b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/pt-BR/Add-AppDevPackage.psd1
deleted file mode 100644
index e8cc86c2..00000000
Binary files a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/pt-BR/Add-AppDevPackage.psd1 and /dev/null differ
diff --git a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/ru-RU/Add-AppDevPackage.psd1 b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/ru-RU/Add-AppDevPackage.psd1
deleted file mode 100644
index 2c1dd5b3..00000000
Binary files a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/ru-RU/Add-AppDevPackage.psd1 and /dev/null differ
diff --git a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/tr-TR/Add-AppDevPackage.psd1 b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/tr-TR/Add-AppDevPackage.psd1
deleted file mode 100644
index 4fb2b071..00000000
Binary files a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/tr-TR/Add-AppDevPackage.psd1 and /dev/null differ
diff --git a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/zh-CN/Add-AppDevPackage.psd1 b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/zh-CN/Add-AppDevPackage.psd1
deleted file mode 100644
index dd32ec36..00000000
Binary files a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/zh-CN/Add-AppDevPackage.psd1 and /dev/null differ
diff --git a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/zh-TW/Add-AppDevPackage.psd1 b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/zh-TW/Add-AppDevPackage.psd1
deleted file mode 100644
index 162d7078..00000000
Binary files a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/zh-TW/Add-AppDevPackage.psd1 and /dev/null differ
diff --git a/clients/win10/app/AppPackages/latest/m.pxt.io_0.1.4.0_AnyCPU_Debug.appxbundle b/clients/win10/app/AppPackages/latest/m.pxt.io_0.1.4.0_AnyCPU_Debug.appxbundle
deleted file mode 100644
index 70a1ae51..00000000
Binary files a/clients/win10/app/AppPackages/latest/m.pxt.io_0.1.4.0_AnyCPU_Debug.appxbundle and /dev/null differ
diff --git a/clients/win10/app/AppPackages/latest/m.pxt.io_0.1.4.0_AnyCPU_Debug.cer b/clients/win10/app/AppPackages/latest/m.pxt.io_0.1.4.0_AnyCPU_Debug.cer
deleted file mode 100644
index 29bd9676..00000000
Binary files a/clients/win10/app/AppPackages/latest/m.pxt.io_0.1.4.0_AnyCPU_Debug.cer and /dev/null differ
diff --git a/clients/win10/app/BundleArtifacts/neutral.txt b/clients/win10/app/BundleArtifacts/neutral.txt
deleted file mode 100644
index dec77c29..00000000
--- a/clients/win10/app/BundleArtifacts/neutral.txt
+++ /dev/null
@@ -1 +0,0 @@
-MainPackage=C:\gh\pxt-microbit\win10\app\bin\Debug\m.pxt.io_0.1.4.0_AnyCPU_Debug.appx
diff --git a/clients/win10/app/codethemicrobitapp.jsproj b/clients/win10/app/codethemicrobitapp.jsproj
deleted file mode 100644
index 5d230f3a..00000000
--- a/clients/win10/app/codethemicrobitapp.jsproj
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|AnyCPU">
-      <Configuration>Debug</Configuration>
-      <Platform>AnyCPU</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|ARM">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x86">
-      <Configuration>Debug</Configuration>
-      <Platform>x86</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|AnyCPU">
-      <Configuration>Release</Configuration>
-      <Platform>AnyCPU</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM">
-      <Configuration>Release</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x86">
-      <Configuration>Release</Configuration>
-      <Platform>x86</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>39122940-ab16-4cd4-a0ce-79a3eb863ecf</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0'">
-    <VisualStudioVersion>14.0</VisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).Default.props" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).props" />
-  <PropertyGroup>
-    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.10586.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
-    <MinimumVisualStudioVersion>$(VersionNumberMajor).$(VersionNumberMinor)</MinimumVisualStudioVersion>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <PackageCertificateKeyFile>pxtwinapp_TemporaryKey.pfx</PackageCertificateKeyFile>
-    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
-    <AppxBundle>Always</AppxBundle>
-    <AppxBundlePlatforms>neutral</AppxBundlePlatforms>
-  </PropertyGroup>
-  <ItemGroup>
-    <AppxManifest Include="package.appxmanifest">
-      <SubType>Designer</SubType>
-    </AppxManifest>
-    <Content Include="msapp-error.js" />
-    <Content Include="msapp-error.css" />
-    <Content Include="msapp-error.html" />
-    <Content Include="images\LockScreenLogo.scale-200.png" />
-    <Content Include="images\SplashScreen.scale-200.png" />
-    <Content Include="images\Square150x150Logo.scale-200.png" />
-    <Content Include="images\Square44x44Logo.scale-200.png" />
-    <Content Include="images\Square44x44Logo.targetsize-24_altform-unplated.png" />
-    <Content Include="images\StoreLogo.png" />
-    <Content Include="images\Wide310x150Logo.scale-200.png" />
-    <None Include="pxtwinapp_TemporaryKey.pfx" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).targets" />
-  <!-- To modify your build process, add your task inside one of the targets below then uncomment
-       that target and the DisableFastUpToDateCheck PropertyGroup. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  <PropertyGroup>
-    <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
-  </PropertyGroup>
-  -->
-</Project>
\ No newline at end of file
diff --git a/clients/win10/app/codethemicrobitapp.sln b/clients/win10/app/codethemicrobitapp.sln
deleted file mode 100644
index ae487bac..00000000
--- a/clients/win10/app/codethemicrobitapp.sln
+++ /dev/null
@@ -1,48 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{262852C6-CD72-467D-83FE-5EEB1973A190}") = "codethemicrobitapp", "codethemicrobitapp.jsproj", "{39122940-AB16-4CD4-A0CE-79A3EB863ECF}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|ARM = Debug|ARM
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|ARM = Release|ARM
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|ARM.ActiveCfg = Debug|ARM
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|ARM.Build.0 = Debug|ARM
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|ARM.Deploy.0 = Debug|ARM
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x64.ActiveCfg = Debug|x64
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x64.Build.0 = Debug|x64
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x64.Deploy.0 = Debug|x64
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x86.ActiveCfg = Debug|x86
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x86.Build.0 = Debug|x86
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x86.Deploy.0 = Debug|x86
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|ARM.ActiveCfg = Release|ARM
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|ARM.Build.0 = Release|ARM
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|ARM.Deploy.0 = Release|ARM
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x64.ActiveCfg = Release|x64
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x64.Build.0 = Release|x64
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x64.Deploy.0 = Release|x64
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x86.ActiveCfg = Release|x86
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x86.Build.0 = Release|x86
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x86.Deploy.0 = Release|x86
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/clients/win10/app/images/LockScreenLogo.scale-200.png b/clients/win10/app/images/LockScreenLogo.scale-200.png
deleted file mode 100644
index ed9a4ef5..00000000
Binary files a/clients/win10/app/images/LockScreenLogo.scale-200.png and /dev/null differ
diff --git a/clients/win10/app/images/SplashScreen.scale-200.png b/clients/win10/app/images/SplashScreen.scale-200.png
deleted file mode 100644
index 9fdfc904..00000000
Binary files a/clients/win10/app/images/SplashScreen.scale-200.png and /dev/null differ
diff --git a/clients/win10/app/images/Square150x150Logo.scale-200.png b/clients/win10/app/images/Square150x150Logo.scale-200.png
deleted file mode 100644
index c879f5f6..00000000
Binary files a/clients/win10/app/images/Square150x150Logo.scale-200.png and /dev/null differ
diff --git a/clients/win10/app/images/Square44x44Logo.scale-200.png b/clients/win10/app/images/Square44x44Logo.scale-200.png
deleted file mode 100644
index 339d7e1b..00000000
Binary files a/clients/win10/app/images/Square44x44Logo.scale-200.png and /dev/null differ
diff --git a/clients/win10/app/images/Square44x44Logo.targetsize-24_altform-unplated.png b/clients/win10/app/images/Square44x44Logo.targetsize-24_altform-unplated.png
deleted file mode 100644
index 285bf05c..00000000
Binary files a/clients/win10/app/images/Square44x44Logo.targetsize-24_altform-unplated.png and /dev/null differ
diff --git a/clients/win10/app/images/StoreLogo.png b/clients/win10/app/images/StoreLogo.png
deleted file mode 100644
index fffe2f1a..00000000
Binary files a/clients/win10/app/images/StoreLogo.png and /dev/null differ
diff --git a/clients/win10/app/images/Wide310x150Logo.scale-200.png b/clients/win10/app/images/Wide310x150Logo.scale-200.png
deleted file mode 100644
index 816b48e1..00000000
Binary files a/clients/win10/app/images/Wide310x150Logo.scale-200.png and /dev/null differ
diff --git a/clients/win10/app/msapp-error.css b/clients/win10/app/msapp-error.css
deleted file mode 100644
index baefb056..00000000
--- a/clients/win10/app/msapp-error.css
+++ /dev/null
@@ -1,17 +0,0 @@
-body {
-  margin: 10px;
-} 
-
-.tip {
-  font-size: 90%;
-  padding-left: 20px;
-}
-
-.paramName {
-  font-size: 100%;
-  color: black;
-} 
-
-.paramValue {
-  color: black;
-}
diff --git a/clients/win10/app/msapp-error.html b/clients/win10/app/msapp-error.html
deleted file mode 100644
index 054a8554..00000000
--- a/clients/win10/app/msapp-error.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Navigation Error</title>
-  <link href="msapp-error.css" rel="stylesheet" type="text/css"/>
-  <script src="msapp-error.js" type="text/javascript"></script>
-</head>
-<body>
-  <h1>Navigation Error</h1>
-  <div id="failureUrl" class="param"> 
-    <span>-</span><span class="paramName">failureUrl</span><span>=</span> 
-    <span id="failureUrlValue" class="paramValue"></span> 
-    <span class="tip">(indicates the url where the error occurred)</span><br/> 
-  </div><br/> 
-  <div id="httpStatus" class="param"> 
-    <span>-</span><span class="paramName">httpStatus</span><span>=</span> 
-    <span id="httpStatusValue" class="paramValue"></span> 
-    <span class="tip">(available when the error has an http status code)</span><br/> 
-  </div><br/> 
-  <div id="failureName"> 
-    <span>-</span><span class="paramName">failureName</span><span>=</span> 
-    <span id="failureNameValue" class="paramValue"></span> 
-    <span class="tip">(available only when the error does not have a http status code)</span><br/> 
-  </div> 
-</body>
-</html>
diff --git a/clients/win10/app/msapp-error.js b/clients/win10/app/msapp-error.js
deleted file mode 100644
index d9051e8b..00000000
--- a/clients/win10/app/msapp-error.js
+++ /dev/null
@@ -1,22 +0,0 @@
-(function () { 
-  var validParameterNames = [ "httpStatus", "failureName", "failureUrl" ]; 
-  
-  function parseQueryParameters() { 
-    var query = location.search.slice(1); 
-    return query.split("&").reduce(function (queryParameters, rawPair) {
-                                   var pair = rawPair.split("=").map(decodeURIComponent);
-                                   queryParameters[pair[0]] = pair[1];
-                                   return queryParameters;
-    }, {});
-  }
- 
-  function initialize() {
-    var queryParameters = parseQueryParameters();
-    validParameterNames.forEach(function (parameterName) {
-                               var parameterValue = queryParameters[parameterName] || "N/A"; 
-                               document.getElementById(parameterName + "Value").textContent = parameterValue;
-    });
-  }
-  
-  document.addEventListener("DOMContentLoaded", initialize);
-}());
diff --git a/clients/win10/app/package.appxmanifest b/clients/win10/app/package.appxmanifest
deleted file mode 100644
index 8eee874c..00000000
--- a/clients/win10/app/package.appxmanifest
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="39122940-ab16-4cd4-a0ce-79a3eb863ecf" Version="0.1.5.0" Publisher="CN=jhalleux" />
-  <mp:PhoneIdentity PhoneProductId="39122940-ab16-4cd4-a0ce-79a3eb863ecf" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
-  <Properties>
-    <DisplayName>codethemicrobit</DisplayName>
-    <PublisherDisplayName>Microsoft</PublisherDisplayName>
-    <Logo>images\storelogo.png</Logo>
-  </Properties>
-  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
-  </Dependencies>
-  <Resources>
-    <Resource Language="x-generate" />
-  </Resources>
-  <Applications>
-    <Application Id="App" StartPage="https://codethemicrobit.com">
-      <uap:ApplicationContentUriRules>
-        <uap:Rule Match="https://m.pxt.io/" Type="include" WindowsRuntimeAccess="all" />
-        <uap:Rule Match="https://codemicrobit.com/" Type="include" WindowsRuntimeAccess="all" />
-        <uap:Rule Match="https://codethemicrobit.com/" Type="include" WindowsRuntimeAccess="all" />
-      </uap:ApplicationContentUriRules>
-      <uap:VisualElements DisplayName="code the micro:bit" Description="A code editor for the BBC micro:bit with Blocks or Javascript." BackgroundColor="white" Square150x150Logo="images\Square150x150Logo.png" Square44x44Logo="images\Square44x44Logo.png">
-        <uap:DefaultTile Wide310x150Logo="images\Wide310x150Logo.png" ShortName="code the micro:bit">
-        </uap:DefaultTile>
-        <uap:SplashScreen Image="images\splashscreen.png" />
-      </uap:VisualElements>
-      <Extensions>
-        <uap:Extension Category="windows.fileTypeAssociation">
-          <uap:FileTypeAssociation Name="microbithex">
-            <uap:DisplayName>BBC micro:bit binary file</uap:DisplayName>
-            <uap:SupportedFileTypes>
-              <uap:FileType ContentType="application/x-microbit-hex">.hex</uap:FileType>
-            </uap:SupportedFileTypes>
-          </uap:FileTypeAssociation>
-        </uap:Extension>
-      </Extensions>
-    </Application>
-  </Applications>
-  <Capabilities>
-    <Capability Name="internetClient" />
-    <uap:Capability Name="removableStorage" />
-    <DeviceCapability Name="bluetooth" />
-    <DeviceCapability Name="serialcommunication">
-      <Device Id="any">
-        <Function Type="name:serialPort" />
-      </Device>
-    </DeviceCapability>
-  </Capabilities>
-</Package>
\ No newline at end of file
diff --git a/clients/win10/app/pxtwinapp_TemporaryKey.pfx b/clients/win10/app/pxtwinapp_TemporaryKey.pfx
deleted file mode 100644
index 613b5574..00000000
Binary files a/clients/win10/app/pxtwinapp_TemporaryKey.pfx and /dev/null differ
diff --git a/clients/win10/store/desktopblocks1366x768.png b/clients/win10/store/desktopblocks1366x768.png
deleted file mode 100644
index 3ce40fd0..00000000
Binary files a/clients/win10/store/desktopblocks1366x768.png and /dev/null differ
diff --git a/clients/win10/store/desktopjavascript1366x768.png b/clients/win10/store/desktopjavascript1366x768.png
deleted file mode 100644
index 997e99fa..00000000
Binary files a/clients/win10/store/desktopjavascript1366x768.png and /dev/null differ
diff --git a/clients/win10/store/mobileblocks480x800.png b/clients/win10/store/mobileblocks480x800.png
deleted file mode 100644
index 0ad1ced6..00000000
Binary files a/clients/win10/store/mobileblocks480x800.png and /dev/null differ
diff --git a/clients/winuploader/Microbit.Uploader/MainForm.cs b/clients/winuploader/Microbit.Uploader/MainForm.cs
index 3a2fbf52..11eecb33 100644
--- a/clients/winuploader/Microbit.Uploader/MainForm.cs
+++ b/clients/winuploader/Microbit.Uploader/MainForm.cs
@@ -32,7 +32,7 @@ namespace Microsoft.MicroBit
         private void openEditor()
         {
             // lanch editor
-            try { Process.Start("https://codethemicrobit.com#uploader"); } catch (Exception) { }
+            try { Process.Start("https://pxt.microbit.org#uploader"); } catch (Exception) { }
         }
 
         private void initializeFileWatch()
@@ -236,7 +236,7 @@ namespace Microsoft.MicroBit
         {
             try
             {
-                Process.Start("https://codethemicrobit.com/uploader");
+                Process.Start("https://pxt.microbit.org/uploader");
             }
             catch (IOException) { }
         }