diff --git a/RyujinConsole/RyujinConsole/RyujinBasicBlock.hh b/RyujinConsole/RyujinConsole/Ryujin/Models/RyujinBasicBlock.hh
similarity index 100%
rename from RyujinConsole/RyujinConsole/RyujinBasicBlock.hh
rename to RyujinConsole/RyujinConsole/Ryujin/Models/RyujinBasicBlock.hh
diff --git a/RyujinConsole/RyujinConsole/RyujinInstruction.hh b/RyujinConsole/RyujinConsole/Ryujin/Models/RyujinInstruction.hh
similarity index 100%
rename from RyujinConsole/RyujinConsole/RyujinInstruction.hh
rename to RyujinConsole/RyujinConsole/Ryujin/Models/RyujinInstruction.hh
diff --git a/RyujinConsole/RyujinConsole/RyujinObfuscatorConfig.hh b/RyujinConsole/RyujinConsole/Ryujin/Models/RyujinObfuscatorConfig.hh
similarity index 100%
rename from RyujinConsole/RyujinConsole/RyujinObfuscatorConfig.hh
rename to RyujinConsole/RyujinConsole/Ryujin/Models/RyujinObfuscatorConfig.hh
diff --git a/RyujinConsole/RyujinConsole/Ryujin/Models/RyujinProcedure.hh b/RyujinConsole/RyujinConsole/Ryujin/Models/RyujinProcedure.hh
new file mode 100644
index 0000000..6776adb
--- /dev/null
+++ b/RyujinConsole/RyujinConsole/Ryujin/Models/RyujinProcedure.hh
@@ -0,0 +1,13 @@
+#pragma once
+#include "RyujinBasicBlock.hh"
+
+class RyujinProcedure {
+
+public:
+    std::string name;
+    uintptr_t imagebase;
+    uintptr_t address;
+    uintptr_t size;
+    std::vector<RyujinBasicBlock> basic_blocks;
+
+};
\ No newline at end of file
diff --git a/RyujinConsole/RyujinConsole/RyujinPdbParsing.hh b/RyujinConsole/RyujinConsole/Ryujin/PDB/RyujinPdbParsing.hh
similarity index 98%
rename from RyujinConsole/RyujinConsole/RyujinPdbParsing.hh
rename to RyujinConsole/RyujinConsole/Ryujin/PDB/RyujinPdbParsing.hh
index 548dc82..56d4cd9 100644
--- a/RyujinConsole/RyujinConsole/RyujinPdbParsing.hh
+++ b/RyujinConsole/RyujinConsole/Ryujin/PDB/RyujinPdbParsing.hh
@@ -2,7 +2,7 @@
 #include <windows.h>
 #include <dbghelp.h>
 #pragma comment(lib, "DbgHelp.lib")
-#include "RyujinProcedure.hh"
+#include "../Models/RyujinProcedure.hh"
 
 #define SymTagFunction 5
 
diff --git a/RyujinConsole/RyujinConsole/Ryujin.cc b/RyujinConsole/RyujinConsole/Ryujin/Ryujin.cc
similarity index 100%
rename from RyujinConsole/RyujinConsole/Ryujin.cc
rename to RyujinConsole/RyujinConsole/Ryujin/Ryujin.cc
diff --git a/RyujinConsole/RyujinConsole/Ryujin.hh b/RyujinConsole/RyujinConsole/Ryujin/Ryujin.hh
similarity index 85%
rename from RyujinConsole/RyujinConsole/Ryujin.hh
rename to RyujinConsole/RyujinConsole/Ryujin/Ryujin.hh
index 6c15c2e..448a040 100644
--- a/RyujinConsole/RyujinConsole/Ryujin.hh
+++ b/RyujinConsole/RyujinConsole/Ryujin/Ryujin.hh
@@ -4,9 +4,9 @@
 #include <iostream>
 #include <memory>
 #include <vector>
-#include "RyujinPdbParsing.hh"
-#include "RyujinUtils.hh"
-#include "RyujinObfuscatorConfig.hh"
+#include "PDB/RyujinPdbParsing.hh"
+#include "Utils/RyujinUtils.hh"
+#include "Models/RyujinObfuscatorConfig.hh"
 
 class Ryujin {
 
diff --git a/RyujinConsole/RyujinConsole/RyujinUtils.cc b/RyujinConsole/RyujinConsole/Ryujin/Utils/RyujinUtils.cc
similarity index 100%
rename from RyujinConsole/RyujinConsole/RyujinUtils.cc
rename to RyujinConsole/RyujinConsole/Ryujin/Utils/RyujinUtils.cc
diff --git a/RyujinConsole/RyujinConsole/RyujinUtils.hh b/RyujinConsole/RyujinConsole/Ryujin/Utils/RyujinUtils.hh
similarity index 100%
rename from RyujinConsole/RyujinConsole/RyujinUtils.hh
rename to RyujinConsole/RyujinConsole/Ryujin/Utils/RyujinUtils.hh
diff --git a/RyujinConsole/RyujinConsole/RyujinConsole.cc b/RyujinConsole/RyujinConsole/RyujinConsole.cc
index 1b7e129..1668826 100644
--- a/RyujinConsole/RyujinConsole/RyujinConsole.cc
+++ b/RyujinConsole/RyujinConsole/RyujinConsole.cc
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "Ryujin.hh"
+#include "Ryujin/Ryujin.hh"
 
 auto main() -> int {
 
diff --git a/RyujinConsole/RyujinConsole/RyujinConsole.vcxproj b/RyujinConsole/RyujinConsole/RyujinConsole.vcxproj
index 0f9fecb..4cf5666 100644
--- a/RyujinConsole/RyujinConsole/RyujinConsole.vcxproj
+++ b/RyujinConsole/RyujinConsole/RyujinConsole.vcxproj
@@ -131,18 +131,18 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="Ryujin.cc" />
     <ClCompile Include="RyujinConsole.cc" />
-    <ClCompile Include="RyujinUtils.cc" />
+    <ClCompile Include="Ryujin\Ryujin.cc" />
+    <ClCompile Include="Ryujin\Utils\RyujinUtils.cc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Ryujin.hh" />
-    <ClInclude Include="RyujinBasicBlock.hh" />
-    <ClInclude Include="RyujinInstruction.hh" />
-    <ClInclude Include="RyujinObfuscatorConfig.hh" />
-    <ClInclude Include="RyujinPdbParsing.hh" />
-    <ClInclude Include="RyujinProcedure.hh" />
-    <ClInclude Include="RyujinUtils.hh" />
+    <ClInclude Include="Ryujin\Models\RyujinBasicBlock.hh" />
+    <ClInclude Include="Ryujin\Models\RyujinInstruction.hh" />
+    <ClInclude Include="Ryujin\Models\RyujinObfuscatorConfig.hh" />
+    <ClInclude Include="Ryujin\Models\RyujinProcedure.hh" />
+    <ClInclude Include="Ryujin\PDB\RyujinPdbParsing.hh" />
+    <ClInclude Include="Ryujin\Ryujin.hh" />
+    <ClInclude Include="Ryujin\Utils\RyujinUtils.hh" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/RyujinConsole/RyujinConsole/RyujinConsole.vcxproj.filters b/RyujinConsole/RyujinConsole/RyujinConsole.vcxproj.filters
index bb9dbb6..65e05e6 100644
--- a/RyujinConsole/RyujinConsole/RyujinConsole.vcxproj.filters
+++ b/RyujinConsole/RyujinConsole/RyujinConsole.vcxproj.filters
@@ -27,37 +27,37 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Ryujin.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RyujinUtils.cc">
+    <ClCompile Include="Ryujin\Utils\RyujinUtils.cc">
       <Filter>Ryujin\Utils</Filter>
     </ClCompile>
-    <ClCompile Include="RyujinConsole.cc">
+    <ClCompile Include="Ryujin\Ryujin.cc">
       <Filter>Ryujin</Filter>
     </ClCompile>
+    <ClCompile Include="RyujinConsole.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="RyujinUtils.hh">
-      <Filter>Ryujin\Utils</Filter>
+    <ClInclude Include="Ryujin\Models\RyujinBasicBlock.hh">
+      <Filter>Ryujin\Models</Filter>
     </ClInclude>
-    <ClInclude Include="RyujinPdbParsing.hh">
+    <ClInclude Include="Ryujin\Models\RyujinInstruction.hh">
+      <Filter>Ryujin\Models</Filter>
+    </ClInclude>
+    <ClInclude Include="Ryujin\Models\RyujinObfuscatorConfig.hh">
+      <Filter>Ryujin\Models</Filter>
+    </ClInclude>
+    <ClInclude Include="Ryujin\Models\RyujinProcedure.hh">
+      <Filter>Ryujin\Models</Filter>
+    </ClInclude>
+    <ClInclude Include="Ryujin\PDB\RyujinPdbParsing.hh">
       <Filter>Ryujin\PDB</Filter>
     </ClInclude>
-    <ClInclude Include="Ryujin.hh">
+    <ClInclude Include="Ryujin\Utils\RyujinUtils.hh">
+      <Filter>Ryujin\Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="Ryujin\Ryujin.hh">
       <Filter>Ryujin</Filter>
     </ClInclude>
-    <ClInclude Include="RyujinProcedure.hh">
-      <Filter>Ryujin\Models</Filter>
-    </ClInclude>
-    <ClInclude Include="RyujinBasicBlock.hh">
-      <Filter>Ryujin\Models</Filter>
-    </ClInclude>
-    <ClInclude Include="RyujinInstruction.hh">
-      <Filter>Ryujin\Models</Filter>
-    </ClInclude>
-    <ClInclude Include="RyujinObfuscatorConfig.hh">
-      <Filter>Ryujin\Models</Filter>
-    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/RyujinConsole/RyujinConsole/RyujinProcedure.hh b/RyujinConsole/RyujinConsole/RyujinProcedure.hh
index 6776adb..ce2af04 100644
--- a/RyujinConsole/RyujinConsole/RyujinProcedure.hh
+++ b/RyujinConsole/RyujinConsole/RyujinProcedure.hh
@@ -1,5 +1,5 @@
 #pragma once
-#include "RyujinBasicBlock.hh"
+#include "Ryujin/Models/RyujinBasicBlock.hh"
 
 class RyujinProcedure {