diff --git a/.gitignore b/.gitignore
index 459b8a3b..80d64f53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -289,13 +289,5 @@ __pycache__/
 
 # Calculator specific
 Generated Files/
-# Don't ignore anything under SpkgDefs or TrexDefs
-!/SpkgDefs/**
-!/TrexDefs/**
 !/build/config/TRexDefs/**
-
-# Localized strings
-# LCT files are loc system artifacts that we don't want in our repo.
-*.lct
-
-WorkspaceInfo.xml
+!src/CalculatorUnitTests/CalculatorUnitTests_TemporaryKey.pfx
\ No newline at end of file
diff --git a/src/Calculator.sln b/src/Calculator.sln
index cfcae417..2d36a93f 100644
--- a/src/Calculator.sln
+++ b/src/Calculator.sln
@@ -14,7 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CalcViewModel", "CalcViewModel\CalcViewModel.vcxproj", "{90E9761D-9262-4773-942D-CAEAE75D7140}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CalculatorUnitTests_VS", "CalculatorUnitTests_VS\CalculatorUnitTests_VS.vcxproj", "{D3BAED2C-4B07-4E1D-8807-9D6499450349}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CalculatorUnitTests", "CalculatorUnitTests\CalculatorUnitTests.vcxproj", "{D3BAED2C-4B07-4E1D-8807-9D6499450349}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/CalculatorUnitTests_VS/Assets/LockScreenLogo.scale-200.png b/src/CalculatorUnitTests/Assets/LockScreenLogo.scale-200.png
similarity index 100%
rename from src/CalculatorUnitTests_VS/Assets/LockScreenLogo.scale-200.png
rename to src/CalculatorUnitTests/Assets/LockScreenLogo.scale-200.png
diff --git a/src/CalculatorUnitTests_VS/Assets/SplashScreen.scale-200.png b/src/CalculatorUnitTests/Assets/SplashScreen.scale-200.png
similarity index 100%
rename from src/CalculatorUnitTests_VS/Assets/SplashScreen.scale-200.png
rename to src/CalculatorUnitTests/Assets/SplashScreen.scale-200.png
diff --git a/src/CalculatorUnitTests_VS/Assets/Square150x150Logo.scale-200.png b/src/CalculatorUnitTests/Assets/Square150x150Logo.scale-200.png
similarity index 100%
rename from src/CalculatorUnitTests_VS/Assets/Square150x150Logo.scale-200.png
rename to src/CalculatorUnitTests/Assets/Square150x150Logo.scale-200.png
diff --git a/src/CalculatorUnitTests_VS/Assets/Square44x44Logo.scale-200.png b/src/CalculatorUnitTests/Assets/Square44x44Logo.scale-200.png
similarity index 100%
rename from src/CalculatorUnitTests_VS/Assets/Square44x44Logo.scale-200.png
rename to src/CalculatorUnitTests/Assets/Square44x44Logo.scale-200.png
diff --git a/src/CalculatorUnitTests_VS/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/src/CalculatorUnitTests/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
similarity index 100%
rename from src/CalculatorUnitTests_VS/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
rename to src/CalculatorUnitTests/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
diff --git a/src/CalculatorUnitTests_VS/Assets/StoreLogo.png b/src/CalculatorUnitTests/Assets/StoreLogo.png
similarity index 100%
rename from src/CalculatorUnitTests_VS/Assets/StoreLogo.png
rename to src/CalculatorUnitTests/Assets/StoreLogo.png
diff --git a/src/CalculatorUnitTests_VS/Assets/Wide310x150Logo.scale-200.png b/src/CalculatorUnitTests/Assets/Wide310x150Logo.scale-200.png
similarity index 100%
rename from src/CalculatorUnitTests_VS/Assets/Wide310x150Logo.scale-200.png
rename to src/CalculatorUnitTests/Assets/Wide310x150Logo.scale-200.png
diff --git a/src/CalculatorUnitTests_VS/AsyncHelper.cpp b/src/CalculatorUnitTests/AsyncHelper.cpp
similarity index 100%
rename from src/CalculatorUnitTests_VS/AsyncHelper.cpp
rename to src/CalculatorUnitTests/AsyncHelper.cpp
diff --git a/src/CalculatorUnitTests_VS/AsyncHelper.h b/src/CalculatorUnitTests/AsyncHelper.h
similarity index 100%
rename from src/CalculatorUnitTests_VS/AsyncHelper.h
rename to src/CalculatorUnitTests/AsyncHelper.h
diff --git a/src/CalculatorUnitTests_VS/CalcEngineTests.cpp b/src/CalculatorUnitTests/CalcEngineTests.cpp
similarity index 100%
rename from src/CalculatorUnitTests_VS/CalcEngineTests.cpp
rename to src/CalculatorUnitTests/CalcEngineTests.cpp
diff --git a/src/CalculatorUnitTests_VS/CalcInputTest.cpp b/src/CalculatorUnitTests/CalcInputTest.cpp
similarity index 100%
rename from src/CalculatorUnitTests_VS/CalcInputTest.cpp
rename to src/CalculatorUnitTests/CalcInputTest.cpp
diff --git a/src/CalculatorUnitTests_VS/CalculatorManagerTest.cpp b/src/CalculatorUnitTests/CalculatorManagerTest.cpp
similarity index 100%
rename from src/CalculatorUnitTests_VS/CalculatorManagerTest.cpp
rename to src/CalculatorUnitTests/CalculatorManagerTest.cpp
diff --git a/src/CalculatorUnitTests_VS/CalculatorUnitTests_VS.rc b/src/CalculatorUnitTests/CalculatorUnitTests.rc
similarity index 100%
rename from src/CalculatorUnitTests_VS/CalculatorUnitTests_VS.rc
rename to src/CalculatorUnitTests/CalculatorUnitTests.rc
diff --git a/src/CalculatorUnitTests_VS/CalculatorUnitTests_VS.vcxproj b/src/CalculatorUnitTests/CalculatorUnitTests.vcxproj
similarity index 98%
rename from src/CalculatorUnitTests_VS/CalculatorUnitTests_VS.vcxproj
rename to src/CalculatorUnitTests/CalculatorUnitTests.vcxproj
index 63730e71..f7e40b2c 100644
--- a/src/CalculatorUnitTests_VS/CalculatorUnitTests_VS.vcxproj
+++ b/src/CalculatorUnitTests/CalculatorUnitTests.vcxproj
@@ -2,7 +2,7 @@
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="Globals">
     <ProjectGuid>{d3baed2c-4b07-4e1d-8807-9d6499450349}</ProjectGuid>
-    <RootNamespace>CalculatorUnitTests_VS</RootNamespace>
+    <RootNamespace>CalculatorUnitTests</RootNamespace>
     <DefaultLanguage>en-US</DefaultLanguage>
     <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
     <AppContainerApplication>true</AppContainerApplication>
@@ -129,7 +129,7 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
-    <PackageCertificateKeyFile>CalculatorUnitTests_VS_TemporaryKey.pfx</PackageCertificateKeyFile>
+    <PackageCertificateKeyFile>CalculatorUnitTests_TemporaryKey.pfx</PackageCertificateKeyFile>
     <PackageCertificateThumbprint>3F0C32266A4D995CC08C9AEC3960CFF3EF0D1853</PackageCertificateThumbprint>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@@ -259,7 +259,7 @@
     <Xml Include="UnitTestApp.rd.xml" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="CalculatorUnitTests_VS_TemporaryKey.pfx" />
+    <None Include="CalculatorUnitTests_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
     <PRIResource Include="..\Calculator\Resources\en-US\CEngineStrings.resw" />
@@ -269,7 +269,7 @@
     </PRIResource>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="CalculatorUnitTests_VS.rc" />
+    <ResourceCompile Include="CalculatorUnitTests.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\CalcManager\CalcManager.vcxproj">
diff --git a/src/CalculatorUnitTests_VS/CalculatorUnitTests_VS.vcxproj.filters b/src/CalculatorUnitTests/CalculatorUnitTests.vcxproj.filters
similarity index 100%
rename from src/CalculatorUnitTests_VS/CalculatorUnitTests_VS.vcxproj.filters
rename to src/CalculatorUnitTests/CalculatorUnitTests.vcxproj.filters
diff --git a/src/CalculatorUnitTests/CalculatorUnitTests_TemporaryKey.pfx b/src/CalculatorUnitTests/CalculatorUnitTests_TemporaryKey.pfx
new file mode 100644
index 00000000..d4e928e8
Binary files /dev/null and b/src/CalculatorUnitTests/CalculatorUnitTests_TemporaryKey.pfx differ
diff --git a/src/CalculatorUnitTests_VS/CopyPasteManagerTest.cpp b/src/CalculatorUnitTests/CopyPasteManagerTest.cpp
similarity index 100%
rename from src/CalculatorUnitTests_VS/CopyPasteManagerTest.cpp
rename to src/CalculatorUnitTests/CopyPasteManagerTest.cpp
diff --git a/src/CalculatorUnitTests_VS/CurrencyConverterUnitTests.cpp b/src/CalculatorUnitTests/CurrencyConverterUnitTests.cpp
similarity index 100%
rename from src/CalculatorUnitTests_VS/CurrencyConverterUnitTests.cpp
rename to src/CalculatorUnitTests/CurrencyConverterUnitTests.cpp
diff --git a/src/CalculatorUnitTests_VS/DateCalculatorUnitTests.cpp b/src/CalculatorUnitTests/DateCalculatorUnitTests.cpp
similarity index 100%
rename from src/CalculatorUnitTests_VS/DateCalculatorUnitTests.cpp
rename to src/CalculatorUnitTests/DateCalculatorUnitTests.cpp
diff --git a/src/CalculatorUnitTests_VS/DateUtils.h b/src/CalculatorUnitTests/DateUtils.h
similarity index 100%
rename from src/CalculatorUnitTests_VS/DateUtils.h
rename to src/CalculatorUnitTests/DateUtils.h
diff --git a/src/CalculatorUnitTests_VS/Helpers.h b/src/CalculatorUnitTests/Helpers.h
similarity index 100%
rename from src/CalculatorUnitTests_VS/Helpers.h
rename to src/CalculatorUnitTests/Helpers.h
diff --git a/src/CalculatorUnitTests_VS/HistoryTests.cpp b/src/CalculatorUnitTests/HistoryTests.cpp
similarity index 100%
rename from src/CalculatorUnitTests_VS/HistoryTests.cpp
rename to src/CalculatorUnitTests/HistoryTests.cpp
diff --git a/src/CalculatorUnitTests_VS/Mocks/CurrencyHttpClient.cpp b/src/CalculatorUnitTests/Mocks/CurrencyHttpClient.cpp
similarity index 100%
rename from src/CalculatorUnitTests_VS/Mocks/CurrencyHttpClient.cpp
rename to src/CalculatorUnitTests/Mocks/CurrencyHttpClient.cpp
diff --git a/src/CalculatorUnitTests_VS/Mocks/CurrencyHttpClient.h b/src/CalculatorUnitTests/Mocks/CurrencyHttpClient.h
similarity index 100%
rename from src/CalculatorUnitTests_VS/Mocks/CurrencyHttpClient.h
rename to src/CalculatorUnitTests/Mocks/CurrencyHttpClient.h
diff --git a/src/CalculatorUnitTests_VS/Module.cpp b/src/CalculatorUnitTests/Module.cpp
similarity index 100%
rename from src/CalculatorUnitTests_VS/Module.cpp
rename to src/CalculatorUnitTests/Module.cpp
diff --git a/src/CalculatorUnitTests_VS/MultiWindowUnitTests.cpp b/src/CalculatorUnitTests/MultiWindowUnitTests.cpp
similarity index 100%
rename from src/CalculatorUnitTests_VS/MultiWindowUnitTests.cpp
rename to src/CalculatorUnitTests/MultiWindowUnitTests.cpp
diff --git a/src/CalculatorUnitTests_VS/NavCategoryUnitTests.cpp b/src/CalculatorUnitTests/NavCategoryUnitTests.cpp
similarity index 100%
rename from src/CalculatorUnitTests_VS/NavCategoryUnitTests.cpp
rename to src/CalculatorUnitTests/NavCategoryUnitTests.cpp
diff --git a/src/CalculatorUnitTests_VS/Package.appxmanifest b/src/CalculatorUnitTests/Package.appxmanifest
similarity index 78%
rename from src/CalculatorUnitTests_VS/Package.appxmanifest
rename to src/CalculatorUnitTests/Package.appxmanifest
index 9bd25f9c..503376f6 100644
--- a/src/CalculatorUnitTests_VS/Package.appxmanifest
+++ b/src/CalculatorUnitTests/Package.appxmanifest
@@ -3,7 +3,7 @@
   <Identity Name="0f7457a6-1a6a-4607-b3b8-e3dd274567c8" Publisher="CN=CalculatorUnitTests" Version="1.0.0.0" />
   <mp:PhoneIdentity PhoneProductId="0f7457a6-1a6a-4607-b3b8-e3dd274567c8" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
-    <DisplayName>CalculatorUnitTests_VS</DisplayName>
+    <DisplayName>CalculatorUnitTests</DisplayName>
     <PublisherDisplayName>Microsoft Corporation</PublisherDisplayName>
     <Logo>Assets\StoreLogo.png</Logo>
   </Properties>
@@ -14,8 +14,8 @@
     <Resource Language="x-generate" />
   </Resources>
   <Applications>
-    <Application Id="vstest.executionengine.universal.App" Executable="$targetnametoken$.exe" EntryPoint="CalculatorUnitTests_VS.App">
-      <uap:VisualElements DisplayName="CalculatorUnitTests_VS" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="CalculatorUnitTests_VS" BackgroundColor="transparent">
+    <Application Id="vstest.executionengine.universal.App" Executable="$targetnametoken$.exe" EntryPoint="CalculatorUnitTests.App">
+      <uap:VisualElements DisplayName="CalculatorUnitTests" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="CalculatorUnitTests" BackgroundColor="transparent">
         <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png">
         </uap:DefaultTile>
         <uap:SplashScreen Image="Assets\SplashScreen.png" />
diff --git a/src/CalculatorUnitTests_VS/StandardViewModelUnitTests.cpp b/src/CalculatorUnitTests/StandardViewModelUnitTests.cpp
similarity index 100%
rename from src/CalculatorUnitTests_VS/StandardViewModelUnitTests.cpp
rename to src/CalculatorUnitTests/StandardViewModelUnitTests.cpp
diff --git a/src/CalculatorUnitTests_VS/Test.resw b/src/CalculatorUnitTests/Test.resw
similarity index 100%
rename from src/CalculatorUnitTests_VS/Test.resw
rename to src/CalculatorUnitTests/Test.resw
diff --git a/src/CalculatorUnitTests_VS/UnitConverterTest.cpp b/src/CalculatorUnitTests/UnitConverterTest.cpp
similarity index 100%
rename from src/CalculatorUnitTests_VS/UnitConverterTest.cpp
rename to src/CalculatorUnitTests/UnitConverterTest.cpp
diff --git a/src/CalculatorUnitTests_VS/UnitConverterViewModelUnitTests.cpp b/src/CalculatorUnitTests/UnitConverterViewModelUnitTests.cpp
similarity index 100%
rename from src/CalculatorUnitTests_VS/UnitConverterViewModelUnitTests.cpp
rename to src/CalculatorUnitTests/UnitConverterViewModelUnitTests.cpp
diff --git a/src/CalculatorUnitTests_VS/UnitConverterViewModelUnitTests.h b/src/CalculatorUnitTests/UnitConverterViewModelUnitTests.h
similarity index 100%
rename from src/CalculatorUnitTests_VS/UnitConverterViewModelUnitTests.h
rename to src/CalculatorUnitTests/UnitConverterViewModelUnitTests.h
diff --git a/src/CalculatorUnitTests_VS/UnitTestApp.rd.xml b/src/CalculatorUnitTests/UnitTestApp.rd.xml
similarity index 100%
rename from src/CalculatorUnitTests_VS/UnitTestApp.rd.xml
rename to src/CalculatorUnitTests/UnitTestApp.rd.xml
diff --git a/src/CalculatorUnitTests_VS/UnitTestApp.xaml b/src/CalculatorUnitTests/UnitTestApp.xaml
similarity index 100%
rename from src/CalculatorUnitTests_VS/UnitTestApp.xaml
rename to src/CalculatorUnitTests/UnitTestApp.xaml
diff --git a/src/CalculatorUnitTests_VS/UnitTestApp.xaml.cpp b/src/CalculatorUnitTests/UnitTestApp.xaml.cpp
similarity index 100%
rename from src/CalculatorUnitTests_VS/UnitTestApp.xaml.cpp
rename to src/CalculatorUnitTests/UnitTestApp.xaml.cpp
diff --git a/src/CalculatorUnitTests_VS/UnitTestApp.xaml.h b/src/CalculatorUnitTests/UnitTestApp.xaml.h
similarity index 100%
rename from src/CalculatorUnitTests_VS/UnitTestApp.xaml.h
rename to src/CalculatorUnitTests/UnitTestApp.xaml.h
diff --git a/src/CalculatorUnitTests_VS/UtilsTests.cpp b/src/CalculatorUnitTests/UtilsTests.cpp
similarity index 100%
rename from src/CalculatorUnitTests_VS/UtilsTests.cpp
rename to src/CalculatorUnitTests/UtilsTests.cpp
diff --git a/src/CalculatorUnitTests_VS/pch.cpp b/src/CalculatorUnitTests/pch.cpp
similarity index 100%
rename from src/CalculatorUnitTests_VS/pch.cpp
rename to src/CalculatorUnitTests/pch.cpp
diff --git a/src/CalculatorUnitTests_VS/pch.h b/src/CalculatorUnitTests/pch.h
similarity index 100%
rename from src/CalculatorUnitTests_VS/pch.h
rename to src/CalculatorUnitTests/pch.h
diff --git a/src/CalculatorUnitTests_VS/resource.h b/src/CalculatorUnitTests/resource.h
similarity index 100%
rename from src/CalculatorUnitTests_VS/resource.h
rename to src/CalculatorUnitTests/resource.h