diff --git a/source2/IL2CPU/Cosmos.IL2CPU.X86/Cosmos.IL2CPU.X86.csproj b/source2/IL2CPU/Cosmos.IL2CPU.X86/Cosmos.IL2CPU.X86.csproj
index 3caf895d3..1a0c7a77c 100644
--- a/source2/IL2CPU/Cosmos.IL2CPU.X86/Cosmos.IL2CPU.X86.csproj
+++ b/source2/IL2CPU/Cosmos.IL2CPU.X86/Cosmos.IL2CPU.X86.csproj
@@ -262,6 +262,7 @@
     <Compile Include="Plugs\Diagnostics\DebuggerImpl.cs" />
     <Compile Include="Plugs\Diagnostics\DebugImpl.cs" />
     <Compile Include="Plugs\Diagnostics\DebugImplRefs.cs" />
+    <Compile Include="Plugs\MS\System\MathImpl.cs" />
     <Compile Include="Plugs\MS\System\StringImpl.cs" />
     <Compile Include="Plugs\NEW_PLUGS\CtorImplAssembler.cs" />
     <Compile Include="Plugs\NEW_PLUGS\DelegateImpl.cs" />
diff --git a/source2/Kernel/System/Hardware/Core/Cosmos.Core.Plugs/MathImpl.cs b/source2/IL2CPU/Cosmos.IL2CPU.X86/Plugs/MS/System/MathImpl.cs
similarity index 92%
rename from source2/Kernel/System/Hardware/Core/Cosmos.Core.Plugs/MathImpl.cs
rename to source2/IL2CPU/Cosmos.IL2CPU.X86/Plugs/MS/System/MathImpl.cs
index e79a0e869..a980ec536 100644
--- a/source2/Kernel/System/Hardware/Core/Cosmos.Core.Plugs/MathImpl.cs
+++ b/source2/IL2CPU/Cosmos.IL2CPU.X86/Plugs/MS/System/MathImpl.cs
@@ -7,7 +7,7 @@ using Assembler = Cosmos.Compiler.Assembler.Assembler;
 using CPUAll = Cosmos.Compiler.Assembler;
 using CPUx86 = Cosmos.Compiler.Assembler.X86;
 
-namespace Cosmos.Core.Plugs
+namespace Cosmos.IL2CPU.X86.Plugs.CustomImplementations.MS.System
 {
 	[Plug(Target = typeof(global::System.Math))]
 	class MathImpl
diff --git a/source2/Kernel/System/Hardware/Core/Cosmos.Core.Plugs/Cosmos.Core.Plugs.csproj b/source2/Kernel/System/Hardware/Core/Cosmos.Core.Plugs/Cosmos.Core.Plugs.csproj
index 2a8e18509..6a9b306f6 100644
--- a/source2/Kernel/System/Hardware/Core/Cosmos.Core.Plugs/Cosmos.Core.Plugs.csproj
+++ b/source2/Kernel/System/Hardware/Core/Cosmos.Core.Plugs/Cosmos.Core.Plugs.csproj
@@ -96,7 +96,6 @@
     <Compile Include="CPUImpl.cs" />
     <Compile Include="GCImplementionImpl.cs" />
     <Compile Include="IOPortImpl.cs" />
-    <Compile Include="MathImpl.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RuntimeHelpersImpl.cs" />
     <Compile Include="StringImpl.cs" />