diff --git a/r5dev/console.h b/r5dev/include/console.h
similarity index 100%
rename from r5dev/console.h
rename to r5dev/include/console.h
diff --git a/r5dev/hooks.h b/r5dev/include/hooks.h
similarity index 100%
rename from r5dev/hooks.h
rename to r5dev/include/hooks.h
diff --git a/r5dev/opcptc.h b/r5dev/include/opcptc.h
similarity index 100%
rename from r5dev/opcptc.h
rename to r5dev/include/opcptc.h
diff --git a/r5dev/patterns.h b/r5dev/include/patterns.h
similarity index 100%
rename from r5dev/patterns.h
rename to r5dev/include/patterns.h
diff --git a/r5dev/r5dev.h b/r5dev/include/r5dev.h
similarity index 100%
rename from r5dev/r5dev.h
rename to r5dev/include/r5dev.h
diff --git a/r5dev/structs.h b/r5dev/include/structs.h
similarity index 100%
rename from r5dev/structs.h
rename to r5dev/include/structs.h
diff --git a/r5dev/utility.h b/r5dev/include/utility.h
similarity index 100%
rename from r5dev/utility.h
rename to r5dev/include/utility.h
diff --git a/r5dev/r5dev.vcxproj b/r5dev/r5dev.vcxproj
index 2fe458a7..6cf24d16 100644
--- a/r5dev/r5dev.vcxproj
+++ b/r5dev/r5dev.vcxproj
@@ -80,12 +80,12 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(SolutionDir)detours\include;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)detours\include;$(SolutionDir)imgui\include;$(SolutionDir)r5dev\include;$(IncludePath)</IncludePath>
     <LibraryPath>$(SolutionDir)detours\lib.X64;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(SolutionDir)detours\include;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)detours\include;$(SolutionDir)imgui\include;$(SolutionDir)r5dev\include;$(IncludePath)</IncludePath>
     <LibraryPath>$(SolutionDir)detours\lib.X64;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -181,20 +181,20 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="console.h" />
-    <ClInclude Include="hooks.h" />
-    <ClInclude Include="opcptc.h" />
-    <ClInclude Include="patterns.h" />
-    <ClInclude Include="r5dev.h" />
-    <ClInclude Include="structs.h" />
-    <ClInclude Include="utility.h" />
+    <ClInclude Include="include\console.h" />
+    <ClInclude Include="include\hooks.h" />
+    <ClInclude Include="include\opcptc.h" />
+    <ClInclude Include="include\patterns.h" />
+    <ClInclude Include="include\r5dev.h" />
+    <ClInclude Include="include\structs.h" />
+    <ClInclude Include="include\utility.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="console.cpp" />
-    <ClCompile Include="dllmain.cpp" />
-    <ClCompile Include="hooks.cpp" />
-    <ClCompile Include="opcptc.cpp" />
-    <ClCompile Include="utility.cpp" />
+    <ClCompile Include="src\console.cpp" />
+    <ClCompile Include="src\dllmain.cpp" />
+    <ClCompile Include="src\hooks.cpp" />
+    <ClCompile Include="src\opcptc.cpp" />
+    <ClCompile Include="src\utility.cpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="r5dev.def" />
diff --git a/r5dev/r5dev.vcxproj.filters b/r5dev/r5dev.vcxproj.filters
index 5ea98e0e..7e062f85 100644
--- a/r5dev/r5dev.vcxproj.filters
+++ b/r5dev/r5dev.vcxproj.filters
@@ -15,42 +15,42 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="dllmain.cpp">
+    <ClCompile Include="src\dllmain.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="console.cpp">
+    <ClCompile Include="src\console.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="hooks.cpp">
+    <ClCompile Include="src\hooks.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="utility.cpp">
+    <ClCompile Include="src\utility.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="opcptc.cpp">
+    <ClCompile Include="src\opcptc.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="r5dev.h">
+    <ClInclude Include="include\r5dev.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="console.h">
+    <ClInclude Include="include\console.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="hooks.h">
+    <ClInclude Include="include\hooks.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="patterns.h">
+    <ClInclude Include="include\patterns.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="structs.h">
+    <ClInclude Include="include\structs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="utility.h">
+    <ClInclude Include="include\utility.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="opcptc.h">
+    <ClInclude Include="include\opcptc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/r5dev/console.cpp b/r5dev/src/console.cpp
similarity index 100%
rename from r5dev/console.cpp
rename to r5dev/src/console.cpp
diff --git a/r5dev/dllmain.cpp b/r5dev/src/dllmain.cpp
similarity index 100%
rename from r5dev/dllmain.cpp
rename to r5dev/src/dllmain.cpp
diff --git a/r5dev/hooks.cpp b/r5dev/src/hooks.cpp
similarity index 100%
rename from r5dev/hooks.cpp
rename to r5dev/src/hooks.cpp
diff --git a/r5dev/opcptc.cpp b/r5dev/src/opcptc.cpp
similarity index 100%
rename from r5dev/opcptc.cpp
rename to r5dev/src/opcptc.cpp
diff --git a/r5dev/utility.cpp b/r5dev/src/utility.cpp
similarity index 100%
rename from r5dev/utility.cpp
rename to r5dev/src/utility.cpp