diff --git a/CLRScriptSDK/NWNScriptJITIntrinsics.dll b/CLRScriptSDK/NWNScriptJITIntrinsics.dll
new file mode 100644
index 0000000..ec39213
Binary files /dev/null and b/CLRScriptSDK/NWNScriptJITIntrinsics.dll differ
diff --git a/NWScriptActions.cs b/CLRScriptSDK/NWScriptActions.cs
similarity index 100%
rename from NWScriptActions.cs
rename to CLRScriptSDK/NWScriptActions.cs
diff --git a/NWScriptConstants.cs b/CLRScriptSDK/NWScriptConstants.cs
similarity index 100%
rename from NWScriptConstants.cs
rename to CLRScriptSDK/NWScriptConstants.cs
diff --git a/CLRScriptSDK/NWScriptManagedInterface.dll b/CLRScriptSDK/NWScriptManagedInterface.dll
new file mode 100644
index 0000000..d4330aa
Binary files /dev/null and b/CLRScriptSDK/NWScriptManagedInterface.dll differ
diff --git a/NWScriptSupport.cs b/CLRScriptSDK/NWScriptSupport.cs
similarity index 100%
rename from NWScriptSupport.cs
rename to CLRScriptSDK/NWScriptSupport.cs
diff --git a/NativeScriptUtil.exe b/CLRScriptSDK/NativeScriptUtil.exe
similarity index 100%
rename from NativeScriptUtil.exe
rename to CLRScriptSDK/NativeScriptUtil.exe
diff --git a/PackageScript.cmd b/CLRScriptSDK/PackageScript.cmd
similarity index 100%
rename from PackageScript.cmd
rename to CLRScriptSDK/PackageScript.cmd
diff --git a/nwn2_ai_onmoduleload/.gitignore b/nwn2_ai_onmoduleload/.gitignore
index cf7bd3f..a0d07d3 100644
--- a/nwn2_ai_onmoduleload/.gitignore
+++ b/nwn2_ai_onmoduleload/.gitignore
@@ -1,3 +1,6 @@
 bin/
 obj/
-packages/
\ No newline at end of file
+packages/
+*.sln
+*.suo
+*.user
\ No newline at end of file
diff --git a/nwn2_ai_onmoduleload/nwn2_ai_onmoduleload.csproj b/nwn2_ai_onmoduleload/nwn2_ai_onmoduleload.csproj
index 6c60ba9..a9f8a01 100644
--- a/nwn2_ai_onmoduleload/nwn2_ai_onmoduleload.csproj
+++ b/nwn2_ai_onmoduleload/nwn2_ai_onmoduleload.csproj
@@ -36,10 +36,10 @@
       <HintPath>..\grapevine\Grapevine\bin\Debug\Grapevine.dll</HintPath>
     </Reference>
     <Reference Include="NWNScriptJITIntrinsics, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\CLRv4.0.30319\NWNScriptJITIntrinsics.dll</HintPath>
+      <HintPath>..\CLRScriptSDK\NWNScriptJITIntrinsics.dll</HintPath>
     </Reference>
     <Reference Include="NWScriptManagedInterface, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\CLRv4.0.30319\NWScriptManagedInterface.dll</HintPath>
+      <HintPath>..\CLRScriptSDK\NWScriptManagedInterface.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -52,15 +52,15 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="nwn2_ai_onmoduleload.cs" />
-    <Compile Include="..\NWScriptActions.cs" />
-    <Compile Include="..\NWScriptConstants.cs" />
-    <Compile Include="..\NWScriptSupport.cs" />
+    <Compile Include="..\CLRScriptSDK\NWScriptActions.cs" />
+    <Compile Include="..\CLRScriptSDK\NWScriptConstants.cs" />
+    <Compile Include="..\CLRScriptSDK\NWScriptSupport.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="StandardEntrypoints.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>..\..\..\PackageScript.cmd "$(TargetPath)" "$(TargetName).ncs"</PostBuildEvent>
+    <PostBuildEvent>..\..\..\CLRScriptSDK\PackageScript.cmd "$(TargetPath)" "$(TargetName).ncs"</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.