diff --git a/src/llvm/expr.c b/src/llvm/llvm-ir/expr.c
similarity index 99%
rename from src/llvm/expr.c
rename to src/llvm/llvm-ir/expr.c
index beee0d3..6896ce1 100644
--- a/src/llvm/expr.c
+++ b/src/llvm/llvm-ir/expr.c
@@ -2,8 +2,8 @@
 // Created by servostar on 5/28/24.
 //
 
-#include <llvm/expr.h>
-#include <llvm/types.h>
+#include <llvm/llvm-ir/expr.h>
+#include <llvm/llvm-ir/types.h>
 #include <sys/log.h>
 
 BackendError impl_bitwise_operation([[maybe_unused]] LLVMBackendCompileUnit *unit,
diff --git a/src/llvm/expr.h b/src/llvm/llvm-ir/expr.h
similarity index 92%
rename from src/llvm/expr.h
rename to src/llvm/llvm-ir/expr.h
index c0c8d47..15df434 100644
--- a/src/llvm/expr.h
+++ b/src/llvm/llvm-ir/expr.h
@@ -7,7 +7,7 @@
 
 #include <codegen/backend.h>
 #include <llvm-c/Types.h>
-#include <llvm/func.h>
+#include <llvm/llvm-ir/func.h>
 #include <llvm/parser.h>
 
 BackendError impl_expr(LLVMBackendCompileUnit *unit, LLVMLocalScope *scope,
diff --git a/src/llvm/func.c b/src/llvm/llvm-ir/func.c
similarity index 98%
rename from src/llvm/func.c
rename to src/llvm/llvm-ir/func.c
index fc21f27..107b697 100644
--- a/src/llvm/func.c
+++ b/src/llvm/llvm-ir/func.c
@@ -3,9 +3,9 @@
 #include <codegen/backend.h>
 #include <llvm-c/Core.h>
 #include <llvm-c/Types.h>
-#include <llvm/func.h>
+#include <llvm/llvm-ir/func.h>
 #include <llvm/parser.h>
-#include <llvm/types.h>
+#include <llvm/llvm-ir/types.h>
 #include <set/types.h>
 #include <sys/log.h>
 
diff --git a/src/llvm/func.h b/src/llvm/llvm-ir/func.h
similarity index 100%
rename from src/llvm/func.h
rename to src/llvm/llvm-ir/func.h
diff --git a/src/llvm/stmt.c b/src/llvm/llvm-ir/stmt.c
similarity index 98%
rename from src/llvm/stmt.c
rename to src/llvm/llvm-ir/stmt.c
index 0e1b470..8692168 100644
--- a/src/llvm/stmt.c
+++ b/src/llvm/llvm-ir/stmt.c
@@ -3,11 +3,11 @@
 //
 
 #include <codegen/backend.h>
-#include <llvm/func.h>
-#include <llvm/parser.h>
-#include <llvm/stmt.h>
-#include <llvm/expr.h>
 #include <sys/log.h>
+#include <llvm/parser.h>
+#include <llvm/llvm-ir/stmt.h>
+#include <llvm/llvm-ir/expr.h>
+#include <llvm/llvm-ir/func.h>
 
 BackendError impl_assign_stmt([[maybe_unused]] LLVMBackendCompileUnit *unit,
                               const LLVMBuilderRef builder, const LLVMLocalScope *scope,
diff --git a/src/llvm/stmt.h b/src/llvm/llvm-ir/stmt.h
similarity index 100%
rename from src/llvm/stmt.h
rename to src/llvm/llvm-ir/stmt.h
diff --git a/src/llvm/types.c b/src/llvm/llvm-ir/types.c
similarity index 99%
rename from src/llvm/types.c
rename to src/llvm/llvm-ir/types.c
index 65fd661..76dcce1 100644
--- a/src/llvm/types.c
+++ b/src/llvm/llvm-ir/types.c
@@ -1,10 +1,10 @@
 #include <codegen/backend.h>
-#include <llvm-c/Core.h>
-#include <llvm-c/Types.h>
-#include <llvm/parser.h>
-#include <llvm/types.h>
 #include <set/types.h>
 #include <sys/log.h>
+#include <llvm/parser.h>
+#include <llvm/llvm-ir/types.h>
+#include <llvm-c/Core.h>
+#include <llvm-c/Types.h>
 
 #define BASE_BYTES 4
 #define BITS_PER_BYTE 8
diff --git a/src/llvm/types.h b/src/llvm/llvm-ir/types.h
similarity index 100%
rename from src/llvm/types.h
rename to src/llvm/llvm-ir/types.h
diff --git a/src/llvm/variables.c b/src/llvm/llvm-ir/variables.c
similarity index 98%
rename from src/llvm/variables.c
rename to src/llvm/llvm-ir/variables.c
index 5519313..595dd35 100644
--- a/src/llvm/variables.c
+++ b/src/llvm/llvm-ir/variables.c
@@ -1,11 +1,11 @@
 
 #include <codegen/backend.h>
-#include <llvm-c/Core.h>
-#include <llvm-c/Types.h>
-#include <llvm/types.h>
-#include <llvm/variables.h>
 #include <set/types.h>
 #include <sys/log.h>
+#include <llvm/llvm-ir/variables.h>
+#include <llvm-c/Core.h>
+#include <llvm-c/Types.h>
+#include <llvm/llvm-ir/types.h>
 
 BackendError impl_global_declaration(LLVMBackendCompileUnit* unit,
                                      LLVMGlobalScope* scope,
diff --git a/src/llvm/variables.h b/src/llvm/llvm-ir/variables.h
similarity index 100%
rename from src/llvm/variables.h
rename to src/llvm/llvm-ir/variables.h
diff --git a/src/llvm/parser.c b/src/llvm/parser.c
index dbe914b..57c989e 100644
--- a/src/llvm/parser.c
+++ b/src/llvm/parser.c
@@ -6,9 +6,9 @@
 #include <llvm-c/Types.h>
 #include <llvm/backend.h>
 #include <llvm/parser.h>
-#include <llvm/types.h>
-#include <llvm/variables.h>
-#include <llvm/func.h>
+#include <llvm/llvm-ir/types.h>
+#include <llvm/llvm-ir/variables.h>
+#include <llvm/llvm-ir/func.h>
 #include <set/types.h>
 #include <stdio.h>
 #include <stdlib.h>