diff --git a/VTIL-Compiler/CMakeLists.txt b/VTIL-Compiler/CMakeLists.txt
index 91df79d..10a07b3 100644
--- a/VTIL-Compiler/CMakeLists.txt
+++ b/VTIL-Compiler/CMakeLists.txt
@@ -2,15 +2,15 @@ project(VTIL-Compiler)
add_library(${PROJECT_NAME} STATIC
common/auxiliaries.cpp
- passes/stack_pinning_pass.cpp
- passes/istack_ref_substitution_pass.cpp
- passes/bblock_extension_pass.cpp
- passes/stack_propagation_pass.cpp
- passes/dead_code_elimination_pass.cpp
- passes/mov_propagation_pass.cpp
- passes/symbolic_rewrite_pass.cpp
- passes/branch_correction_pass.cpp
- passes/register_renaming_pass.cpp
+ optimization/stack_pinning_pass.cpp
+ optimization/istack_ref_substitution_pass.cpp
+ optimization/bblock_extension_pass.cpp
+ optimization/stack_propagation_pass.cpp
+ optimization/dead_code_elimination_pass.cpp
+ optimization/mov_propagation_pass.cpp
+ optimization/symbolic_rewrite_pass.cpp
+ optimization/branch_correction_pass.cpp
+ optimization/register_renaming_pass.cpp
)
target_include_directories(${PROJECT_NAME} PUBLIC includes)
diff --git a/VTIL-Compiler/VTIL-Compiler.vcxproj b/VTIL-Compiler/VTIL-Compiler.vcxproj
index c465085..386e104 100644
--- a/VTIL-Compiler/VTIL-Compiler.vcxproj
+++ b/VTIL-Compiler/VTIL-Compiler.vcxproj
@@ -107,32 +107,32 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
diff --git a/VTIL-Compiler/VTIL-Compiler.vcxproj.filters b/VTIL-Compiler/VTIL-Compiler.vcxproj.filters
index 85ae332..6448f71 100644
--- a/VTIL-Compiler/VTIL-Compiler.vcxproj.filters
+++ b/VTIL-Compiler/VTIL-Compiler.vcxproj.filters
@@ -1,67 +1,49 @@
-
- Optimizer Passes
-
-
- Optimizer Passes
-
-
- Optimizer Passes
-
-
- Optimizer Passes
-
-
- Optimizer Passes
-
-
- Optimizer Passes
-
Common
-
- Optimizer Passes
+
+ Optimization Passes
-
- Optimizer Passes
+
+ Optimization Passes
-
- Optimizer Passes
+
+ Optimization Passes
+
+
+ Optimization Passes
+
+
+ Optimization Passes
+
+
+ Optimization Passes
+
+
+ Optimization Passes
+
+
+ Optimization Passes
+
+
+ Optimization Passes
{6307ebe6-d515-4f15-a927-44dacb7a337c}
-
- {93550fd4-29f0-496a-ba4a-c90fcf11efb1}
-
{5ad32c73-c84f-45a2-ba7b-e4170f51b3d3}
+
+ {93550fd4-29f0-496a-ba4a-c90fcf11efb1}
+
-
- Optimizer Passes
-
-
- Optimizer Passes
-
-
- Optimizer Passes
-
-
- Optimizer Passes
-
-
- Optimizer Passes
-
-
- Optimizer Passes
-
Common
@@ -71,21 +53,39 @@
Common
-
- Optimizer Passes
+
+ Optimization Passes
-
- Optimizer Passes
+
+ Optimization Passes
-
- Optimizer Passes
+
+ Optimization Passes
+
+
+ Optimization Passes
+
+
+ Optimization Passes
+
+
+ Optimization Passes
+
+
+ Optimization Passes
+
+
+ Optimization Passes
+
+
+ Optimization Passes
-
+
+
Includes
-
diff --git a/VTIL-Compiler/common/apply_all.hpp b/VTIL-Compiler/common/apply_all.hpp
index 64d8ff3..35ea49b 100644
--- a/VTIL-Compiler/common/apply_all.hpp
+++ b/VTIL-Compiler/common/apply_all.hpp
@@ -27,15 +27,15 @@
//
#pragma once
#include "interface.hpp"
-#include "../passes/stack_pinning_pass.hpp"
-#include "../passes/istack_ref_substitution_pass.hpp"
-#include "../passes/bblock_extension_pass.hpp"
-#include "../passes/stack_propagation_pass.hpp"
-#include "../passes/dead_code_elimination_pass.hpp"
-#include "../passes/mov_propagation_pass.hpp"
-#include "../passes/symbolic_rewrite_pass.hpp"
-#include "../passes/branch_correction_pass.hpp"
-#include "../passes/register_renaming_pass.hpp"
+#include "../optimizer/stack_pinning_pass.hpp"
+#include "../optimizer/istack_ref_substitution_pass.hpp"
+#include "../optimizer/bblock_extension_pass.hpp"
+#include "../optimizer/stack_propagation_pass.hpp"
+#include "../optimizer/dead_code_elimination_pass.hpp"
+#include "../optimizer/mov_propagation_pass.hpp"
+#include "../optimizer/symbolic_rewrite_pass.hpp"
+#include "../optimizer/branch_correction_pass.hpp"
+#include "../optimizer/register_renaming_pass.hpp"
namespace vtil::optimizer
{
diff --git a/VTIL-Compiler/includes/vtil/optimizer b/VTIL-Compiler/includes/vtil/compiler
similarity index 100%
rename from VTIL-Compiler/includes/vtil/optimizer
rename to VTIL-Compiler/includes/vtil/compiler
diff --git a/VTIL-Compiler/passes/bblock_extension_pass.cpp b/VTIL-Compiler/optimizer/bblock_extension_pass.cpp
similarity index 100%
rename from VTIL-Compiler/passes/bblock_extension_pass.cpp
rename to VTIL-Compiler/optimizer/bblock_extension_pass.cpp
diff --git a/VTIL-Compiler/passes/bblock_extension_pass.hpp b/VTIL-Compiler/optimizer/bblock_extension_pass.hpp
similarity index 100%
rename from VTIL-Compiler/passes/bblock_extension_pass.hpp
rename to VTIL-Compiler/optimizer/bblock_extension_pass.hpp
diff --git a/VTIL-Compiler/passes/branch_correction_pass.cpp b/VTIL-Compiler/optimizer/branch_correction_pass.cpp
similarity index 100%
rename from VTIL-Compiler/passes/branch_correction_pass.cpp
rename to VTIL-Compiler/optimizer/branch_correction_pass.cpp
diff --git a/VTIL-Compiler/passes/branch_correction_pass.hpp b/VTIL-Compiler/optimizer/branch_correction_pass.hpp
similarity index 100%
rename from VTIL-Compiler/passes/branch_correction_pass.hpp
rename to VTIL-Compiler/optimizer/branch_correction_pass.hpp
diff --git a/VTIL-Compiler/passes/dead_code_elimination_pass.cpp b/VTIL-Compiler/optimizer/dead_code_elimination_pass.cpp
similarity index 100%
rename from VTIL-Compiler/passes/dead_code_elimination_pass.cpp
rename to VTIL-Compiler/optimizer/dead_code_elimination_pass.cpp
diff --git a/VTIL-Compiler/passes/dead_code_elimination_pass.hpp b/VTIL-Compiler/optimizer/dead_code_elimination_pass.hpp
similarity index 100%
rename from VTIL-Compiler/passes/dead_code_elimination_pass.hpp
rename to VTIL-Compiler/optimizer/dead_code_elimination_pass.hpp
diff --git a/VTIL-Compiler/passes/istack_ref_substitution_pass.cpp b/VTIL-Compiler/optimizer/istack_ref_substitution_pass.cpp
similarity index 100%
rename from VTIL-Compiler/passes/istack_ref_substitution_pass.cpp
rename to VTIL-Compiler/optimizer/istack_ref_substitution_pass.cpp
diff --git a/VTIL-Compiler/passes/istack_ref_substitution_pass.hpp b/VTIL-Compiler/optimizer/istack_ref_substitution_pass.hpp
similarity index 100%
rename from VTIL-Compiler/passes/istack_ref_substitution_pass.hpp
rename to VTIL-Compiler/optimizer/istack_ref_substitution_pass.hpp
diff --git a/VTIL-Compiler/passes/mov_propagation_pass.cpp b/VTIL-Compiler/optimizer/mov_propagation_pass.cpp
similarity index 100%
rename from VTIL-Compiler/passes/mov_propagation_pass.cpp
rename to VTIL-Compiler/optimizer/mov_propagation_pass.cpp
diff --git a/VTIL-Compiler/passes/mov_propagation_pass.hpp b/VTIL-Compiler/optimizer/mov_propagation_pass.hpp
similarity index 100%
rename from VTIL-Compiler/passes/mov_propagation_pass.hpp
rename to VTIL-Compiler/optimizer/mov_propagation_pass.hpp
diff --git a/VTIL-Compiler/passes/register_renaming_pass.cpp b/VTIL-Compiler/optimizer/register_renaming_pass.cpp
similarity index 100%
rename from VTIL-Compiler/passes/register_renaming_pass.cpp
rename to VTIL-Compiler/optimizer/register_renaming_pass.cpp
diff --git a/VTIL-Compiler/passes/register_renaming_pass.hpp b/VTIL-Compiler/optimizer/register_renaming_pass.hpp
similarity index 100%
rename from VTIL-Compiler/passes/register_renaming_pass.hpp
rename to VTIL-Compiler/optimizer/register_renaming_pass.hpp
diff --git a/VTIL-Compiler/passes/stack_pinning_pass.cpp b/VTIL-Compiler/optimizer/stack_pinning_pass.cpp
similarity index 100%
rename from VTIL-Compiler/passes/stack_pinning_pass.cpp
rename to VTIL-Compiler/optimizer/stack_pinning_pass.cpp
diff --git a/VTIL-Compiler/passes/stack_pinning_pass.hpp b/VTIL-Compiler/optimizer/stack_pinning_pass.hpp
similarity index 100%
rename from VTIL-Compiler/passes/stack_pinning_pass.hpp
rename to VTIL-Compiler/optimizer/stack_pinning_pass.hpp
diff --git a/VTIL-Compiler/passes/stack_propagation_pass.cpp b/VTIL-Compiler/optimizer/stack_propagation_pass.cpp
similarity index 100%
rename from VTIL-Compiler/passes/stack_propagation_pass.cpp
rename to VTIL-Compiler/optimizer/stack_propagation_pass.cpp
diff --git a/VTIL-Compiler/passes/stack_propagation_pass.hpp b/VTIL-Compiler/optimizer/stack_propagation_pass.hpp
similarity index 100%
rename from VTIL-Compiler/passes/stack_propagation_pass.hpp
rename to VTIL-Compiler/optimizer/stack_propagation_pass.hpp
diff --git a/VTIL-Compiler/passes/symbolic_rewrite_pass.cpp b/VTIL-Compiler/optimizer/symbolic_rewrite_pass.cpp
similarity index 100%
rename from VTIL-Compiler/passes/symbolic_rewrite_pass.cpp
rename to VTIL-Compiler/optimizer/symbolic_rewrite_pass.cpp
diff --git a/VTIL-Compiler/passes/symbolic_rewrite_pass.hpp b/VTIL-Compiler/optimizer/symbolic_rewrite_pass.hpp
similarity index 100%
rename from VTIL-Compiler/passes/symbolic_rewrite_pass.hpp
rename to VTIL-Compiler/optimizer/symbolic_rewrite_pass.hpp
diff --git a/VTIL/includes/vtil/vtil b/VTIL/includes/vtil/vtil
index baa9349..3256fb6 100644
--- a/VTIL/includes/vtil/vtil
+++ b/VTIL/includes/vtil/vtil
@@ -2,4 +2,4 @@
#include
#include
#include
-#include
\ No newline at end of file
+#include
\ No newline at end of file