diff --git a/c64/basic/math/bba2.interop b/c64/basic/math_mov/bba2.interop
similarity index 100%
rename from c64/basic/math/bba2.interop
rename to c64/basic/math_mov/bba2.interop
diff --git a/c64/basic/math/bba2.mov_MEM_FAC1.jmp.s b/c64/basic/math_mov/bba2.mov_MEM_FAC1.jmp.s
similarity index 100%
rename from c64/basic/math/bba2.mov_MEM_FAC1.jmp.s
rename to c64/basic/math_mov/bba2.mov_MEM_FAC1.jmp.s
diff --git a/c64/basic/math/bbc7.interop b/c64/basic/math_mov/bbc7.interop
similarity index 100%
rename from c64/basic/math/bbc7.interop
rename to c64/basic/math_mov/bbc7.interop
diff --git a/c64/basic/math/bbc7.mov_r_FAC1_TMP2.s b/c64/basic/math_mov/bbc7.mov_r_FAC1_TMP2.s
similarity index 100%
rename from c64/basic/math/bbc7.mov_r_FAC1_TMP2.s
rename to c64/basic/math_mov/bbc7.mov_r_FAC1_TMP2.s
diff --git a/c64/basic/math/bbca.interop b/c64/basic/math_mov/bbca.interop
similarity index 100%
rename from c64/basic/math/bbca.interop
rename to c64/basic/math_mov/bbca.interop
diff --git a/c64/basic/math/bbca.mov_r_FAC1_TMP1.s b/c64/basic/math_mov/bbca.mov_r_FAC1_TMP1.s
similarity index 100%
rename from c64/basic/math/bbca.mov_r_FAC1_TMP1.s
rename to c64/basic/math_mov/bbca.mov_r_FAC1_TMP1.s
diff --git a/c64/basic/math/bbd0.interop b/c64/basic/math_mov/bbd0.interop
similarity index 100%
rename from c64/basic/math/bbd0.interop
rename to c64/basic/math_mov/bbd0.interop
diff --git a/c64/basic/math/bbd0.mov_r_FAC1_VAR.s b/c64/basic/math_mov/bbd0.mov_r_FAC1_VAR.s
similarity index 100%
rename from c64/basic/math/bbd0.mov_r_FAC1_VAR.s
rename to c64/basic/math_mov/bbd0.mov_r_FAC1_VAR.s
diff --git a/c64/basic/math/bbd4.interop b/c64/basic/math_mov/bbd4.interop
similarity index 100%
rename from c64/basic/math/bbd4.interop
rename to c64/basic/math_mov/bbd4.interop
diff --git a/c64/basic/math/bbd4.mov_r_FAC1_MEM.s b/c64/basic/math_mov/bbd4.mov_r_FAC1_MEM.s
similarity index 100%
rename from c64/basic/math/bbd4.mov_r_FAC1_MEM.s
rename to c64/basic/math_mov/bbd4.mov_r_FAC1_MEM.s
diff --git a/c64/basic/math/bbfc.interop b/c64/basic/math_mov/bbfc.interop
similarity index 100%
rename from c64/basic/math/bbfc.interop
rename to c64/basic/math_mov/bbfc.interop
diff --git a/c64/basic/math/bbfc.mov_FAC2_FAC1.s b/c64/basic/math_mov/bbfc.mov_FAC2_FAC1.s
similarity index 100%
rename from c64/basic/math/bbfc.mov_FAC2_FAC1.s
rename to c64/basic/math_mov/bbfc.mov_FAC2_FAC1.s
diff --git a/c64/basic/math/bc0c.interop b/c64/basic/math_mov/bc0c.interop
similarity index 100%
rename from c64/basic/math/bc0c.interop
rename to c64/basic/math_mov/bc0c.interop
diff --git a/c64/basic/math/bc0c.mov_r_FAC1_FAC2.s b/c64/basic/math_mov/bc0c.mov_r_FAC1_FAC2.s
similarity index 100%
rename from c64/basic/math/bc0c.mov_r_FAC1_FAC2.s
rename to c64/basic/math_mov/bc0c.mov_r_FAC1_FAC2.s
diff --git a/c64/basic/math/bc0f.interop b/c64/basic/math_mov/bc0f.interop
similarity index 100%
rename from c64/basic/math/bc0f.interop
rename to c64/basic/math_mov/bc0f.interop
diff --git a/c64/basic/math/bc0f.mov_FAC1_FAC2.jmp.s b/c64/basic/math_mov/bc0f.mov_FAC1_FAC2.jmp.s
similarity index 100%
rename from c64/basic/math/bc0f.mov_FAC1_FAC2.jmp.s
rename to c64/basic/math_mov/bc0f.mov_FAC1_FAC2.jmp.s
diff --git a/c64/basic/math/mov_FAC1_FAC2.s b/c64/basic/math_mov/mov_FAC1_FAC2.s
similarity index 100%
rename from c64/basic/math/mov_FAC1_FAC2.s
rename to c64/basic/math_mov/mov_FAC1_FAC2.s
diff --git a/c64/basic/math/mov_FAC1_MEM.s b/c64/basic/math_mov/mov_FAC1_MEM.s
similarity index 100%
rename from c64/basic/math/mov_FAC1_MEM.s
rename to c64/basic/math_mov/mov_FAC1_MEM.s
diff --git a/c64/basic/math/mov_FAC2_FAC1.s b/c64/basic/math_mov/mov_FAC2_FAC1.s
similarity index 100%
rename from c64/basic/math/mov_FAC2_FAC1.s
rename to c64/basic/math_mov/mov_FAC2_FAC1.s
diff --git a/c64/basic/math/mov_MEM_FAC1.s b/c64/basic/math_mov/mov_MEM_FAC1.s
similarity index 100%
rename from c64/basic/math/mov_MEM_FAC1.s
rename to c64/basic/math_mov/mov_MEM_FAC1.s
diff --git a/c64/basic/math/mov_MEM_FAC2.s b/c64/basic/math_mov/mov_MEM_FAC2.s
similarity index 100%
rename from c64/basic/math/mov_MEM_FAC2.s
rename to c64/basic/math_mov/mov_MEM_FAC2.s
diff --git a/c64/basic/math/mov_r_FAC1_TMP1.s b/c64/basic/math_mov/mov_r_FAC1_TMP1.s
similarity index 100%
rename from c64/basic/math/mov_r_FAC1_TMP1.s
rename to c64/basic/math_mov/mov_r_FAC1_TMP1.s
diff --git a/c64/basic/math/mov_r_FAC1_TMP2.s b/c64/basic/math_mov/mov_r_FAC1_TMP2.s
similarity index 100%
rename from c64/basic/math/mov_r_FAC1_TMP2.s
rename to c64/basic/math_mov/mov_r_FAC1_TMP2.s