diff --git a/src/vm.c b/src/vm.c
index a425ccc..7998125 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -193,26 +193,26 @@ void vm_run(VM *vm, Bytecode *entry) {
 
         switch (inst.op) {
             /* All opcode handlers as .c includes */
-            #include "vm_case_nop.c"
-            #include "vm_case_load_const.c"
-            #include "vm_case_load_local.c"
-            #include "vm_case_store_local.c"
-            #include "vm_case_add.c"
-            #include "vm_case_sub.c"
+            #include "vm_cases/core/vm_case_nop.c"
+            #include "vm_cases/core/vm_case_load_const.c"
+            #include "vm_cases/core/vm_case_load_local.c"
+            #include "vm_cases/core/vm_case_store_local.c"
+            #include "vm_cases/arithmetic/vm_case_add.c"
+            #include "vm_cases/arithmetic/vm_case_sub.c"
             #include "vm_case_mul.c"
             #include "vm_case_div.c"
             #include "vm_case_lt.c"
             #include "vm_case_lte.c"
-            #include "vm_case_jump.c"
+            #include "vm_cases/core/vm_case_jump.c"
             #include "vm_case_gt.c"
             #include "vm_case_gte.c"
-            #include "vm_case_eq.c"
+            #include "vm_cases/logic/vm_case_eq.c"
             #include "vm_case_neq.c"
-            #include "vm_case_jump_if_false.c"
+            #include "vm_cases/core/vm_case_jump_if_false.c"
             #include "vm_case_call.c"
             #include "vm_case_return.c"
             #include "vm_case_print.c"
-            #include "vm_case_halt.c"
+            #include "vm_cases/core/vm_case_halt.c"
             #include "vm_case_pop.c"
             #include "vm_case_dup.c"
             #include "vm_case_swap.c"
diff --git a/src/vm_case_add.c b/src/vm_cases/arithmetic/vm_case_add.c
similarity index 100%
rename from src/vm_case_add.c
rename to src/vm_cases/arithmetic/vm_case_add.c
diff --git a/src/vm_case_sub.c b/src/vm_cases/arithmetic/vm_case_sub.c
similarity index 100%
rename from src/vm_case_sub.c
rename to src/vm_cases/arithmetic/vm_case_sub.c
diff --git a/src/vm_case_halt.c b/src/vm_cases/core/vm_case_halt.c
similarity index 100%
rename from src/vm_case_halt.c
rename to src/vm_cases/core/vm_case_halt.c
diff --git a/src/vm_case_jump.c b/src/vm_cases/core/vm_case_jump.c
similarity index 100%
rename from src/vm_case_jump.c
rename to src/vm_cases/core/vm_case_jump.c
diff --git a/src/vm_case_jump_if_false.c b/src/vm_cases/core/vm_case_jump_if_false.c
similarity index 100%
rename from src/vm_case_jump_if_false.c
rename to src/vm_cases/core/vm_case_jump_if_false.c
diff --git a/src/vm_case_load_const.c b/src/vm_cases/core/vm_case_load_const.c
similarity index 100%
rename from src/vm_case_load_const.c
rename to src/vm_cases/core/vm_case_load_const.c
diff --git a/src/vm_case_load_local.c b/src/vm_cases/core/vm_case_load_local.c
similarity index 100%
rename from src/vm_case_load_local.c
rename to src/vm_cases/core/vm_case_load_local.c
diff --git a/src/vm_case_nop.c b/src/vm_cases/core/vm_case_nop.c
similarity index 100%
rename from src/vm_case_nop.c
rename to src/vm_cases/core/vm_case_nop.c
diff --git a/src/vm_case_store_local.c b/src/vm_cases/core/vm_case_store_local.c
similarity index 100%
rename from src/vm_case_store_local.c
rename to src/vm_cases/core/vm_case_store_local.c
diff --git a/src/vm_case_eq.c b/src/vm_cases/logic/vm_case_eq.c
similarity index 100%
rename from src/vm_case_eq.c
rename to src/vm_cases/logic/vm_case_eq.c