diff --git a/.gitignore b/.gitignore
index 4a44abd..afa5129 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,9 +31,6 @@ bld/
 [Ll]og/
 [Ll]ogs/
 
-ida-sdk-9.2/
-IDA-SDK/
-
 # Visual Studio 2015/2017 cache/options directory
 .vs/
 # Uncomment if you have tasks that create the project's static files in wwwroot
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..a0cb98c
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "IDA-SDK"]
+	path = IDA-SDK
+	url = https://github.com/HexRaysSA/ida-sdk.git
diff --git a/IDA-SDK b/IDA-SDK
new file mode 160000
index 0000000..70e2975
--- /dev/null
+++ b/IDA-SDK
@@ -0,0 +1 @@
+Subproject commit 70e29758997745524e917e296fbbfeef5faf9c57
diff --git a/IDAExecFunctions64/IDAExecFunctions64.vcxproj b/IDAExecFunctions64/IDAExecFunctions64.vcxproj
index d9ea4e7..ec3a7cc 100644
--- a/IDAExecFunctions64/IDAExecFunctions64.vcxproj
+++ b/IDAExecFunctions64/IDAExecFunctions64.vcxproj
@@ -68,10 +68,10 @@
     <IDASDKPath>$(SolutionDir)IDA-SDK\src</IDASDKPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>C:\Program Files\IDA Professional 9.3\plugins\</OutDir>
+    <OutDir>$(AppData)\Hex-Rays\IDA Pro\plugins</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>C:\Program Files\IDA Professional 9.2\plugins\</OutDir>
+    <OutDir>$(AppData)\Hex-Rays\IDA Pro\plugins</OutDir>
     <IncludePath>$(ProjectDir);$(IncludePath)</IncludePath>
     <PublicIncludeDirectories>$(PublicIncludeDirectories)</PublicIncludeDirectories>
   </PropertyGroup>
@@ -125,4 +125,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/IDAExecFunctions64/IDAExecFunctions64.vcxproj.filters b/IDAExecFunctions64/IDAExecFunctions64.vcxproj.filters
index 2200521..1ba9f43 100644
--- a/IDAExecFunctions64/IDAExecFunctions64.vcxproj.filters
+++ b/IDAExecFunctions64/IDAExecFunctions64.vcxproj.filters
@@ -19,11 +19,13 @@
       <Filter>Import</Filter>
     </ClInclude>
     <ClInclude Include="Import\StructBuilder.hpp" />
-    <ClInclude Include="Format\Format.hpp" />
     <ClInclude Include="Format\Parser.hpp" />
     <ClInclude Include="Import\MappingsImporter.hpp" />
     <ClInclude Include="StaticClassNamer.hpp" />
     <ClInclude Include="FNameConstantNamer.hpp" />
     <ClInclude Include="Utility.hpp" />
+    <ClInclude Include="Format\IDAMappingLayout.hpp" />
+    <ClInclude Include="Import\ExecRename.hpp" />
+    <ClInclude Include="Import\ExecSignatures.hpp" />
   </ItemGroup>
 </Project>
\ No newline at end of file