diff --git a/src/arch/arm64/Registers.go b/src/arm64/Registers.go
similarity index 100%
rename from src/arch/arm64/Registers.go
rename to src/arm64/Registers.go
diff --git a/src/arch/arm64/Registers_test.go b/src/arm64/Registers_test.go
similarity index 80%
rename from src/arch/arm64/Registers_test.go
rename to src/arm64/Registers_test.go
index 75f5b7c..14ce983 100644
--- a/src/arch/arm64/Registers_test.go
+++ b/src/arm64/Registers_test.go
@@ -3,7 +3,7 @@ package arm64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/arm64"
+	"git.akyoto.dev/cli/q/src/arm64"
 	"git.akyoto.dev/go/assert"
 )
 
diff --git a/src/asm/Finalize.go b/src/asm/Finalize.go
index 492f722..3ae543a 100644
--- a/src/asm/Finalize.go
+++ b/src/asm/Finalize.go
@@ -6,11 +6,11 @@ import (
 	"slices"
 	"strings"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/config"
 	"git.akyoto.dev/cli/q/src/dll"
 	"git.akyoto.dev/cli/q/src/exe"
 	"git.akyoto.dev/cli/q/src/sizeof"
+	"git.akyoto.dev/cli/q/src/x64"
 )
 
 // Finalize generates the final machine code.
diff --git a/src/compiler/Result.go b/src/compiler/Result.go
index 121d55a..7343241 100644
--- a/src/compiler/Result.go
+++ b/src/compiler/Result.go
@@ -6,17 +6,17 @@ import (
 	"io"
 	"os"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/asm"
 	"git.akyoto.dev/cli/q/src/config"
 	"git.akyoto.dev/cli/q/src/core"
 	"git.akyoto.dev/cli/q/src/dll"
-	"git.akyoto.dev/cli/q/src/exe/elf"
-	"git.akyoto.dev/cli/q/src/exe/macho"
-	"git.akyoto.dev/cli/q/src/exe/pe"
-	"git.akyoto.dev/cli/q/src/os/linux"
-	"git.akyoto.dev/cli/q/src/os/mac"
-	"git.akyoto.dev/cli/q/src/os/windows"
+	"git.akyoto.dev/cli/q/src/elf"
+	"git.akyoto.dev/cli/q/src/linux"
+	"git.akyoto.dev/cli/q/src/mac"
+	"git.akyoto.dev/cli/q/src/macho"
+	"git.akyoto.dev/cli/q/src/pe"
+	"git.akyoto.dev/cli/q/src/windows"
+	"git.akyoto.dev/cli/q/src/x64"
 )
 
 // Result contains all the compiled functions in a build.
diff --git a/src/core/CompileAssignDivision.go b/src/core/CompileAssignDivision.go
index 7531001..22f68fd 100644
--- a/src/core/CompileAssignDivision.go
+++ b/src/core/CompileAssignDivision.go
@@ -1,10 +1,10 @@
 package core
 
 import (
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/asm"
 	"git.akyoto.dev/cli/q/src/ast"
 	"git.akyoto.dev/cli/q/src/errors"
+	"git.akyoto.dev/cli/q/src/x64"
 )
 
 // CompileAssignDivision compiles an assign statement that has quotient and remainder on the left side and division on the right.
diff --git a/src/core/CompileCall.go b/src/core/CompileCall.go
index 2bf126a..fe63447 100644
--- a/src/core/CompileCall.go
+++ b/src/core/CompileCall.go
@@ -6,8 +6,8 @@ import (
 	"git.akyoto.dev/cli/q/src/asm"
 	"git.akyoto.dev/cli/q/src/errors"
 	"git.akyoto.dev/cli/q/src/expression"
-	"git.akyoto.dev/cli/q/src/os/windows"
 	"git.akyoto.dev/cli/q/src/types"
+	"git.akyoto.dev/cli/q/src/windows"
 )
 
 // CompileCall executes a function call.
diff --git a/src/core/ExecuteRegisterNumber.go b/src/core/ExecuteRegisterNumber.go
index e3cfda4..0714751 100644
--- a/src/core/ExecuteRegisterNumber.go
+++ b/src/core/ExecuteRegisterNumber.go
@@ -1,11 +1,11 @@
 package core
 
 import (
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/asm"
 	"git.akyoto.dev/cli/q/src/cpu"
 	"git.akyoto.dev/cli/q/src/errors"
 	"git.akyoto.dev/cli/q/src/token"
+	"git.akyoto.dev/cli/q/src/x64"
 )
 
 // ExecuteRegisterNumber performs an operation on a register and a number.
diff --git a/src/core/ExecuteRegisterRegister.go b/src/core/ExecuteRegisterRegister.go
index 738ed9c..3add7ef 100644
--- a/src/core/ExecuteRegisterRegister.go
+++ b/src/core/ExecuteRegisterRegister.go
@@ -1,11 +1,11 @@
 package core
 
 import (
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/asm"
 	"git.akyoto.dev/cli/q/src/cpu"
 	"git.akyoto.dev/cli/q/src/errors"
 	"git.akyoto.dev/cli/q/src/token"
+	"git.akyoto.dev/cli/q/src/x64"
 )
 
 // ExecuteRegisterRegister performs an operation on two registers.
diff --git a/src/core/NewFunction.go b/src/core/NewFunction.go
index 0f7bccc..5e5a4ae 100644
--- a/src/core/NewFunction.go
+++ b/src/core/NewFunction.go
@@ -1,13 +1,13 @@
 package core
 
 import (
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/asm"
 	"git.akyoto.dev/cli/q/src/cpu"
 	"git.akyoto.dev/cli/q/src/fs"
 	"git.akyoto.dev/cli/q/src/register"
 	"git.akyoto.dev/cli/q/src/scope"
 	"git.akyoto.dev/cli/q/src/token"
+	"git.akyoto.dev/cli/q/src/x64"
 )
 
 // NewFunction creates a new function.
diff --git a/src/exe/elf/Constants.go b/src/elf/Constants.go
similarity index 100%
rename from src/exe/elf/Constants.go
rename to src/elf/Constants.go
diff --git a/src/exe/elf/ELF.go b/src/elf/ELF.go
similarity index 100%
rename from src/exe/elf/ELF.go
rename to src/elf/ELF.go
diff --git a/src/exe/elf/ELF_test.go b/src/elf/ELF_test.go
similarity index 76%
rename from src/exe/elf/ELF_test.go
rename to src/elf/ELF_test.go
index aa28d0d..c813536 100644
--- a/src/exe/elf/ELF_test.go
+++ b/src/elf/ELF_test.go
@@ -4,7 +4,7 @@ import (
 	"io"
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/exe/elf"
+	"git.akyoto.dev/cli/q/src/elf"
 )
 
 func TestWrite(t *testing.T) {
diff --git a/src/exe/elf/Header.go b/src/elf/Header.go
similarity index 100%
rename from src/exe/elf/Header.go
rename to src/elf/Header.go
diff --git a/src/exe/elf/ProgramHeader.go b/src/elf/ProgramHeader.go
similarity index 100%
rename from src/exe/elf/ProgramHeader.go
rename to src/elf/ProgramHeader.go
diff --git a/src/exe/elf/SectionHeader.go b/src/elf/SectionHeader.go
similarity index 100%
rename from src/exe/elf/SectionHeader.go
rename to src/elf/SectionHeader.go
diff --git a/src/exe/elf/elf.md b/src/elf/elf.md
similarity index 100%
rename from src/exe/elf/elf.md
rename to src/elf/elf.md
diff --git a/src/os/linux/Syscall.go b/src/linux/Syscall.go
similarity index 100%
rename from src/os/linux/Syscall.go
rename to src/linux/Syscall.go
diff --git a/src/os/mac/Syscall.go b/src/mac/Syscall.go
similarity index 100%
rename from src/os/mac/Syscall.go
rename to src/mac/Syscall.go
diff --git a/src/exe/macho/Constants.go b/src/macho/Constants.go
similarity index 100%
rename from src/exe/macho/Constants.go
rename to src/macho/Constants.go
diff --git a/src/exe/macho/Header.go b/src/macho/Header.go
similarity index 100%
rename from src/exe/macho/Header.go
rename to src/macho/Header.go
diff --git a/src/exe/macho/LoadCommand.go b/src/macho/LoadCommand.go
similarity index 100%
rename from src/exe/macho/LoadCommand.go
rename to src/macho/LoadCommand.go
diff --git a/src/exe/macho/MachO.go b/src/macho/MachO.go
similarity index 100%
rename from src/exe/macho/MachO.go
rename to src/macho/MachO.go
diff --git a/src/exe/macho/MachO_test.go b/src/macho/MachO_test.go
similarity index 75%
rename from src/exe/macho/MachO_test.go
rename to src/macho/MachO_test.go
index 29b63c5..a026960 100644
--- a/src/exe/macho/MachO_test.go
+++ b/src/macho/MachO_test.go
@@ -4,7 +4,7 @@ import (
 	"io"
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/exe/macho"
+	"git.akyoto.dev/cli/q/src/macho"
 )
 
 func TestWrite(t *testing.T) {
diff --git a/src/exe/macho/Segment64.go b/src/macho/Segment64.go
similarity index 100%
rename from src/exe/macho/Segment64.go
rename to src/macho/Segment64.go
diff --git a/src/exe/macho/Thread.go b/src/macho/Thread.go
similarity index 100%
rename from src/exe/macho/Thread.go
rename to src/macho/Thread.go
diff --git a/src/exe/macho/macho.md b/src/macho/macho.md
similarity index 100%
rename from src/exe/macho/macho.md
rename to src/macho/macho.md
diff --git a/src/exe/pe/Constants.go b/src/pe/Constants.go
similarity index 100%
rename from src/exe/pe/Constants.go
rename to src/pe/Constants.go
diff --git a/src/exe/pe/DLLImport.go b/src/pe/DLLImport.go
similarity index 100%
rename from src/exe/pe/DLLImport.go
rename to src/pe/DLLImport.go
diff --git a/src/exe/pe/DOSHeader.go b/src/pe/DOSHeader.go
similarity index 100%
rename from src/exe/pe/DOSHeader.go
rename to src/pe/DOSHeader.go
diff --git a/src/exe/pe/DataDirectory.go b/src/pe/DataDirectory.go
similarity index 100%
rename from src/exe/pe/DataDirectory.go
rename to src/pe/DataDirectory.go
diff --git a/src/exe/pe/EXE.go b/src/pe/EXE.go
similarity index 100%
rename from src/exe/pe/EXE.go
rename to src/pe/EXE.go
diff --git a/src/exe/pe/EXE_test.go b/src/pe/EXE_test.go
similarity index 76%
rename from src/exe/pe/EXE_test.go
rename to src/pe/EXE_test.go
index 5f8d07e..64a6356 100644
--- a/src/exe/pe/EXE_test.go
+++ b/src/pe/EXE_test.go
@@ -4,7 +4,7 @@ import (
 	"io"
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/exe/pe"
+	"git.akyoto.dev/cli/q/src/pe"
 )
 
 func TestWrite(t *testing.T) {
diff --git a/src/exe/pe/NTHeader.go b/src/pe/NTHeader.go
similarity index 100%
rename from src/exe/pe/NTHeader.go
rename to src/pe/NTHeader.go
diff --git a/src/exe/pe/OptionalHeader64.go b/src/pe/OptionalHeader64.go
similarity index 100%
rename from src/exe/pe/OptionalHeader64.go
rename to src/pe/OptionalHeader64.go
diff --git a/src/exe/pe/SectionHeader.go b/src/pe/SectionHeader.go
similarity index 100%
rename from src/exe/pe/SectionHeader.go
rename to src/pe/SectionHeader.go
diff --git a/src/exe/pe/pe.md b/src/pe/pe.md
similarity index 100%
rename from src/exe/pe/pe.md
rename to src/pe/pe.md
diff --git a/src/arch/riscv/Registers.go b/src/riscv/Registers.go
similarity index 100%
rename from src/arch/riscv/Registers.go
rename to src/riscv/Registers.go
diff --git a/src/arch/riscv/Registers_test.go b/src/riscv/Registers_test.go
similarity index 80%
rename from src/arch/riscv/Registers_test.go
rename to src/riscv/Registers_test.go
index bc74568..efef49d 100644
--- a/src/arch/riscv/Registers_test.go
+++ b/src/riscv/Registers_test.go
@@ -3,7 +3,7 @@ package riscv_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/riscv"
+	"git.akyoto.dev/cli/q/src/riscv"
 	"git.akyoto.dev/go/assert"
 )
 
diff --git a/src/scanner/scanFile.go b/src/scanner/scanFile.go
index 4f7c6e1..6d57c0a 100644
--- a/src/scanner/scanFile.go
+++ b/src/scanner/scanFile.go
@@ -4,7 +4,6 @@ import (
 	"os"
 	"path/filepath"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/config"
 	"git.akyoto.dev/cli/q/src/core"
 	"git.akyoto.dev/cli/q/src/errors"
@@ -12,6 +11,7 @@ import (
 	"git.akyoto.dev/cli/q/src/scope"
 	"git.akyoto.dev/cli/q/src/token"
 	"git.akyoto.dev/cli/q/src/types"
+	"git.akyoto.dev/cli/q/src/x64"
 )
 
 // scanFile scans a single file.
diff --git a/src/os/windows/Registers.go b/src/windows/Registers.go
similarity index 84%
rename from src/os/windows/Registers.go
rename to src/windows/Registers.go
index ffbbd21..1043298 100644
--- a/src/os/windows/Registers.go
+++ b/src/windows/Registers.go
@@ -1,9 +1,9 @@
 package windows
 
 import (
-	"git.akyoto.dev/cli/q/src/arch/arm64"
-	"git.akyoto.dev/cli/q/src/arch/x64"
+	"git.akyoto.dev/cli/q/src/arm64"
 	"git.akyoto.dev/cli/q/src/cpu"
+	"git.akyoto.dev/cli/q/src/x64"
 )
 
 var (
diff --git a/src/arch/x64/Add.go b/src/x64/Add.go
similarity index 100%
rename from src/arch/x64/Add.go
rename to src/x64/Add.go
diff --git a/src/arch/x64/Add_test.go b/src/x64/Add_test.go
similarity index 98%
rename from src/arch/x64/Add_test.go
rename to src/x64/Add_test.go
index 52d6645..134e09e 100644
--- a/src/arch/x64/Add_test.go
+++ b/src/x64/Add_test.go
@@ -3,8 +3,8 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/cpu"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 
diff --git a/src/arch/x64/AlignStack.go b/src/x64/AlignStack.go
similarity index 100%
rename from src/arch/x64/AlignStack.go
rename to src/x64/AlignStack.go
diff --git a/src/arch/x64/And.go b/src/x64/And.go
similarity index 100%
rename from src/arch/x64/And.go
rename to src/x64/And.go
diff --git a/src/arch/x64/And_test.go b/src/x64/And_test.go
similarity index 98%
rename from src/arch/x64/And_test.go
rename to src/x64/And_test.go
index e0e60c8..249d7b8 100644
--- a/src/arch/x64/And_test.go
+++ b/src/x64/And_test.go
@@ -3,8 +3,8 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/cpu"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 
diff --git a/src/arch/x64/Call.go b/src/x64/Call.go
similarity index 100%
rename from src/arch/x64/Call.go
rename to src/x64/Call.go
diff --git a/src/arch/x64/Compare.go b/src/x64/Compare.go
similarity index 100%
rename from src/arch/x64/Compare.go
rename to src/x64/Compare.go
diff --git a/src/arch/x64/Compare_test.go b/src/x64/Compare_test.go
similarity index 98%
rename from src/arch/x64/Compare_test.go
rename to src/x64/Compare_test.go
index 6372665..0105ed0 100644
--- a/src/arch/x64/Compare_test.go
+++ b/src/x64/Compare_test.go
@@ -3,8 +3,8 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/cpu"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 
diff --git a/src/arch/x64/Div.go b/src/x64/Div.go
similarity index 100%
rename from src/arch/x64/Div.go
rename to src/x64/Div.go
diff --git a/src/arch/x64/Div_test.go b/src/x64/Div_test.go
similarity index 96%
rename from src/arch/x64/Div_test.go
rename to src/x64/Div_test.go
index 3598dbf..de684b4 100644
--- a/src/arch/x64/Div_test.go
+++ b/src/x64/Div_test.go
@@ -3,8 +3,8 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/cpu"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 
diff --git a/src/arch/x64/ExtendRAXToRDX.go b/src/x64/ExtendRAXToRDX.go
similarity index 100%
rename from src/arch/x64/ExtendRAXToRDX.go
rename to src/x64/ExtendRAXToRDX.go
diff --git a/src/arch/x64/Jump.go b/src/x64/Jump.go
similarity index 100%
rename from src/arch/x64/Jump.go
rename to src/x64/Jump.go
diff --git a/src/arch/x64/Jump_test.go b/src/x64/Jump_test.go
similarity index 96%
rename from src/arch/x64/Jump_test.go
rename to src/x64/Jump_test.go
index fe40c50..4dde162 100644
--- a/src/arch/x64/Jump_test.go
+++ b/src/x64/Jump_test.go
@@ -3,7 +3,7 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 
diff --git a/src/arch/x64/Load.go b/src/x64/Load.go
similarity index 100%
rename from src/arch/x64/Load.go
rename to src/x64/Load.go
diff --git a/src/arch/x64/Load_test.go b/src/x64/Load_test.go
similarity index 99%
rename from src/arch/x64/Load_test.go
rename to src/x64/Load_test.go
index 31330c6..9585f15 100644
--- a/src/arch/x64/Load_test.go
+++ b/src/x64/Load_test.go
@@ -3,8 +3,8 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/cpu"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 
diff --git a/src/arch/x64/ModRM.go b/src/x64/ModRM.go
similarity index 100%
rename from src/arch/x64/ModRM.go
rename to src/x64/ModRM.go
diff --git a/src/arch/x64/ModRM_test.go b/src/x64/ModRM_test.go
similarity index 96%
rename from src/arch/x64/ModRM_test.go
rename to src/x64/ModRM_test.go
index edcaffe..09f72eb 100644
--- a/src/arch/x64/ModRM_test.go
+++ b/src/x64/ModRM_test.go
@@ -3,7 +3,7 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 
diff --git a/src/arch/x64/Move.go b/src/x64/Move.go
similarity index 100%
rename from src/arch/x64/Move.go
rename to src/x64/Move.go
diff --git a/src/arch/x64/Move_test.go b/src/x64/Move_test.go
similarity index 99%
rename from src/arch/x64/Move_test.go
rename to src/x64/Move_test.go
index faf9fcc..071e05b 100644
--- a/src/arch/x64/Move_test.go
+++ b/src/x64/Move_test.go
@@ -3,8 +3,8 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/cpu"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 
diff --git a/src/arch/x64/Mul.go b/src/x64/Mul.go
similarity index 100%
rename from src/arch/x64/Mul.go
rename to src/x64/Mul.go
diff --git a/src/arch/x64/Mul_test.go b/src/x64/Mul_test.go
similarity index 98%
rename from src/arch/x64/Mul_test.go
rename to src/x64/Mul_test.go
index cd8da70..03ffae1 100644
--- a/src/arch/x64/Mul_test.go
+++ b/src/x64/Mul_test.go
@@ -3,8 +3,8 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/cpu"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 
diff --git a/src/arch/x64/Negate.go b/src/x64/Negate.go
similarity index 100%
rename from src/arch/x64/Negate.go
rename to src/x64/Negate.go
diff --git a/src/arch/x64/Negate_test.go b/src/x64/Negate_test.go
similarity index 96%
rename from src/arch/x64/Negate_test.go
rename to src/x64/Negate_test.go
index 98aa13e..625e601 100644
--- a/src/arch/x64/Negate_test.go
+++ b/src/x64/Negate_test.go
@@ -3,8 +3,8 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/cpu"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 
diff --git a/src/arch/x64/Or.go b/src/x64/Or.go
similarity index 100%
rename from src/arch/x64/Or.go
rename to src/x64/Or.go
diff --git a/src/arch/x64/Or_test.go b/src/x64/Or_test.go
similarity index 98%
rename from src/arch/x64/Or_test.go
rename to src/x64/Or_test.go
index 89bdc5d..d85065a 100644
--- a/src/arch/x64/Or_test.go
+++ b/src/x64/Or_test.go
@@ -3,8 +3,8 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/cpu"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 
diff --git a/src/arch/x64/Pop.go b/src/x64/Pop.go
similarity index 100%
rename from src/arch/x64/Pop.go
rename to src/x64/Pop.go
diff --git a/src/arch/x64/Pop_test.go b/src/x64/Pop_test.go
similarity index 95%
rename from src/arch/x64/Pop_test.go
rename to src/x64/Pop_test.go
index 0a4ce98..446eebe 100644
--- a/src/arch/x64/Pop_test.go
+++ b/src/x64/Pop_test.go
@@ -3,8 +3,8 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/cpu"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 
diff --git a/src/arch/x64/Push.go b/src/x64/Push.go
similarity index 100%
rename from src/arch/x64/Push.go
rename to src/x64/Push.go
diff --git a/src/arch/x64/Push_test.go b/src/x64/Push_test.go
similarity index 95%
rename from src/arch/x64/Push_test.go
rename to src/x64/Push_test.go
index 0dc092b..a49095d 100644
--- a/src/arch/x64/Push_test.go
+++ b/src/x64/Push_test.go
@@ -3,8 +3,8 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/cpu"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 
diff --git a/src/arch/x64/REX.go b/src/x64/REX.go
similarity index 100%
rename from src/arch/x64/REX.go
rename to src/x64/REX.go
diff --git a/src/arch/x64/REX_test.go b/src/x64/REX_test.go
similarity index 95%
rename from src/arch/x64/REX_test.go
rename to src/x64/REX_test.go
index b212b24..c754354 100644
--- a/src/arch/x64/REX_test.go
+++ b/src/x64/REX_test.go
@@ -3,7 +3,7 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 
diff --git a/src/arch/x64/Registers.go b/src/x64/Registers.go
similarity index 100%
rename from src/arch/x64/Registers.go
rename to src/x64/Registers.go
diff --git a/src/arch/x64/Registers_test.go b/src/x64/Registers_test.go
similarity index 81%
rename from src/arch/x64/Registers_test.go
rename to src/x64/Registers_test.go
index bb8ff19..626bb84 100644
--- a/src/arch/x64/Registers_test.go
+++ b/src/x64/Registers_test.go
@@ -3,7 +3,7 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 
diff --git a/src/arch/x64/Return.go b/src/x64/Return.go
similarity index 100%
rename from src/arch/x64/Return.go
rename to src/x64/Return.go
diff --git a/src/arch/x64/SIB.go b/src/x64/SIB.go
similarity index 100%
rename from src/arch/x64/SIB.go
rename to src/x64/SIB.go
diff --git a/src/arch/x64/SIB_test.go b/src/x64/SIB_test.go
similarity index 96%
rename from src/arch/x64/SIB_test.go
rename to src/x64/SIB_test.go
index 7dedf6e..911b133 100644
--- a/src/arch/x64/SIB_test.go
+++ b/src/x64/SIB_test.go
@@ -3,7 +3,7 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 
diff --git a/src/arch/x64/Shift.go b/src/x64/Shift.go
similarity index 100%
rename from src/arch/x64/Shift.go
rename to src/x64/Shift.go
diff --git a/src/arch/x64/Shift_test.go b/src/x64/Shift_test.go
similarity index 98%
rename from src/arch/x64/Shift_test.go
rename to src/x64/Shift_test.go
index 926c98d..dc95cf2 100644
--- a/src/arch/x64/Shift_test.go
+++ b/src/x64/Shift_test.go
@@ -3,8 +3,8 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/cpu"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 
diff --git a/src/arch/x64/Store.go b/src/x64/Store.go
similarity index 100%
rename from src/arch/x64/Store.go
rename to src/x64/Store.go
diff --git a/src/arch/x64/Store_test.go b/src/x64/Store_test.go
similarity index 99%
rename from src/arch/x64/Store_test.go
rename to src/x64/Store_test.go
index 1d9d9a9..3f4bd05 100644
--- a/src/arch/x64/Store_test.go
+++ b/src/x64/Store_test.go
@@ -3,8 +3,8 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/cpu"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 
diff --git a/src/arch/x64/Sub.go b/src/x64/Sub.go
similarity index 100%
rename from src/arch/x64/Sub.go
rename to src/x64/Sub.go
diff --git a/src/arch/x64/Sub_test.go b/src/x64/Sub_test.go
similarity index 98%
rename from src/arch/x64/Sub_test.go
rename to src/x64/Sub_test.go
index d6898e9..7f03b53 100644
--- a/src/arch/x64/Sub_test.go
+++ b/src/x64/Sub_test.go
@@ -3,8 +3,8 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/cpu"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 
diff --git a/src/arch/x64/Syscall.go b/src/x64/Syscall.go
similarity index 100%
rename from src/arch/x64/Syscall.go
rename to src/x64/Syscall.go
diff --git a/src/arch/x64/Xor.go b/src/x64/Xor.go
similarity index 100%
rename from src/arch/x64/Xor.go
rename to src/x64/Xor.go
diff --git a/src/arch/x64/Xor_test.go b/src/x64/Xor_test.go
similarity index 98%
rename from src/arch/x64/Xor_test.go
rename to src/x64/Xor_test.go
index c9e0744..1a2b629 100644
--- a/src/arch/x64/Xor_test.go
+++ b/src/x64/Xor_test.go
@@ -3,8 +3,8 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
 	"git.akyoto.dev/cli/q/src/cpu"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )
 
diff --git a/src/arch/x64/encode.go b/src/x64/encode.go
similarity index 100%
rename from src/arch/x64/encode.go
rename to src/x64/encode.go
diff --git a/src/arch/x64/encodeNum.go b/src/x64/encodeNum.go
similarity index 100%
rename from src/arch/x64/encodeNum.go
rename to src/x64/encodeNum.go
diff --git a/src/arch/x64/memoryAccess.go b/src/x64/memoryAccess.go
similarity index 100%
rename from src/arch/x64/memoryAccess.go
rename to src/x64/memoryAccess.go
diff --git a/src/arch/x64/x64_test.go b/src/x64/x64_test.go
similarity index 93%
rename from src/arch/x64/x64_test.go
rename to src/x64/x64_test.go
index 0ed00d5..23f61ef 100644
--- a/src/arch/x64/x64_test.go
+++ b/src/x64/x64_test.go
@@ -3,7 +3,7 @@ package x64_test
 import (
 	"testing"
 
-	"git.akyoto.dev/cli/q/src/arch/x64"
+	"git.akyoto.dev/cli/q/src/x64"
 	"git.akyoto.dev/go/assert"
 )