diff --git a/X86Disassembler/X86/Handlers/InstructionHandlerFactory.cs b/X86Disassembler/X86/Handlers/InstructionHandlerFactory.cs
index bf04948..7f345ec 100644
--- a/X86Disassembler/X86/Handlers/InstructionHandlerFactory.cs
+++ b/X86Disassembler/X86/Handlers/InstructionHandlerFactory.cs
@@ -110,11 +110,6 @@ public class InstructionHandlerFactory
         _handlers.Add(new AddImmToRm32Handler(_codeBuffer, _decoder, _length));
         _handlers.Add(new AddImmToRm32SignExtendedHandler(_codeBuffer, _decoder, _length));
         
-        // OR handlers
-        _handlers.Add(new OrImmToRm8Handler(_codeBuffer, _decoder, _length));
-        _handlers.Add(new OrImmToRm32Handler(_codeBuffer, _decoder, _length));
-        _handlers.Add(new OrImmToRm32SignExtendedHandler(_codeBuffer, _decoder, _length));
-        
         // ADC handlers
         _handlers.Add(new AdcImmToRm32Handler(_codeBuffer, _decoder, _length));
         _handlers.Add(new AdcImmToRm32SignExtendedHandler(_codeBuffer, _decoder, _length));
@@ -204,7 +199,11 @@ public class InstructionHandlerFactory
     /// </summary>
     private void RegisterOrHandlers()
     {
-        // Add Or handlers
+        // Add OR handlers
+        _handlers.Add(new OrImmToRm8Handler(_codeBuffer, _decoder, _length));
+        _handlers.Add(new OrImmToRm32Handler(_codeBuffer, _decoder, _length));
+        _handlers.Add(new OrImmToRm32SignExtendedHandler(_codeBuffer, _decoder, _length));
+
         _handlers.Add(new OrR8Rm8Handler(_codeBuffer, _decoder, _length));
         _handlers.Add(new OrR32Rm32Handler(_codeBuffer, _decoder, _length));
         _handlers.Add(new OrAlImmHandler(_codeBuffer, _decoder, _length));
diff --git a/X86Disassembler/X86/Handlers/ArithmeticImmediate/OrImmToRm32Handler.cs b/X86Disassembler/X86/Handlers/Or/OrImmToRm32Handler.cs
similarity index 97%
rename from X86Disassembler/X86/Handlers/ArithmeticImmediate/OrImmToRm32Handler.cs
rename to X86Disassembler/X86/Handlers/Or/OrImmToRm32Handler.cs
index a5e1887..5560ec7 100644
--- a/X86Disassembler/X86/Handlers/ArithmeticImmediate/OrImmToRm32Handler.cs
+++ b/X86Disassembler/X86/Handlers/Or/OrImmToRm32Handler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers.ArithmeticImmediate;
+namespace X86Disassembler.X86.Handlers.Or;
 
 /// <summary>
 /// Handler for OR r/m32, imm32 instruction (0x81 /1)
diff --git a/X86Disassembler/X86/Handlers/ArithmeticImmediate/OrImmToRm32SignExtendedHandler.cs b/X86Disassembler/X86/Handlers/Or/OrImmToRm32SignExtendedHandler.cs
similarity index 97%
rename from X86Disassembler/X86/Handlers/ArithmeticImmediate/OrImmToRm32SignExtendedHandler.cs
rename to X86Disassembler/X86/Handlers/Or/OrImmToRm32SignExtendedHandler.cs
index 17e8d62..1e7ac5e 100644
--- a/X86Disassembler/X86/Handlers/ArithmeticImmediate/OrImmToRm32SignExtendedHandler.cs
+++ b/X86Disassembler/X86/Handlers/Or/OrImmToRm32SignExtendedHandler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers.ArithmeticImmediate;
+namespace X86Disassembler.X86.Handlers.Or;
 
 /// <summary>
 /// Handler for OR r/m32, imm8 (sign-extended) instruction (0x83 /1)
diff --git a/X86Disassembler/X86/Handlers/ArithmeticImmediate/OrImmToRm8Handler.cs b/X86Disassembler/X86/Handlers/Or/OrImmToRm8Handler.cs
similarity index 98%
rename from X86Disassembler/X86/Handlers/ArithmeticImmediate/OrImmToRm8Handler.cs
rename to X86Disassembler/X86/Handlers/Or/OrImmToRm8Handler.cs
index 3212df9..36207e6 100644
--- a/X86Disassembler/X86/Handlers/ArithmeticImmediate/OrImmToRm8Handler.cs
+++ b/X86Disassembler/X86/Handlers/Or/OrImmToRm8Handler.cs
@@ -1,4 +1,4 @@
-namespace X86Disassembler.X86.Handlers.ArithmeticImmediate;
+namespace X86Disassembler.X86.Handlers.Or;
 
 /// <summary>
 /// Handler for OR r/m8, imm8 instruction (0x80 /1)