diff --git a/X86Disassembler/X86/Handlers/Group1/AdcImmToRm32Handler.cs b/X86Disassembler/X86/Handlers/ArithmeticImmediate/AdcImmToRm32Handler.cs
similarity index 97%
rename from X86Disassembler/X86/Handlers/Group1/AdcImmToRm32Handler.cs
rename to X86Disassembler/X86/Handlers/ArithmeticImmediate/AdcImmToRm32Handler.cs
index d79a229..a85400b 100644
--- a/X86Disassembler/X86/Handlers/Group1/AdcImmToRm32Handler.cs
+++ b/X86Disassembler/X86/Handlers/ArithmeticImmediate/AdcImmToRm32Handler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers.Group1;
+namespace X86Disassembler.X86.Handlers.ArithmeticImmediate;
 
 /// <summary>
 /// Handler for ADC r/m32, imm32 instruction (0x81 /2)
diff --git a/X86Disassembler/X86/Handlers/Group1/AdcImmToRm32SignExtendedHandler.cs b/X86Disassembler/X86/Handlers/ArithmeticImmediate/AdcImmToRm32SignExtendedHandler.cs
similarity index 97%
rename from X86Disassembler/X86/Handlers/Group1/AdcImmToRm32SignExtendedHandler.cs
rename to X86Disassembler/X86/Handlers/ArithmeticImmediate/AdcImmToRm32SignExtendedHandler.cs
index f24bcb1..876acf8 100644
--- a/X86Disassembler/X86/Handlers/Group1/AdcImmToRm32SignExtendedHandler.cs
+++ b/X86Disassembler/X86/Handlers/ArithmeticImmediate/AdcImmToRm32SignExtendedHandler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers.Group1;
+namespace X86Disassembler.X86.Handlers.ArithmeticImmediate;
 
 /// <summary>
 /// Handler for ADC r/m32, imm8 (sign-extended) instruction (0x83 /2)
diff --git a/X86Disassembler/X86/Handlers/Group1/AddImmToRm32Handler.cs b/X86Disassembler/X86/Handlers/ArithmeticImmediate/AddImmToRm32Handler.cs
similarity index 97%
rename from X86Disassembler/X86/Handlers/Group1/AddImmToRm32Handler.cs
rename to X86Disassembler/X86/Handlers/ArithmeticImmediate/AddImmToRm32Handler.cs
index 41f7be9..8e97c18 100644
--- a/X86Disassembler/X86/Handlers/Group1/AddImmToRm32Handler.cs
+++ b/X86Disassembler/X86/Handlers/ArithmeticImmediate/AddImmToRm32Handler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers.Group1;
+namespace X86Disassembler.X86.Handlers.ArithmeticImmediate;
 
 /// <summary>
 /// Handler for ADD r/m32, imm32 instruction (0x81 /0)
diff --git a/X86Disassembler/X86/Handlers/Group1/AddImmToRm32SignExtendedHandler.cs b/X86Disassembler/X86/Handlers/ArithmeticImmediate/AddImmToRm32SignExtendedHandler.cs
similarity index 97%
rename from X86Disassembler/X86/Handlers/Group1/AddImmToRm32SignExtendedHandler.cs
rename to X86Disassembler/X86/Handlers/ArithmeticImmediate/AddImmToRm32SignExtendedHandler.cs
index dc89f8c..abe907d 100644
--- a/X86Disassembler/X86/Handlers/Group1/AddImmToRm32SignExtendedHandler.cs
+++ b/X86Disassembler/X86/Handlers/ArithmeticImmediate/AddImmToRm32SignExtendedHandler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers.Group1;
+namespace X86Disassembler.X86.Handlers.ArithmeticImmediate;
 
 /// <summary>
 /// Handler for ADD r/m32, imm8 (sign-extended) instruction (0x83 /0)
diff --git a/X86Disassembler/X86/Handlers/Group1/AddImmToRm8Handler.cs b/X86Disassembler/X86/Handlers/ArithmeticImmediate/AddImmToRm8Handler.cs
similarity index 98%
rename from X86Disassembler/X86/Handlers/Group1/AddImmToRm8Handler.cs
rename to X86Disassembler/X86/Handlers/ArithmeticImmediate/AddImmToRm8Handler.cs
index 03f1e27..10d9073 100644
--- a/X86Disassembler/X86/Handlers/Group1/AddImmToRm8Handler.cs
+++ b/X86Disassembler/X86/Handlers/ArithmeticImmediate/AddImmToRm8Handler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers.Group1;
+namespace X86Disassembler.X86.Handlers.ArithmeticImmediate;
 
 /// <summary>
 /// Handler for ADD r/m8, imm8 instruction (0x80 /0)
diff --git a/X86Disassembler/X86/Handlers/Group1/AndImmWithRm32Handler.cs b/X86Disassembler/X86/Handlers/ArithmeticImmediate/AndImmWithRm32Handler.cs
similarity index 97%
rename from X86Disassembler/X86/Handlers/Group1/AndImmWithRm32Handler.cs
rename to X86Disassembler/X86/Handlers/ArithmeticImmediate/AndImmWithRm32Handler.cs
index 175e3ba..1497e66 100644
--- a/X86Disassembler/X86/Handlers/Group1/AndImmWithRm32Handler.cs
+++ b/X86Disassembler/X86/Handlers/ArithmeticImmediate/AndImmWithRm32Handler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers.Group1;
+namespace X86Disassembler.X86.Handlers.ArithmeticImmediate;
 
 /// <summary>
 /// Handler for AND r/m32, imm32 instruction (0x81 /4)
diff --git a/X86Disassembler/X86/Handlers/Group1/AndImmWithRm32SignExtendedHandler.cs b/X86Disassembler/X86/Handlers/ArithmeticImmediate/AndImmWithRm32SignExtendedHandler.cs
similarity index 97%
rename from X86Disassembler/X86/Handlers/Group1/AndImmWithRm32SignExtendedHandler.cs
rename to X86Disassembler/X86/Handlers/ArithmeticImmediate/AndImmWithRm32SignExtendedHandler.cs
index dd7ab1e..574e848 100644
--- a/X86Disassembler/X86/Handlers/Group1/AndImmWithRm32SignExtendedHandler.cs
+++ b/X86Disassembler/X86/Handlers/ArithmeticImmediate/AndImmWithRm32SignExtendedHandler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers.Group1;
+namespace X86Disassembler.X86.Handlers.ArithmeticImmediate;
 
 /// <summary>
 /// Handler for AND r/m32, imm8 (sign-extended) instruction (0x83 /4)
diff --git a/X86Disassembler/X86/Handlers/Group1/CmpImmWithRm32Handler.cs b/X86Disassembler/X86/Handlers/ArithmeticImmediate/CmpImmWithRm32Handler.cs
similarity index 97%
rename from X86Disassembler/X86/Handlers/Group1/CmpImmWithRm32Handler.cs
rename to X86Disassembler/X86/Handlers/ArithmeticImmediate/CmpImmWithRm32Handler.cs
index 2423438..fcf98ce 100644
--- a/X86Disassembler/X86/Handlers/Group1/CmpImmWithRm32Handler.cs
+++ b/X86Disassembler/X86/Handlers/ArithmeticImmediate/CmpImmWithRm32Handler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers.Group1;
+namespace X86Disassembler.X86.Handlers.ArithmeticImmediate;
 
 /// <summary>
 /// Handler for CMP r/m32, imm32 instruction (0x81 /7)
diff --git a/X86Disassembler/X86/Handlers/Group1/CmpImmWithRm32SignExtendedHandler.cs b/X86Disassembler/X86/Handlers/ArithmeticImmediate/CmpImmWithRm32SignExtendedHandler.cs
similarity index 97%
rename from X86Disassembler/X86/Handlers/Group1/CmpImmWithRm32SignExtendedHandler.cs
rename to X86Disassembler/X86/Handlers/ArithmeticImmediate/CmpImmWithRm32SignExtendedHandler.cs
index 22134d6..33d5ec8 100644
--- a/X86Disassembler/X86/Handlers/Group1/CmpImmWithRm32SignExtendedHandler.cs
+++ b/X86Disassembler/X86/Handlers/ArithmeticImmediate/CmpImmWithRm32SignExtendedHandler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers.Group1;
+namespace X86Disassembler.X86.Handlers.ArithmeticImmediate;
 
 /// <summary>
 /// Handler for CMP r/m32, imm8 (sign-extended) instruction (0x83 /7)
diff --git a/X86Disassembler/X86/Handlers/Group1/OrImmToRm32Handler.cs b/X86Disassembler/X86/Handlers/ArithmeticImmediate/OrImmToRm32Handler.cs
similarity index 97%
rename from X86Disassembler/X86/Handlers/Group1/OrImmToRm32Handler.cs
rename to X86Disassembler/X86/Handlers/ArithmeticImmediate/OrImmToRm32Handler.cs
index 6682a0e..a5e1887 100644
--- a/X86Disassembler/X86/Handlers/Group1/OrImmToRm32Handler.cs
+++ b/X86Disassembler/X86/Handlers/ArithmeticImmediate/OrImmToRm32Handler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers.Group1;
+namespace X86Disassembler.X86.Handlers.ArithmeticImmediate;
 
 /// <summary>
 /// Handler for OR r/m32, imm32 instruction (0x81 /1)
diff --git a/X86Disassembler/X86/Handlers/Group1/OrImmToRm32SignExtendedHandler.cs b/X86Disassembler/X86/Handlers/ArithmeticImmediate/OrImmToRm32SignExtendedHandler.cs
similarity index 97%
rename from X86Disassembler/X86/Handlers/Group1/OrImmToRm32SignExtendedHandler.cs
rename to X86Disassembler/X86/Handlers/ArithmeticImmediate/OrImmToRm32SignExtendedHandler.cs
index 964fd51..17e8d62 100644
--- a/X86Disassembler/X86/Handlers/Group1/OrImmToRm32SignExtendedHandler.cs
+++ b/X86Disassembler/X86/Handlers/ArithmeticImmediate/OrImmToRm32SignExtendedHandler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers.Group1;
+namespace X86Disassembler.X86.Handlers.ArithmeticImmediate;
 
 /// <summary>
 /// Handler for OR r/m32, imm8 (sign-extended) instruction (0x83 /1)
diff --git a/X86Disassembler/X86/Handlers/Group1/OrImmToRm8Handler.cs b/X86Disassembler/X86/Handlers/ArithmeticImmediate/OrImmToRm8Handler.cs
similarity index 98%
rename from X86Disassembler/X86/Handlers/Group1/OrImmToRm8Handler.cs
rename to X86Disassembler/X86/Handlers/ArithmeticImmediate/OrImmToRm8Handler.cs
index 3b6378b..3212df9 100644
--- a/X86Disassembler/X86/Handlers/Group1/OrImmToRm8Handler.cs
+++ b/X86Disassembler/X86/Handlers/ArithmeticImmediate/OrImmToRm8Handler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers.Group1;
+namespace X86Disassembler.X86.Handlers.ArithmeticImmediate;
 
 /// <summary>
 /// Handler for OR r/m8, imm8 instruction (0x80 /1)
diff --git a/X86Disassembler/X86/Handlers/Group1/SbbImmFromRm32Handler.cs b/X86Disassembler/X86/Handlers/ArithmeticImmediate/SbbImmFromRm32Handler.cs
similarity index 97%
rename from X86Disassembler/X86/Handlers/Group1/SbbImmFromRm32Handler.cs
rename to X86Disassembler/X86/Handlers/ArithmeticImmediate/SbbImmFromRm32Handler.cs
index f8ef226..764f2fa 100644
--- a/X86Disassembler/X86/Handlers/Group1/SbbImmFromRm32Handler.cs
+++ b/X86Disassembler/X86/Handlers/ArithmeticImmediate/SbbImmFromRm32Handler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers.Group1;
+namespace X86Disassembler.X86.Handlers.ArithmeticImmediate;
 
 /// <summary>
 /// Handler for SBB r/m32, imm32 instruction (0x81 /3)
diff --git a/X86Disassembler/X86/Handlers/Group1/SbbImmFromRm32SignExtendedHandler.cs b/X86Disassembler/X86/Handlers/ArithmeticImmediate/SbbImmFromRm32SignExtendedHandler.cs
similarity index 97%
rename from X86Disassembler/X86/Handlers/Group1/SbbImmFromRm32SignExtendedHandler.cs
rename to X86Disassembler/X86/Handlers/ArithmeticImmediate/SbbImmFromRm32SignExtendedHandler.cs
index 4f41c44..d3f0947 100644
--- a/X86Disassembler/X86/Handlers/Group1/SbbImmFromRm32SignExtendedHandler.cs
+++ b/X86Disassembler/X86/Handlers/ArithmeticImmediate/SbbImmFromRm32SignExtendedHandler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers.Group1;
+namespace X86Disassembler.X86.Handlers.ArithmeticImmediate;
 
 /// <summary>
 /// Handler for SBB r/m32, imm8 (sign-extended) instruction (0x83 /3)
diff --git a/X86Disassembler/X86/Handlers/Group1/SubImmFromRm32Handler.cs b/X86Disassembler/X86/Handlers/ArithmeticImmediate/SubImmFromRm32Handler.cs
similarity index 97%
rename from X86Disassembler/X86/Handlers/Group1/SubImmFromRm32Handler.cs
rename to X86Disassembler/X86/Handlers/ArithmeticImmediate/SubImmFromRm32Handler.cs
index b8ca06a..5e0b2ac 100644
--- a/X86Disassembler/X86/Handlers/Group1/SubImmFromRm32Handler.cs
+++ b/X86Disassembler/X86/Handlers/ArithmeticImmediate/SubImmFromRm32Handler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers.Group1;
+namespace X86Disassembler.X86.Handlers.ArithmeticImmediate;
 
 /// <summary>
 /// Handler for SUB r/m32, imm32 instruction (0x81 /5)
diff --git a/X86Disassembler/X86/Handlers/Group1/SubImmFromRm32SignExtendedHandler.cs b/X86Disassembler/X86/Handlers/ArithmeticImmediate/SubImmFromRm32SignExtendedHandler.cs
similarity index 97%
rename from X86Disassembler/X86/Handlers/Group1/SubImmFromRm32SignExtendedHandler.cs
rename to X86Disassembler/X86/Handlers/ArithmeticImmediate/SubImmFromRm32SignExtendedHandler.cs
index 1e286a6..7305bae 100644
--- a/X86Disassembler/X86/Handlers/Group1/SubImmFromRm32SignExtendedHandler.cs
+++ b/X86Disassembler/X86/Handlers/ArithmeticImmediate/SubImmFromRm32SignExtendedHandler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers.Group1;
+namespace X86Disassembler.X86.Handlers.ArithmeticImmediate;
 
 /// <summary>
 /// Handler for SUB r/m32, imm8 (sign-extended) instruction (0x83 /5)
diff --git a/X86Disassembler/X86/Handlers/Group3/DivRm32Handler.cs b/X86Disassembler/X86/Handlers/ArithmeticUnary/DivRm32Handler.cs
similarity index 97%
rename from X86Disassembler/X86/Handlers/Group3/DivRm32Handler.cs
rename to X86Disassembler/X86/Handlers/ArithmeticUnary/DivRm32Handler.cs
index a8ec5fc..461dcbc 100644
--- a/X86Disassembler/X86/Handlers/Group3/DivRm32Handler.cs
+++ b/X86Disassembler/X86/Handlers/ArithmeticUnary/DivRm32Handler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers.Group3;
+namespace X86Disassembler.X86.Handlers.ArithmeticUnary;
 
 /// <summary>
 /// Handler for DIV r/m32 instruction (0xF7 /6)
diff --git a/X86Disassembler/X86/Handlers/Group3/IdivRm32Handler.cs b/X86Disassembler/X86/Handlers/ArithmeticUnary/IdivRm32Handler.cs
similarity index 97%
rename from X86Disassembler/X86/Handlers/Group3/IdivRm32Handler.cs
rename to X86Disassembler/X86/Handlers/ArithmeticUnary/IdivRm32Handler.cs
index 5b2cfce..199fbe5 100644
--- a/X86Disassembler/X86/Handlers/Group3/IdivRm32Handler.cs
+++ b/X86Disassembler/X86/Handlers/ArithmeticUnary/IdivRm32Handler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers.Group3;
+namespace X86Disassembler.X86.Handlers.ArithmeticUnary;
 
 /// <summary>
 /// Handler for IDIV r/m32 instruction (0xF7 /7)
diff --git a/X86Disassembler/X86/Handlers/Group3/ImulRm32Handler.cs b/X86Disassembler/X86/Handlers/ArithmeticUnary/ImulRm32Handler.cs
similarity index 97%
rename from X86Disassembler/X86/Handlers/Group3/ImulRm32Handler.cs
rename to X86Disassembler/X86/Handlers/ArithmeticUnary/ImulRm32Handler.cs
index 71a3828..9ac0f8c 100644
--- a/X86Disassembler/X86/Handlers/Group3/ImulRm32Handler.cs
+++ b/X86Disassembler/X86/Handlers/ArithmeticUnary/ImulRm32Handler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers.Group3;
+namespace X86Disassembler.X86.Handlers.ArithmeticUnary;
 
 /// <summary>
 /// Handler for IMUL r/m32 instruction (0xF7 /5)
diff --git a/X86Disassembler/X86/Handlers/Group3/MulRm32Handler.cs b/X86Disassembler/X86/Handlers/ArithmeticUnary/MulRm32Handler.cs
similarity index 97%
rename from X86Disassembler/X86/Handlers/Group3/MulRm32Handler.cs
rename to X86Disassembler/X86/Handlers/ArithmeticUnary/MulRm32Handler.cs
index 36c0d52..ebf5fef 100644
--- a/X86Disassembler/X86/Handlers/Group3/MulRm32Handler.cs
+++ b/X86Disassembler/X86/Handlers/ArithmeticUnary/MulRm32Handler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers.Group3;
+namespace X86Disassembler.X86.Handlers.ArithmeticUnary;
 
 /// <summary>
 /// Handler for MUL r/m32 instruction (0xF7 /4)
diff --git a/X86Disassembler/X86/Handlers/Group3/NegRm32Handler.cs b/X86Disassembler/X86/Handlers/ArithmeticUnary/NegRm32Handler.cs
similarity index 97%
rename from X86Disassembler/X86/Handlers/Group3/NegRm32Handler.cs
rename to X86Disassembler/X86/Handlers/ArithmeticUnary/NegRm32Handler.cs
index 5418668..a701619 100644
--- a/X86Disassembler/X86/Handlers/Group3/NegRm32Handler.cs
+++ b/X86Disassembler/X86/Handlers/ArithmeticUnary/NegRm32Handler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers.Group3;
+namespace X86Disassembler.X86.Handlers.ArithmeticUnary;
 
 /// <summary>
 /// Handler for NEG r/m32 instruction (0xF7 /3)
diff --git a/X86Disassembler/X86/Handlers/Group3/NotRm32Handler.cs b/X86Disassembler/X86/Handlers/ArithmeticUnary/NotRm32Handler.cs
similarity index 98%
rename from X86Disassembler/X86/Handlers/Group3/NotRm32Handler.cs
rename to X86Disassembler/X86/Handlers/ArithmeticUnary/NotRm32Handler.cs
index f97afd0..54998c3 100644
--- a/X86Disassembler/X86/Handlers/Group3/NotRm32Handler.cs
+++ b/X86Disassembler/X86/Handlers/ArithmeticUnary/NotRm32Handler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers.Group3;
+namespace X86Disassembler.X86.Handlers.ArithmeticUnary;
 
 /// <summary>
 /// Handler for NOT r/m32 instruction (0xF7 /2)
diff --git a/X86Disassembler/X86/Handlers/InstructionHandlerFactory.cs b/X86Disassembler/X86/Handlers/InstructionHandlerFactory.cs
index dec1ac7..c9d7e3e 100644
--- a/X86Disassembler/X86/Handlers/InstructionHandlerFactory.cs
+++ b/X86Disassembler/X86/Handlers/InstructionHandlerFactory.cs
@@ -1,7 +1,7 @@
+using X86Disassembler.X86.Handlers.ArithmeticImmediate;
+using X86Disassembler.X86.Handlers.ArithmeticUnary;
 using X86Disassembler.X86.Handlers.Call;
 using X86Disassembler.X86.Handlers.FloatingPoint;
-using X86Disassembler.X86.Handlers.Group1;
-using X86Disassembler.X86.Handlers.Group3;
 using X86Disassembler.X86.Handlers.Jump;
 using X86Disassembler.X86.Handlers.Mov;
 using X86Disassembler.X86.Handlers.Pop;
@@ -44,8 +44,8 @@ public class InstructionHandlerFactory
     private void RegisterHandlers()
     {
         // Register group handlers
-        RegisterGroup3Handlers();
-        RegisterGroup1Handlers();
+        RegisterArithmeticUnaryHandlers();
+        RegisterArithmeticImmediateHandlers();
         
         // Register specific instruction handlers
         _handlers.Add(new Int3Handler(_codeBuffer, _decoder, _length));
@@ -73,9 +73,33 @@ public class InstructionHandlerFactory
     }
     
     /// <summary>
-    /// Registers all Group1 instruction handlers
+    /// Registers all ArithmeticUnary instruction handlers
     /// </summary>
-    private void RegisterGroup1Handlers()
+    private void RegisterArithmeticUnaryHandlers()
+    {
+        // NOT handler
+        _handlers.Add(new NotRm32Handler(_codeBuffer, _decoder, _length));
+        
+        // NEG handler
+        _handlers.Add(new NegRm32Handler(_codeBuffer, _decoder, _length));
+        
+        // MUL handler
+        _handlers.Add(new MulRm32Handler(_codeBuffer, _decoder, _length));
+        
+        // IMUL handler
+        _handlers.Add(new ImulRm32Handler(_codeBuffer, _decoder, _length));
+        
+        // DIV handler
+        _handlers.Add(new DivRm32Handler(_codeBuffer, _decoder, _length));
+        
+        // IDIV handler
+        _handlers.Add(new IdivRm32Handler(_codeBuffer, _decoder, _length));
+    }
+    
+    /// <summary>
+    /// Registers all ArithmeticImmediate instruction handlers
+    /// </summary>
+    private void RegisterArithmeticImmediateHandlers()
     {
         // ADD handlers
         _handlers.Add(new AddImmToRm8Handler(_codeBuffer, _decoder, _length));
@@ -112,30 +136,6 @@ public class InstructionHandlerFactory
         _handlers.Add(new CmpImmWithRm32SignExtendedHandler(_codeBuffer, _decoder, _length));
     }
     
-    /// <summary>
-    /// Registers all Group3 instruction handlers
-    /// </summary>
-    private void RegisterGroup3Handlers()
-    {
-        // NOT handler
-        _handlers.Add(new NotRm32Handler(_codeBuffer, _decoder, _length));
-        
-        // NEG handler
-        _handlers.Add(new NegRm32Handler(_codeBuffer, _decoder, _length));
-        
-        // MUL handler
-        _handlers.Add(new MulRm32Handler(_codeBuffer, _decoder, _length));
-        
-        // IMUL handler
-        _handlers.Add(new ImulRm32Handler(_codeBuffer, _decoder, _length));
-        
-        // DIV handler
-        _handlers.Add(new DivRm32Handler(_codeBuffer, _decoder, _length));
-        
-        // IDIV handler
-        _handlers.Add(new IdivRm32Handler(_codeBuffer, _decoder, _length));
-    }
-    
     /// <summary>
     /// Registers all Return instruction handlers
     /// </summary>
diff --git a/X86DisassemblerTests/Group1InstructionTests.cs b/X86DisassemblerTests/Group1InstructionTests.cs
index 111a905..0a5c9c7 100644
--- a/X86DisassemblerTests/Group1InstructionTests.cs
+++ b/X86DisassemblerTests/Group1InstructionTests.cs
@@ -3,7 +3,6 @@ namespace X86DisassemblerTests;
 using System;
 using Xunit;
 using X86Disassembler.X86;
-using X86Disassembler.X86.Handlers.Group1;
 
 /// <summary>
 /// Tests for Group1 instruction handlers
diff --git a/X86DisassemblerTests/Group3InstructionTests.cs b/X86DisassemblerTests/Group3InstructionTests.cs
index 69555b5..9521749 100644
--- a/X86DisassemblerTests/Group3InstructionTests.cs
+++ b/X86DisassemblerTests/Group3InstructionTests.cs
@@ -3,7 +3,6 @@ namespace X86DisassemblerTests;
 using System;
 using Xunit;
 using X86Disassembler.X86;
-using X86Disassembler.X86.Handlers.Group3;
 
 /// <summary>
 /// Tests for Group3 instruction handlers
diff --git a/X86DisassemblerTests/TestInstructionHandlerTests.cs b/X86DisassemblerTests/TestInstructionHandlerTests.cs
index eda19f7..9a62552 100644
--- a/X86DisassemblerTests/TestInstructionHandlerTests.cs
+++ b/X86DisassemblerTests/TestInstructionHandlerTests.cs
@@ -6,7 +6,6 @@ using System;
 using Xunit;
 using X86Disassembler.X86;
 using X86Disassembler.X86.Handlers;
-using X86Disassembler.X86.Handlers.Group3;
 
 /// <summary>
 /// Tests for TEST instruction handlers