API Revamp

- Hook now using DLL Injection - Better Sensor and Input callback integration - Restructured project files
SirusDoma · Jan 7, 2020 · 1ac52ff · 1ac52ff
1 parent 5e221a4
commit 1ac52ff
Show file tree

Hide file tree

Showing 31 changed files with 2,367 additions and 336 deletions.
diff --git a/MaiSense.sln → MaiSense.API.sln b/MaiSense.sln → MaiSense.API.sln
@@ -5,7 +5,12 @@ VisualStudioVersion = 16.0.29009.5
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MaiSense", "MaiSense.vcxproj", "{E69E1597-4570-4115-BAE6-EC49177F62E8}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Input.Keyboard", "Input.Keyboard.vcxproj", "{255303BA-5155-4849-B4BF-828A615EF916}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MaiSense.Launcher", "MaiSense.Launcher.vcxproj", "{60C5B665-943F-476F-8EDB-C57DDFE74560}"
+	ProjectSection(ProjectDependencies) = postProject
+		{EC890B06-E505-4217-BEFC-6F63CCDC7CA3} = {EC890B06-E505-4217-BEFC-6F63CCDC7CA3}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MaiSense.Input", "MaiSense.Input.vcxproj", "{EC890B06-E505-4217-BEFC-6F63CCDC7CA3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -23,14 +28,22 @@ Global
 		{E69E1597-4570-4115-BAE6-EC49177F62E8}.Release|x64.Build.0 = Release|x64
 		{E69E1597-4570-4115-BAE6-EC49177F62E8}.Release|x86.ActiveCfg = Release|Win32
 		{E69E1597-4570-4115-BAE6-EC49177F62E8}.Release|x86.Build.0 = Release|Win32
-		{255303BA-5155-4849-B4BF-828A615EF916}.Debug|x64.ActiveCfg = Debug|x64
-		{255303BA-5155-4849-B4BF-828A615EF916}.Debug|x64.Build.0 = Debug|x64
-		{255303BA-5155-4849-B4BF-828A615EF916}.Debug|x86.ActiveCfg = Debug|Win32
-		{255303BA-5155-4849-B4BF-828A615EF916}.Debug|x86.Build.0 = Debug|Win32
-		{255303BA-5155-4849-B4BF-828A615EF916}.Release|x64.ActiveCfg = Release|x64
-		{255303BA-5155-4849-B4BF-828A615EF916}.Release|x64.Build.0 = Release|x64
-		{255303BA-5155-4849-B4BF-828A615EF916}.Release|x86.ActiveCfg = Release|Win32
-		{255303BA-5155-4849-B4BF-828A615EF916}.Release|x86.Build.0 = Release|Win32
+		{60C5B665-943F-476F-8EDB-C57DDFE74560}.Debug|x64.ActiveCfg = Debug|x64
+		{60C5B665-943F-476F-8EDB-C57DDFE74560}.Debug|x64.Build.0 = Debug|x64
+		{60C5B665-943F-476F-8EDB-C57DDFE74560}.Debug|x86.ActiveCfg = Debug|Win32
+		{60C5B665-943F-476F-8EDB-C57DDFE74560}.Debug|x86.Build.0 = Debug|Win32
+		{60C5B665-943F-476F-8EDB-C57DDFE74560}.Release|x64.ActiveCfg = Release|x64
+		{60C5B665-943F-476F-8EDB-C57DDFE74560}.Release|x64.Build.0 = Release|x64
+		{60C5B665-943F-476F-8EDB-C57DDFE74560}.Release|x86.ActiveCfg = Release|Win32
+		{60C5B665-943F-476F-8EDB-C57DDFE74560}.Release|x86.Build.0 = Release|Win32
+		{EC890B06-E505-4217-BEFC-6F63CCDC7CA3}.Debug|x64.ActiveCfg = Debug|x64
+		{EC890B06-E505-4217-BEFC-6F63CCDC7CA3}.Debug|x64.Build.0 = Debug|x64
+		{EC890B06-E505-4217-BEFC-6F63CCDC7CA3}.Debug|x86.ActiveCfg = Debug|Win32
+		{EC890B06-E505-4217-BEFC-6F63CCDC7CA3}.Debug|x86.Build.0 = Debug|Win32
+		{EC890B06-E505-4217-BEFC-6F63CCDC7CA3}.Release|x64.ActiveCfg = Release|x64
+		{EC890B06-E505-4217-BEFC-6F63CCDC7CA3}.Release|x64.Build.0 = Release|x64
+		{EC890B06-E505-4217-BEFC-6F63CCDC7CA3}.Release|x86.ActiveCfg = Release|Win32
+		{EC890B06-E505-4217-BEFC-6F63CCDC7CA3}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/MaiSense.Input.vcxproj b/MaiSense.Input.vcxproj
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>16.0</VCProjectVersion>
+    <ProjectGuid>{EC890B06-E505-4217-BEFC-6F63CCDC7CA3}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>MaiSenseInput</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>build\$(Configuration)\</OutDir>
+    <IntDir>temp\$(Configuration)\input\</IntDir>
+    <TargetName>MaiSense</TargetName>
+    <IncludePath>$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>build\$(Configuration)\</OutDir>
+    <IntDir>temp\$(Configuration)\input\</IntDir>
+    <TargetName>MaiSense.Input</TargetName>
+    <IncludePath>$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>build\$(Configuration)\</OutDir>
+    <IntDir>temp\$(Configuration)\input\</IntDir>
+    <TargetName>MaiSense</TargetName>
+    <IncludePath>$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>build\$(Configuration)\</OutDir>
+    <IntDir>temp\$(Configuration)\input\</IntDir>
+    <TargetName>MaiSense.Input</TargetName>
+    <IncludePath>$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;_DEBUG;MAISENSEINPUT_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalIncludeDirectories>./include/;./extlibs/include/</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableUAC>false</EnableUAC>
+      <AdditionalLibraryDirectories>./extlibs/lib/;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>detours.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;MAISENSEINPUT_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalIncludeDirectories>./include/;</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableUAC>false</EnableUAC>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;NDEBUG;MAISENSEINPUT_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalIncludeDirectories>./include/;</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableUAC>false</EnableUAC>
+      <AdditionalDependencies>detours.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>./extlibs/lib/;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;MAISENSEINPUT_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalIncludeDirectories>./include/;</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableUAC>false</EnableUAC>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="include\MaiSense\Input\InputController.hpp" />
+    <ClInclude Include="include\MaiSense\Input\InputManager.hpp" />
+    <ClInclude Include="include\MaiSense\Input\KeyboardController.hpp" />
+    <ClInclude Include="include\MaiSense\Input\KeyEvent.hpp" />
+    <ClInclude Include="src/Input/framework.h" />
+    <ClInclude Include="src/Input/pch.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src/Input/dllmain.cpp" />
+    <ClCompile Include="src/Input/pch.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\Input\InputManager.cpp" />
+    <ClCompile Include="src\Input\KeyboardController.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="MaiSense.vcxproj">
+      <Project>{e69e1597-4570-4115-bae6-ec49177f62e8}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/MaiSense.Input.vcxproj.filters b/MaiSense.Input.vcxproj.filters
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Sources">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Headers">
+      <UniqueIdentifier>{21603add-e118-448d-91f9-110ed6508917}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Framework">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="src/Input/framework.h">
+      <Filter>Framework</Filter>
+    </ClInclude>
+    <ClInclude Include="src/Input/pch.h">
+      <Filter>Framework</Filter>
+    </ClInclude>
+    <ClInclude Include="include\MaiSense\Input\InputManager.hpp">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\MaiSense\Input\InputController.hpp">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\MaiSense\Input\KeyboardController.hpp">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\MaiSense\Input\KeyEvent.hpp">
+      <Filter>Headers</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src/Input/dllmain.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src/Input/pch.cpp">
+      <Filter>Framework</Filter>
+    </ClCompile>
+    <ClCompile Include="src\Input\InputManager.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\Input\KeyboardController.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
diff --git a/Input.Keyboard.vcxproj → MaiSense.Launcher.vcxproj b/Input.Keyboard.vcxproj → MaiSense.Launcher.vcxproj
@@ -20,7 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
-    <ProjectGuid>{255303BA-5155-4849-B4BF-828A615EF916}</ProjectGuid>
+    <ProjectGuid>{60C5B665-943F-476F-8EDB-C57DDFE74560}</ProjectGuid>
     <RootNamespace>InputKeyboard</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
@@ -70,24 +70,24 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>MaiSense.Keyboard</TargetName>
+    <TargetName>MaiSense.Launcher</TargetName>
     <OutDir>build\$(Configuration)\</OutDir>
-    <IntDir>temp\$(Configuration)\</IntDir>
+    <IntDir>temp\$(Configuration)\launcher\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <TargetName>MaiSense.Keyboard</TargetName>
+    <TargetName>MaiSense.Launcher</TargetName>
     <OutDir>build\$(Configuration)\</OutDir>
-    <IntDir>temp\$(Configuration)\</IntDir>
+    <IntDir>temp\$(Configuration)\launcher\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <TargetName>MaiSense.Keyboard</TargetName>
+    <TargetName>MaiSense.Launcher</TargetName>
     <OutDir>build\$(Configuration)\</OutDir>
-    <IntDir>temp\$(Configuration)\</IntDir>
+    <IntDir>temp\$(Configuration)\launcher\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <TargetName>MaiSense.Keyboard</TargetName>
+    <TargetName>MaiSense.Launcher</TargetName>
     <OutDir>build\$(Configuration)\</OutDir>
-    <IntDir>temp\$(Configuration)\</IntDir>
+    <IntDir>temp\$(Configuration)\launcher\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -159,12 +159,11 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\Keyboard\Keyboard.cpp" />
-    <ClCompile Include="src\Keyboard\main.cpp" />
+    <ClCompile Include="src\Launcher\Injector.cpp" />
+    <ClCompile Include="src\Launcher\main.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="src\Keyboard\Keyboard.hpp" />
-    <ClInclude Include="src\Keyboard\KeyEvent.hpp" />
+    <ClInclude Include="include\MaiSense\Launcher\Injector.hpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/Input.Keyboard.vcxproj.filters → MaiSense.Launcher.vcxproj.filters b/Input.Keyboard.vcxproj.filters → MaiSense.Launcher.vcxproj.filters
@@ -11,18 +11,15 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\Keyboard\main.cpp">
+    <ClCompile Include="src\Launcher\main.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\Keyboard\Keyboard.cpp">
+    <ClCompile Include="src\Launcher\Injector.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="src\Keyboard\KeyEvent.hpp">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Keyboard\Keyboard.hpp">
+    <ClInclude Include="include\MaiSense\Launcher\Injector.hpp">
       <Filter>Headers</Filter>
     </ClInclude>
   </ItemGroup>