diff --git a/src/CalcManager/CalcManager.vcxproj b/src/CalcManager/CalcManager.vcxproj
index 02e5f8a..3f41b48 100644
--- a/src/CalcManager/CalcManager.vcxproj
+++ b/src/CalcManager/CalcManager.vcxproj
@@ -288,7 +288,7 @@
     <ClInclude Include="UnitConverter.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="CalculatorHistory.Cpp" />
+    <ClCompile Include="CalculatorHistory.cpp" />
     <ClCompile Include="CalculatorManager.cpp" />
     <ClCompile Include="CEngine\calc.cpp" />
     <ClCompile Include="CEngine\CalcUtils.cpp" />
diff --git a/src/CalcManager/CalcManager.vcxproj.filters b/src/CalcManager/CalcManager.vcxproj.filters
index fd61b03..7c4ad53 100644
--- a/src/CalcManager/CalcManager.vcxproj.filters
+++ b/src/CalcManager/CalcManager.vcxproj.filters
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tga;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
     <Filter Include="CEngine">
       <UniqueIdentifier>{957a8e3c-00c7-48bc-b63c-83b2140a8251}</UniqueIdentifier>
     </Filter>
@@ -81,7 +77,7 @@
     <ClCompile Include="Ratpack\transh.cpp">
       <Filter>RatPack</Filter>
     </ClCompile>
-    <ClCompile Include="CalculatorHistory.Cpp" />
+    <ClCompile Include="CalculatorHistory.cpp" />
     <ClCompile Include="CalculatorManager.cpp" />
     <ClCompile Include="UnitConverter.cpp" />
     <ClCompile Include="CEngine\CalcInput.cpp">
diff --git a/src/CalcManager/CalculatorHistory.Cpp b/src/CalcManager/CalculatorHistory.cpp
similarity index 100%
rename from src/CalcManager/CalculatorHistory.Cpp
rename to src/CalcManager/CalculatorHistory.cpp
diff --git a/src/CalcViewModel/CalcViewModel.vcxproj.filters b/src/CalcViewModel/CalcViewModel.vcxproj.filters
index 5154242..d05aca0 100644
--- a/src/CalcViewModel/CalcViewModel.vcxproj.filters
+++ b/src/CalcViewModel/CalcViewModel.vcxproj.filters
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tga;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
     <Filter Include="Common">
       <UniqueIdentifier>{1daab7c4-63f6-4266-a259-f34acad66d09}</UniqueIdentifier>
     </Filter>
diff --git a/src/Calculator/Calculator.vcxproj.filters b/src/Calculator/Calculator.vcxproj.filters
index c702af9..f17fe36 100644
--- a/src/Calculator/Calculator.vcxproj.filters
+++ b/src/Calculator/Calculator.vcxproj.filters
@@ -14,9 +14,6 @@
     <Filter Include="Converters">
       <UniqueIdentifier>{5a666ef7-54fb-46cc-9588-5cbcfaed3465}</UniqueIdentifier>
     </Filter>
-    <Filter Include="PerfTrack">
-      <UniqueIdentifier>{1cba827f-63eb-4cda-8bf0-eea60190725e}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Resources">
       <UniqueIdentifier>{f9b88d9e-918b-49ac-869b-a1a380ec3201}</UniqueIdentifier>
     </Filter>
diff --git a/src/Calculator/Themes/Type.xaml b/src/Calculator/Themes/Type.xaml
deleted file mode 100644
index bb0d126..0000000
--- a/src/Calculator/Themes/Type.xaml
+++ /dev/null
@@ -1,53 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-   <x:Double x:Key="CaptionFontSize">12</x:Double>
-   <x:Double x:Key="BodyFontSize">15</x:Double>
-   <x:Double x:Key="BaseFontSize">15</x:Double>
-   <x:Double x:Key="SubtitleFontSize">20</x:Double>
-   <x:Double x:Key="TitleFontSize">24</x:Double>
-   <x:Double x:Key="SubheaderFontSize">34</x:Double>
-   <x:Double x:Key="HeaderFontSize">46</x:Double>
-
-   <Style x:Key="CaptionTextBlockStyle" TargetType="TextBlock">
-      <Setter Property="FontSize" Value="{StaticResource CaptionFontSize}" />
-      <Setter Property="LineHeight" Value="14" />
-      <Setter Property="FontWeight" Value="Normal" />
-   </Style>
-
-   <Style x:Key="BodyTextBlockStyle" TargetType="TextBlock">
-      <Setter Property="FontSize" Value="{StaticResource BodyFontSize}" />
-      <Setter Property="LineHeight" Value="20" />
-      <Setter Property="FontWeight" Value="Normal" />
-   </Style>
-
-   <Style x:Key="BaseTextBlockStyle" TargetType="TextBlock" BasedOn="{StaticResource BodyTextBlockStyle}">
-      <Setter Property="FontWeight" Value="SemiBold" />
-   </Style>
-
-   <Style x:Key="SubtitleTextBlockStyle" TargetType="TextBlock">
-      <Setter Property="FontSize" Value="{StaticResource SubtitleFontSize}" />
-      <Setter Property="LineHeight" Value="24" />
-      <Setter Property="FontWeight" Value="Normal" />
-   </Style>
-
-   <Style x:Key="TitleTextBlockStyle" TargetType="TextBlock">
-      <Setter Property="FontSize" Value="{StaticResource TitleFontSize}" />
-      <Setter Property="LineHeight" Value="28" />
-      <Setter Property="FontWeight" Value="SemiLight" />
-   </Style>
-
-   <Style x:Key="SubheaderTextBlockStyle" TargetType="TextBlock">
-      <Setter Property="FontSize" Value="{StaticResource SubheaderFontSize}" />
-      <Setter Property="LineHeight" Value="40" />
-      <Setter Property="FontWeight" Value="Light" />
-   </Style>
-
-   <Style x:Key="HeaderTextBlockStyle" TargetType="TextBlock">
-      <Setter Property="FontSize" Value="{StaticResource HeaderFontSize}" />
-      <Setter Property="LineHeight" Value="56" />
-      <Setter Property="FontWeight" Value="Light" />
-   </Style>
-
-</ResourceDictionary>
\ No newline at end of file
diff --git a/src/CalculatorUnitTests/CalculatorUnitTests.vcxproj.filters b/src/CalculatorUnitTests/CalculatorUnitTests.vcxproj.filters
index c468442..57ac4fe 100644
--- a/src/CalculatorUnitTests/CalculatorUnitTests.vcxproj.filters
+++ b/src/CalculatorUnitTests/CalculatorUnitTests.vcxproj.filters
@@ -17,7 +17,6 @@
     <ClCompile Include="CurrencyConverterUnitTests.cpp" />
     <ClCompile Include="DateCalculatorUnitTests.cpp" />
     <ClCompile Include="HistoryTests.cpp" />
-    <ClCompile Include="Mocks\CurrencyHttpClient.cpp" />
     <ClCompile Include="Module.cpp" />
     <ClCompile Include="MultiWindowUnitTests.cpp" />
     <ClCompile Include="NavCategoryUnitTests.cpp" />
@@ -27,31 +26,50 @@
     <ClCompile Include="UnitTestApp.xaml.cpp" />
     <ClCompile Include="pch.cpp" />
     <ClCompile Include="UtilsTests.cpp" />
+    <ClCompile Include="Mocks\CurrencyHttpClient.cpp">
+      <Filter>Mocks</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="AsyncHelper.h" />
     <ClInclude Include="DateUtils.h" />
     <ClInclude Include="Helpers.h" />
-    <ClInclude Include="Mocks\CurrencyHttpClient.h" />
     <ClInclude Include="pch.h" />
     <ClInclude Include="UnitConverterViewModelUnitTests.h" />
     <ClInclude Include="UnitTestApp.xaml.h" />
     <ClInclude Include="resource.h" />
+    <ClInclude Include="Mocks\CurrencyHttpClient.h">
+      <Filter>Mocks</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="CalculatorUnitTests_VS.rc" />
+    <ResourceCompile Include="CalculatorUnitTests.rc" />
   </ItemGroup>
   <ItemGroup>
     <Xml Include="UnitTestApp.rd.xml" />
   </ItemGroup>
   <ItemGroup>
-    <Image Include="Assets\LockScreenLogo.scale-200.png" />
-    <Image Include="Assets\SplashScreen.scale-200.png" />
-    <Image Include="Assets\Square44x44Logo.scale-200.png" />
-    <Image Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
-    <Image Include="Assets\Square150x150Logo.scale-200.png" />
-    <Image Include="Assets\StoreLogo.png" />
-    <Image Include="Assets\Wide310x150Logo.scale-200.png" />
+    <Image Include="Assets\SplashScreen.scale-200.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\Square44x44Logo.scale-200.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\Square150x150Logo.scale-200.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\StoreLogo.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\Wide310x150Logo.scale-200.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\LockScreenLogo.scale-200.png">
+      <Filter>Assets</Filter>
+    </Image>
   </ItemGroup>
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest" />
@@ -59,4 +77,12 @@
   <ItemGroup>
     <None Include="CalculatorUnitTests_TemporaryKey.pfx" />
   </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Assets">
+      <UniqueIdentifier>{f2987b0a-9832-46fc-b818-d5347362b3d8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Mocks">
+      <UniqueIdentifier>{d3ec8922-022d-4531-8744-f65a872f3841}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
 </Project>
\ No newline at end of file