diff --git a/src/CalcManager/CalculatorManager.cpp b/src/CalcManager/CalculatorManager.cpp
index 3aa185d..0e03afa 100644
--- a/src/CalcManager/CalculatorManager.cpp
+++ b/src/CalcManager/CalculatorManager.cpp
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 #include "pch.h"
-#include "Header Files\CalcEngine.h"
+#include "Header Files/CalcEngine.h"
 #include "CalculatorManager.h"
 #include "CalculatorResource.h"
 
diff --git a/src/CalcManager/ExpressionCommand.cpp b/src/CalcManager/ExpressionCommand.cpp
index 393a471..fcede22 100644
--- a/src/CalcManager/ExpressionCommand.cpp
+++ b/src/CalcManager/ExpressionCommand.cpp
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 #include "pch.h"
-#include "Header Files\CCommand.h"
+#include "Header Files/CCommand.h"
 #include "CalculatorVector.h"
 #include "ExpressionCommand.h"
 
diff --git a/src/CalcViewModel/ApplicationViewModel.cpp b/src/CalcViewModel/ApplicationViewModel.cpp
index 9c1aa38..4df5bac 100644
--- a/src/CalcViewModel/ApplicationViewModel.cpp
+++ b/src/CalcViewModel/ApplicationViewModel.cpp
@@ -3,13 +3,13 @@
 
 #include "pch.h"
 #include "ApplicationViewModel.h"
-#include "Common\TraceLogger.h"
-#include "Common\AppResourceProvider.h"
+#include "Common/TraceLogger.h"
+#include "Common/AppResourceProvider.h"
 #include "StandardCalculatorViewModel.h"
 #include "DateCalculatorViewModel.h"
-#include "DataLoaders\CurrencyHttpClient.h"
-#include "DataLoaders\CurrencyDataLoader.h"
-#include "DataLoaders\UnitConverterDataLoader.h"
+#include "DataLoaders/CurrencyHttpClient.h"
+#include "DataLoaders/CurrencyDataLoader.h"
+#include "DataLoaders/UnitConverterDataLoader.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
diff --git a/src/CalcViewModel/Common/CopyPasteManager.cpp b/src/CalcViewModel/Common/CopyPasteManager.cpp
index c8f9c5f..75abbb7 100644
--- a/src/CalcViewModel/Common/CopyPasteManager.cpp
+++ b/src/CalcViewModel/Common/CopyPasteManager.cpp
@@ -3,8 +3,8 @@
 
 #include "pch.h"
 #include "CopyPasteManager.h"
-#include "Common\TraceLogger.h"
-#include "Common\LocalizationSettings.h"
+#include "Common/TraceLogger.h"
+#include "Common/LocalizationSettings.h"
 
 using namespace std;
 using namespace concurrency;
diff --git a/src/CalcViewModel/Common/EngineResourceProvider.h b/src/CalcViewModel/Common/EngineResourceProvider.h
index 1bcb93f..83b3f41 100644
--- a/src/CalcViewModel/Common/EngineResourceProvider.h
+++ b/src/CalcViewModel/Common/EngineResourceProvider.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "CalcManager\CalculatorResource.h"
+#include "CalcManager/CalculatorResource.h"
 
 namespace CalculatorApp
 {
diff --git a/src/CalcViewModel/Common/ExpressionCommandSerializer.cpp b/src/CalcViewModel/Common/ExpressionCommandSerializer.cpp
index 51c3eae..38bae50 100644
--- a/src/CalcViewModel/Common/ExpressionCommandSerializer.cpp
+++ b/src/CalcViewModel/Common/ExpressionCommandSerializer.cpp
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 #include "pch.h"
-#include "Common\ExpressionCommandSerializer.h"
+#include "Common/ExpressionCommandSerializer.h"
 
 using namespace CalculatorApp::Common;
 using namespace Windows::Storage::Streams;
diff --git a/src/CalcViewModel/Common/NavCategory.cpp b/src/CalcViewModel/Common/NavCategory.cpp
index bcfeb64..e5247cf 100644
--- a/src/CalcViewModel/Common/NavCategory.cpp
+++ b/src/CalcViewModel/Common/NavCategory.cpp
@@ -4,7 +4,7 @@
 #include "pch.h"
 #include "NavCategory.h"
 #include "AppResourceProvider.h"
-#include "Common\LocalizationStringUtil.h"
+#include "Common/LocalizationStringUtil.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
diff --git a/src/CalcViewModel/Common/Utils.cpp b/src/CalcViewModel/Common/Utils.cpp
index c0ddf69..55e78e6 100644
--- a/src/CalcViewModel/Common/Utils.cpp
+++ b/src/CalcViewModel/Common/Utils.cpp
@@ -7,9 +7,9 @@
 
 #include "pch.h"
 #include "Utils.h"
-#include "Common\AppResourceProvider.h"
-#include "Common\ExpressionCommandSerializer.h"
-#include "Common\ExpressionCommandDeserializer.h"
+#include "Common/AppResourceProvider.h"
+#include "Common/ExpressionCommandSerializer.h"
+#include "Common/ExpressionCommandDeserializer.h"
 #include "ViewState.h"
 
 using namespace CalculatorApp;
diff --git a/src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp b/src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp
index 5366f37..4958532 100644
--- a/src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp
+++ b/src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp
@@ -3,11 +3,11 @@
 
 #include "pch.h"
 #include "CurrencyDataLoader.h"
-#include "Common\AppResourceProvider.h"
-#include "Common\LocalizationStringUtil.h"
-#include "Common\LocalizationService.h"
-#include "Common\LocalizationSettings.h"
-#include "Common\TraceLogger.h"
+#include "Common/AppResourceProvider.h"
+#include "Common/LocalizationStringUtil.h"
+#include "Common/LocalizationService.h"
+#include "Common/LocalizationSettings.h"
+#include "Common/TraceLogger.h"
 #include "UnitConverterDataConstants.h"
 
 using namespace CalculatorApp;
diff --git a/src/CalcViewModel/DataLoaders/CurrencyDataLoader.h b/src/CalcViewModel/DataLoaders/CurrencyDataLoader.h
index 917fa21..cdb006b 100644
--- a/src/CalcViewModel/DataLoaders/CurrencyDataLoader.h
+++ b/src/CalcViewModel/DataLoaders/CurrencyDataLoader.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include "CalcManager\UnitConverter.h"
-#include "Common\NetworkManager.h"
+#include "CalcManager/UnitConverter.h"
+#include "Common/NetworkManager.h"
 #include "ICurrencyHttpClient.h"
 
 namespace CalculatorApp
diff --git a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp
index 19ee3ba..b00cf79 100644
--- a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp
+++ b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 #include "pch.h"
-#include "Common\AppResourceProvider.h"
+#include "Common/AppResourceProvider.h"
 #include "UnitConverterDataLoader.h"
 #include "UnitConverterDataConstants.h"
 #include "CurrencyDataLoader.h"
diff --git a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.h b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.h
index 17565ed..519ffda 100644
--- a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.h
+++ b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "CalcManager\UnitConverter.h"
+#include "CalcManager/UnitConverter.h"
 #include "Common/NavCategory.h"
 
 namespace CalculatorApp
diff --git a/src/CalcViewModel/DateCalculatorViewModel.cpp b/src/CalcViewModel/DateCalculatorViewModel.cpp
index 89e2688..dde91cc 100644
--- a/src/CalcViewModel/DateCalculatorViewModel.cpp
+++ b/src/CalcViewModel/DateCalculatorViewModel.cpp
@@ -3,11 +3,11 @@
 
 #include "pch.h"
 #include "DateCalculatorViewModel.h"
-#include "Common\TraceLogger.h"
-#include "Common\LocalizationStringUtil.h"
-#include "Common\LocalizationService.h"
-#include "Common\LocalizationSettings.h"
-#include "Common\CopyPasteManager.h"
+#include "Common/TraceLogger.h"
+#include "Common/LocalizationStringUtil.h"
+#include "Common/LocalizationService.h"
+#include "Common/LocalizationSettings.h"
+#include "Common/CopyPasteManager.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
diff --git a/src/CalcViewModel/HistoryItemViewModel.cpp b/src/CalcViewModel/HistoryItemViewModel.cpp
index f3726fc..c5cd078 100644
--- a/src/CalcViewModel/HistoryItemViewModel.cpp
+++ b/src/CalcViewModel/HistoryItemViewModel.cpp
@@ -3,7 +3,7 @@
 
 #include "pch.h"
 #include "HistoryItemViewModel.h"
-#include "Common\LocalizationService.h"
+#include "Common/LocalizationService.h"
 
 using namespace CalculatorApp::Common;
 using namespace CalculatorApp::ViewModel;
diff --git a/src/CalcViewModel/HistoryViewModel.cpp b/src/CalcViewModel/HistoryViewModel.cpp
index 822aab0..aa491f1 100644
--- a/src/CalcViewModel/HistoryViewModel.cpp
+++ b/src/CalcViewModel/HistoryViewModel.cpp
@@ -3,9 +3,9 @@
 
 #include "pch.h"
 #include "HistoryViewModel.h"
-#include "Common\TraceLogger.h"
-#include "Common\LocalizationStringUtil.h"
-#include "Common\LocalizationSettings.h"
+#include "Common/TraceLogger.h"
+#include "Common/LocalizationStringUtil.h"
+#include "Common/LocalizationSettings.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
diff --git a/src/CalcViewModel/StandardCalculatorViewModel.cpp b/src/CalcViewModel/StandardCalculatorViewModel.cpp
index c8b8707..4b8f6bc 100644
--- a/src/CalcViewModel/StandardCalculatorViewModel.cpp
+++ b/src/CalcViewModel/StandardCalculatorViewModel.cpp
@@ -3,11 +3,11 @@
 
 #include "pch.h"
 #include "StandardCalculatorViewModel.h"
-#include "Common\CalculatorButtonPressedEventArgs.h"
-#include "Common\LocalizationStringUtil.h"
-#include "Common\LocalizationSettings.h"
-#include "Common\CopyPasteManager.h"
-#include "Common\TraceLogger.h"
+#include "Common/CalculatorButtonPressedEventArgs.h"
+#include "Common/LocalizationStringUtil.h"
+#include "Common/LocalizationSettings.h"
+#include "Common/CopyPasteManager.h"
+#include "Common/TraceLogger.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
diff --git a/src/CalcViewModel/StandardCalculatorViewModel.h b/src/CalcViewModel/StandardCalculatorViewModel.h
index 7fb311c..91ff9da 100644
--- a/src/CalcViewModel/StandardCalculatorViewModel.h
+++ b/src/CalcViewModel/StandardCalculatorViewModel.h
@@ -2,11 +2,11 @@
 // Licensed under the MIT License.
 
 #pragma once
-#include "Common\Automation\NarratorAnnouncement.h"
-#include "Common\DisplayExpressionToken.h"
-#include "Common\CalculatorDisplay.h"
-#include "Common\EngineResourceProvider.h"
-#include "Common\CalculatorButtonUser.h"
+#include "Common/Automation/NarratorAnnouncement.h"
+#include "Common/DisplayExpressionToken.h"
+#include "Common/CalculatorDisplay.h"
+#include "Common/EngineResourceProvider.h"
+#include "Common/CalculatorButtonUser.h"
 #include "HistoryViewModel.h"
 #include "MemoryItemViewModel.h"
 
diff --git a/src/CalcViewModel/UnitConverterViewModel.cpp b/src/CalcViewModel/UnitConverterViewModel.cpp
index c5df49a..393165e 100644
--- a/src/CalcViewModel/UnitConverterViewModel.cpp
+++ b/src/CalcViewModel/UnitConverterViewModel.cpp
@@ -4,15 +4,15 @@
 #include "pch.h"
 #include "UnitConverterViewModel.h"
 #include "CalcManager/Header Files/EngineStrings.h"
-#include "Common\CalculatorButtonPressedEventArgs.h"
-#include "Common\CopyPasteManager.h"
-#include "Common\LocalizationStringUtil.h"
-#include "Common\LocalizationService.h"
-#include "Common\LocalizationSettings.h"
-#include "Common\TraceLogger.h"
-#include "DataLoaders\CurrencyHttpClient.h"
-#include "DataLoaders\CurrencyDataLoader.h"
-#include "DataLoaders\UnitConverterDataLoader.h"
+#include "Common/CalculatorButtonPressedEventArgs.h"
+#include "Common/CopyPasteManager.h"
+#include "Common/LocalizationStringUtil.h"
+#include "Common/LocalizationService.h"
+#include "Common/LocalizationSettings.h"
+#include "Common/TraceLogger.h"
+#include "DataLoaders/CurrencyHttpClient.h"
+#include "DataLoaders/CurrencyDataLoader.h"
+#include "DataLoaders/UnitConverterDataLoader.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
diff --git a/src/CalcViewModel/pch.h b/src/CalcViewModel/pch.h
index 01a40fa..b2717d1 100644
--- a/src/CalcViewModel/pch.h
+++ b/src/CalcViewModel/pch.h
@@ -28,12 +28,12 @@
 #include <regex>
 
 // C++\WinRT Headers
-#include "winrt\base.h"
-#include "winrt\Windows.Foundation.Diagnostics.h"
-#include "winrt\Windows.Globalization.h"
-#include "winrt\Windows.Globalization.DateTimeFormatting.h"
-#include "winrt\Windows.System.UserProfile.h"
-#include "winrt\Windows.UI.Xaml.h"
+#include "winrt/base.h"
+#include "winrt/Windows.Foundation.Diagnostics.h"
+#include "winrt/Windows.Globalization.h"
+#include "winrt/Windows.Globalization.DateTimeFormatting.h"
+#include "winrt/Windows.System.UserProfile.h"
+#include "winrt/Windows.UI.Xaml.h"
 
 // The following namespaces exist as a convenience to resolve
 // ambiguity for Windows types in the Windows::UI::Xaml::Automation::Peers
diff --git a/src/Calculator/Common/AppLifecycleLogger.cpp b/src/Calculator/Common/AppLifecycleLogger.cpp
index 342cc19..983deac 100644
--- a/src/Calculator/Common/AppLifecycleLogger.cpp
+++ b/src/Calculator/Common/AppLifecycleLogger.cpp
@@ -3,7 +3,7 @@
 
 #include "pch.h"
 #include "AppLifecycleLogger.h"
-#include "CalcViewModel\Common\TraceActivity.h"
+#include "CalcViewModel/Common/TraceActivity.h"
 
 using namespace std;
 using namespace winrt;
diff --git a/src/Calculator/Common/TitleBarHelper.cpp b/src/Calculator/Common/TitleBarHelper.cpp
index 8206730..18e8be9 100644
--- a/src/Calculator/Common/TitleBarHelper.cpp
+++ b/src/Calculator/Common/TitleBarHelper.cpp
@@ -3,8 +3,8 @@
 
 #include "pch.h"
 #include "TitleBarHelper.h"
-#include "Converters\BooleanToVisibilityConverter.h"
-#include "CalcViewModel\ViewState.h"
+#include "Converters/BooleanToVisibilityConverter.h"
+#include "CalcViewModel/ViewState.h"
 
 using namespace CalculatorApp::Common;
 using namespace CalculatorApp::Converters;
diff --git a/src/Calculator/Controls/AppBar.h b/src/Calculator/Controls/AppBar.h
index 3f8053c..b6ac374 100644
--- a/src/Calculator/Controls/AppBar.h
+++ b/src/Calculator/Controls/AppBar.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "Common\KeyboardShortcutManager.h"
+#include "Common/KeyboardShortcutManager.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Controls/CalculationResult.cpp b/src/Calculator/Controls/CalculationResult.cpp
index 22f938a..8896617 100644
--- a/src/Calculator/Controls/CalculationResult.cpp
+++ b/src/Calculator/Controls/CalculationResult.cpp
@@ -4,7 +4,7 @@
 #include "pch.h"
 #include "CalculationResult.h"
 #include "CalculationResultAutomationPeer.h"
-#include "CalcViewModel\Common\LocalizationSettings.h"
+#include "CalcViewModel/Common/LocalizationSettings.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Controls;
diff --git a/src/Calculator/Controls/CalculationResultAutomationPeer.h b/src/Calculator/Controls/CalculationResultAutomationPeer.h
index 7882d7b..afdaa8b 100644
--- a/src/Calculator/Controls/CalculationResultAutomationPeer.h
+++ b/src/Calculator/Controls/CalculationResultAutomationPeer.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "Controls\CalculationResult.h"
+#include "Controls/CalculationResult.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Controls/CalculatorButton.cpp b/src/Calculator/Controls/CalculatorButton.cpp
index 9d385ef..68efc00 100644
--- a/src/Calculator/Controls/CalculatorButton.cpp
+++ b/src/Calculator/Controls/CalculatorButton.cpp
@@ -3,7 +3,7 @@
 
 #include "pch.h"
 #include "CalculatorButton.h"
-#include "CalcViewModel\Common\CalculatorButtonPressedEventArgs.h"
+#include "CalcViewModel/Common/CalculatorButtonPressedEventArgs.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
diff --git a/src/Calculator/Controls/OverflowTextBlockAutomationPeer.cpp b/src/Calculator/Controls/OverflowTextBlockAutomationPeer.cpp
index 2e07102..ed7faaf 100644
--- a/src/Calculator/Controls/OverflowTextBlockAutomationPeer.cpp
+++ b/src/Calculator/Controls/OverflowTextBlockAutomationPeer.cpp
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 #include "pch.h"
-#include "Controls\OverflowTextBlock.h"
+#include "Controls/OverflowTextBlock.h"
 #include "OverflowTextBlockAutomationPeer.h"
 
 using namespace Windows::UI::Xaml::Automation::Peers;
diff --git a/src/Calculator/Controls/OverflowTextBlockAutomationPeer.h b/src/Calculator/Controls/OverflowTextBlockAutomationPeer.h
index 842dcc4..8cb86d0 100644
--- a/src/Calculator/Controls/OverflowTextBlockAutomationPeer.h
+++ b/src/Calculator/Controls/OverflowTextBlockAutomationPeer.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "Controls\OverflowTextBlock.h"
+#include "Controls/OverflowTextBlock.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Controls/RadixButton.cpp b/src/Calculator/Controls/RadixButton.cpp
index e008648..63fd7a6 100644
--- a/src/Calculator/Controls/RadixButton.cpp
+++ b/src/Calculator/Controls/RadixButton.cpp
@@ -3,7 +3,7 @@
 
 #include "pch.h"
 #include "RadixButton.h"
-#include "CalcViewModel\Common\LocalizationSettings.h"
+#include "CalcViewModel/Common/LocalizationSettings.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
diff --git a/src/Calculator/Controls/SupplementaryItemsControl.cpp b/src/Calculator/Controls/SupplementaryItemsControl.cpp
index d0529d5..d5bc00a 100644
--- a/src/Calculator/Controls/SupplementaryItemsControl.cpp
+++ b/src/Calculator/Controls/SupplementaryItemsControl.cpp
@@ -3,7 +3,7 @@
 
 #include "pch.h"
 #include "SupplementaryItemsControl.h"
-#include "CalcViewModel\UnitConverterViewModel.h"
+#include "CalcViewModel/UnitConverterViewModel.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Controls;
diff --git a/src/Calculator/Converters/BitFlipAutomationNameConverter.cpp b/src/Calculator/Converters/BitFlipAutomationNameConverter.cpp
index 713a748..667e4ae 100644
--- a/src/Calculator/Converters/BitFlipAutomationNameConverter.cpp
+++ b/src/Calculator/Converters/BitFlipAutomationNameConverter.cpp
@@ -2,8 +2,8 @@
 // Licensed under the MIT License.
 
 #include "pch.h"
-#include "CalcViewModel\Common\AppResourceProvider.h"
-#include "CalcViewModel\Common\LocalizationSettings.h"
+#include "CalcViewModel/Common/AppResourceProvider.h"
+#include "CalcViewModel/Common/LocalizationSettings.h"
 #include "BitFlipAutomationNameConverter.h"
 
 using namespace CalculatorApp::Common;
diff --git a/src/Calculator/Converters/ExpressionItemContainerStyle.cpp b/src/Calculator/Converters/ExpressionItemContainerStyle.cpp
index 0c494d3..d99332c 100644
--- a/src/Calculator/Converters/ExpressionItemContainerStyle.cpp
+++ b/src/Calculator/Converters/ExpressionItemContainerStyle.cpp
@@ -3,7 +3,7 @@
 
 #include "pch.h"
 #include "ExpressionItemContainerStyle.h"
-#include "CalcViewModel\Common\DisplayExpressionToken.h"
+#include "CalcViewModel/Common/DisplayExpressionToken.h"
 
 using namespace CalculatorApp::Common;
 
diff --git a/src/Calculator/Converters/ExpressionItemTemplateSelector.cpp b/src/Calculator/Converters/ExpressionItemTemplateSelector.cpp
index aa4cb64..9bacec9 100644
--- a/src/Calculator/Converters/ExpressionItemTemplateSelector.cpp
+++ b/src/Calculator/Converters/ExpressionItemTemplateSelector.cpp
@@ -3,7 +3,7 @@
 
 #include "pch.h"
 #include "ExpressionItemTemplateSelector.h"
-#include "CalcViewModel\Common\DisplayExpressionToken.h"
+#include "CalcViewModel/Common/DisplayExpressionToken.h"
 
 using namespace CalculatorApp::Common;
 
diff --git a/src/Calculator/Views/Calculator.xaml.h b/src/Calculator/Views/Calculator.xaml.h
index ca385e6..3ec3fea 100644
--- a/src/Calculator/Views/Calculator.xaml.h
+++ b/src/Calculator/Views/Calculator.xaml.h
@@ -3,22 +3,22 @@
 
 #pragma once
 
-#include "Views\Calculator.g.h"
-#include "Converters\BooleanNegationConverter.h"
-#include "Converters\ExpressionItemContainerStyle.h"
-#include "Converters\ExpressionItemTemplateSelector.h"
-#include "Converters\VisibilityNegationConverter.h"
-#include "CalcViewModel\Common\Automation\NarratorNotifier.h"
-#include "Controls\CalculatorButton.h"
-#include "Controls\CalculationResult.h"
-#include "Controls\OverflowTextBlock.h"
-#include "CalcViewModel\HistoryViewModel.h"
-#include "Views\CalculatorProgrammerDisplayPanel.xaml.h"
-#include "Views\CalculatorProgrammerOperators.xaml.h"
-#include "Views\CalculatorScientificAngleButtons.xaml.h"
-#include "Views\HistoryList.xaml.h"
-#include "Views\Memory.xaml.h"
-#include "Views\OperatorsPanel.xaml.h"
+#include "Views/Calculator.g.h"
+#include "Converters/BooleanNegationConverter.h"
+#include "Converters/ExpressionItemContainerStyle.h"
+#include "Converters/ExpressionItemTemplateSelector.h"
+#include "Converters/VisibilityNegationConverter.h"
+#include "CalcViewModel/Common/Automation/NarratorNotifier.h"
+#include "Controls/CalculatorButton.h"
+#include "Controls/CalculationResult.h"
+#include "Controls/OverflowTextBlock.h"
+#include "CalcViewModel/HistoryViewModel.h"
+#include "Views/CalculatorProgrammerDisplayPanel.xaml.h"
+#include "Views/CalculatorProgrammerOperators.xaml.h"
+#include "Views/CalculatorScientificAngleButtons.xaml.h"
+#include "Views/HistoryList.xaml.h"
+#include "Views/Memory.xaml.h"
+#include "Views/OperatorsPanel.xaml.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.h b/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.h
index 4db8ce0..bc4ac12 100644
--- a/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.h
+++ b/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.h
@@ -8,12 +8,12 @@
 
 #pragma once
 
-#include "Views\CalculatorProgrammerBitFlipPanel.g.h"
-#include "Controls\FlipButtons.h"
-#include "Converters\BitFlipAutomationNameConverter.h"
-#include "Converters\BooleanNegationConverter.h"
-#include "Converters\VisibilityNegationConverter.h"
-#include "CalcViewModel\StandardCalculatorViewModel.h"
+#include "Views/CalculatorProgrammerBitFlipPanel.g.h"
+#include "Controls/FlipButtons.h"
+#include "Converters/BitFlipAutomationNameConverter.h"
+#include "Converters/BooleanNegationConverter.h"
+#include "Converters/VisibilityNegationConverter.h"
+#include "CalcViewModel/StandardCalculatorViewModel.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.h b/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.h
index 83df007..3534063 100644
--- a/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.h
+++ b/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include "Views\CalculatorProgrammerDisplayPanel.g.h"
-#include "CalcViewModel\StandardCalculatorViewModel.h"
+#include "Views/CalculatorProgrammerDisplayPanel.g.h"
+#include "CalcViewModel/StandardCalculatorViewModel.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Views/CalculatorProgrammerOperators.xaml.h b/src/Calculator/Views/CalculatorProgrammerOperators.xaml.h
index 1b006df..2830828 100644
--- a/src/Calculator/Views/CalculatorProgrammerOperators.xaml.h
+++ b/src/Calculator/Views/CalculatorProgrammerOperators.xaml.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include "Views\CalculatorProgrammerOperators.g.h"
-#include "Controls\RadixButton.h"
-#include "CalcViewModel\StandardCalculatorViewModel.h"
+#include "Views/CalculatorProgrammerOperators.g.h"
+#include "Controls/RadixButton.h"
+#include "CalcViewModel/StandardCalculatorViewModel.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cpp b/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cpp
index 4c599ae..60a628b 100644
--- a/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cpp
+++ b/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cpp
@@ -8,9 +8,9 @@
 
 #include "pch.h"
 #include "CalculatorProgrammerRadixOperators.xaml.h"
-#include "Controls\CalculatorButton.h"
-#include "Converters\BooleanToVisibilityConverter.h"
-#include "Views\NumberPad.xaml.h"
+#include "Controls/CalculatorButton.h"
+#include "Converters/BooleanToVisibilityConverter.h"
+#include "Views/NumberPad.xaml.h"
 
 using namespace CalculatorApp;
 
diff --git a/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.h b/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.h
index ad13f2b..7aae73f 100644
--- a/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.h
+++ b/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include "Views\CalculatorProgrammerRadixOperators.g.h"
-#include "Converters\VisibilityNegationConverter.h"
-#include "CalcViewModel\StandardCalculatorViewModel.h"
+#include "Views/CalculatorProgrammerRadixOperators.g.h"
+#include "Converters/VisibilityNegationConverter.h"
+#include "CalcViewModel/StandardCalculatorViewModel.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.h b/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.h
index eeac9d5..286d04b 100644
--- a/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.h
+++ b/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.h
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "Views\CalculatorScientificAngleButtons.g.h"
-#include "CalcViewModel\StandardCalculatorViewModel.h"
+#include "Views/CalculatorScientificAngleButtons.g.h"
+#include "CalcViewModel/StandardCalculatorViewModel.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Views/CalculatorScientificOperators.xaml.cpp b/src/Calculator/Views/CalculatorScientificOperators.xaml.cpp
index 013d7dd..4799849 100644
--- a/src/Calculator/Views/CalculatorScientificOperators.xaml.cpp
+++ b/src/Calculator/Views/CalculatorScientificOperators.xaml.cpp
@@ -8,9 +8,9 @@
 
 #include "pch.h"
 #include "CalculatorScientificOperators.xaml.h"
-#include "CalcViewModel\Common\KeyboardShortcutManager.h"
-#include "Controls\CalculatorButton.h"
-#include "CalcViewModel\StandardCalculatorViewModel.h"
+#include "CalcViewModel/Common/KeyboardShortcutManager.h"
+#include "Controls/CalculatorButton.h"
+#include "CalcViewModel/StandardCalculatorViewModel.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
diff --git a/src/Calculator/Views/CalculatorScientificOperators.xaml.h b/src/Calculator/Views/CalculatorScientificOperators.xaml.h
index 81172a7..ae35e49 100644
--- a/src/Calculator/Views/CalculatorScientificOperators.xaml.h
+++ b/src/Calculator/Views/CalculatorScientificOperators.xaml.h
@@ -8,11 +8,11 @@
 
 #pragma once
 
-#include "Views\CalculatorScientificOperators.g.h"
-#include "Views\NumberPad.xaml.h"
-#include "Converters\BooleanNegationConverter.h"
-#include "Converters\VisibilityNegationConverter.h"
-#include "CalcViewModel\StandardCalculatorViewModel.h"
+#include "Views/CalculatorScientificOperators.g.h"
+#include "Views/NumberPad.xaml.h"
+#include "Converters/BooleanNegationConverter.h"
+#include "Converters/VisibilityNegationConverter.h"
+#include "CalcViewModel/StandardCalculatorViewModel.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Views/CalculatorStandardOperators.xaml.h b/src/Calculator/Views/CalculatorStandardOperators.xaml.h
index fa6ecea..6d3d2ee 100644
--- a/src/Calculator/Views/CalculatorStandardOperators.xaml.h
+++ b/src/Calculator/Views/CalculatorStandardOperators.xaml.h
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "Views\CalculatorStandardOperators.g.h"
-#include "Views\NumberPad.xaml.h"
+#include "Views/CalculatorStandardOperators.g.h"
+#include "Views/NumberPad.xaml.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Views/DateCalculator.xaml.h b/src/Calculator/Views/DateCalculator.xaml.h
index 414dc6b..9221809 100644
--- a/src/Calculator/Views/DateCalculator.xaml.h
+++ b/src/Calculator/Views/DateCalculator.xaml.h
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "Converters\BooleanNegationConverter.h"
-#include "Converters\VisibilityNegationConverter.h"
-#include "Views\DateCalculator.g.h"
+#include "Converters/BooleanNegationConverter.h"
+#include "Converters/VisibilityNegationConverter.h"
+#include "Views/DateCalculator.g.h"
 
 // We choose 2550 as the max year because CalendarDatePicker experiences clipping
 // issues just after 2558.  We would like 9999 but will need to wait for a platform
diff --git a/src/Calculator/Views/HistoryList.xaml.cpp b/src/Calculator/Views/HistoryList.xaml.cpp
index 7678633..de4a96c 100644
--- a/src/Calculator/Views/HistoryList.xaml.cpp
+++ b/src/Calculator/Views/HistoryList.xaml.cpp
@@ -8,7 +8,7 @@
 
 #include "pch.h"
 #include "HistoryList.xaml.h"
-#include "CalcViewModel\Common\LocalizationService.h"
+#include "CalcViewModel/Common/LocalizationService.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
diff --git a/src/Calculator/Views/HistoryList.xaml.h b/src/Calculator/Views/HistoryList.xaml.h
index ed43f3e..f4e4439 100644
--- a/src/Calculator/Views/HistoryList.xaml.h
+++ b/src/Calculator/Views/HistoryList.xaml.h
@@ -8,11 +8,11 @@
 
 #pragma once
 
-#include "Views\HistoryList.g.h"
-#include "Common\TitleBarHelper.h"
-#include "Converters\ItemSizeToVisibilityConverter.h"
-#include "Converters\VisibilityNegationConverter.h"
-#include "CalcViewModel\HistoryViewModel.h"
+#include "Views/HistoryList.g.h"
+#include "Common/TitleBarHelper.h"
+#include "Converters/ItemSizeToVisibilityConverter.h"
+#include "Converters/VisibilityNegationConverter.h"
+#include "CalcViewModel/HistoryViewModel.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Views/MainPage.xaml.h b/src/Calculator/Views/MainPage.xaml.h
index 4db633e..96a5ff7 100644
--- a/src/Calculator/Views/MainPage.xaml.h
+++ b/src/Calculator/Views/MainPage.xaml.h
@@ -3,12 +3,12 @@
 
 #pragma once
 
-#include "Views\Calculator.xaml.h"
-#include "Views\MainPage.g.h"
-#include "Views\DateCalculator.xaml.h"
-#include "Views\UnitConverter.xaml.h"
-#include "CalcViewModel\ApplicationViewModel.h"
-#include "Views\TitleBar.xaml.h"
+#include "Views/Calculator.xaml.h"
+#include "Views/MainPage.g.h"
+#include "Views/DateCalculator.xaml.h"
+#include "Views/UnitConverter.xaml.h"
+#include "CalcViewModel/ApplicationViewModel.h"
+#include "Views/TitleBar.xaml.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Views/Memory.xaml.cpp b/src/Calculator/Views/Memory.xaml.cpp
index fc69b10..7aa6011 100644
--- a/src/Calculator/Views/Memory.xaml.cpp
+++ b/src/Calculator/Views/Memory.xaml.cpp
@@ -8,9 +8,9 @@
 
 #include "pch.h"
 #include "Memory.xaml.h"
-#include "Controls\CalculatorButton.h"
-#include "CalcViewModel\StandardCalculatorViewModel.h"
-#include "CalcViewModel\Common\LocalizationService.h"
+#include "Controls/CalculatorButton.h"
+#include "CalcViewModel/StandardCalculatorViewModel.h"
+#include "CalcViewModel/Common/LocalizationService.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
diff --git a/src/Calculator/Views/Memory.xaml.h b/src/Calculator/Views/Memory.xaml.h
index 3abee32..7a3e2da 100644
--- a/src/Calculator/Views/Memory.xaml.h
+++ b/src/Calculator/Views/Memory.xaml.h
@@ -8,11 +8,11 @@
 
 #pragma once
 
-#include "Views\Memory.g.h"
-#include "Common\TitleBarHelper.h"
-#include "Converters\BooleanNegationConverter.h"
-#include "Converters\VisibilityNegationConverter.h"
-#include "CalcViewModel\StandardCalculatorViewModel.h"
+#include "Views/Memory.g.h"
+#include "Common/TitleBarHelper.h"
+#include "Converters/BooleanNegationConverter.h"
+#include "Converters/VisibilityNegationConverter.h"
+#include "CalcViewModel/StandardCalculatorViewModel.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Views/MemoryListItem.xaml.cpp b/src/Calculator/Views/MemoryListItem.xaml.cpp
index f6a79fe..313607a 100644
--- a/src/Calculator/Views/MemoryListItem.xaml.cpp
+++ b/src/Calculator/Views/MemoryListItem.xaml.cpp
@@ -3,7 +3,7 @@
 
 #include "pch.h"
 #include "MemoryListItem.xaml.h"
-#include "Controls\CalculatorButton.h"
+#include "Controls/CalculatorButton.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
diff --git a/src/Calculator/Views/MemoryListItem.xaml.h b/src/Calculator/Views/MemoryListItem.xaml.h
index 9f24944..6bfd515 100644
--- a/src/Calculator/Views/MemoryListItem.xaml.h
+++ b/src/Calculator/Views/MemoryListItem.xaml.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include "Views\MemoryListItem.g.h"
-#include "CalcViewModel\MemoryItemViewModel.h"
+#include "Views/MemoryListItem.g.h"
+#include "CalcViewModel/MemoryItemViewModel.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Views/NumberPad.xaml.cpp b/src/Calculator/Views/NumberPad.xaml.cpp
index 714aeab..1e179d2 100644
--- a/src/Calculator/Views/NumberPad.xaml.cpp
+++ b/src/Calculator/Views/NumberPad.xaml.cpp
@@ -8,9 +8,9 @@
 
 #include "pch.h"
 #include "NumberPad.xaml.h"
-#include "Controls\CalculatorButton.h"
-#include "CalcViewModel\StandardCalculatorViewModel.h"
-#include "CalcViewModel\Common\LocalizationSettings.h"
+#include "Controls/CalculatorButton.h"
+#include "CalcViewModel/StandardCalculatorViewModel.h"
+#include "CalcViewModel/Common/LocalizationSettings.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::ViewModel;
diff --git a/src/Calculator/Views/NumberPad.xaml.h b/src/Calculator/Views/NumberPad.xaml.h
index af4f219..61b978e 100644
--- a/src/Calculator/Views/NumberPad.xaml.h
+++ b/src/Calculator/Views/NumberPad.xaml.h
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "Views\NumberPad.g.h"
-#include "CalcViewModel\Common\KeyboardShortcutManager.h"
+#include "Views/NumberPad.g.h"
+#include "CalcViewModel/Common/KeyboardShortcutManager.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Views/OperatorsPanel.xaml.h b/src/Calculator/Views/OperatorsPanel.xaml.h
index 42c5302..dce811d 100644
--- a/src/Calculator/Views/OperatorsPanel.xaml.h
+++ b/src/Calculator/Views/OperatorsPanel.xaml.h
@@ -3,11 +3,11 @@
 
 #pragma once
 
-#include "Views\OperatorsPanel.g.h"
-#include "Views\CalculatorStandardOperators.xaml.h"
-#include "Views\CalculatorScientificOperators.xaml.h"
-#include "Views\CalculatorProgrammerBitFlipPanel.xaml.h"
-#include "Views\CalculatorProgrammerRadixOperators.xaml.h"
+#include "Views/OperatorsPanel.g.h"
+#include "Views/CalculatorStandardOperators.xaml.h"
+#include "Views/CalculatorScientificOperators.xaml.h"
+#include "Views/CalculatorProgrammerBitFlipPanel.xaml.h"
+#include "Views/CalculatorProgrammerRadixOperators.xaml.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Views/SupplementaryResults.xaml.h b/src/Calculator/Views/SupplementaryResults.xaml.h
index 6630fc1..1d94b0a 100644
--- a/src/Calculator/Views/SupplementaryResults.xaml.h
+++ b/src/Calculator/Views/SupplementaryResults.xaml.h
@@ -8,11 +8,11 @@
 
 #pragma once
 
-#include "Views\SupplementaryResults.g.h"
-#include "Controls\SupplementaryItemsControl.h"
-#include "Controls\OperandTextBox.h"
-#include "Controls\OperatorTextBox.h"
-#include "CalcViewModel\UnitConverterViewModel.h"
+#include "Views/SupplementaryResults.g.h"
+#include "Controls/SupplementaryItemsControl.h"
+#include "Controls/OperandTextBox.h"
+#include "Controls/OperatorTextBox.h"
+#include "CalcViewModel/UnitConverterViewModel.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Views/TitleBar.xaml.cpp b/src/Calculator/Views/TitleBar.xaml.cpp
index d08739c..e66413c 100644
--- a/src/Calculator/Views/TitleBar.xaml.cpp
+++ b/src/Calculator/Views/TitleBar.xaml.cpp
@@ -3,7 +3,7 @@
 
 #include "pch.h"
 #include "TitleBar.xaml.h"
-#include "CalcViewModel\Common\AppResourceProvider.h"
+#include "CalcViewModel/Common/AppResourceProvider.h"
 
 using namespace std;
 using namespace Platform;
diff --git a/src/Calculator/Views/TitleBar.xaml.h b/src/Calculator/Views/TitleBar.xaml.h
index 8945aa5..85a360b 100644
--- a/src/Calculator/Views/TitleBar.xaml.h
+++ b/src/Calculator/Views/TitleBar.xaml.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "Views\TitleBar.g.h"
+#include "Views/TitleBar.g.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/Views/UnitConverter.xaml.cpp b/src/Calculator/Views/UnitConverter.xaml.cpp
index 1116c04..a4889a5 100644
--- a/src/Calculator/Views/UnitConverter.xaml.cpp
+++ b/src/Calculator/Views/UnitConverter.xaml.cpp
@@ -6,13 +6,13 @@
 
 #include "pch.h"
 #include "UnitConverter.xaml.h"
-#include "CalcViewModel\UnitConverterViewModel.h"
-#include "Controls\CalculationResult.h"
-#include "Controls\CalculatorButton.h"
-#include "CalcViewModel\Common\CopyPasteManager.h"
-#include "CalcViewModel\Common\KeyboardShortcutManager.h"
-#include "CalcViewModel\Common\LocalizationService.h"
-#include "CalcViewModel\Common\LocalizationSettings.h"
+#include "CalcViewModel/UnitConverterViewModel.h"
+#include "Controls/CalculationResult.h"
+#include "Controls/CalculatorButton.h"
+#include "CalcViewModel/Common/CopyPasteManager.h"
+#include "CalcViewModel/Common/KeyboardShortcutManager.h"
+#include "CalcViewModel/Common/LocalizationService.h"
+#include "CalcViewModel/Common/LocalizationSettings.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
diff --git a/src/Calculator/Views/UnitConverter.xaml.h b/src/Calculator/Views/UnitConverter.xaml.h
index c65c6aa..b4b8444 100644
--- a/src/Calculator/Views/UnitConverter.xaml.h
+++ b/src/Calculator/Views/UnitConverter.xaml.h
@@ -6,13 +6,13 @@
 
 #pragma once
 
-#include "Views\UnitConverter.g.h"
-#include "Common\AlwaysSelectedCollectionView.h"
-#include "CalcViewModel\Common\ValidatingConverters.h"
-#include "Converters\BooleanToVisibilityConverter.h"
-#include "Converters\VisibilityNegationConverter.h"
-#include "CalcViewModel\UnitConverterViewModel.h"
-#include "Views\StateTriggers\AspectRatioTrigger.h"
+#include "Views/UnitConverter.g.h"
+#include "Common/AlwaysSelectedCollectionView.h"
+#include "CalcViewModel/Common/ValidatingConverters.h"
+#include "Converters/BooleanToVisibilityConverter.h"
+#include "Converters/VisibilityNegationConverter.h"
+#include "CalcViewModel/UnitConverterViewModel.h"
+#include "Views/StateTriggers/AspectRatioTrigger.h"
 
 namespace CalculatorApp
 {
diff --git a/src/Calculator/pch.h b/src/Calculator/pch.h
index c393e82..92d1667 100644
--- a/src/Calculator/pch.h
+++ b/src/Calculator/pch.h
@@ -23,15 +23,15 @@
 #include <regex>
 
 // C++\WinRT Headers
-#include "winrt\base.h"
-#include "winrt\Windows.ApplicationModel.h"
-#include "winrt\Windows.ApplicationModel.Core.h"
-#include "winrt\Windows.Foundation.Diagnostics.h"
-#include "winrt\Windows.Globalization.h"
-#include "winrt\Windows.Globalization.DateTimeFormatting.h"
-#include "winrt\Windows.System.UserProfile.h"
-#include "winrt\Windows.UI.ViewManagement.h"
-#include "winrt\Windows.UI.Xaml.h"
+#include "winrt/base.h"
+#include "winrt/Windows.ApplicationModel.h"
+#include "winrt/Windows.ApplicationModel.Core.h"
+#include "winrt/Windows.Foundation.Diagnostics.h"
+#include "winrt/Windows.Globalization.h"
+#include "winrt/Windows.Globalization.DateTimeFormatting.h"
+#include "winrt/Windows.System.UserProfile.h"
+#include "winrt/Windows.UI.ViewManagement.h"
+#include "winrt/Windows.UI.Xaml.h"
 
 // The following namespaces exist as a convenience to resolve
 // ambiguity for Windows types in the Windows::UI::Xaml::Automation::Peers
diff --git a/src/CalculatorUnitTests/AsyncHelper.h b/src/CalculatorUnitTests/AsyncHelper.h
index de3a88e..3ad6c1d 100644
--- a/src/CalculatorUnitTests/AsyncHelper.h
+++ b/src/CalculatorUnitTests/AsyncHelper.h
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 #pragma once
-#include <wrl\wrappers\corewrappers.h>
+#include <wrl/wrappers/corewrappers.h>
 
 namespace CalculatorApp
 {
diff --git a/src/CalculatorUnitTests/CalcEngineTests.cpp b/src/CalculatorUnitTests/CalcEngineTests.cpp
index 402f531..1b9bc57 100644
--- a/src/CalculatorUnitTests/CalcEngineTests.cpp
+++ b/src/CalculatorUnitTests/CalcEngineTests.cpp
@@ -4,7 +4,7 @@
 #include "pch.h"
 #include <CppUnitTest.h>
 
-#include "CalcViewModel\Common\EngineResourceProvider.h"
+#include "CalcViewModel/Common/EngineResourceProvider.h"
 
 using namespace std;
 using namespace CalculatorApp;
diff --git a/src/CalculatorUnitTests/CalculatorManagerTest.cpp b/src/CalculatorUnitTests/CalculatorManagerTest.cpp
index 78b6223..37ceb42 100644
--- a/src/CalculatorUnitTests/CalculatorManagerTest.cpp
+++ b/src/CalculatorUnitTests/CalculatorManagerTest.cpp
@@ -5,8 +5,8 @@
 
 #include <CppUnitTest.h>
 
-#include "CalcManager\CalculatorHistory.h"
-#include "CalcViewModel\Common\EngineResourceProvider.h"
+#include "CalcManager/CalculatorHistory.h"
+#include "CalcViewModel/Common/EngineResourceProvider.h"
 
 using namespace CalculatorApp;
 using namespace CalculationManager;
diff --git a/src/CalculatorUnitTests/CopyPasteManagerTest.cpp b/src/CalculatorUnitTests/CopyPasteManagerTest.cpp
index ec68158..2e90d84 100644
--- a/src/CalculatorUnitTests/CopyPasteManagerTest.cpp
+++ b/src/CalculatorUnitTests/CopyPasteManagerTest.cpp
@@ -4,8 +4,8 @@
 #include "pch.h"
 #include <CppUnitTest.h>
 
-#include "CalcViewModel\StandardCalculatorViewModel.h"
-#include "CalcViewModel\Common\CopyPasteManager.h"
+#include "CalcViewModel/StandardCalculatorViewModel.h"
+#include "CalcViewModel/Common/CopyPasteManager.h"
 
 using namespace CalculationManager;
 using namespace CalculatorApp;
diff --git a/src/CalculatorUnitTests/CurrencyConverterUnitTests.cpp b/src/CalculatorUnitTests/CurrencyConverterUnitTests.cpp
index abb3612..ab7fa7e 100644
--- a/src/CalculatorUnitTests/CurrencyConverterUnitTests.cpp
+++ b/src/CalculatorUnitTests/CurrencyConverterUnitTests.cpp
@@ -4,8 +4,8 @@
 #include "pch.h"
 #include <CppUnitTest.h>
 
-#include "CalcViewModel\DataLoaders\CurrencyDataLoader.h"
-#include "CalcViewModel\Common\LocalizationService.h"
+#include "CalcViewModel/DataLoaders/CurrencyDataLoader.h"
+#include "CalcViewModel/Common/LocalizationService.h"
 
 using namespace CalculatorApp::Common;
 using namespace CalculatorApp::Common::LocalizationServiceProperties;
diff --git a/src/CalculatorUnitTests/DateCalculatorUnitTests.cpp b/src/CalculatorUnitTests/DateCalculatorUnitTests.cpp
index 4d90945..7371a26 100644
--- a/src/CalculatorUnitTests/DateCalculatorUnitTests.cpp
+++ b/src/CalculatorUnitTests/DateCalculatorUnitTests.cpp
@@ -5,8 +5,8 @@
 #include <CppUnitTest.h>
 #include "DateUtils.h"
 
-#include "CalcViewModel\Common\DateCalculator.h"
-#include "CalcViewModel\DateCalculatorViewModel.h"
+#include "CalcViewModel/Common/DateCalculator.h"
+#include "CalcViewModel/DateCalculatorViewModel.h"
 
 using namespace Platform;
 using namespace std;
diff --git a/src/CalculatorUnitTests/Helpers.h b/src/CalculatorUnitTests/Helpers.h
index 649e156..7fd32d4 100644
--- a/src/CalculatorUnitTests/Helpers.h
+++ b/src/CalculatorUnitTests/Helpers.h
@@ -4,7 +4,7 @@
 #include "pch.h"
 
 #pragma once
-#include "CalcViewModel\Common\CalculatorButtonUser.h"
+#include "CalcViewModel/Common/CalculatorButtonUser.h"
 
 namespace CalculatorUnitTests
 {
diff --git a/src/CalculatorUnitTests/HistoryTests.cpp b/src/CalculatorUnitTests/HistoryTests.cpp
index c85ad82..8036ec1 100644
--- a/src/CalculatorUnitTests/HistoryTests.cpp
+++ b/src/CalculatorUnitTests/HistoryTests.cpp
@@ -4,8 +4,8 @@
 #include "pch.h"
 #include <CppUnitTest.h>
 
-#include "CalcViewModel\HistoryViewModel.h"
-#include "CalcViewModel\StandardCalculatorViewModel.h"
+#include "CalcViewModel/HistoryViewModel.h"
+#include "CalcViewModel/StandardCalculatorViewModel.h"
 
 using namespace CalculationManager;
 using namespace CalculatorApp;
diff --git a/src/CalculatorUnitTests/Mocks/CurrencyHttpClient.cpp b/src/CalculatorUnitTests/Mocks/CurrencyHttpClient.cpp
index 083342c..56b6fd2 100644
--- a/src/CalculatorUnitTests/Mocks/CurrencyHttpClient.cpp
+++ b/src/CalculatorUnitTests/Mocks/CurrencyHttpClient.cpp
@@ -6,7 +6,7 @@
 #include "pch.h"
 #include "CurrencyHttpClient.h"
 
-#include "CalcViewModel\Common\NetworkManager.h"
+#include "CalcViewModel/Common/NetworkManager.h"
 
 using namespace CalculatorApp::DataLoaders;
 using namespace Platform;
diff --git a/src/CalculatorUnitTests/Mocks/CurrencyHttpClient.h b/src/CalculatorUnitTests/Mocks/CurrencyHttpClient.h
index e9bff41..62b9e95 100644
--- a/src/CalculatorUnitTests/Mocks/CurrencyHttpClient.h
+++ b/src/CalculatorUnitTests/Mocks/CurrencyHttpClient.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "CalcViewModel\DataLoaders\ICurrencyHttpClient.h"
+#include "CalcViewModel/DataLoaders/ICurrencyHttpClient.h"
 
 namespace CalculatorApp
 {
diff --git a/src/CalculatorUnitTests/MultiWindowUnitTests.cpp b/src/CalculatorUnitTests/MultiWindowUnitTests.cpp
index 03faf1b..fcb8217 100644
--- a/src/CalculatorUnitTests/MultiWindowUnitTests.cpp
+++ b/src/CalculatorUnitTests/MultiWindowUnitTests.cpp
@@ -6,10 +6,10 @@
 #include "UnitConverterViewModelUnitTests.h"
 #include "DateUtils.h"
 
-#include "CalcViewModel\StandardCalculatorViewModel.h"
-#include "CalcViewModel\UnitConverterViewModel.h"
-#include "CalcViewModel\DateCalculatorViewModel.h"
-#include "CalcViewModel\DataLoaders\UnitConverterDataLoader.h"
+#include "CalcViewModel/StandardCalculatorViewModel.h"
+#include "CalcViewModel/UnitConverterViewModel.h"
+#include "CalcViewModel/DateCalculatorViewModel.h"
+#include "CalcViewModel/DataLoaders/UnitConverterDataLoader.h"
 
 using namespace Platform;
 using namespace Platform::Collections;
diff --git a/src/CalculatorUnitTests/UnitConverterViewModelUnitTests.cpp b/src/CalculatorUnitTests/UnitConverterViewModelUnitTests.cpp
index 4670ec4..e9e7817 100644
--- a/src/CalculatorUnitTests/UnitConverterViewModelUnitTests.cpp
+++ b/src/CalculatorUnitTests/UnitConverterViewModelUnitTests.cpp
@@ -5,8 +5,8 @@
 #include <CppUnitTest.h>
 #include "UnitConverterViewModelUnitTests.h"
 
-#include "CalcViewModel\UnitConverterViewModel.h"
-#include "CalcViewModel\DataLoaders\UnitConverterDataLoader.h"
+#include "CalcViewModel/UnitConverterViewModel.h"
+#include "CalcViewModel/DataLoaders/UnitConverterDataLoader.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;
diff --git a/src/CalculatorUnitTests/UnitTestApp.xaml.h b/src/CalculatorUnitTests/UnitTestApp.xaml.h
index f7918db..9877eea 100644
--- a/src/CalculatorUnitTests/UnitTestApp.xaml.h
+++ b/src/CalculatorUnitTests/UnitTestApp.xaml.h
@@ -9,10 +9,10 @@
 #pragma once
 
 #include "UnitTestApp.g.h"
-#include "CalcViewModel\DateCalculatorViewModel.h"
-#include "CalcViewModel\StandardCalculatorViewModel.h"
-#include "CalcViewModel\UnitConverterViewModel.h"
-#include "CalcViewModel\MemoryItemViewModel.h"
+#include "CalcViewModel/DateCalculatorViewModel.h"
+#include "CalcViewModel/StandardCalculatorViewModel.h"
+#include "CalcViewModel/UnitConverterViewModel.h"
+#include "CalcViewModel/MemoryItemViewModel.h"
 
 namespace CalculatorUnitTests
 {
diff --git a/src/CalculatorUnitTests/pch.h b/src/CalculatorUnitTests/pch.h
index ecfd700..7f46aea 100644
--- a/src/CalculatorUnitTests/pch.h
+++ b/src/CalculatorUnitTests/pch.h
@@ -38,11 +38,11 @@
 #include <sstream>
 
 // C++\WinRT Headers
-#include "winrt\base.h"
-#include "winrt\Windows.Foundation.Diagnostics.h"
-#include "winrt\Windows.Globalization.h"
-#include "winrt\Windows.Globalization.DateTimeFormatting.h"
-#include "winrt\Windows.System.UserProfile.h"
+#include "winrt/base.h"
+#include "winrt/Windows.Foundation.Diagnostics.h"
+#include "winrt/Windows.Globalization.h"
+#include "winrt/Windows.Globalization.DateTimeFormatting.h"
+#include "winrt/Windows.System.UserProfile.h"
 
 namespace CalculatorApp
 {
@@ -74,21 +74,21 @@ namespace CalculatorApp::Common::Automation {}
 namespace CustomPeers = CalculatorApp::Common::Automation;
 
 //CalcManager Headers
-#include "CalcManager\CalculatorVector.h"
-#include "CalcManager\ExpressionCommand.h"
-#include "CalcManager\CalculatorResource.h"
-#include "CalcManager\CalculatorManager.h"
-#include "CalcManager\UnitConverter.h"
+#include "CalcManager/CalculatorVector.h"
+#include "CalcManager/ExpressionCommand.h"
+#include "CalcManager/CalculatorResource.h"
+#include "CalcManager/CalculatorManager.h"
+#include "CalcManager/UnitConverter.h"
 
 // CalcViewModel Headers
-#include "CalcViewModel\Common\DelegateCommand.h"
-#include "CalcViewModel\Common\Utils.h"
-#include "CalcViewModel\Common\MyVirtualKey.h"
-#include "CalcViewModel\Common\NavCategory.h"
-#include "CalcViewModel\Common\CalculatorButtonUser.h"
-#include "CalcViewModel\Common\NetworkManager.h"
+#include "CalcViewModel/Common/DelegateCommand.h"
+#include "CalcViewModel/Common/Utils.h"
+#include "CalcViewModel/Common/MyVirtualKey.h"
+#include "CalcViewModel/Common/NavCategory.h"
+#include "CalcViewModel/Common/CalculatorButtonUser.h"
+#include "CalcViewModel/Common/NetworkManager.h"
 
-#include "Mocks\CurrencyHttpClient.h"
+#include "Mocks/CurrencyHttpClient.h"
 #include "Helpers.h"
 
 #include "UnitTestApp.xaml.h"