diff --git a/support/hololens/ServoApp/BrowserPage.cpp b/support/hololens/ServoApp/BrowserPage.cpp
index fd1d984621d..0233308fa75 100644
--- a/support/hololens/ServoApp/BrowserPage.cpp
+++ b/support/hololens/ServoApp/BrowserPage.cpp
@@ -7,7 +7,6 @@
 #include "BrowserPage.h"
 #include "BrowserPage.g.cpp"
 #include "ImmersiveView.h"
-#include "OpenGLES.h"
 
 using namespace winrt::Windows::UI::Xaml;
 using namespace winrt::Windows::UI::Core;
diff --git a/support/hololens/ServoApp/BrowserPage.h b/support/hololens/ServoApp/BrowserPage.h
index b52731fed70..69515931976 100644
--- a/support/hololens/ServoApp/BrowserPage.h
+++ b/support/hololens/ServoApp/BrowserPage.h
@@ -6,7 +6,7 @@
 
 #include "BrowserPage.g.h"
 #include "ImmersiveView.h"
-#include "ServoControl.h"
+#include "ServoControl\ServoControl.h"
 
 
 namespace winrt::ServoApp::implementation {
diff --git a/support/hololens/ServoApp/ImmersiveView.h b/support/hololens/ServoApp/ImmersiveView.h
index 806d267ca59..574d0685850 100644
--- a/support/hololens/ServoApp/ImmersiveView.h
+++ b/support/hololens/ServoApp/ImmersiveView.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include "OpenGLES.h"
 #include "Common/DeviceResources.h"
 #include "ImmersiveMain.h"
 
diff --git a/support/hololens/ServoApp/ServoApp.vcxproj b/support/hololens/ServoApp/ServoApp.vcxproj
index 4ff7de52ce8..045d042ba10 100644
--- a/support/hololens/ServoApp/ServoApp.vcxproj
+++ b/support/hololens/ServoApp/ServoApp.vcxproj
@@ -151,7 +151,6 @@
     <ClInclude Include="ImmersiveMain.h" />
     <ClInclude Include="ImmersiveView.h" />
     <ClInclude Include="logs.h" />
-    <ClInclude Include="OpenGLES.h" />
     <ClInclude Include="pch.h" />
     <ClInclude Include="App.h">
       <DependentUpon>App.xaml</DependentUpon>
@@ -159,8 +158,9 @@
     <ClInclude Include="BrowserPage.h">
       <DependentUpon>BrowserPage.xaml</DependentUpon>
     </ClInclude>
-    <ClInclude Include="Servo.h" />
-    <ClInclude Include="ServoControl.h" />
+    <ClInclude Include="ServoControl\OpenGLES.h" />
+    <ClInclude Include="ServoControl\Servo.h" />
+    <ClInclude Include="ServoControl\ServoControl.h" />
   </ItemGroup>
   <ItemGroup>
     <ApplicationDefinition Include="App.xaml">
@@ -298,7 +298,6 @@
     <ClCompile Include="Content\SpinningCubeRenderer.cpp" />
     <ClCompile Include="ImmersiveMain.cpp" />
     <ClCompile Include="ImmersiveView.cpp" />
-    <ClCompile Include="OpenGLES.cpp" />
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
@@ -310,8 +309,9 @@
     </ClCompile>
     <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
     <ClCompile Include="logs.cpp" />
-    <ClCompile Include="Servo.cpp" />
-    <ClCompile Include="ServoControl.cpp" />
+    <ClCompile Include="ServoControl\OpenGLES.cpp" />
+    <ClCompile Include="ServoControl\Servo.cpp" />
+    <ClCompile Include="ServoControl\ServoControl.cpp" />
   </ItemGroup>
   <ItemGroup>
     <Midl Include="App.idl">
@@ -320,7 +320,7 @@
     <Midl Include="BrowserPage.idl">
       <DependentUpon>BrowserPage.xaml</DependentUpon>
     </Midl>
-    <Midl Include="ServoControl.idl" />
+    <Midl Include="ServoControl\ServoControl.idl" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
@@ -358,4 +358,4 @@
     <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.targets'))" />
     <Error Condition="!Exists('..\packages\ANGLE.WindowsStore.Servo.2.1.13\build\native\ANGLE.WindowsStore.Servo.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ANGLE.WindowsStore.Servo.2.1.13\build\native\ANGLE.WindowsStore.Servo.targets'))" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/support/hololens/ServoApp/ServoApp.vcxproj.filters b/support/hololens/ServoApp/ServoApp.vcxproj.filters
index 0d01f93b0a2..3fa4f04b149 100644
--- a/support/hololens/ServoApp/ServoApp.vcxproj.filters
+++ b/support/hololens/ServoApp/ServoApp.vcxproj.filters
@@ -3,7 +3,7 @@
   <ItemGroup>
     <Midl Include="BrowserPage.idl" />
     <Midl Include="App.idl" />
-    <Midl Include="ServoControl.idl">
+    <Midl Include="ServoControl\ServoControl.idl">
       <Filter>ServoControl</Filter>
     </Midl>
   </ItemGroup>
@@ -27,13 +27,13 @@
       <Filter>Content</Filter>
     </ClCompile>
     <ClCompile Include="ImmersiveMain.cpp" />
-    <ClCompile Include="ServoControl.cpp">
+    <ClCompile Include="ServoControl\OpenGLES.cpp">
       <Filter>ServoControl</Filter>
     </ClCompile>
-    <ClCompile Include="Servo.cpp">
+    <ClCompile Include="ServoControl\Servo.cpp">
       <Filter>ServoControl</Filter>
     </ClCompile>
-    <ClCompile Include="OpenGLES.cpp">
+    <ClCompile Include="ServoControl\ServoControl.cpp">
       <Filter>ServoControl</Filter>
     </ClCompile>
   </ItemGroup>
@@ -65,13 +65,13 @@
       <Filter>Content</Filter>
     </ClInclude>
     <ClInclude Include="ImmersiveMain.h" />
-    <ClInclude Include="ServoControl.h">
+    <ClInclude Include="ServoControl\OpenGLES.h">
       <Filter>ServoControl</Filter>
     </ClInclude>
-    <ClInclude Include="Servo.h">
+    <ClInclude Include="ServoControl\Servo.h">
       <Filter>ServoControl</Filter>
     </ClInclude>
-    <ClInclude Include="OpenGLES.h">
+    <ClInclude Include="ServoControl\ServoControl.h">
       <Filter>ServoControl</Filter>
     </ClInclude>
   </ItemGroup>
@@ -238,4 +238,4 @@
   <ItemGroup>
     <ApplicationDefinition Include="App.xaml" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/support/hololens/ServoApp/OpenGLES.cpp b/support/hololens/ServoApp/ServoControl/OpenGLES.cpp
similarity index 100%
rename from support/hololens/ServoApp/OpenGLES.cpp
rename to support/hololens/ServoApp/ServoControl/OpenGLES.cpp
diff --git a/support/hololens/ServoApp/OpenGLES.h b/support/hololens/ServoApp/ServoControl/OpenGLES.h
similarity index 100%
rename from support/hololens/ServoApp/OpenGLES.h
rename to support/hololens/ServoApp/ServoControl/OpenGLES.h
diff --git a/support/hololens/ServoApp/Servo.cpp b/support/hololens/ServoApp/ServoControl/Servo.cpp
similarity index 100%
rename from support/hololens/ServoApp/Servo.cpp
rename to support/hololens/ServoApp/ServoControl/Servo.cpp
diff --git a/support/hololens/ServoApp/Servo.h b/support/hololens/ServoApp/ServoControl/Servo.h
similarity index 100%
rename from support/hololens/ServoApp/Servo.h
rename to support/hololens/ServoApp/ServoControl/Servo.h
diff --git a/support/hololens/ServoApp/ServoControl.cpp b/support/hololens/ServoApp/ServoControl/ServoControl.cpp
similarity index 100%
rename from support/hololens/ServoApp/ServoControl.cpp
rename to support/hololens/ServoApp/ServoControl/ServoControl.cpp
diff --git a/support/hololens/ServoApp/ServoControl.h b/support/hololens/ServoApp/ServoControl/ServoControl.h
similarity index 100%
rename from support/hololens/ServoApp/ServoControl.h
rename to support/hololens/ServoApp/ServoControl/ServoControl.h
diff --git a/support/hololens/ServoApp/ServoControl.idl b/support/hololens/ServoApp/ServoControl/ServoControl.idl
similarity index 100%
rename from support/hololens/ServoApp/ServoControl.idl
rename to support/hololens/ServoApp/ServoControl/ServoControl.idl