diff --git a/X86Disassembler/X86/Handlers/CallRel32Handler.cs b/X86Disassembler/X86/Handlers/Call/CallRel32Handler.cs
similarity index 97%
rename from X86Disassembler/X86/Handlers/CallRel32Handler.cs
rename to X86Disassembler/X86/Handlers/Call/CallRel32Handler.cs
index 04950f6..f3748fe 100644
--- a/X86Disassembler/X86/Handlers/CallRel32Handler.cs
+++ b/X86Disassembler/X86/Handlers/Call/CallRel32Handler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers;
+namespace X86Disassembler.X86.Handlers.Call;
 
 /// <summary>
 /// Handler for CALL rel32 instruction (0xE8)
diff --git a/X86Disassembler/X86/Handlers/InstructionHandlerFactory.cs b/X86Disassembler/X86/Handlers/InstructionHandlerFactory.cs
index 5dafc28..248a42e 100644
--- a/X86Disassembler/X86/Handlers/InstructionHandlerFactory.cs
+++ b/X86Disassembler/X86/Handlers/InstructionHandlerFactory.cs
@@ -1,5 +1,8 @@
+using X86Disassembler.X86.Handlers.Call;
 using X86Disassembler.X86.Handlers.Jump;
+using X86Disassembler.X86.Handlers.Ret;
 using X86Disassembler.X86.Handlers.Test;
+using X86Disassembler.X86.Handlers.Xor;
 
 namespace X86Disassembler.X86.Handlers;
 
diff --git a/X86Disassembler/X86/Handlers/RetHandler.cs b/X86Disassembler/X86/Handlers/Ret/RetHandler.cs
similarity index 97%
rename from X86Disassembler/X86/Handlers/RetHandler.cs
rename to X86Disassembler/X86/Handlers/Ret/RetHandler.cs
index 76769ca..5a4be94 100644
--- a/X86Disassembler/X86/Handlers/RetHandler.cs
+++ b/X86Disassembler/X86/Handlers/Ret/RetHandler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers;
+namespace X86Disassembler.X86.Handlers.Ret;
 
 /// <summary>
 /// Handler for RET instruction (0xC3)
diff --git a/X86Disassembler/X86/Handlers/RetImmHandler.cs b/X86Disassembler/X86/Handlers/Ret/RetImmHandler.cs
similarity index 97%
rename from X86Disassembler/X86/Handlers/RetImmHandler.cs
rename to X86Disassembler/X86/Handlers/Ret/RetImmHandler.cs
index d2c6a31..ca4358e 100644
--- a/X86Disassembler/X86/Handlers/RetImmHandler.cs
+++ b/X86Disassembler/X86/Handlers/Ret/RetImmHandler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers;
+namespace X86Disassembler.X86.Handlers.Ret;
 
 /// <summary>
 /// Handler for RET instruction with immediate operand (0xC2)
diff --git a/X86Disassembler/X86/Handlers/XorAlImmHandler.cs b/X86Disassembler/X86/Handlers/Xor/XorAlImmHandler.cs
similarity index 97%
rename from X86Disassembler/X86/Handlers/XorAlImmHandler.cs
rename to X86Disassembler/X86/Handlers/Xor/XorAlImmHandler.cs
index ba46ee6..af9e75d 100644
--- a/X86Disassembler/X86/Handlers/XorAlImmHandler.cs
+++ b/X86Disassembler/X86/Handlers/Xor/XorAlImmHandler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers;
+namespace X86Disassembler.X86.Handlers.Xor;
 
 /// <summary>
 /// Handler for XOR AL, imm8 instruction (0x34)
diff --git a/X86Disassembler/X86/Handlers/XorEaxImmHandler.cs b/X86Disassembler/X86/Handlers/Xor/XorEaxImmHandler.cs
similarity index 97%
rename from X86Disassembler/X86/Handlers/XorEaxImmHandler.cs
rename to X86Disassembler/X86/Handlers/Xor/XorEaxImmHandler.cs
index 78fcae1..db8f9dc 100644
--- a/X86Disassembler/X86/Handlers/XorEaxImmHandler.cs
+++ b/X86Disassembler/X86/Handlers/Xor/XorEaxImmHandler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers;
+namespace X86Disassembler.X86.Handlers.Xor;
 
 /// <summary>
 /// Handler for XOR EAX, imm32 instruction (0x35)
diff --git a/X86Disassembler/X86/Handlers/Group1/XorImmWithRm32Handler.cs b/X86Disassembler/X86/Handlers/Xor/XorImmWithRm32Handler.cs
similarity index 96%
rename from X86Disassembler/X86/Handlers/Group1/XorImmWithRm32Handler.cs
rename to X86Disassembler/X86/Handlers/Xor/XorImmWithRm32Handler.cs
index 7b5a8cb..e1bfb7a 100644
--- a/X86Disassembler/X86/Handlers/Group1/XorImmWithRm32Handler.cs
+++ b/X86Disassembler/X86/Handlers/Xor/XorImmWithRm32Handler.cs
@@ -1,4 +1,6 @@
-namespace X86Disassembler.X86.Handlers.Group1;
+using X86Disassembler.X86.Handlers.Group1;
+
+namespace X86Disassembler.X86.Handlers.Xor;
 
 /// <summary>
 /// Handler for XOR r/m32, imm32 instruction (0x81 /6)
diff --git a/X86Disassembler/X86/Handlers/Group1/XorImmWithRm32SignExtendedHandler.cs b/X86Disassembler/X86/Handlers/Xor/XorImmWithRm32SignExtendedHandler.cs
similarity index 97%
rename from X86Disassembler/X86/Handlers/Group1/XorImmWithRm32SignExtendedHandler.cs
rename to X86Disassembler/X86/Handlers/Xor/XorImmWithRm32SignExtendedHandler.cs
index c446099..7addad3 100644
--- a/X86Disassembler/X86/Handlers/Group1/XorImmWithRm32SignExtendedHandler.cs
+++ b/X86Disassembler/X86/Handlers/Xor/XorImmWithRm32SignExtendedHandler.cs
@@ -1,4 +1,6 @@
-namespace X86Disassembler.X86.Handlers.Group1;
+using X86Disassembler.X86.Handlers.Group1;
+
+namespace X86Disassembler.X86.Handlers.Xor;
 
 /// <summary>
 /// Handler for XOR r/m32, imm8 (sign-extended) instruction (0x83 /6)
diff --git a/X86Disassembler/X86/Handlers/XorMemRegHandler.cs b/X86Disassembler/X86/Handlers/Xor/XorMemRegHandler.cs
similarity index 98%
rename from X86Disassembler/X86/Handlers/XorMemRegHandler.cs
rename to X86Disassembler/X86/Handlers/Xor/XorMemRegHandler.cs
index acefa7c..8cb0cd4 100644
--- a/X86Disassembler/X86/Handlers/XorMemRegHandler.cs
+++ b/X86Disassembler/X86/Handlers/Xor/XorMemRegHandler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers;
+namespace X86Disassembler.X86.Handlers.Xor;
 
 /// <summary>
 /// Handler for XOR r/m32, r32 instruction (0x31)
diff --git a/X86Disassembler/X86/Handlers/XorRegMemHandler.cs b/X86Disassembler/X86/Handlers/Xor/XorRegMemHandler.cs
similarity index 98%
rename from X86Disassembler/X86/Handlers/XorRegMemHandler.cs
rename to X86Disassembler/X86/Handlers/Xor/XorRegMemHandler.cs
index 21bf4c1..10e1604 100644
--- a/X86Disassembler/X86/Handlers/XorRegMemHandler.cs
+++ b/X86Disassembler/X86/Handlers/Xor/XorRegMemHandler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers;
+namespace X86Disassembler.X86.Handlers.Xor;
 
 /// <summary>
 /// Handler for XOR r32, r/m32 instruction (0x33)